1329 Commits (c17900a461fb94db17aff3c6c7223c314bc752ae)
 

Author SHA1 Message Date
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
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
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
hba56 4c2ab9cc9a Merge branch 'master' into story77
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
hba56 4780354452 Errors in this commit: mock threads get interrupted
8 years ago
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
8 years ago
Joseph Gardner 2868f921e2 Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]
8 years ago
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
8 years ago
Joseph Gardner df624a8437 Angular movement when auto vmg is pressed is smoothed. #story[1196]
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
fjc40 ec82e65ae7 Fixed javadocs in xml creation classes.
8 years ago
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
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 a494eb4a6d games are now added on the correct port
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
cbt24 8c7345a30d Documented command classes
8 years ago
cbt24 a6db06a82c Boats now reverse smoothly when colliding
8 years ago
cbt24 9cba3934ea Sails command now applies acceleration to boat
8 years ago
cbt24 eba70ab2d4 Sails command now listens to race to check if goal velocity is met
8 years ago
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
cbt24 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate"
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
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
8 years ago
Fan-Wu Yang ba13713ba1 Merge branch 'wind_(story53)' into 'master'
8 years ago
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187]
8 years ago
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)
8 years ago
hba56 0886a60911 arrow Flip
8 years ago
hba56 86f495a551 javaDoc
8 years ago
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187]
8 years ago