447 Commits (55402136ede134cb8a9f6d1a38e6ae7d7b562667)

Author	SHA1	Message	Date
fjc40	55402136ed	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java Also added keybindings.xml to git ignore. #story[1185]	8 years ago
fjc40	2a6085c9e8	Test fix.	8 years ago
fjc40	a1684a410c	Javadoc.	8 years ago
fjc40	9fa1b9ee67	Re-enabled source id allocator check. ... Re-enabled rotation of map at startup. Changed race.xml schema so that yacht elements aren't required inside the participants element. #story[1185]	8 years ago
fjc40	3fa6b9200d	Finished MarkRoundingSequence class. Added MarkRoundingData class. ... RaceState has a MarkRoundingSequenceMember. The temporary rounding line drawing in canvas uses MarkRoundingSequence. MockRace now uses MarkRoundingSequence. #story[1185]	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. ... #story[1261]	8 years ago
Jessica Syder	b808056567	Host boat isnt disappearing anymore (I think). ... #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	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 ... # 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
fjc40	346aa148ef	Added some debug statements, and WIP MarkRoundingSequence class. ... Temporarily disabled source id allocator time checks. Added mark rounding stuff to race canvas to help debug. #story[1185]	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	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 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml	8 years ago
Jessica Syder	14aaf26b73	Merge branch 'story40-zoom' into 'master' ... 40. [V] As Caleb or Gemma I'd like to zoom the view to follow a boat (my boat) around the course (revised). Note: in this story we will select a boat and zoom the view to place the boat at the center of a display that shows only the boat's immediate surrounds. The default option will be to zoom on the player's boat. Acceptance criteria: - Any particular boat can be chosen (at any time during the race.) - When a boat is selected for zooming, the view should change to show the boat at the center, with the scale of the view increased. - The view should remain this way until the boat is unselected, at which point it should revert to the usual display. - Other information (e.g., the position list) may be removed from the zoomed view. - Zoomed view follows selected boat as a third person mode - There must be a keyboard option to zoom in on the player's boat_ - The zoom amount can be fixed (jump between zoom in and zoom out) or scrollable (like control-mousewheel scrolling.) See merge request !38	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
hba56	5e516b0508	re added the standard race ... #story[1193]	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
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 ... # 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
fjc40	ec82e65ae7	Fixed javadocs in xml creation classes.	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
hba56	d3ddff8bf1	host game start button added margins ... #story[1193]	8 years ago
zwu18	64ed1f9aa6	Improved map layout image. #story[1193]	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	55cfda33d0	Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76	8 years ago