 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
|
5ce6454824
|
Spacing
|
2015-06-19 19:10:56 +02:00 |
|
 Daniel
|
35c6c27d15
|
HelpState beter gemaakt
|
2015-06-18 17:41:18 +02:00 |
|
|
Daniel
|
85107d85a9
|
Gameover toegevoegt
|
2015-06-08 14:50:38 +02:00 |
|
 Dofensmirtsz
|
44f50f2698
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
image/Images.java
model/gameState/TitleState.java
|
2015-06-08 14:22:44 +02:00 |
|
 jancoow
|
38a0bc4620
|
Gradients veranderd naar plaatjes voor betere prestaties hue (reverted from commit 3f7cd5a964)
|
2015-06-08 14:13:46 +02:00 |
|
|
Dofensmirtsz
|
ad81242081
|
Afbeelding van knopdrukken toegevoegt
|
2015-06-08 14:13:29 +02:00 |
|
|
Dofensmirtsz
|
3f7cd5a964
|
Gradients veranderd naar plaatjes voor betere prestaties hue
|
2015-06-08 12:41:03 +02:00 |
|
|
Dofensmirtsz
|
1a11235534
|
Player is veranderd naar de regenboogshit, en de submenu cursor is gefixt (geen foutmeldingen meer)
|
2015-06-08 09:45:40 +02:00 |
|
|
jancoow
|
d79d73fc9e
|
A lot of improvements for the RPI. Uses images cached on the gpu.
|
2015-06-07 23:46:43 +02:00 |
|
|
jancoow
|
750f525c2d
|
Optimized code, everything is buffered in a buffered image now
|
2015-06-07 14:22:56 +02:00 |
|
|
Dofensmirtsz
|
e424faf0e6
|
Mooie aanwijzer voor submenu, met mooie spritesheet
|
2015-06-05 17:31:59 +02:00 |
|
|
jancoow
|
42ae80b1b3
|
Feature/json
# Conflicts:
# control/GameStateManager.java
# image/Images.java
# main/Window.java
# model/gameState/MenuState.java
|
2015-06-02 10:51:47 +02:00 |
|
|
jancoow
|
df207836e0
|
original game? (reverted from commit 3fc6c98ea5)
Fixed overwrited code
|
2015-06-02 10:22:52 +02:00 |
|
 Remco
|
3fc6c98ea5
|
original game?
|
2015-06-02 09:59:26 +02:00 |
|
|
Daniel
|
4e0a94adeb
|
background verandert samen met het logo, test
|
2015-05-31 00:27:47 +02:00 |
|
|
Daniel
|
50e2ea18dc
|
Color Strike toegevoegt
|
2015-05-29 18:41:31 +02:00 |
|
|
Daniel
|
7251d919ae
|
Menu added and having fun~!
|
2015-05-29 18:07:21 +02:00 |
|
|
kennyboy55
|
7b21aa1e09
|
Added songs, new libraries and more code
|
2015-05-29 12:47:25 +02:00 |
|
|
Remco
|
dc8f3c92e4
|
First bug free game?
|
2015-05-28 09:30:17 +02:00 |
|
|
Remco
|
09caaad7e1
|
Player added
|
2015-05-21 14:23:30 +02:00 |
|