1403 Commits (76db768b76f0c8f8b286cedfc89eec6551f318d2)
 

Author SHA1 Message Date
Joseph 0b3ef992bc Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Joseph 253a16a664 Made the sky box use sky box planes they cannot be scaled. #story[1261]
8 years ago
Connor Taylor-Brown 0f846f31c3 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Connor Taylor-Brown 963c8a43ad Boats and marks are sized realistically in 3rd person
8 years ago
David Wu bdb68a89c0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu 7cea1fb11c Reworking fxml for lobby.
8 years ago
hba56 bed9f8b07a send out to every client fix
8 years ago
fjc40 ab96884dc6 Javadoc.
8 years ago
hba56 4adcd6322c send out to every client
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Joseph 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
fjc40 2a6085c9e8 Test fix.
8 years ago
fjc40 a1684a410c Javadoc.
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
fjc40 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class.
8 years ago
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196]
8 years ago
hba56 3d58801760 matchbrowser now updates and flushes in a better time frame. 30s for flush as thats the time for match lobbys and 5s for update
8 years ago
hba56 4dcff5c009 SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby
8 years ago
Fan-Wu Yang 3301798411 Fixed boats not rotating in lobby #story[1188]
8 years ago
Joseph Gardner bcc827b554 Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
Connor Taylor-Brown bae428fb3f Recovered a private method used in a test
8 years ago
Connor Taylor-Brown c94e0af69c Removed remaining println statements
8 years ago
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
David Wu 83c1aeba50 Merge branch 'controllerSplit' into 'master'
8 years ago
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261]
8 years ago
Jessica Syder 625eb62af2 Wrapped the tutorial text on the title fxml.
8 years ago
Jessica Syder b808056567 Host boat isnt disappearing anymore (I think).
8 years ago
Jessica Syder e664619a81 Tutorial is played with tutorial map.
8 years ago
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-)
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Connor Taylor-Brown 59bd22c2aa Fixed mark rounding
8 years ago
Connor Taylor-Brown 0f316afb3c Added colour indication to next mark
8 years ago
Joseph 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Connor Taylor-Brown b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)
8 years ago
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Jessica Syder 0cb008cef7 Removed a couple of old canvas lines.
8 years ago
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Connor Taylor Brown 0ea647b9fd Merge branch 'story70' into 'master'
8 years ago
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189]
8 years ago
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
8 years ago
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]
8 years ago
Connor Taylor-Brown 5e35cd4195 Removed empty java files
8 years ago
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]
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby.
8 years ago
Joseph Gardner 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188]
8 years ago