14 Commits

Author	SHA1	Message	Date
Alistair McIntyre	482d987839	- Fixed Null Pointer ... - Build Should pass Tags: #story[1245]	2017-09-14 15:10:48 +12:00
Kusal Ekanayake	ec7ee34305	Fixed tests.	2017-09-12 16:52:26 +12:00
Haoming Yin	0bf83aa858	Merge remote-tracking branch 'origin/develop' into NewUI_merge ... # Conflicts: # 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/visualiser/GameClient.java # src/main/java/seng302/visualiser/GameView.java # src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java # src/main/java/seng302/visualiser/controllers/LobbyController.java # src/main/java/seng302/visualiser/controllers/RaceViewController.java # src/main/java/seng302/visualiser/controllers/StartScreenController.java # src/main/resources/views/LobbyView.fxml # src/main/resources/views/RaceView.fxml # src/main/resources/views/StartScreenView.fxml	2017-09-11 18:15:08 +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
William Muir	e2bc613c9d	Merge request fixes ... #story[1246]	2017-09-08 15:52:01 +12:00
Kusal Ekanayake	56f1dd2efb	Reverted change, didn't work. ... #story[1246]	2017-09-05 18:20:56 +12:00
Kusal Ekanayake	302bc91461	Tried to fix build by removing invalid '>' char. ... #story[1246]	2017-09-05 18:17:20 +12:00
Calum	e4dbbd05c7	Merged with remote changes	2017-09-04 23:42:10 +12:00
Calum	47f3f6e27d	Created a new chat history class that allows for rich formatting of individual messages. Current implementation allows for bold and coloured text only. Has been manually tested. Fixed 3/5 chat command tests. ... #implement #test #story[1246]	2017-09-04 23:10:54 +12:00
Calum	5026c568a7	Wrote tests that are currently broken for sending server commands through text chat. ... #tests	2017-09-03 20:38:31 +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
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
William Muir	454e9ac9f1	Added an attribute to each yacht: 'DistanceToNextMark' ... This attribute is calculated at each update of the boat as prompted by the game state regularly Removed the lat and lng attribute from the Yacht class and replaced its usage with the GeoPoint object instead Removed redundant test files and merged GeoUtility and testGeoUtil test classes into one tags: #story[1124] #pair[hyi25, wmu16]	2017-08-03 16:29:12 +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