sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java
This commit is contained in:
Sem van der Hoeven
2020-06-07 15:13:17 +02:00
parent 41b8544646 8b70287aa0
commit 63b1f66567
13 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/netwerkprog/game/client/MainGame.java
View File

@@ -24,9 +24,8 @@ import netwerkprog.game.client.game.map.GameTile;
import netwerkprog.game.client.game.map.Map;
import netwerkprog.game.client.game.map.MapRenderer;
import netwerkprog.game.util.data.Data;
import netwerkprog.game.util.data.NameData;
import netwerkprog.game.util.data.ReadyData;
import netwerkprog.game.util.data.TeamData;
import netwerkprog.game.util.data.connection.NameData;
import netwerkprog.game.util.data.connection.TeamData;
import netwerkprog.game.util.game.Faction;
import netwerkprog.game.util.game.GameCharacter;
import netwerkprog.game.util.graphics.FrameRate;