10 Commits

Author	SHA1	Message	Date
Calum	9b00ba654a	Added a race importer. Added imported races to visualizer. Made it so that the host sets the race. Refactored server to no longer be dependant on a specific race. Tested functionality of map manually. Some bugs found and listed below. ... #implement #testmanual #story[1275] Known bugs: * Can't move * Map is off center in lobby view. * 3D Map is off center	2017-09-23 22:45:53 +12:00
Michael Rausch	5dd936f8f1	Added chat functionality & timer back into the game + bug fixes ... - Added chat back into the game - Fixed a bug where the timer would show "race finished" when the race hadn't started - Fixed a bug where resources weren't being deallocated when the game was closed Tags: #story[1246]	2017-09-12 01:31:38 +12:00
Michael Rausch	1fec620427	Merged 3d branch into new UI ... Tags: #story[1245]	2017-09-11 15:50:22 +12:00
Michael Rausch	76a1a3c7a0	Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge ... # Conflicts: # pom.xml # src/main/java/seng302/App.java # src/main/java/seng302/gameServer/GameState.java # src/main/java/seng302/gameServer/MainServerThread.java # src/main/java/seng302/gameServer/ServerToClientThread.java # src/main/java/seng302/utilities/XMLGenerator.java # src/main/java/seng302/visualiser/GameClient.java # src/main/java/seng302/visualiser/controllers/RaceViewController.java # src/main/resources/views/RaceView.fxml # src/main/resources/views/StartScreenView.fxml	2017-09-11 15:29:33 +12:00
Michael Rausch	cf4f8813d2	re-implemented existing functionality in UI ... - Correct player count is shown in server list - Servers now advertise their capacity and number of players connected - Players can click join on the servers in the server list - Direct connect works - Can set max players / server name in host dialog - Server starts correctly when host clicked - Implemented boat customization - Implemented 'begin race button', and disabled it for players that aren't hosts - Added countdown timer in lobby - Fixed bug where app wouldn't close Tags: #story[1245]	2017-09-08 18:00:09 +12:00
Michael Rausch	b346d5a706	Implemented server re-registration when a server closes / updates ... - When a server is closed, it will disappear from the server list - When a player joins a server, the number of spaces left will decrease - Servers now disappear instead of duplicating - Added tests for ServerDescription - Added documentation for new classes Tags: #story[1247]	2017-09-01 16:05:47 +12:00
William Muir	c15f13bc2c	Refactored some of the XMLGenerator code. Added tokens to the generated XML ... Refactor not complete. Generation needs some tidying. #story[1250]	2017-08-29 14:56:06 +12:00
Calum	ac47e9d88a	Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work. ... #bug #refactor #implement #story[1118]	2017-08-16 03:51:48 +12:00
Calum	87ef37a689	Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of. ... #refactor #bug #issue[34, 35]	2017-08-02 00:26:57 +12:00
Calum	6cae338c1e	Began fixing bugs with caused by asynchronous listener calls. ... #bug	2017-07-30 20:12:19 +12:00