fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,368 Commits 1 Branch 0 Tags
67779eb9ad65f34e7bc453ee48d9056c50bedb7c
Commit Graph
403 Commits
Author SHA1 Message Date
hba56 083eb5a4bc updated race view that does not use a split pane 2017-09-14 13:45:46 +12:00
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction." 
This reverts commit 8e6a720558.
 2017-09-14 13:22:35 +12:00
Connor Taylor-Brown f2370485a0 RaceController can now set up collision listeners on each boat. 
#story[1195]
 2017-09-14 12:48:02 +12:00
fjc40 8e6a720558 Appears to fix wind arrow direction. 2017-09-14 12:39:41 +12:00
Connor Taylor-Brown e354320d74 Replaced camera tracking listeners with animation timer 
- Documented animation timers and mark arrow

#story[1195]
 2017-09-14 12:20:55 +12:00
Connor Taylor-Brown b8c4582d2a Replaced mark arrow listener with animation timer. 
#story[1195]
 2017-09-14 12:06:47 +12:00
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI. 2017-09-13 23:50:55 +12:00
Fan-Wu Yang 1b946b6807 Removed/commented out unecessary print messages #story[1188] 2017-09-13 21:21:19 +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
cbt24 de9f4e22eb Direction to mark arrow is now displayed relative to camera 
#story[1195]
 2017-09-13 16:10:41 +12:00
Connor Taylor-Brown 5f96526fcc Added "arrow" pointing to next mark on third person view 
#story[1195]
 2017-09-13 15:34:02 +12:00
David Wu 22b4b66049 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
 2017-09-13 15:28:13 +12:00
David Wu cccce9002b Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
 2017-09-13 15:28:01 +12:00
Joseph Gardner 0944e5729a Dimmed the ambient light and specular light. #story[1261] 2017-09-13 15:18:27 +12:00
hba56 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-13 15:17:37 +12:00
David Wu 8cc4d7741c Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188] 2017-09-13 15:17:09 +12:00
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-13 15:16:06 +12:00
Connor Taylor-Brown e657a0cc99 Added tracking for angle between third person boat and next mark 
#story[1195]
 2017-09-13 14:44:18 +12:00
David Wu 06bd637460 Added documentation. #story[1188] 2017-09-13 14:42:54 +12:00
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188] 2017-09-13 14:30:55 +12:00
hba56 079d93fc0f 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:22:46 +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
David Wu 89ce8a7cc0 Pre-race countdown implementation. 2017-09-13 14:00:29 +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
David Wu c750b806e0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 13:00:34 +12:00
hba56 2c06a46ad2 send out to every client fix 2017-09-13 12:59:49 +12:00
David Wu 42a5d8ddc4 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 12:49:11 +12:00
hba56 5fb24307ec send out to every client fix 2017-09-13 12:48:47 +12:00
Joseph 0b3ef992bc Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D 2017-09-13 12:45:02 +12:00
Joseph 253a16a664 Made the sky box use sky box planes they cannot be scaled. #story[1261] 2017-09-13 12:44:25 +12:00
Connor Taylor-Brown 0f846f31c3 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/SkyBox.java
 2017-09-13 12:28:29 +12:00
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]
 2017-09-13 12:25:52 +12:00
David Wu 7cea1fb11c Reworking fxml for lobby. 2017-09-13 12:20:42 +12:00
hba56 4adcd6322c send out to every client 2017-09-13 12:05:09 +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
Joseph 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261] 2017-09-13 11:45:49 +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
hba56 4dcff5c009 SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby 2017-09-12 21:55:23 +12:00
Fan-Wu Yang 3301798411 Fixed boats not rotating in lobby #story[1188] 2017-09-12 21:35:10 +12:00
Joseph Gardner bcc827b554 Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261] 2017-09-12 18:16:08 +12:00
Connor Taylor-Brown c94e0af69c Removed remaining println statements 2017-09-12 17:35:51 +12:00
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261] 2017-09-12 16:54:36 +12:00
Jessica Syder e664619a81 Tutorial is played with tutorial map. 
#story[1261]
 2017-09-12 16:23:11 +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
Connor Taylor-Brown 59bd22c2aa Fixed mark rounding 
- Returning mark 2 as mark 1 breaks rounding calculations

#story[1195]
 2017-09-12 13:52:29 +12:00
Connor Taylor-Brown 0f316afb3c Added colour indication to next mark 
- Colour is swapped with end mark in leg when mark is passed

#story[1195]
 2017-09-12 13:36:31 +12:00