Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
265 Commits 5 Branches 0 Tags
develop
Commit Graph
59 Commits
Author SHA1 Message Date
kennyboy55 55f9c1a623 Removed old code 2015-07-09 22:00:36 +02:00
kennyboy55 c0123378aa Added current difficulty 2015-07-09 21:17:12 +02:00
kennyboy55 fc21037006 Moved SongHandler 2015-07-09 16:48:42 +02:00
jancoow 3f08675d9e Feature/daniel info panel 
# Conflicts:
#	model/objects/DifficultyButton.java
 2015-07-09 14:50:33 +02:00
Dofensmirtsz 764fc33836 randje gefixt 2015-07-09 12:33:37 +02:00
Dofensmirtsz 9380506d06 QWERTY 2015-07-09 12:18:24 +02:00
Daniel 5679b20616 Changed infopanel 2015-07-09 11:24:42 +02:00
jancoow 172454e13f Feature/herkasingen 
# Conflicts:
#	model/gameState/PlayState.java
# Bugs:
#   model/gameState/PlayState.java highscore empty
 2015-07-09 10:17:39 +02:00
Daniel 06cc34a8fe InfoPanel herdeelt 2015-07-07 12:18:19 +02:00
Remco b4cd80807f lines nice round 2015-07-07 10:51:34 +02:00
jancoow c25ae6757d Fixed bug infopanel and added send method for PRI 2015-06-26 20:36:30 +02:00
jancoow d86d4dc62e Remove some system outs 2015-06-19 10:25:44 +02:00
kennyboy55 93cb22b0c0 Removed broken characters and added new ones 2015-06-18 20:28:07 +02:00
kennyboy55 b60ff37301 Added extra text 2015-06-18 20:16:19 +02:00
Dofensmirtsz 82f903828f Àchtergrond verandert van kleur en inforpanel is beter 2015-06-18 14:02:38 +02:00
jancoow 1f0030b90d Added webcam support + QR code generator. 
Some cleanup
 2015-06-15 19:29:55 +02:00
kennyboy55 06a26fc058 Small fix 2015-06-14 10:59:50 +02:00
kennyboy55 2131f845b5 Public to Private 2015-06-13 19:31:52 +02:00
kennyboy55 e3a15dc28b Removed border 2015-06-13 19:30:40 +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 3dba4b6b92 Added SQL and Network 2015-06-12 12:40:23 +02:00
kennyboy55 5e0a7512bb Merge remote-tracking branch 'origin/develop' into develop 2015-06-11 16:31:21 +02:00
kennyboy55 a9de8f077a Fixed IndexOutOfBounds 2015-06-11 16:31:03 +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 04305bc4fb Feature/glowing hit area 2015-06-11 14:03:42 +02:00
Dofensmirtsz 7dd4066a8a Aanwijzertje toegevoegt 2015-06-11 13:32:27 +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
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
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 85107d85a9 Gameover toegevoegt 2015-06-08 14:50:38 +02:00
kennyboy55 861a973cde Fixed resetting playState 2015-06-08 13:54:26 +02:00
kennyboy55 8766037def Fixed a lot of bugs 2015-06-08 11:41:01 +02:00
jancoow 37b721215c Optimized submenu 2015-06-08 09:16:03 +02:00
jancoow d79d73fc9e A lot of improvements for the RPI. Uses images cached on the gpu. 2015-06-07 23:46:43 +02:00
jancoow 750f525c2d Optimized code, everything is buffered in a buffered image now 2015-06-07 14:22:56 +02:00
jancoow 396769317c Feature/menu 
Conflicts:
	audio/AudioPlayer.java
	model/GameModel.java
	model/SongHandler.java
	model/gameState/MenuState.java

Menu now works togheter with the game. A lot of known bugs with audio player
 2015-06-05 23:17:29 +02:00
Dofensmirtsz 5f8e7706f2 Added SongInstanceDifficultyButtons :))))))) 2015-06-04 13:48:49 +02:00
Remco 1bf525c6b7 game logic fixed by tips of johan 2015-06-04 13:20:46 +02:00
Daniel 65e5cb3eac Difficulty Toegevoegt 2015-06-04 12:53:19 +02:00
jancoow 1acba841fa Added slider menu 2015-06-04 08:27:37 +02:00
Remco 76a41dbbd1 playable game 2015-06-02 15:47:23 +02:00
Remco 6a356982a6 game logic updated 2015-06-02 14:08:53 +02:00
Remco 0e62a2e2b0 fixed playarea 2015-06-02 11:24:26 +02:00
Remco 8cda332a95 fixed buggs 2015-06-02 11:14:05 +02:00
jancoow 42ae80b1b3 Feature/json 
# Conflicts:
#	control/GameStateManager.java
#	image/Images.java
#	main/Window.java
#	model/gameState/MenuState.java
 2015-06-02 10:51:47 +02:00