Commit Graph
242 Commits
Author SHA1 Message Date
kennyboy55 b81c5c73f9 Changed first button color 2015-07-09 16:24:34 +02:00
jancoow 3f08675d9e Feature/daniel info panel
# Conflicts:
#	model/objects/DifficultyButton.java
2015-07-09 14:50:33 +02:00
jancoow f3f1a11a75 Fixed nullpointer exception when highsore doesn't exist 2015-07-09 13:37:41 +02:00
Dofensmirtsz 1edab2daac screenshot verandert 2015-07-09 13:07:03 +02:00
jancoow e739255d23 Feature/sub screen fix 2015-07-09 12:56:45 +02:00
jancoow 201fa6d0b1 Bug: Added missing image 2015-07-09 12:55:02 +02:00
jancoow cc69ad63c3 Feature/title screen kast fix 2015-07-09 12:47:14 +02:00
kennyboy55 749c80c748 Merge remote-tracking branch 'origin/develop' into develop 2015-07-09 12:42:37 +02:00
Dofensmirtsz bac38b5aa5 locatie kast fix 2015-07-09 12:40:25 +02:00
Dofensmirtsz effbcc3670 kast vervangen door nieuw plaatje 2015-07-09 12:38:46 +02:00
Dofensmirtsz 8c858e93e1 kast veranderd 2015-07-09 12:38:35 +02:00
kennyboy55 a6f7177084 Added button color 2015-07-09 12:38:22 +02:00
Dofensmirtsz 2c3cdd4d15 nummer toegevoegt, locatie alles gefixt 2015-07-09 12:34:14 +02:00
Dofensmirtsz 764fc33836 randje gefixt 2015-07-09 12:33:37 +02:00
jancoow 713cfaf836 Fixed endless scrolling and removed cursor on rasp 2015-07-09 12:30:04 +02:00
Dofensmirtsz 9380506d06 QWERTY 2015-07-09 12:18:24 +02:00
kennyboy55 61fdeb27c5 Merge pull request #26 from ProjectGroepA2/feature/HelpVerandert
Help state verandert
2015-07-09 12:16:54 +02:00
Daniel 458ccb99d0 Help state verandert 2015-07-09 11:54:16 +02:00
kennyboy55 7a6d2e9d5d Removed black bar 2015-07-09 11:28:01 +02:00
kennyboy55 74b6cafc40 Color fix 2015-07-09 11:27:53 +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
kennyboy55 5480476837 Merge pull request #23 from ProjectGroepA2/feature/sorting
Feature/sorting
2015-07-07 12:21:42 +02:00
Daniel e349ec9fa6 Een highscore ophalen 2015-07-07 12:18:55 +02:00
Daniel 4cc41ea2c8 Kleuren ovalen locatie verandert 2015-07-07 12:18:42 +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
kennyboy55 18d6a9dcbd Sort on highest score 2015-07-06 17:01:45 +02:00
kennyboy55 c111a52f52 Sort on Author name A-Z 2015-07-06 17:01:39 +02:00
kennyboy55 e64fc291fe Added highest score 2015-07-06 17:00:17 +02:00
kennyboy55 803c0e1707 Added highest score 2015-07-06 17:00:14 +02:00
kennyboy55 fc86051f04 Bugfixes 2015-07-06 17:00:02 +02:00
kennyboy55 2fa9c3afe8 Added two new sorting methods 2015-07-06 16:59:52 +02:00
kennyboy55 54d9a91f6a Load highest score on startup 2015-07-06 16:59:40 +02:00
Remco bedd6899db If you not die you win 2015-07-06 16:55:15 +02:00
Remco 0516027069 little bug fix 2015-07-06 14:45:48 +02:00
jancoow be274685b5 Fixed double songs playing 2015-06-26 21:51:58 +02:00
jancoow f229153346 Feature/help state
Conflicts:
	image/Images.java
2015-06-26 21:17:09 +02:00
jancoow 4a3208c85f Turned full screen mode on the rasp off 2015-06-26 21:14:25 +02:00
jancoow b4e7a7c213 - Scorebalk kleur krijgt geen Alpha meer mee
- Scorebalk renderde niet opnieuw wanneer speler score verliest.
- Boot Animatie toegevoegd.
- Nog wat kleine verbeteringen. (reverted from commit d0a91023b3)
2015-06-26 21:02:09 +02:00
jancoow 951ff4367e Removed Syso's 2015-06-26 20:50:32 +02:00
jancoow c25ae6757d Fixed bug infopanel and added send method for PRI 2015-06-26 20:36:30 +02:00
Daniel dbf3312801 help.png zit er nu in 2015-06-21 23:04:51 +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 93cb22b0c0 Removed broken characters and added new ones 2015-06-18 20:28:07 +02:00
kennyboy55 3d2e0c666c Load timesPlayed value on start 2015-06-18 20:18:17 +02:00
kennyboy55 fb08e22b0e Changed SortPLAYED to use new timesplayed value 2015-06-18 20:18:06 +02:00