Commit Graph
33 Commits
Author SHA1 Message Date
jancoow 713cfaf836 Fixed endless scrolling and removed cursor on rasp 2015-07-09 12:30:04 +02:00
jancoow f229153346 Feature/help state
Conflicts:
	image/Images.java
2015-06-26 21:17:09 +02:00
jancoow 4a3208c85f Turned full screen mode on the rasp off 2015-06-26 21:14:25 +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
jancoow 5248ae94d1 New network thing.. 2015-06-18 16:34:35 +02:00
jancoow 1f0030b90d Added webcam support + QR code generator.
Some cleanup
2015-06-15 19:29:55 +02:00
kennyboy55 b4a223fdd1 Added SQLConnector to states 2015-06-12 13:15:06 +02:00
kennyboy55 3dba4b6b92 Added SQL and Network 2015-06-12 12:40:23 +02:00
jancoow 44f4444ad0 Network buttons 2015-06-11 19:11:38 +02:00
kennyboy55 86bd970fe1 Changing to network 2015-06-11 16:30:53 +02:00
jancoow 44cc0e38d5 Enabled keys on rpi 2015-06-08 14:55:44 +02:00
kennyboy55 a3069af5c0 Bugfix things 2015-06-08 12:50:51 +02:00
jancoow ab5fd4007d Changed sound player, code will work on java 7 2015-06-05 20:45:39 +02:00
Remco 76a41dbbd1 playable game 2015-06-02 15:47:23 +02:00
Remco 6a356982a6 game logic updated 2015-06-02 14:08:53 +02:00
kennyboy55 7b21aa1e09 Added songs, new libraries and more code 2015-05-29 12:47:25 +02:00
kennyboy55 05df81c4f6 Fixed Eclipse error
Might have broken some other stuff by doing this.
2015-05-28 19:23:18 +02:00
jancoow ea6895c6c1 Code cleanup and some improvements 2015-05-28 12:25:42 +02:00
Remco 6808919490 Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop
Conflicts:
	main/Window.java
	model/drawObjects/Player.java
	model/gameState/PlayState.java
2015-05-28 09:45:41 +02:00
Remco dc8f3c92e4 First bug free game? 2015-05-28 09:30:17 +02:00
jancoow 30def21275 Feature/test game sprint1
# Conflicts:
#	control/GameControl.java
#	main/Main.java
#	main/Window.java

Sprint 1 finished
2015-05-28 07:37:59 +02:00
jancoow 07e35d02c8 Cursor remove on fullscreen on rpi 2015-05-27 12:03:01 +02:00
jancoow 6510d4b93a Only full screen on rpi & enabled AA 2015-05-27 11:41:10 +02:00
Remco 3bc4f55f5a GameSprint1Done, little bug. When aiming right down not possible to hit with button 1 and 3 :S 2015-05-26 22:14:44 +02:00
jancoow 973aef2d59 Fixed full-screen method for linux/rpi 2015-05-26 12:05:52 +02:00
Remco 2af16890d4 Changed size to resolution of arcade screen 2015-05-26 11:30:03 +02:00
jancoow ff0dafcee0 Merge remote-tracking branch 'arcade-controls/develop' into feature/controls
Conflicts:
	README.md
	control/GameControl.java
	main/Main.java
	main/Window.java
	model/GameModel.java
	view/GameView.java
2015-05-24 20:09:58 +02:00
jancoow 2338366080 Moved to main directory instead of src folder 2015-05-24 18:03:16 +02:00
Remco 0af599077e Timer changed from control to model 2015-05-22 12:15:16 +02:00
kennyboy55 435296b9be Fix for Janco 2015-05-03 21:57:46 +02:00
kennyboy55 39484a720d Fixed size problem. 2015-05-03 21:44:28 +02:00
kennyboy55 c256cdfe13 First Commit 2015-05-03 21:42:27 +02:00
kennyboy55 e3a1ad7866 First Commit 2015-05-03 19:30:17 +02:00