michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge

Browse Source 
# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java
This commit is contained in:
Alistair McIntyre
2017-09-14 12:40:20 +12:00
parent 7e0c2abbfd 20d73d8f2f
commit 6223a8fc0b
26 changed files with 881 additions and 956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/ServerToClientThread.java
-2
View File
@@ -237,8 +237,6 @@ public class ServerToClientThread implements Runnable {
xmlGenerator.setRaceTemplate(race);
System.out.println(xmlGenerator.getRegatta().getName());
XMLMessage xmlMessage;
xmlMessage = new XMLMessage(xmlGenerator.getRegattaAsXml(), XMLMessageSubType.REGATTA,
xmlGenerator.getRegattaAsXml().length());