1537 Commits (df95e2b3b147edb9224e1c338d2620b40a24ed57)

 

All Branches   

Search

Author	SHA1	Message	Date
hba56	3d58801760	matchbrowser now updates and flushes in a better time frame. 30s for flush as thats the time for match lobbys and 5s for update	8 years ago
hba56	4dcff5c009	SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby	8 years ago
Fan-Wu Yang	3301798411	Fixed boats not rotating in lobby #story[1188]	8 years ago
Joseph Gardner	bcc827b554	Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]	8 years ago
Connor Taylor-Brown	bae428fb3f	Recovered a private method used in a test	8 years ago
Connor Taylor-Brown	c94e0af69c	Removed remaining println statements	8 years ago
Connor Taylor-Brown	01a304efb9	Merge remote-tracking branch 'remotes/origin/master' into storyB-)	8 years ago
David Wu	83c1aeba50	Merge branch 'controllerSplit' into 'master' ... Controller split Only one scene is loaded at a time, instead of all at once. Run through the race, tutorial, all options you can think of to try break it! See merge request !41	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
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
Connor Taylor-Brown	59bd22c2aa	Fixed mark rounding ... - Returning mark 2 as mark 1 breaks rounding calculations #story[1195]	8 years ago
Connor Taylor-Brown	0f316afb3c	Added colour indication to next mark ... - Colour is swapped with end mark in leg when mark is passed #story[1195]	8 years ago
Joseph	7a8ea7fea7	Made seasurface overlay to enable skybox to be smaller. #story[1261]	8 years ago
Connor Taylor-Brown	b902b05e5e	Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)	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	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
Connor Taylor Brown	0ea647b9fd	Merge branch 'story70' into 'master' ... Story70 Merge Request Acceptance criteria: Only the player's boat is present (there are no other boats) and no other course elements are present. Each key function is introduced, and the player given the opportunity to use that (and only) that key, and observe the result. The practice ends when the final key has been taught. At least the up/down, tack/gybe, sails in/out keys must be taught. [manual tests](https://eng-git.canterbury.ac.nz/seng302-2017/team-7/wikis/manual-test:-tutorial-mode) See merge request !40	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
Joseph Gardner	0da6931f8f	Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]	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
Jessica Syder	a123bfb7e8	Merge branch 'Story_76' into 'master' ... Story 76 AC: Note: most sailing races take place on fairly standard courses: windward-leeward, triangular/Olympic, and so on. An (incomplete) list can be found at http://www.rya.org.uk/racing/race-officials/resource-centre/forms-data-diagrams-graphics/Pages/course-diagrams-other-graphics.aspx This story is related to Story 51 (generating course layouts). While 51 is concerned with orienting a course to the wind, this one relates to a library of common course layouts which could be adjusted before use by the method in 51 DOD: Adheres to relevant architectural decisions. Branch has latest version of master merged in. All acceptance criteria sufficiently met. mvn clean package with no errors. All tests pass on CI. Javadoc compiles without error. 1 Code passes our code review (see code quality standard). New tests have been sufficiently written for new functions/classes/components. Existing tests have been modified to correctly use new functions/classes/components. Manual tests have been written and logged. Related issues in the issue tracker should be linked to, and closed once merged. DOD feature check carried out and successfully completed. New step has been added to DOD feature check, if required. All System.out.println() removed from program See merge request !39	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
Fan-Wu Yang	ae75bb86d3	Resized models to a similar size of the collision detectors. #story[1261]	8 years ago
Fan-Wu Yang	08ca42f786	Wrote some missing java docs #story[1261]	8 years ago
Fan-Wu Yang	9ac9c25923	Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]	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
Fan-Wu Yang	a7eefca13a	Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]	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
Fan-Wu Yang	e2b868d815	Added boundaries to the map, which are drawn by the race #story[1261]	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	ddc3a6ae47	boxes in lobby are now boats	8 years ago