294 Commits (31bb2897237f1250985bd49aad88308fb07d7cfc)

Author	SHA1	Message	Date
fjc40	5ea4200e67	Some javadoc warning fixes.	8 years ago
David Wu	1a672e8ac8	Merge branch 'master' into story1292_hp_punish	8 years ago
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
zwu18	1b8fa59f0e	Having 0 hp now removes the boat from being an active boat. #story[1292]	8 years ago
Fan-Wu Yang	1ca276ec62	Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]	8 years ago
Fan-Wu Yang	d6884a6981	Deprecated a method that shouldn't be used but is still being used, and merged in most recent master #story[1323]	8 years ago
Fan-Wu Yang	d599df3901	Merge branch 'master' into raceLength ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
Fan-Wu Yang	a33583d67d	Fixed racescaling a mark twice and removed println statements #story[1323]	8 years ago
Fan-Wu Yang	980d1d7977	Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails	8 years ago
Joseph Gardner	7d789c04bb	Fixed sails out / colliding issue. #story[1297]	8 years ago
Joseph Gardner	332722e099	Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]	8 years ago
Jessica Syder	f1c1fc7063	Race length is affected by slider value. ... - modified constructor of a race event to take in a scale value - race is scaled according to minutes selected on the slider - applied minimal css styling - playing around with more styling options - bug exists with 1 minute races, to be fixed #story[1323]	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
fjc40	612b4b455e	Added start button for host on the ingameLobby screen. ... #story[1352]	8 years ago
Connor Taylor-Brown	1b4b980081	Exponentially decrease speed as boat loses health ... - Boat halves in speed after 90% health loss #story[1291]	8 years ago
Connor Taylor-Brown	5473fde731	Merge remote-tracking branch 'remotes/origin/master' into story1291-hp	8 years ago
Fan-Wu Yang	fec421da00	Removed println messages	8 years ago
Fan-Wu Yang	3c9e520d9f	Merged in null pointer issue.	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
Fan-Wu Yang	f7da497743	Resizing maps to time taking now works #story[1323]	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	8d9624db96	Recovered sails smoothing ... - Boat default position is now overridden only by collision command - Sails command overrides boat velocity #story[1195]	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
David Wu	e345ecdec1	Removed sout statements.	8 years ago
Joseph Gardner	c42e25df86	Merge branch 'master' into storyD-3D	8 years ago
Joseph Gardner	14b5f4bdf1	Merge branch 'master' into storyD-3D ... # Conflicts: # .gitignore # racevisionGame/src/main/java/mock/model/RaceServer.java # racevisionGame/src/main/java/mock/model/collider/Collider.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/shared/model/Mark.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/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/layout/Plane3D.java # racevisionGame/src/main/java/visualiser/layout/SeaSurface.java # racevisionGame/src/main/java/visualiser/layout/View3D.java # racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java # racevisionGame/src/main/resources/visualiser/scenes/title.fxml	8 years ago
David Wu	43ee92fb95	Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]	8 years ago
fjc40	b59d36f4e5	Actually fixed the wind arrow direction.	8 years ago
fjc40	afd923c9fb	Revert "Appears to fix wind arrow direction." ... This reverts commit 8e6a720558.	8 years ago
fjc40	e0278fdb85	Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5	8 years ago
fjc40	8e6a720558	Appears to fix wind arrow direction.	8 years ago
Joseph Gardner	a6eea88524	Fixed collisions #fix #story[1196]	8 years ago
Fan-Wu Yang	92500e13ee	Added in windangle for rotated map as it had been lost through merge. #story[1188]	8 years ago
hba56	4c52673fc1	javadoc fixes ... #story[1188]	8 years ago
hba56	e4dbebfcac	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	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
Fan-Wu Yang	7b97e93d3a	Merge branch 'merge_fix_story51' ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
Fan-Wu Yang	1cbb24e9fd	Merged in master #story[1185]	8 years ago
Fan-Wu Yang	3760a43cfc	Merge branch 'master' into HEAD ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
fjc40	b655b3e233	Fixed merge bug, and an unrelated null pointer exception.	8 years ago
fjc40	6761778dd4	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
Fan-Wu Yang	e87173ee39	Fixed Tutorial not being able to run #story[1185]	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	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
Connor Taylor-Brown	83e696b79e	Committed merge-related bug fixes	8 years ago
Connor Taylor-Brown	70bbc89239	Fixed merge-related bugs	8 years ago