fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,360 Commits 1 Branch 0 Tags
91c442e46554f7bb3c7e03bda32e08a03eb3b4c0
Commit Graph
250 Commits
Author SHA1 Message Date
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
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
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
Joseph 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261] 2017-09-12 12:37:25 +12:00
Connor Taylor-Brown b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element) 2017-09-12 11:46:57 +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 0cb008cef7 Removed a couple of old canvas lines. 
#story[1261]
 2017-09-11 23:17:36 +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 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
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188] 2017-09-11 20:34:34 +12:00
Fan-Wu Yang 54a9140f31 lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188] 2017-09-11 20:29:15 +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
Jessica Syder 108643b59d 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:05:24 +12:00
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby. 2017-09-11 19:54:43 +12:00
Joseph Gardner 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261] 2017-09-11 18:24:21 +12:00
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189] 2017-09-11 15:31:18 +12:00
David Wu c97706d86e Merge branch 'master' into story70 
# Conflicts:
#	dedicatedServer/src/main/java/app/App.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml
 2017-09-11 14:27:12 +12:00
Fan-Wu Yang ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261] 2017-09-11 02:48:00 +12:00
Fan-Wu Yang 9ac9c25923 Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261] 2017-09-11 00:54:11 +12:00
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189] 2017-09-10 19:31:56 +12:00
David Wu 9a96131a33 Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189] 2017-09-10 18:11:52 +12:00
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189] 2017-09-10 17:38:48 +12:00
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189] 2017-09-10 17:11:20 +12:00
Fan-Wu Yang a7eefca13a Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261] 2017-09-10 16:15:37 +12:00
David Wu 28ec4b9246 Merge branch 'master' into story70 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
 2017-09-10 15:19:03 +12:00
Fan-Wu Yang e2b868d815 Added boundaries to the map, which are drawn by the race #story[1261] 2017-09-10 14:49:16 +12:00
cbt24 70f4a00d12 Scaled down marks and boats to make 3rd person view more realistic 
- Added boat and mark annotations to support selection at large camera distance
- Reduced collision radius to 15 m
- Fixed event startup and XML files as race was crashing on start

#story[1296]
 2017-09-09 17:09:14 +12:00
hba56 ddc3a6ae47 boxes in lobby are now boats 2017-09-09 16:26:17 +12:00
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/layout/Subject3D.java
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
#	racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
 2017-09-09 16:20:00 +12:00
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-09 15:35:02 +12:00
cbt24 2508b847b8 Merge branch 'master' into storyD-3D 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
#	racevisionGame/src/main/java/visualiser/layout/Subject3D.java
 2017-09-09 15:26:33 +12:00
cbt24 643f145407 Added mark radius 3D annotation to improve bird's eye visibility 
#story[1261]
 2017-09-09 14:44:58 +12:00
Jessica Syder 1ed7ccf146 Minor changes preparing to merge in 3D 
#story[1261]
 2017-09-09 10:44:19 +12:00
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality 
#story[1190]
 2017-09-08 23:48:47 +12:00
Jessica Syder 0dff85006a Changes to code to use new controller structure. 
- renamed javadoc referencing old controllers
- keybindings no longer need to be static
- finished lobby and lobbyhost controllers

#story[1261]
 2017-09-08 22:07:16 +12:00
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196] 2017-09-08 20:10:45 +12:00
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196] 2017-09-08 19:15:39 +12:00
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers. 
- renamed fxml and their controllers to match
- removed old controllers
- finished lobby and lobbyhost controllers

#story[1261]
 2017-09-08 18:08:58 +12:00