Commit Graph
23 Commits
Author SHA1 Message Date
kennyboy55 8766037def Fixed a lot of bugs 2015-06-08 11:41:01 +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
jancoow ab5fd4007d Changed sound player, code will work on java 7 2015-06-05 20:45:39 +02:00
Remco f9e6a90160 fixed button collors in song 2015-06-05 12:45:09 +02:00
Remco 76c288cfec game logic fixed1.0 2015-06-05 11:48:09 +02:00
Remco 1bf525c6b7 game logic fixed by tips of johan 2015-06-04 13:20:46 +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
jancoow ab827600b1 Last fix 2015-06-02 11:26:46 +02:00
Remco 663abb7043 fixed playstate 2015-06-02 11:19:20 +02:00
kennyboy55 7b21aa1e09 Added songs, new libraries and more code 2015-05-29 12:47:25 +02:00
Remco 7263442ea3 Highscore + highscore bar added + life bar 2015-05-28 14:48:29 +02:00
Remco a7c52c04b6 highscore added 2015-05-28 12:56:31 +02:00
jancoow ea6895c6c1 Code cleanup and some improvements 2015-05-28 12:25:42 +02:00
jancoow fab4ac6ce7 Buttonpress improved 2015-05-28 11:58:19 +02:00
Remco 2276964639 bug fixed 2015-05-28 10:13:39 +02:00
Remco 6808919490 Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop
Conflicts:
	main/Window.java
	model/drawObjects/Player.java
	model/gameState/PlayState.java
2015-05-28 09:45:41 +02:00
Remco dc8f3c92e4 First bug free game? 2015-05-28 09:30:17 +02:00
Remco ad447eedf8 Waarschijnlijk de exception opgelost, ik krijg de expection zelf niet 2015-05-27 20:10:28 +02:00
Remco 54382e9c1d Colors 2015-05-27 10:42:29 +02:00
Remco 3bc4f55f5a GameSprint1Done, little bug. When aiming right down not possible to hit with button 1 and 3 :S 2015-05-26 22:14:44 +02:00
Remco 0af599077e Timer changed from control to model 2015-05-22 12:15:16 +02:00