Commit Graph

7 Commits

Author SHA1 Message Date
Sem van der Hoeven
6c1e073348 merge master into this branch
# Conflicts:
#	core/src/netwerkprog/game/util/game/Character.java
#	core/src/netwerkprog/game/util/game/Faction.java
2020-05-27 23:04:04 +02:00
MickWerf
a20568b427 Restructured Util for better usability
Moved MainGame from util to client.
Moved server port static from serverData to Data
2020-05-18 15:53:14 +02:00
MickWerf
7601496e40 Added Data parser call to the ServerClient class.
Added comments, helper functions and finished the framework of the SessionController.
2020-05-18 15:04:22 +02:00
MickWerf
1c7b47dc57 Moved connection code from server to sessioncontroller
Added implements runnable to controller super class.
Added Thread management to server.
Added testcode to GameController
Added InputController to client
Added Objective to Game package
Added Timer to game package
Removed ScoreController
2020-05-11 17:04:33 +02:00
Sem van der Hoeven
615273f301 removed todos 2020-05-11 11:41:35 +02:00
Sem van der Hoeven
aac30b4317 added todos 2020-05-10 22:13:26 +02:00
Sem van der Hoeven
db5b84233b added basic GDX project to this project 2020-05-10 19:51:46 +02:00