Commit Graph
173 Commits
Author SHA1 Message Date
Daniel 35c6c27d15 HelpState beter gemaakt 2015-06-18 17:41:18 +02:00
Daniel 2d9daf8844 Help State Added 2015-06-18 16:39:21 +02:00
Dofensmirtsz 82f903828f Àchtergrond verandert van kleur en inforpanel is beter 2015-06-18 14:02:38 +02:00
Janco Kock 7507d0fd63 Merge pull request #16 from ProjectGroepA2/feature/database
Feature/database
2015-06-15 22:09:43 +02:00
Janco Kock 16c41b94d5 Merge pull request #15 from ProjectGroepA2/revert-14-coin
Revert "Coin"
2015-06-15 21:46:58 +02:00
Janco Kock 54156e52b3 Revert "Coin" 2015-06-15 21:43:12 +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
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 a8e1c30024 Added highscore queries.
Added playdata queries
2015-06-13 19:35:43 +02:00
kennyboy55 6644b80480 Bugfixes 2015-06-13 19:35:11 +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 5b5f4e0ce1 Added infinite scrolling 2015-06-13 19:32:03 +02:00
kennyboy55 2131f845b5 Public to Private 2015-06-13 19:31:52 +02:00
kennyboy55 9c17b654e8 Added infinite scrolling 2015-06-13 19:31:34 +02:00
kennyboy55 4d2d6c68ac Added infinite scrolling.
Added highscores SQL call
2015-06-13 19:31:21 +02:00
kennyboy55 e3a15dc28b Removed border 2015-06-13 19:30:40 +02:00
BilelAvans 427cd9accc Merge pull request #14 from ProjectGroepA2/coin
Coin
2015-06-12 19:26:21 +02:00
Bilel Bghiel d0a91023b3 - Scorebalk kleur krijgt geen Alpha meer mee
- Scorebalk renderde niet opnieuw wanneer speler score verliest.
- Boot Animatie toegevoegd.
- Nog wat kleine verbeteringen.
2015-06-12 19:17: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 211bdda4a8 Added highscore loading 2015-06-12 13:10:13 +02:00
kennyboy55 3dba4b6b92 Added SQL and Network 2015-06-12 12:40:23 +02:00
Bilel Bghiel 9f0752c577 Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into coin 2015-06-12 11:42:46 +02:00
Bilel Bghiel 68f5f2392c - mooiere afdaling.
- scorebar vult pas nadat muntje 'erin valt'
2015-06-11 21:23:02 +02:00
kennyboy55 ce35aaf667 Added network joystick handling 2015-06-11 19:55:54 +02:00
jancoow 44f4444ad0 Network buttons 2015-06-11 19:11:38 +02:00
kennyboy55 22853812f3 Added border around enemies 2015-06-11 17:15:41 +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
kennyboy55 86bd970fe1 Changing to network 2015-06-11 16:30:53 +02:00
Dofensmirtsz e979252aae Submenu fix, songselect fix 2015-06-11 15:38:11 +02:00
Bilel Bghiel 01169b0ab7 Coin on hit 2015-06-11 15:36:07 +02:00
Bilel Bghiel 1e09c3e024 Coin on hit 2015-06-11 14:33:33 +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
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
kennyboy55 61757652c3 Fixed timing 2015-06-11 12:48:48 +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