131 Commits (88d5a606967ac9564934af8a3d6ce243d47593df)

Author	SHA1	Message	Date
David Wu	3adc5330b4	Merge branch 'master' into story1292_hp_punish ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml # racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml	8 years ago
fjc40	46192af628	Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes). ... The start button (visible to host) starts the race in whatever the prepatory time is. #story[1352]	8 years ago
Connor Taylor-Brown	5473fde731	Merge remote-tracking branch 'remotes/origin/master' into story1291-hp	8 years ago
Fan-Wu Yang	bb0c1d1780	Merge branch 'nullptr_finish_race_arrow' into newHostServer	8 years ago
Fan-Wu Yang	b0857debeb	Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer	8 years ago
Fan-Wu Yang	b550afcca7	Merged race scaling with Http Match Discovery.	8 years ago
Connor Taylor-Brown	7eb59cdcfc	Allowed fractional health deductions per frame ... - Fixed boundary penalty system #story[1291]	8 years ago
Connor Taylor-Brown	50d5dd02a2	BoatState message can be received from mock by visualiser ... - Basic penalties have been made for out of bounds and collisions - RaceServer packages and sends BoatState messages for each boat - ServerConnection routes BoatState messages instead of dropping by default - VisualiserRaceCommandFactory produces BoatStateCommands #story[1291]	8 years ago
fjc40	db27d673de	Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.	8 years ago
Fan-Wu Yang	928f5e31f0	Hopefully final version of Hosting #story[1188]	8 years ago
fjc40	424cd63c59	Should fix the race xml issues where boats get unassigned sometimes. ... This removes the static raceServer stuff. The Race/Boat/Regatta XML commands only execute if they contain newer data (it checks the sequence number).	8 years ago
fjc40	191f249bfb	Speed scale is 2, rather than 10. ... Server simulates frames every 16ms rather than 50ms.	8 years ago
Connor Taylor-Brown	90c258e9e9	Reset collision tag on visualiser boat after displaying collision ... - Modified View3D to index subjects rather than shapes by source ID - Enforced one collision per boat on server to reduce rendering load - Changed collision radius to less than bounce radius - Fixed game-breaking null command bug #story[1195]	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
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
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
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
Connor Taylor-Brown	01a304efb9	Merge remote-tracking branch 'remotes/origin/master' into storyB-)	8 years ago
Connor Taylor-Brown	fbd124e602	Merge branch 'master' into storyB-) ... # Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java	8 years ago
Jessica Syder	108643b59d	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/java/visualiser/Controllers/StartController.java # racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml # racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml # racevisionGame/src/main/java/visualiser/Controllers/main.fxml # racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml	8 years ago
fjc40	346aa148ef	Added some debug statements, and WIP MarkRoundingSequence class. ... Temporarily disabled source id allocator time checks. Added mark rounding stuff to race canvas to help debug. #story[1185]	8 years ago
hba56	ae8fa312a3	removed sout and added a longer startup time. Also fixed race xmls to remove set boats	8 years ago
Jessica Syder	a5050b8ea8	Adding back lost changes and finishing splitting last controllers. ... - renamed fxml and their controllers to match - removed old controllers - finished lobby and lobbyhost controllers #story[1261]	8 years ago
Jessica Syder	a5d3434a70	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	8 years ago
fjc40	ec82e65ae7	Fixed javadocs in xml creation classes.	8 years ago
Jessica Syder	9f3cc53a63	Finished Arrow, Title and StartController scene splitting ... - scenes do not load in at the same time - scenes do not rely upon previous abstract controller class - scenes are not a part of previous main controller class - unecessary functions and code removed #story[1261]	8 years ago
Fan-Wu Yang	18a689b110	Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]	8 years ago
cbt24	a6db06a82c	Boats now reverse smoothly when colliding ... - Collision objects specify which boat is colliding - RaceLogic sets up an observable CollisionCommand when collision bubbles up - Boats now selectively identify observers of collision #story[1196]	8 years ago
cbt24	b62344261a	Merge remote-tracking branch 'remotes/origin/master' into storyB-)	8 years ago
Connor Taylor-Brown	e3e61e5b28	Merge remote-tracking branch 'remotes/origin/master' into storyD-3D	8 years ago
Joseph Gardner	00cedf4d4d	TackGybeCommand now smooths the rotation of the boat. #story[1196]	8 years ago
hba56	6b9c041c6b	Merge remote-tracking branch 'remotes/origin/master' into wind_(story53) ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java	8 years ago
cbt24	3ecf203cba	Recovered stable rotation of the player's boat ... - Uses AnimationTimer rather than listeners - Reduced pre-start time to speed up testing #story[1261]	8 years ago
Joseph	f4cb1a3ac4	Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]	8 years ago
fjc40	361856ea1d	Updated timescale.	8 years ago
fjc40	16bf57e333	javadoc fixes.	8 years ago
fjc40	8c76d6c26e	Added boats.xml schema. ... RaceServer now creates an XMLMessage when the race's BoatDataSource changes. #story[1188]	8 years ago
fjc40	298fcd03dc	Added regatta schema. ... RaceServer now creates an XMLMessage when the race's RegattaDataSource changes. #story[1188]	8 years ago
fjc40	ec58f0c847	Participants can now join during the warning period as well. ... Added RaceDataSourceToXML. RaceServer now create an XMLMessage when the race's RaceDataSource changes. #story[1188]	8 years ago
fjc40	9156bde8af	Moved XML message creation to RaceServer instead of ConnectionAcceptor. ... RaceServer does not currently generate new XMLMessages - NYI. Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified. #story[1188]	8 years ago
fjc40	d0eebcdb2f	SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period. ... RaceLogic now calls MockRace.initialiseBoats() after the prestart period has finished. MockRace create a VisualiserBoat when a source ID is allocated. MockOutput now sends updated XML messages during the race, instead of only at the start. #story[1188]	8 years ago
fjc40	3176e76c8c	MockRace: ... Now uses RaceState as its base class, rather than Race. This aligns it with VisualiserRace. RaceState contains the shared race state between the client and server, and stores most of its data in RaceDataSource etc..., instead of maintaining its own copy. Moved collider registry member to MockRace. XMLUtilities: Added documentation to two important functions, and updated them to use generics instead of Objects. #story[1188]	8 years ago
Joseph Gardner	0be5b731c3	Merge branch 'master' into wind_(story53)	8 years ago
Joseph Gardner	12e2ae9c01	Started implementing wind oscillation. #story[1187]	8 years ago
fjc40	a9fde95b39	Updated maven version to 2.0. ... Added a dedicatedServer module. Removed Visualiser module. Removed mock module. Removed network module. Fixed weird exception non-handling that appeared for some reason.	8 years ago
fjc40	0d2be85d17	Brought over long/latitude fix from "rounding_line_visible_hack" branch.	8 years ago
David Wu	5234cdea66	Merge branch 'master' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	8 years ago
David Wu	f1ef75fb81	Merge branch 'master' into new_issue#19	8 years ago