12 Commits

Author	SHA1	Message	Date
Alistair McIntyre	3a41c27d8d	- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not. ... tags : #story[1245]	2017-09-14 14:42:25 +12:00
Kusal Ekanayake	6ee2517f74	Added most sound functionality. ... There is not background music and sound effects (button clicking, ocean noises, crashes for collisions). Can mute the sound and the music independently of each other from the main menu. #story[1249]	2017-08-28 16:37:09 +12:00
Calum	87acce71ea	Merge branch 'develop' into story1118_map_arrows ... # Conflicts: # src/main/java/seng302/gameServer/MainServerThread.java # src/main/java/seng302/model/RaceState.java # src/main/java/seng302/visualiser/GameClient.java # src/main/java/seng302/visualiser/controllers/RaceViewController.java	2017-08-17 00:52:41 +12:00
William Muir	65286f273b	Working ordering for in game AND race finish screen. ... List in RaceState holds a sorted list of yachts. A Listener is added to this list, listening for a permutation change, on perm change, sorts the list by comparitor of leg number of each yacht (stable sort)	2017-08-16 23:22:58 +12:00
William Muir	9727e86249	Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen ... # Conflicts: # src/main/java/seng302/gameServer/MainServerThread.java # src/main/java/seng302/visualiser/GameClient.java # src/main/java/seng302/visualiser/controllers/RaceViewController.java # src/main/resources/server_config/xml_templates/race.ftlh	2017-08-16 22:40:32 +12:00
Calum	85899e3fbe	Merged with develop functionality.	2017-08-16 21:11:34 +12:00
Calum	c103595bba	Merge branch 'develop' into story1118_map_arrows ... # Conflicts: # src/main/java/seng302/gameServer/GameState.java # src/main/java/seng302/gameServer/MainServerThread.java # src/main/java/seng302/model/RaceState.java # src/main/java/seng302/visualiser/GameClient.java	2017-08-16 20:34:27 +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
Peter Galloway	ff92262a78	fixed race clock countdown/count up #story[1109]	2017-08-14 16:32:50 +12:00
Michael Rausch	d2fd9ebaea	Started work on start screen ... - Server now sends out race start status messages during lobby & pre-start stages - Added timer in lobby Tags: #story[1109]	2017-08-11 19:03:57 +12:00
Calum	08e369f1ae	Merged with develop. Fixed many bugs in Visualiser. ... #bugs	2017-07-26 02:49:31 +12:00
Calum	6242ab0b2e	Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox. ... Also implemented various other small fixes and further refactored code. #refactor	2017-07-25 20:45:27 +12:00