fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,200 Commits 1 Branch 0 Tags
22b4b66049b69211384ff0cac2c25a091880949f
Commit Graph
437 Commits
Author SHA1 Message Date
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
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
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 f926355d1c Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 14:00:36 +12:00
David Wu 89ce8a7cc0 Pre-race countdown implementation. 2017-09-13 14:00:29 +12:00
hba56 731c0b0e61 send out to every client fix 2017-09-13 13:34: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
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
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
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
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby. 2017-09-11 19:54:43 +12:00
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188] 2017-09-11 18:14:26 +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
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
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
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 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats 2017-09-09 15:37:35 +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
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality 
#story[1190]
 2017-09-08 23:48:47 +12:00
hba56 5e516b0508 re added the standard race 
#story[1193]
 2017-09-08 18:12:51 +12:00
hba56 4c2ab9cc9a Merge branch '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/model/View3D.java
 2017-09-08 17:28:17 +12:00
hba56 4780354452 Errors in this commit: mock threads get interrupted 
#story[#1188]
 2017-09-08 16:35:36 +12:00
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys 
#story[1190]
 2017-09-08 16:30:03 +12:00
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys 
- View3D subject selection is no longer enabled by default
- Added documentation

#story[1190]
 2017-09-08 15:49:53 +12:00
Connor Taylor-Brown 1efec06bdc View3D can untrack objects and zoom in different modes 
- updateDistance zooms between 0 and infinity
- Camera switches from third person to bird's eye when reaching a set distance
- Only one subject can be tracked at a time

#story[1190]
 2017-09-08 14:21:03 +12:00
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193] 2017-09-08 14:20:14 +12:00
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
 2017-09-08 13:34:48 +12:00
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193] 2017-09-08 13:27:30 +12:00
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw 
#story[1190]
 2017-09-08 12:58:06 +12:00
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D 
- Changed how View3D is added to canvasBase to allow events to get through

#story[1190]
 2017-09-08 12:43:36 +12:00
hba56 a494eb4a6d games are now added on the correct port 
#story[1188]
 2017-09-08 12:04:54 +12:00