fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,372 Commits 1 Branch 0 Tags
fec421da00d1ac74e512c752376160931231ae1d
Commit Graph
626 Commits
Author SHA1 Message Date
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar. 
Changed the prestart time to 30 seconds (was 3 minutes).
Changed the preparatory time to 10 seconds (was 1 minute).
Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished.
 2017-09-13 12:59:51 +12:00
hba56 2c06a46ad2 send out to every client fix 2017-09-13 12:59:49 +12:00
David Wu 202c8d80c8 Minor fxml adjustments. 2017-09-13 12:57:35 +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
fjc40 ab96884dc6 Javadoc. 2017-09-13 12:10:36 +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 2a6085c9e8 Test fix. 2017-09-13 00:52:35 +12:00
fjc40 a1684a410c Javadoc. 2017-09-13 00:43:38 +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
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
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196] 2017-09-12 22:10:13 +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 bae428fb3f Recovered a private method used in a test 2017-09-12 17:44:05 +12:00
Connor Taylor-Brown c94e0af69c Removed remaining println statements 2017-09-12 17:35:51 +12:00
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-) 2017-09-12 17:23:47 +12:00
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261] 2017-09-12 16:54:36 +12:00
Jessica Syder 625eb62af2 Wrapped the tutorial text on the title fxml. 
#story[1261]
 2017-09-12 16:41:54 +12:00
Jessica Syder b808056567 Host boat isnt disappearing anymore (I think). 
#story[1261]
 2017-09-12 16:39:19 +12:00
Jessica Syder e664619a81 Tutorial is played with tutorial map. 
#story[1261]
 2017-09-12 16:23:11 +12:00
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-) 
# Conflicts:
#	racevisionGame/src/main/java/shared/model/Constants.java
 2017-09-12 15:40:49 +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 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
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
Connor Taylor-Brown 5e35cd4195 Removed empty java files 2017-09-11 20:31:20 +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
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