1160 Commits (0cb008cef72e56c7a1b9ea6fd8ebec385d3b298c)
 

Author SHA1 Message Date
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
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
Connor Taylor-Brown 0c9e55093c Set lobby anchor pane to invisible to allow races to start
8 years ago
Jessica Syder a5d3434a70 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
8 years ago
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
8 years ago
Connor Taylor-Brown 1efec06bdc View3D can untrack objects and zoom in different modes
8 years ago
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
8 years ago
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193]
8 years ago
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
8 years ago
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
8 years ago
hba56 d3ddff8bf1 host game start button added margins
8 years ago
zwu18 64ed1f9aa6 Improved map layout image. #story[1193]
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Jessica Syder a2b3ba44c0 RaceController scene separating
8 years ago
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
hba56 d302a08a14 fix for ci builds
8 years ago
hba56 e82c59a8a4 New css for the host game window
8 years ago
hba56 cbfcd3aa0d Images
8 years ago
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
Hamish Ball 321359be07 Merge branch 'vmg_fix' into 'master'
8 years ago
hba56 dfd3cb96f3 removed System.out.println
8 years ago