217 Commits (63fbffdbc14e2823234561d05e6bc9bc2f08e81a)

Author	SHA1	Message	Date
zwu18	051811b97d	Merge branch 'master' into story_speedometer	8 years ago
zwu18	be9feff6fd	Layout changes to speedometer UI. #story[1311]	8 years ago
zwu18	eea394372f	Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311]	8 years ago
hba56	731be68831	test for a minimap	8 years ago
fjc40	eb2ed45ed2	Merge branch 'master' into spectate_mode_basic ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java	8 years ago
hba56	e0d886ffb2	overlay off by default ... #story[1195]	8 years ago
hba56	88f1a393f2	Made the info tab into an overlay ... #story[1195]	8 years ago
hba56	c17900a461	Merge remote-tracking branch 'remotes/origin/master' into scoreTable	8 years ago
Fan-Wu Yang	2383915c78	Merged #story[1195]	8 years ago
Fan-Wu Yang	d70f556741	Changed arrow to next mark appearance #story[1195]	8 years ago
Joseph Gardner	14b5f4bdf1	Merge branch 'master' into storyD-3D ... # Conflicts: # .gitignore # racevisionGame/src/main/java/mock/model/RaceServer.java # racevisionGame/src/main/java/mock/model/collider/Collider.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/shared/model/Mark.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/layout/Plane3D.java # racevisionGame/src/main/java/visualiser/layout/SeaSurface.java # racevisionGame/src/main/java/visualiser/layout/View3D.java # racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java # racevisionGame/src/main/resources/visualiser/scenes/title.fxml	8 years ago
fjc40	43a1fbcb64	Spectate mode can be selected by clients when they join a game. ... #story[1194]	8 years ago
Joseph Gardner	7b076f3718	Merge branch 'storyA_sounds' into storyD-3D ... # Conflicts: # racevisionGame/src/main/java/visualiser/layout/SeaSurface.java # racevisionGame/src/main/java/visualiser/layout/SkyBox.java	8 years ago
Joseph Gardner	c23fcfcaa3	new skybox textures. Still need to fix two planes having a small gap between them. #story[1196]	8 years ago
hba56	083eb5a4bc	updated race view that does not use a split pane	8 years ago
hba56	87f3265640	pushed branch ... #story[1195]	8 years ago
hba56	fd120edaf9	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java # settings/keyBindings.xml	8 years ago
David Wu	22b4b66049	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml	8 years ago
David Wu	cccce9002b	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml	8 years ago
David Wu	490aab3f8d	Changes made to pre-race countdown. #story[1188]	8 years ago
hba56	079d93fc0f	Merge remote-tracking branch 'remotes/origin/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/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml	8 years ago
hba56	70ccb4cf1c	Merge remote-tracking branch 'remotes/origin/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/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml	8 years ago
David Wu	89ce8a7cc0	Pre-race countdown implementation.	8 years ago
Connor Taylor-Brown	70bbc89239	Fixed merge-related bugs	8 years ago
David Wu	202c8d80c8	Minor fxml adjustments.	8 years ago
David Wu	7cea1fb11c	Reworking fxml for lobby.	8 years ago
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
Joseph	771068966e	Just rotated the images to make them look like the plane is rotated properly... #story[1261]	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
Jessica Syder	625eb62af2	Wrapped the tutorial text on the title fxml. ... #story[1261]	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
Connor Taylor-Brown	d90b161d01	Merge branch 'master' into storyA_sounds ... # Conflicts: # racevisionGame/src/main/java/mock/model/RaceServer.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	8 years ago
Joseph	49cd19e1a8	Made and textured a skybox, still needs to be fixed on two sides. #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
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	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
cbt24	70f4a00d12	Scaled down marks and boats to make 3rd person view more realistic ... - Added boat and mark annotations to support selection at large camera distance - Reduced collision radius to 15 m - Fixed event startup and XML files as race was crashing on start #story[1296]	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
cbt24	2508b847b8	Merge branch 'master' into storyD-3D ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceController.java # racevisionGame/src/main/java/visualiser/layout/Subject3D.java	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
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 ... #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
Joseph Gardner	d2c8ccd98e	Course image for a type M2 course has been made. #story[1193]	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
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
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
hba56	e82c59a8a4	New css for the host game window ... #story[1193]	8 years ago
hba56	cbfcd3aa0d	Images ... #story[1193]	8 years ago
Fan-Wu Yang	7024cac426	Rotated image of arrow direction #story[1187]	8 years ago
hba56	0886a60911	arrow Flip	8 years ago
hba56	4ec2a50d20	Image Scales ... #story[1193]	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
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
David Wu	8b5a5506e7	Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]	8 years ago
hba56	8287fbf6ba	Updated the HostGame window to support maps ... #story[1193]	8 years ago
Jessica Syder	addaaf0de3	Merge remote-tracking branch 'remotes/origin/master' into C_keybindings	8 years ago
Jessica Syder	85eb66d508	Keybindings can be saved and loaded, and work when Jar'd! ... - trying to solve jar file reading issue - learnt a lot about jars including their lack of file structure - changed location of keybindings settings to outside of jar - added new folder/file that is generated on first run #story[1197]	8 years ago
fjc40	dd1cb89b66	Merge remote-tracking branch 'origin/master' into 77_racexml_updates	8 years ago
zwu18	cd685ae467	Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195]	8 years ago
Jessica Syder	cfa6fc37e0	User modified keybindings are persistently saved ... - Works on windows computers - KeyFactory processes its own XML saving/loading - Does not work with Jar yet - Changed keyFactory to static temporarily to work with existing FXML loading architecture #story[1197]	8 years ago
fjc40	8c76d6c26e	Added boats.xml schema. ... RaceServer now creates an XMLMessage when the race's BoatDataSource changes. #story[1188]	8 years ago
fjc40	298fcd03dc	Added regatta schema. ... RaceServer now creates an XMLMessage when the race's RegattaDataSource changes. #story[1188]	8 years ago
fjc40	ec58f0c847	Participants can now join during the warning period as well. ... Added RaceDataSourceToXML. RaceServer now create an XMLMessage when the race's RaceDataSource changes. #story[1188]	8 years ago
hba56	66699a4660	Added a draft for a new Course layout ... #story[1193]	8 years ago
Jessica Syder	3fdfbd83e0	User can save, reset or cancel. ... - Created a notification popups for errors - Added functionality to save, cancel and reset buttons - Key bindings are only saved if they're valid - Added window close event - Can not exit without saving correctly - CSS to cancel, save and reset buttons to differentiate between key buttons - Javadocd #story[1197]	8 years ago
David Wu	c3be9665ac	Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195]	8 years ago
David Wu	65b960f725	Background of title now changes colour depending on day mode and night mode. Sun image also changes. This is so that the tutorial label is more visible during night mode. #story[1189]	8 years ago
David Wu	ea029baf22	Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189]	8 years ago
fjc40	9156bde8af	Moved XML message creation to RaceServer instead of ConnectionAcceptor. ... RaceServer does not currently generate new XMLMessages - NYI. Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified. #story[1188]	8 years ago
zwu18	c7af4f2eb7	Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189]	8 years ago
Jessica Syder	8250226bde	Key bindings can be updated with any key. ... - Changed key press from FXML key event to a listener - UP, DOWN, ENTER keys now work - Keys no longer change cells or press buttons - Added placeholder buttons Cancel, Reset and Save - Added some JavaDoc #story[1197]	8 years ago
Jessica Syder	ad0e26e882	Created scene to view/update current key bindings. ... - Current key bindings are shown on buttons - Added button action events to store the clicked button - Added key press event to entire pane - Button text is updated to display its key - Added functionality to keyFactory to update key bindings - CSS styling for some components #story[1197]	8 years ago
Connor Taylor-Brown	c2fd5c9bae	Changed box to boat mesh ... - Mesh needs to be rotated -90 degrees on X - STL file has been added to assets #story[1196]	8 years ago
David Wu	86f1a608e4	Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]	8 years ago
David Wu	23d58dc809	Created UI option in the start menu to play a practice game. #story[1189]	8 years ago
David Wu	028428da2c	Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]	8 years ago