157 Commits (01a304efb9b081dc060f850f18bb964a2a32e956)

Author	SHA1	Message	Date
zwu18	b6c340614f	Tutorial text disabled on actual races. #story[1261]	8 years ago
Jessica Syder	e664619a81	Tutorial is played with tutorial map. ... #story[1261]	8 years ago
Jessica Syder	0cb008cef7	Removed a couple of old canvas lines. ... #story[1261]	8 years ago
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	8 years ago
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	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
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	8 years ago
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	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 ... # Conflicts: # dedicatedServer/src/main/java/app/App.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml	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 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java	8 years ago
hba56	ea1594a839	Merge remote-tracking branch 'remotes/origin/master' into Story_76 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml	8 years ago
Jessica Syder	1ed7ccf146	Minor changes preparing to merge in 3D ... #story[1261]	8 years ago
Connor Taylor-Brown	93883ee8b7	Added more descriptive documentation to new classes and functionality ... #story[1190]	8 years ago
Jessica Syder	0dff85006a	Changes to code to use new controller structure. ... - renamed javadoc referencing old controllers - keybindings no longer need to be static - finished lobby and lobbyhost controllers #story[1261]	8 years ago
Jessica Syder	a5050b8ea8	Adding back lost changes and finishing splitting last controllers. ... - renamed fxml and their controllers to match - removed old controllers - finished lobby and lobbyhost controllers #story[1261]	8 years ago
Jessica Syder	a5d3434a70	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	8 years ago
Connor Taylor-Brown	b034a452b6	Fixed problem with race pane registering non-control keys ... #story[1190]	8 years ago
Connor Taylor-Brown	68f434b6b6	Bound zooming action to zoom keys ... - View3D subject selection is no longer enabled by default - Added documentation #story[1190]	8 years ago
Connor Taylor-Brown	1efec06bdc	View3D can untrack objects and zoom in different modes ... - updateDistance zooms between 0 and infinity - Camera switches from third person to bird's eye when reaching a set distance - Only one subject can be tracked at a time #story[1190]	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 ... #story[1190]	8 years ago
Connor Taylor-Brown	b59eca1a8b	Added Subject3D selection to View3D ... - Changed how View3D is added to canvasBase to allow events to get through #story[1190]	8 years ago
Connor Taylor-Brown	54baf4f884	Added scroll-wheel zooming ... - Race pane listens to scroll delta and sets View3D distance accordingly - GPSConverter has more applicable property names for infinite 3D #story[1190]	8 years ago
Jessica Syder	a2b3ba44c0	RaceController scene separating ... - removed a lot of unecessary parameters - simplified set up functions - racecontroller works on its own now - made all the scenes visible by default #story[1261]	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 ... - scenes do not load in at the same time - scenes do not rely upon previous abstract controller class - scenes are not a part of previous main controller class - unecessary functions and code removed #story[1261]	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
Connor Taylor-Brown	e3e61e5b28	Merge remote-tracking branch 'remotes/origin/master' into storyD-3D	8 years ago
Fan-Wu Yang	5bb8ba44b8	Fixed Javadoc and also made some variables private #story[1187]	8 years ago
Fan-Wu Yang	2382585c15	Fixed Javadoc and also made some variables private #story[1187]	8 years ago
hba56	4ec2a50d20	Image Scales ... #story[1193]	8 years ago
Connor Taylor-Brown	d89186d8bf	Finished playable 3D race with first person camera ... - Camera pivot must be manually updated - GPS coordinates are scaled by an arbitrary amount to make movement visible - Model has to be flipped 180 degrees to move forward #story[1261]	8 years ago
hba56	4eac3ea8b5	Updated the HostGame now has images for the maps and the map can be picked ... #story[1193]	8 years ago
hba56	6b9c041c6b	Merge remote-tracking branch 'remotes/origin/master' into wind_(story53) ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java	8 years ago
hba56	dbd4703e74	javadoc fix	8 years ago
cbt24	19f4d0fc06	Added marks back to the race view ... #story[1261]	8 years ago
cbt24	05a0614246	Boats now rotate correctly in position rather than about the origin ... #story[1261]	8 years ago
cbt24	3ecf203cba	Recovered stable rotation of the player's boat ... - Uses AnimationTimer rather than listeners - Reduced pre-start time to speed up testing #story[1261]	8 years ago
Connor Taylor-Brown	c74cc26bf1	Merged with master and changed View3D default background ... - Removed sparkline from RaceController #story[1261]	8 years ago
Connor Taylor-Brown	b8c99be201	Merge branch 'master' into storyD-3D ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceController.java	8 years ago
Jessica Syder	4a0d04d7ab	Created new abstract Controller class with load methods. ... - loadScene method to load into current stage - loadPopupScene method to load into a new window - icon added to popup windows - load methods return Controller of the new scee - KeyBindingsController extends new Controller class and works correctly #story[1261]	8 years ago
cbt24	971a061499	View3D within RaceController now tracks boat heading ... - Race leaves lobby on Warning status for development - Latest subject added is used as camera pivot #story[1261]	8 years ago
Jessica Syder	1073113589	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit	8 years ago
hba56	8287fbf6ba	Updated the HostGame window to support maps ... #story[1193]	8 years ago