104 Commits (86de4e7c0c0c030e84449806849ae8e4ca7a944a)

Author	SHA1	Message	Date
hba56	fd120edaf9	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java # settings/keyBindings.xml	8 years ago
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
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	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	2cda5ea70d	Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]	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
Jessica Syder	0dff85006a	Changes to code to use new controller structure. ... - renamed javadoc referencing old controllers - keybindings no longer need to be static - finished lobby and lobbyhost controllers #story[1261]	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
Connor Taylor-Brown	0ee448e17d	Created wrapper for controlling the position and heading of rendered 3D models. ... - Updated View3D to use Subject3D wrappers instead of Shape3D - Fixed HostController for the new architecture - Made position and heading observable in VisualiserBoat - Attached listeners to each VisualiserBoat in RaceController #story[1261]	8 years ago
Connor Taylor-Brown	fb7bf572d8	Changed View3D add-remove interface to an ObservableList ... #story[1196]	8 years ago
Connor Taylor-Brown	b6e56d815c	ResizableRaceCanvas no longer depends on VisualiserRaceEvent ... #story[1196]	8 years ago
Connor Taylor-Brown	c2fd5c9bae	Changed box to boat mesh ... - Mesh needs to be rotated -90 degrees on X - STL file has been added to assets #story[1196]	8 years ago
Connor Taylor-Brown	cc66d63096	Removed unused shapes list from View3D ... #story[1196]	8 years ago
Connor Taylor-Brown	bb7eb7cb44	Added adapter interface for PerspectiveCamera frustum and transformations in View3D. ... - Tested interface while initialising HostController #story[1196]	8 years ago
Connor Taylor-Brown	e7164d8a78	View3D perspective camera is now operational ... #story[1196]	8 years ago
Connor Taylor-Brown	cf838f2072	Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working. ... #story[1196]	8 years ago
Fan-Wu Yang	43ec179d79	Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D	8 years ago
Fan-Wu Yang	ea41c64c34	Added dependency for stl converter #story[1191]	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
hba56	b886cb426f	guide line last leg fix	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
Joseph Gardner	d41e52766b	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java	8 years ago
David Wu	5a188f0582	Merge branch 'master' into new_issue#19	8 years ago
David Wu	c08bafa566	Fixed most of issue #19 with new master?	8 years ago
fjc40	2656efcb4d	Marks are a bit darker. ... Wake no longer has circle at end.	8 years ago
Joseph Gardner	a50d460222	Merged master.	8 years ago
fjc40	0f58270c10	Merge branch 'master' into issue_18_track_alpha ... # Conflicts: # racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java	8 years ago
Joseph Gardner	20c9870fea	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java	8 years ago
fjc40	62f400b924	Trackpoint line color fades out.	8 years ago
fjc40	fa26abe10c	Minor tidy.	8 years ago
Joseph	d7e0bfa86c	Trackpoints are only shown for the player's boat. #story[1098]	8 years ago
Joseph	47fc55245c	Merged master.	8 years ago
Joseph	f60809bdd4	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/app/MockOutput.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java # racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java # racevisionGame/src/main/resources/visualiser/scenes/connect.fxml # racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml # racevisionGame/src/test/java/mock/model/MockRaceTest.java # racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java # racevisionGame/src/test/java/network/XMLMessageEncoderTest.java	8 years ago
fjc40	114c18763b	Reduced track point period to 1000ms. ... issue #18	8 years ago
fjc40	20055b1883	Removed redunant calls in VisualiserRaceState.initialiseBoats(). ... Slightly refactored ResizableRaceCanvas - removed a redundant drawPoint() function, functions which alter the gc stroke call save/restore. Text is drawn black, at 20pts. The drawBoats() function: instead of drawing everything for each boat, one boat at a time, it draws the track points for all boats, then wake for all boats, etc..., to have better layering. issue #18	8 years ago
fjc40	f1e41d5d8f	Merge branch 'master' into issue_18_trackpoint	8 years ago
cbt24	f44929f376	Spun off Locatable interface to make collision code more reusable ... #story[1100]	8 years ago
fjc40	85e703cba5	RaceController/info table now makes a copy of the boat list, to avoid race conditions. ... #story[1095]	8 years ago
fjc40	bcb6b79f8d	Fixed player boat not being highlighted. ... #story[1095]	8 years ago
fjc40	a4755ed88b	Maybe fixed updating boat list on FX thread.	8 years ago
fjc40	0483859c40	Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale). ... issue #32	8 years ago
fjc40	dc4610d6eb	Fixed sparkline not updating. ... #story[1095]	8 years ago
fjc40	5ae8393126	Fixed null pointer exception when a boat finishes the race. ... Boats now default to have position (0, 0). Added mark rounding data to single player race.xml	8 years ago
fjc40	3a0bd10a57	Merge remote-tracking branch 'origin/master' into story_61 ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/resources/visualiser/scenes/race.fxml	8 years ago
fjc40	c9875f3987	RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).	8 years ago
fjc40	5a03d97713	Added comment.	8 years ago
fjc40	b07c30704a	The trackpoint line is now a line (poly-line) instead of a sequence of circles. A point along the poly-line is added every 250ms. ... issue #18	8 years ago
Jessica Syder	0558629dc6	Added luffing sails image. ... - Created transparent gif of luffing sail - Displayed image when sail is luffing - Repositioned luffing sail #story[1098]	8 years ago
fjc40	175fb11178	Javadoc fixes. ... #story[1095]	8 years ago