265 Commits
Author SHA1 Message Date
kennyboy55 b4d0706443 Fix for empty object array 2015-07-09 22:35:06 +02:00
kennyboy55 5c239b17f7 Made the game more difficult 2015-07-09 22:34:56 +02:00
jancoow 78acc6aa5f SQLFix 2015-07-09 22:33:08 +02:00
kennyboy55 55f9c1a623 Removed old code 2015-07-09 22:00:36 +02:00
kennyboy55 d322e0ca3f Changed timing slightly 2015-07-09 22:00:17 +02:00
kennyboy55 04ad4edc2b Merge remote-tracking branch 'origin/bugfix/general' into bugfix/general 2015-07-09 21:40:02 +02:00
kennyboy55 675daadd13 Possible fix for audio stopping 2015-07-09 21:39:37 +02:00
kennyboy55 137eb5384f Fixed wrong highscores 2015-07-09 21:39:27 +02:00
kennyboy55 9d50e6d9f9 Added more time to win 2015-07-09 21:39:19 +02:00
jancoow 06a3d74445 Undecorated window on arcade 2015-07-09 21:27:09 +02:00
kennyboy55 7ebf6a18e8 Fix selecting wrong difficulty 2015-07-09 21:26:14 +02:00
kennyboy55 4250e99682 Fix preplay-state only showing once 2015-07-09 21:25:55 +02:00
kennyboy55 c0123378aa Added current difficulty 2015-07-09 21:17:12 +02:00
kennyboy55 cb57ce7fe6 Fix for ledstrip 2015-07-09 20:13:17 +02:00
kennyboy55 b39e62d69b Oops... 2015-07-09 16:49:55 +02:00
kennyboy55 86cec99367 Added LedStrip effects 2015-07-09 16:48:54 +02:00
kennyboy55 fc21037006 Moved SongHandler 2015-07-09 16:48:42 +02:00
kennyboy55 da934f7111 Changed variable name 2015-07-09 16:26:30 +02:00
kennyboy55 f771fb4e2d Draw copyright on top. Made frames slower 2015-07-09 16:26:19 +02:00
kennyboy55 e32165f654 Changed variable name 2015-07-09 16:25:52 +02:00
kennyboy55 67455ccd72 Finally removed GameOverState 2015-07-09 16:25:43 +02:00
kennyboy55 6dda54928c Changed variable name 2015-07-09 16:25:28 +02:00
kennyboy55 56710c1b46 Added timeout before you can send your highscore 2015-07-09 16:25:05 +02:00
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