Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
230 Commits 5 Branches 0 Tags
feature/new
Commit Graph
230 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bilel Bghiel b526152957 - bugs 2015-06-22 10:34:17 +02:00
Bilel Bghiel 32fadbbec1 - bugs 2015-06-22 10:26:59 +02:00
Bilel Bghiel 25828bdbf9 - Degelijke pre state integratie. 
- Help state naar volledigheid geintegreerd.
 2015-06-22 09:51:30 +02:00
Bilel Bghiel 6d354d0675 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	control/GameControl.java
	control/GameStateManager.java
	image/Images.java
 2015-06-22 09:51:07 +02:00
Bilel Bghiel 1a12edf752 - Degelijke pre state integratie. 
- Help state naar volledigheid geintegreerd.
 2015-06-22 09:50:24 +02:00
kennyboy55 9f2f84c608 Merge remote-tracking branch 'origin/pre-playState' into develop 
Conflicts:
	control/GameControl.java
	control/GameStateManager.java
	image/Images.java
 2015-06-22 09:13:25 +02:00
Bilel Bghiel 8a8323e547 Merge branch 'feature/helpState' of https://github.com/ProjectGroepA2/Arcade into develop 2015-06-22 09:11:32 +02:00
Daniel dbf3312801 help.png zit er nu in 2015-06-21 23:04:51 +02:00
Bilel Bghiel 93e4cb3d6e - Bugs en verbeteringen 2015-06-21 01:59:22 +02:00
Bilel Bghiel db68f35835 - Bugs en verbeteringen 2015-06-20 23:53:14 +02:00
Bilel Bghiel a855764ee6 - Duidelijkere score (punten beloning * multiplier) 
- Score animatie bij het balletje waar je punten mee scoort
 2015-06-20 13:24:49 +02:00
Bilel Bghiel 11811ef6af - Duidelijkere score (punten beloning * multiplier) 
- Score animatie bij het balletje waar je punten mee scoort
 2015-06-20 13:24:23 +02:00
Bilel Bghiel 412ed60dfe - infopanel laat nu een tijdje je 'score change' zien, die na een bepaalde tijd vervaagd 
- verbeteringen
 2015-06-19 22:42:00 +02:00
Bilel Bghiel bfc62c2b62 - code cleanup 
- Verbeteringen in stoppen van audio
-- Simpelere afhandeling
-- Thread stopt wanneer (clip != null) ipv .stop()
 2015-06-19 19:48:26 +02:00
Bilel Bghiel 42228aa9f7 Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop 
Conflicts:
	image/Images.java
 2015-06-19 19:46:35 +02:00
Bilel Bghiel b86ce91755 - code cleanup 
- Verbeteringen in stoppen van audio
-- Simpelere afhandeling
-- Thread stopt wanneer (clip != null) ipv .stop()
 2015-06-19 19:40:35 +02:00
kennyboy55 2ba069c0e2 Fixed import 2015-06-19 19:11:09 +02:00
kennyboy55 5ce6454824 Spacing 2015-06-19 19:10:56 +02:00
kennyboy55 1ed5ac1be2 Fixed skipping gameover 2015-06-19 19:10:15 +02:00
kennyboy55 e6050715fc Small bugfix for playdata 2015-06-19 18:58:32 +02:00
Bilel Bghiel c019fdeea3 Helpstate geintereerd 2015-06-19 15:28:43 +02:00
Bilel Bghiel d92cd7333b clean up 'n bugcrushing 2015-06-19 14:36:40 +02:00
Bilel Bghiel 864b6efa52 fixes 2015-06-19 13:50:26 +02:00
Bilel Bghiel 91a6ae718d betere animatie en een fix 2015-06-19 13:36:17 +02:00
Remco 5b1138936d bug fix, getcolor is null 2015-06-19 12:43:27 +02:00
jancoow 9b779537b6 Some little fixes 2015-06-19 12:35:48 +02:00
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
Daniel 35c6c27d15 HelpState beter gemaakt 2015-06-18 17:41:18 +02:00
Remco ec8f1e5bb3 Games played underneath 5 secs will nog be added to database 2015-06-18 16:47:27 +02:00
Daniel 2d9daf8844 Help State Added 2015-06-18 16:39:21 +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