Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
195 Commits 5 Branches 0 Tags
8b18077fff0f11d75e905d2f8803600b618c9f25
Commit Graph
195 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jancoow 8b18077fff Fixed infoscreen bug 2015-06-19 12:35:48 +02:00
Bilel Bghiel d21bcb3b54 verkeerde kleur 2015-06-19 11:39:29 +02:00
Bilel Bghiel f72d54202f Merge branch 'fix' of https://github.com/ProjectGroepA2/Arcade into develop 
Conflicts:
	control/GameStateManager.java
	model/objects/InfoPanel.java
 2015-06-19 11:36:19 +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
kennyboy55 f2fd2b5993 Added times played 2015-06-18 20:17:47 +02:00
kennyboy55 1c1b6f0c8e Changed default sort to mostplayed 2015-06-18 20:17:35 +02:00
kennyboy55 3f22402bc4 Added mostplayed counter 2015-06-18 20:17:23 +02:00
kennyboy55 1520a6a104 Add mostplayed. 
Don't ask for highscore if 0
 2015-06-18 20:17:10 +02:00
kennyboy55 ec2d6cbc29 Removed sysos 2015-06-18 20:16:45 +02:00
kennyboy55 5ce2cca4df Moved menubuttons 2015-06-18 20:16:32 +02:00
kennyboy55 b60ff37301 Added extra text 2015-06-18 20:16:19 +02:00
kennyboy55 75ec5ccf37 Removed syso 2015-06-18 20:16:04 +02:00
kennyboy55 ef36b2052e Added cancel button color 2015-06-18 20:15:50 +02:00
Remco ec8f1e5bb3 Games played underneath 5 secs will nog be added to database 2015-06-18 16:47:27 +02:00
jancoow 5248ae94d1 New network thing.. 2015-06-18 16:34:35 +02:00
Remco df35dbeb8d back to title when you wait too long 2015-06-18 16:32:47 +02:00
Bilel Bghiel d1a4ccf150 Audio stopt bij wisselen tussen schermen 2015-06-18 16:24:03 +02:00
Dofensmirtsz 82f903828f Àchtergrond verandert van kleur en inforpanel is beter 2015-06-18 14:02:38 +02:00
Bilel Bghiel 1f44b5b487 Verbetercode. 2015-06-16 17:30:34 +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