 Bilel Bghiel
|
42228aa9f7
|
Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop
Conflicts:
image/Images.java
|
2015-06-19 19:46:35 +02:00 |
|
|
Bilel Bghiel
|
b86ce91755
|
- code cleanup
- Verbeteringen in stoppen van audio
-- Simpelere afhandeling
-- Thread stopt wanneer (clip != null) ipv .stop()
|
2015-06-19 19:40:35 +02:00 |
|
 kennyboy55
|
2ba069c0e2
|
Fixed import
|
2015-06-19 19:11:09 +02:00 |
|
|
kennyboy55
|
1ed5ac1be2
|
Fixed skipping gameover
|
2015-06-19 19:10:15 +02:00 |
|
|
kennyboy55
|
e6050715fc
|
Small bugfix for playdata
|
2015-06-19 18:58:32 +02:00 |
|
|
Bilel Bghiel
|
c019fdeea3
|
Helpstate geintereerd
|
2015-06-19 15:28:43 +02:00 |
|
|
Bilel Bghiel
|
d92cd7333b
|
clean up 'n bugcrushing
|
2015-06-19 14:36:40 +02:00 |
|
|
Bilel Bghiel
|
864b6efa52
|
fixes
|
2015-06-19 13:50:26 +02:00 |
|
 jancoow
|
9b779537b6
|
Some little fixes
|
2015-06-19 12:35:48 +02:00 |
|
|
Bilel Bghiel
|
f72d54202f
|
Merge branch 'fix' of https://github.com/ProjectGroepA2/Arcade into develop
Conflicts:
control/GameStateManager.java
model/objects/InfoPanel.java
|
2015-06-19 11:36:19 +02:00 |
|
 Remco
|
a54c3e2991
|
While on gamestate and you press the start button you go back to the title_state
|
2015-06-19 11:17:36 +02:00 |
|
|
Remco
|
8adc39f00f
|
joystick bugg fix?
|
2015-06-19 10:57:31 +02:00 |
|
|
jancoow
|
d86d4dc62e
|
Remove some system outs
|
2015-06-19 10:25:44 +02:00 |
|
|
Remco
|
2ed5ceeaba
|
qrimage is set in the middle of the gameoverscreen, frame is not resizable anymore
|
2015-06-19 10:17:58 +02:00 |
|
|
kennyboy55
|
1520a6a104
|
Add mostplayed.
Don't ask for highscore if 0
|
2015-06-18 20:17:10 +02:00 |
|
|
kennyboy55
|
5ce2cca4df
|
Moved menubuttons
|
2015-06-18 20:16:32 +02:00 |
|
|
kennyboy55
|
ef36b2052e
|
Added cancel button color
|
2015-06-18 20:15:50 +02:00 |
|
 Daniel
|
35c6c27d15
|
HelpState beter gemaakt
|
2015-06-18 17:41:18 +02:00 |
|
|
Remco
|
ec8f1e5bb3
|
Games played underneath 5 secs will nog be added to database
|
2015-06-18 16:47:27 +02:00 |
|
|
Daniel
|
2d9daf8844
|
Help State Added
|
2015-06-18 16:39:21 +02:00 |
|
|
Bilel Bghiel
|
d1a4ccf150
|
Audio stopt bij wisselen tussen schermen
|
2015-06-18 16:24:03 +02:00 |
|
|
Bilel Bghiel
|
1f44b5b487
|
Verbetercode.
|
2015-06-16 17:30:34 +02:00 |
|
|
jancoow
|
1f0030b90d
|
Added webcam support + QR code generator.
Some cleanup
|
2015-06-15 19:29:55 +02:00 |
|
|
Remco
|
c731797f7d
|
allen op je pc krijg je te zien in de playstate welke kleur welke knop is
|
2015-06-14 10:23:04 +02:00 |
|
|
kennyboy55
|
b0ce0bb6f8
|
Added playdata SQL call.
Bugfixes
|
2015-06-13 19:35:02 +02:00 |
|
|
kennyboy55
|
67764c1608
|
Added infinite scrolling.
Bugfixes
|
2015-06-13 19:34:36 +02:00 |
|
|
kennyboy55
|
4d2d6c68ac
|
Added infinite scrolling.
Added highscores SQL call
|
2015-06-13 19:31:21 +02:00 |
|
|
Remco
|
3fcefa6df5
|
bug fix
|
2015-06-12 14:52:01 +02:00 |
|
|
Remco
|
336a3051ff
|
By gameoverscreen able to typ a name
|
2015-06-12 14:42:40 +02:00 |
|
 Dofensmirtsz
|
1a3f2cbc17
|
getters gemaakt voor time,name, en score in highscore.
weergeven van highscores in menustate, geeft niks weer omdat de database leeg is.
|
2015-06-12 14:37:01 +02:00 |
|
|
kennyboy55
|
b4a223fdd1
|
Added SQLConnector to states
|
2015-06-12 13:15:06 +02:00 |
|
|
kennyboy55
|
22853812f3
|
Added border around enemies
|
2015-06-11 17:15:41 +02:00 |
|
|
Dofensmirtsz
|
e979252aae
|
Submenu fix, songselect fix
|
2015-06-11 15:38:11 +02:00 |
|
|
jancoow
|
fd46800e80
|
Fixed menu merge errors
|
2015-06-11 14:32:25 +02:00 |
|
|
jancoow
|
409866ab75
|
Feature/menu
# Conflicts:
# model/gameState/MenuState.java
# model/objects/MenuButton.java
|
2015-06-11 14:22:22 +02:00 |
|
|
jancoow
|
a9201902e1
|
Feature/help
# Conflicts:
# model/gameState/PlayState.java
|
2015-06-11 14:15:27 +02:00 |
|
|
jancoow
|
04305bc4fb
|
Feature/glowing hit area
|
2015-06-11 14:03:42 +02:00 |
|
|
Remco
|
6f17124e02
|
help line added, helps where the closest enemy is
|
2015-06-11 13:00:51 +02:00 |
|
|
Dofensmirtsz
|
fc4410c160
|
Buttons verbeterd
|
2015-06-11 12:57:21 +02:00 |
|
|
kennyboy55
|
7671294207
|
Changed init
|
2015-06-11 12:48:42 +02:00 |
|
|
kennyboy55
|
2e24060a12
|
Fixed button leds
|
2015-06-11 12:48:28 +02:00 |
|
|
Dofensmirtsz
|
5d153d3a2c
|
Kleuren scrollen mee met het liedje
|
2015-06-11 12:39:54 +02:00 |
|
|
Remco
|
69bc3c2bee
|
Glowing hitArea if you hit the enemy
|
2015-06-11 11:28:45 +02:00 |
|
|
Daniel
|
b28114c40b
|
Help++
|
2015-06-11 11:09:31 +02:00 |
|
|
kennyboy55
|
136d9fe2cf
|
Objects stop on song end.
Added time and song name.
Changed WHITE to ORANGE.
|
2015-06-11 10:42:05 +02:00 |
|
|
Daniel
|
cce3c22deb
|
Added Game Over State
|
2015-06-08 14:51:12 +02:00 |
|
|
Daniel
|
85107d85a9
|
Gameover toegevoegt
|
2015-06-08 14:50:38 +02:00 |
|
|
Dofensmirtsz
|
44f50f2698
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
image/Images.java
model/gameState/TitleState.java
|
2015-06-08 14:22:44 +02:00 |
|
|
jancoow
|
38a0bc4620
|
Gradients veranderd naar plaatjes voor betere prestaties hue (reverted from commit 3f7cd5a964)
|
2015-06-08 14:13:46 +02:00 |
|
|
Dofensmirtsz
|
ad81242081
|
Afbeelding van knopdrukken toegevoegt
|
2015-06-08 14:13:29 +02:00 |
|