fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,410 Commits 1 Branch 0 Tags
f4001e0ae3fb94cb042e4d03675b58af16cdd696
Commit Graph
179 Commits
Author SHA1 Message Date
zwu18 f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311] 2017-09-26 17:05:22 +13:00
zwu18 e53d7d894b Warning sound added. Sound synced with visual display. #story[1292] 2017-09-26 16:03:35 +13:00
David Wu 3a966fa6b8 Reworked visual displays for low hp boats. There is now a warning indication under boats that drop below 20hp. TODO: Create sfx and different display when boat is in critical hp/dead. #story[1292] 2017-09-25 02:15:09 +13:00
David Wu c527ad0c52 Forgot to add image file. #story[1292] 2017-09-24 18:58:49 +13:00
David Wu 45eb557256 Displaying visual effect with imageview. #story[1292] 2017-09-24 18:58:19 +13:00
zwu18 1946bfd658 Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292] 2017-09-22 21:19:35 +12:00
Connor Taylor-Brown 16da9e009b Cherry-picked FXML changes from Development 
#story[1291]
 2017-09-22 00:21:56 +12:00
Connor Taylor-Brown 985f784066 Removed broken stuff from FXML after merge 2017-09-21 23:41:18 +12:00
Connor Taylor-Brown dc9445a8a6 Merge branch 'master' into story1291-hp 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
 2017-09-21 23:40:46 +12:00
hba56 4242d05279 fixed issue with being unable to click through minimap 
#story[1295]
 2017-09-21 20:34:21 +12:00
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test 2017-09-20 23:46:02 +12:00
hba56 afc42cf2ab lowered opacity 2017-09-20 22:22:07 +12:00
hba56 50125e0151 moved minimap to left so does not overlap with speedo 2017-09-20 22:03:22 +12:00
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato 
- Tab view now contains health column
- BoatStateCommand now fails silently if command is received before race state is set up

#story[1291]
 2017-09-20 18:22:14 +12:00
hba56 f7d866144a Map now only shows annotations when in full screen 
#story[1295]
 2017-09-19 22:08:27 +12:00
hba56 731be68831 test for a minimap 2017-09-18 10:22:01 +12:00
fjc40 eb2ed45ed2 Merge branch 'master' into spectate_mode_basic 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
 2017-09-15 00:46:07 +12:00
hba56 e0d886ffb2 overlay off by default 
#story[1195]
 2017-09-14 23:53:13 +12:00
hba56 88f1a393f2 Made the info tab into an overlay 
#story[1195]
 2017-09-14 23:40:02 +12:00
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable 2017-09-14 22:25:33 +12:00
Fan-Wu Yang 2383915c78 Merged #story[1195] 2017-09-14 16:42:23 +12:00
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195] 2017-09-14 16:36:17 +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
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game. 
#story[1194]
 2017-09-14 14:33:21 +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
hba56 87f3265640 pushed branch 
#story[1195]
 2017-09-14 13:06:39 +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
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
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
David Wu 202c8d80c8 Minor fxml adjustments. 2017-09-13 12:57:35 +12:00
David Wu 7cea1fb11c Reworking fxml for lobby. 2017-09-13 12:20:42 +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 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
Jessica Syder 625eb62af2 Wrapped the tutorial text on the title fxml. 
#story[1261]
 2017-09-12 16:41:54 +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 d90b161d01 Merge branch 'master' into storyA_sounds 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/RaceServer.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-09-12 11:11:39 +12:00
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261] 2017-09-12 01:55:24 +12:00
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/StartController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
 2017-09-11 23:09:48 +12:00
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/StartController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
 2017-09-11 23:07:53 +12:00
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189] 2017-09-11 21:18:09 +12:00
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189] 2017-09-11 21:07:52 +12:00
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/StartController.java
#	racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
#	racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
#	racevisionGame/src/main/java/visualiser/Controllers/main.fxml
#	racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
 2017-09-11 20:19:10 +12:00