527 Commits (22e9db473e7321922300a82723f71fcce522d92f)

Author	SHA1	Message	Date
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
Connor Taylor-Brown	fbd124e602	Merge branch 'master' into storyB-) ... # Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java	8 years ago
hba56	e3ddb272c0	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml	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
Fan-Wu Yang	2cda5ea70d	Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]	8 years ago
Connor Taylor-Brown	5e35cd4195	Removed empty java files	8 years ago
Fan-Wu Yang	54a9140f31	lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188]	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
Fan-Wu Yang	df04cdf87c	Boats are now visualy removed when they leave the lobby.	8 years ago
Fan-Wu Yang	d92410b9b4	Fixed XML Issue where sometimes the last boat would not display itself #story[1188]	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	ddc3a6ae47	boxes in lobby are now boats	8 years ago
hba56	e5d8a4028d	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/layout/Subject3D.java # racevisionGame/src/main/java/visualiser/layout/View3D.java # racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml	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
hba56	4c2ab9cc9a	Merge branch 'master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/model/View3D.java	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
hba56	4780354452	Errors in this commit: mock threads get interrupted ... #story[#1188]	8 years ago
Connor Taylor-Brown	b034a452b6	Fixed problem with race pane registering non-control keys ... #story[1190]	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 ... - View3D subject selection is no longer enabled by default - Added documentation #story[1190]	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 ... - 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
hba56	63e2cc1fd0	Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java	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	a494eb4a6d	games are now added on the correct port ... #story[1188]	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
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	e82c59a8a4	New css for the host game window ... #story[1193]	8 years ago
hba56	cbfcd3aa0d	Images ... #story[1193]	8 years ago
cbt24	8c7345a30d	Documented command classes ... #story[1196]	8 years ago
cbt24	a6db06a82c	Boats now reverse smoothly when colliding ... - Collision objects specify which boat is colliding - RaceLogic sets up an observable CollisionCommand when collision bubbles up - Boats now selectively identify observers of collision #story[1196]	8 years ago
cbt24	9cba3934ea	Sails command now applies acceleration to boat ... - Race only has control over speed while Sails command is not in action - This is governed by a default velocity property on the boat - Sails command returns control when sails are out and boat is up to speed - Speed never falls below 0 - Speed never goes above VMG velocity to prevent exploitation #story[1196]	8 years ago
cbt24	eba70ab2d4	Sails command now listens to race to check if goal velocity is met ... #story[1196]	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" ... #story[1196]	8 years ago
Connor Taylor-Brown	e3e61e5b28	Merge remote-tracking branch 'remotes/origin/master' into storyD-3D	8 years ago
hba56	dfd3cb96f3	removed System.out.println	8 years ago
Fan-Wu Yang	ae1526c457	Merge branch 'master' into vmg_fix ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	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
Fan-Wu Yang	2382585c15	Fixed Javadoc and also made some variables private #story[1187]	8 years ago
Joseph Gardner	00cedf4d4d	TackGybeCommand now smooths the rotation of the boat. #story[1196]	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	9560486248	Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76	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
Fan-Wu Yang	06517b7b47	Tidied up code ... - Removed prints from tests - Added Javadocs in necessary places - Reenabled boat status message to send - Added boat average angle - pulled out modulateAngle function - Commented harder to read loops - Disabled toggled VMG #story[1182]	8 years ago
Fan-Wu Yang	d602c1ec6f	VMG is now working and fixed, however, it feels a bit odd #story[1182]	8 years ago
David Wu	b22c5c5cd6	Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]	8 years ago
Fan-Wu Yang	7331ad1a20	VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]	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
Fan-Wu Yang	7aaa880f40	VMG now works with some edge cases issues #story[1182]	8 years ago
Joseph	f4cb1a3ac4	Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]	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
Fan-Wu Yang	71dcc8ee6c	Added POlar Linear Interpolation #story[1186]	8 years ago
Jessica Syder	35c595adf8	Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D	8 years ago