1368 Commits (67779eb9ad65f34e7bc453ee48d9056c50bedb7c)

 

All Branches   

Search

Author	SHA1	Message	Date
hba56	70ccb4cf1c	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml	8 years ago
David Wu	f926355d1c	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
David Wu	89ce8a7cc0	Pre-race countdown implementation.	8 years ago
hba56	731c0b0e61	send out to every client fix	8 years ago
fjc40	d29a47ec23	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/shared/model/Constants.java	8 years ago
Fraser Cope	d1f74dec3a	Merge branch 'storyB-)' into 'master' ... B) [V,M] As a player I would like to have the game run smoothly and have a unique game experience Acceptance criteria: * Boat moves smoothly when executing command * The appearance of the game is unique and consistent This merge request also closes issue #42. See merge request !42	8 years ago
Connor Taylor-Brown	83e696b79e	Committed merge-related bug fixes	8 years ago
Connor Taylor-Brown	70bbc89239	Fixed merge-related bugs	8 years ago
fjc40	070654a95c	Javadoc fix.	8 years ago
David Wu	c750b806e0	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
fjc40	2ad947b57d	The start time of the race is no longer scaled by the race speed scalar. ... Changed the prestart time to 30 seconds (was 3 minutes). Changed the preparatory time to 10 seconds (was 1 minute). Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished.	8 years ago
hba56	2c06a46ad2	send out to every client fix	8 years ago
David Wu	202c8d80c8	Minor fxml adjustments.	8 years ago
David Wu	42a5d8ddc4	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
hba56	5fb24307ec	send out to every client fix	8 years ago
Joseph	0b3ef992bc	Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D	8 years ago
Joseph	253a16a664	Made the sky box use sky box planes they cannot be scaled. #story[1261]	8 years ago
Connor Taylor-Brown	0f846f31c3	Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D ... # Conflicts: # racevisionGame/src/main/java/visualiser/layout/SkyBox.java	8 years ago
Connor Taylor-Brown	963c8a43ad	Boats and marks are sized realistically in 3rd person ... - Changed SeaSurface to Subject3D to suppress scaling - Cameras can now be selected through View3D interface #story[1190]	8 years ago
David Wu	bdb68a89c0	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
David Wu	7cea1fb11c	Reworking fxml for lobby.	8 years ago
hba56	bed9f8b07a	send out to every client fix	8 years ago
fjc40	ab96884dc6	Javadoc.	8 years ago
hba56	4adcd6322c	send out to every client	8 years ago
fjc40	55402136ed	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java Also added keybindings.xml to git ignore. #story[1185]	8 years ago
Joseph	771068966e	Just rotated the images to make them look like the plane is rotated properly... #story[1261]	8 years ago
fjc40	2a6085c9e8	Test fix.	8 years ago
fjc40	a1684a410c	Javadoc.	8 years ago
fjc40	9fa1b9ee67	Re-enabled source id allocator check. ... Re-enabled rotation of map at startup. Changed race.xml schema so that yacht elements aren't required inside the participants element. #story[1185]	8 years ago
fjc40	3fa6b9200d	Finished MarkRoundingSequence class. Added MarkRoundingData class. ... RaceState has a MarkRoundingSequenceMember. The temporary rounding line drawing in canvas uses MarkRoundingSequence. MockRace now uses MarkRoundingSequence. #story[1185]	8 years ago
Fan-Wu Yang	3a6070a645	Fixed Merge and added back some merge changes #story[1196]	8 years ago
hba56	3d58801760	matchbrowser now updates and flushes in a better time frame. 30s for flush as thats the time for match lobbys and 5s for update	8 years ago
hba56	4dcff5c009	SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby	8 years ago
Fan-Wu Yang	3301798411	Fixed boats not rotating in lobby #story[1188]	8 years ago
Joseph Gardner	bcc827b554	Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]	8 years ago
Connor Taylor-Brown	bae428fb3f	Recovered a private method used in a test	8 years ago
Connor Taylor-Brown	c94e0af69c	Removed remaining println statements	8 years ago
Connor Taylor-Brown	01a304efb9	Merge remote-tracking branch 'remotes/origin/master' into storyB-)	8 years ago
David Wu	83c1aeba50	Merge branch 'controllerSplit' into 'master' ... Controller split Only one scene is loaded at a time, instead of all at once. Run through the race, tutorial, all options you can think of to try break it! See merge request !41	8 years ago
zwu18	b6c340614f	Tutorial text disabled on actual races. #story[1261]	8 years ago
Jessica Syder	625eb62af2	Wrapped the tutorial text on the title fxml. ... #story[1261]	8 years ago
Jessica Syder	b808056567	Host boat isnt disappearing anymore (I think). ... #story[1261]	8 years ago
Jessica Syder	e664619a81	Tutorial is played with tutorial map. ... #story[1261]	8 years ago
Connor Taylor-Brown	fbd124e602	Merge branch 'master' into storyB-) ... # Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java	8 years ago
hba56	e3ddb272c0	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml	8 years ago
Connor Taylor-Brown	59bd22c2aa	Fixed mark rounding ... - Returning mark 2 as mark 1 breaks rounding calculations #story[1195]	8 years ago
Connor Taylor-Brown	0f316afb3c	Added colour indication to next mark ... - Colour is swapped with end mark in leg when mark is passed #story[1195]	8 years ago
Joseph	7a8ea7fea7	Made seasurface overlay to enable skybox to be smaller. #story[1261]	8 years ago
Connor Taylor-Brown	b902b05e5e	Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)	8 years ago
Connor Taylor-Brown	d90b161d01	Merge branch 'master' into storyA_sounds ... # Conflicts: # racevisionGame/src/main/java/mock/model/RaceServer.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	8 years ago