fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,411 Commits 1 Branch 0 Tags
1b8fa59f0ef810bbbcc02f368e3c1aa8ebff9ce2
Commit Graph
281 Commits
Author SHA1 Message Date
zwu18 1b8fa59f0e Having 0 hp now removes the boat from being an active boat. #story[1292] 2017-09-26 18:20:11 +13:00
Connor Taylor-Brown 1b4b980081 Exponentially decrease speed as boat loses health 
- Boat halves in speed after 90% health loss

#story[1291]
 2017-09-22 00:49:36 +12:00
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp 2017-09-21 12:49:27 +12:00
Fan-Wu Yang fec421da00 Removed println messages 2017-09-20 15:16:32 +12:00
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue. 2017-09-20 15:07:22 +12:00
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:05:26 +12:00
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery. 2017-09-20 15:05:08 +12:00
Connor Taylor-Brown 7eb59cdcfc Allowed fractional health deductions per frame 
- Fixed boundary penalty system

#story[1291]
 2017-09-20 14:18:39 +12:00
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]
 2017-09-20 14:07:50 +12:00
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323] 2017-09-18 18:22:20 +12:00
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).
 2017-09-18 12:44:10 +12:00
fjc40 191f249bfb Speed scale is 2, rather than 10. 
Server simulates frames every 16ms rather than 50ms.
 2017-09-15 01:00:26 +12:00
Connor Taylor-Brown 8d9624db96 Recovered sails smoothing 
- Boat default position is now overridden only by collision command
- Sails command overrides boat velocity

#story[1195]
 2017-09-14 23:01:29 +12:00
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]
 2017-09-14 22:36:18 +12:00
David Wu e345ecdec1 Removed sout statements. 2017-09-14 16:52:45 +12:00
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D 2017-09-14 16:39:55 +12:00
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
 2017-09-14 16:34:28 +12:00
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] 2017-09-14 16:23:56 +12:00
fjc40 b59d36f4e5 Actually fixed the wind arrow direction. 2017-09-14 13:32:23 +12:00
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction." 
This reverts commit 8e6a720558.
 2017-09-14 13:22:35 +12:00
fjc40 e0278fdb85 Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5 2017-09-14 12:40:23 +12:00
fjc40 8e6a720558 Appears to fix wind arrow direction. 2017-09-14 12:39:41 +12:00
Joseph Gardner a6eea88524 Fixed collisions #fix #story[1196] 2017-09-14 11:58:40 +12:00
Fan-Wu Yang 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188] 2017-09-13 21:30:16 +12:00
hba56 4c52673fc1 javadoc fixes 
#story[1188]
 2017-09-13 17:12:24 +12:00
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
 2017-09-13 16:14:07 +12:00
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
 2017-09-13 16:13:14 +12:00
Fan-Wu Yang 7b97e93d3a Merge branch 'merge_fix_story51' 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-13 15:51:59 +12:00
Fan-Wu Yang 1cbb24e9fd Merged in master #story[1185] 2017-09-13 15:05:36 +12:00
Fan-Wu Yang 3760a43cfc Merge branch 'master' into HEAD 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-13 14:56:52 +12:00
fjc40 b655b3e233 Fixed merge bug, and an unrelated null pointer exception. 2017-09-13 14:52:21 +12:00
fjc40 6761778dd4 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-13 14:43:49 +12:00
Fan-Wu Yang e87173ee39 Fixed Tutorial not being able to run #story[1185] 2017-09-13 14:29:48 +12:00
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
 2017-09-13 14:00:40 +12:00
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
 2017-09-13 13:30:51 +12:00
Connor Taylor-Brown 83e696b79e Committed merge-related bug fixes 2017-09-13 13:18:25 +12:00
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs 2017-09-13 13:12:26 +12:00
fjc40 070654a95c Javadoc fix. 2017-09-13 13:07:13 +12:00
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.
 2017-09-13 12:59:51 +12:00
fjc40 ab96884dc6 Javadoc. 2017-09-13 12:10:36 +12:00
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]
 2017-09-13 12:04:32 +12:00
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]
 2017-09-13 00:41:23 +12:00
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]
 2017-09-13 00:38:58 +12:00
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196] 2017-09-12 22:10:13 +12:00
Connor Taylor-Brown bae428fb3f Recovered a private method used in a test 2017-09-12 17:44:05 +12:00
Connor Taylor-Brown c94e0af69c Removed remaining println statements 2017-09-12 17:35:51 +12:00
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-) 2017-09-12 17:23:47 +12:00
Jessica Syder b808056567 Host boat isnt disappearing anymore (I think). 
#story[1261]
 2017-09-12 16:39:19 +12:00
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-) 
# Conflicts:
#	racevisionGame/src/main/java/shared/model/Constants.java
 2017-09-12 15:40:49 +12:00
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
 2017-09-12 15:13:35 +12:00