1195 Commits (b655b3e2333e49c9de546c514828ed6c434ef556)
 

Author SHA1 Message Date
fjc40 b655b3e233 Fixed merge bug, and an unrelated null pointer exception.
8 years ago
fjc40 6761778dd4 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Fan-Wu Yang e87173ee39 Fixed Tutorial not being able to run #story[1185]
8 years ago
fjc40 d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Fraser Cope d1f74dec3a Merge branch 'storyB-)' into 'master'
8 years ago
fjc40 070654a95c Javadoc fix.
8 years ago
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar.
8 years ago
fjc40 ab96884dc6 Javadoc.
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
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
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
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
Connor Taylor-Brown 5e35cd4195 Removed empty java files
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
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
Jessica Syder a123bfb7e8 Merge branch 'Story_76' into 'master'
8 years ago
fjc40 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class.
8 years ago
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
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]
8 years ago
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
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]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
8 years ago
Jessica Syder 14aaf26b73 Merge branch 'story40-zoom' into 'master'
8 years ago
Jessica Syder 1ed7ccf146 Minor changes preparing to merge in 3D
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Jessica Syder 6a302841c0 Minor changes preparing to merge in 3D
8 years ago
Jessica Syder 0dff85006a Changes to code to use new controller structure.
8 years ago
hba56 5e516b0508 re added the standard race
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago