fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,339 Commits 1 Branch 0 Tags
3131d67cf2f51452665d9077a2fe0d6d896b5c5f
Commit Graph
245 Commits
Author SHA1 Message Date
hba56 3131d67cf2 Merge remote-tracking branch 'remotes/origin/master' into scoreTable 2017-09-14 23:50:29 +12:00
fjc40 ae9594f8c3 Removed a println and fixed some javadoc warnings. 2017-09-14 23:46:54 +12:00
fjc40 47d013612a Fix for null pointer exception when finishing race. 2017-09-14 23:40:52 +12:00
hba56 88f1a393f2 Made the info tab into an overlay 
#story[1195]
 2017-09-14 23:40:02 +12:00
fjc40 24b068f249 Collision effect uses color.transparent instead of a custom transparent color. 2017-09-14 23:33:23 +12:00
fjc40 536428ce16 There was a null pointer exception related to going into/leaving third person camera and the arrow annotation. 2017-09-14 23:11:52 +12:00
fjc40 f308f5b8f3 Visualiser model thread was updating GUI instead of fx thread. 2017-09-14 23:08:58 +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
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable 2017-09-14 22:25:33 +12:00
Joseph Gardner 7fa2037753 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D 2017-09-14 16:42:39 +12:00
Fan-Wu Yang 2383915c78 Merged #story[1195] 2017-09-14 16:42:23 +12:00
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D 2017-09-14 16:39:55 +12:00
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195] 2017-09-14 16:36:17 +12:00
Joseph Gardner 7bea2fee73 Merge branch 'storyA_sounds' into storyD-3D 2017-09-14 16:36:05 +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
hba56 004aebceb5 fix null pointer when playing tutorial 2017-09-14 16:27:36 +12:00
cbt24 02b4146fa3 Amended collision effect radius 
#story[1195]
 2017-09-14 16:24:14 +12:00
cbt24 7d58b05e38 Fixed collision not fading to zero 
#story[1195]
 2017-09-14 16:23:21 +12:00
cbt24 cdc7b642db Boat now shows a fading collision effect 
#story[1195]
 2017-09-14 16:22:04 +12:00
David Wu 550180f286 Removed countdown pane. 2017-09-14 14:28:42 +12:00
Joseph Gardner 7b076f3718 Merge branch 'storyA_sounds' into storyD-3D 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
#	racevisionGame/src/main/java/visualiser/layout/SkyBox.java
 2017-09-14 14:16:53 +12:00
Joseph Gardner c23fcfcaa3 new skybox textures. Still need to fix two planes having a small gap between them. #story[1196] 2017-09-14 14:03:36 +12:00
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
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
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs 2017-09-13 13:12:26 +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