1330 Commits (88f1a393f2428e55dd012937674ea06b661c9e47)

 

All Branches   

Search

Author	SHA1	Message	Date
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
Hamish Ball	0888a743a7	Merge branch 'storyD-3D' into 'master' ... D and A D) As user I wish to play on a modern day 3D view Description: The current base of the game is run on a 2D dot and line canvas, this will be overhauled and replaced with a 3D view of the game. Acceptance Criteria: - Boats, and markers in the race are now 3D. - Sea has a surface. - Race runs and is reflected on the 3D view. - Skybox must be present. - Boundary must be shown (2D or 3D) - Annotations do not need to be shown. Tests: - When the FXML's are split make sure that the race still changes panes to reflect each stage of the race, prestart, racing, and finish. - The boats headings on the 3D models are the correct orientation (if they aren't facting forward on load please tell Fan-Wu as this should be an issue with the stl file). - The camera is "fixed" for now. - The base pane of the race is a stack pane so we can stack an annotations layer, or control layer, etc in the future. A) [V] As a player I would like for the style of the application to be informative Acceptance criteria: * The direction to the next mark is shown in 3rd person view * The next mark to be rounded is highlighted * Player is notified with a sound effect when the mark is rounded * Collisions are made clear and give visual and audio feedback * The score table overlays on the race and does not affect scaling See merge request !46	8 years ago
David Wu	e345ecdec1	Removed sout statements.	8 years ago
Joseph Gardner	f794aec4c8	boundaries are annotations.	8 years ago
Joseph Gardner	7fa2037753	Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D	8 years ago
Fan-Wu Yang	2383915c78	Merged #story[1195]	8 years ago
Joseph Gardner	c42e25df86	Merge branch 'master' into storyD-3D	8 years ago
Joseph Gardner	55713f14a1	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
Fan-Wu Yang	d70f556741	Changed arrow to next mark appearance #story[1195]	8 years ago
Joseph Gardner	7bea2fee73	Merge branch 'storyA_sounds' into storyD-3D	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
hba56	86de4e7c0c	Merge remote-tracking branch 'origin/master'	8 years ago
hba56	004aebceb5	fix null pointer when playing tutorial	8 years ago
cbt24	02b4146fa3	Amended collision effect radius ... #story[1195]	8 years ago
David Wu	43ee92fb95	Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]	8 years ago
cbt24	7d58b05e38	Fixed collision not fading to zero ... #story[1195]	8 years ago
cbt24	cdc7b642db	Boat now shows a fading collision effect ... #story[1195]	8 years ago
David Wu	4cb0948aaf	Merge branch 'wind_arrow_direction_5' into 'master' ... Wind arrow direction 5 This should fix the wind arrow direction. The polars were actually backwards so wind was being simulated with: into wind = faster, away from wind = slower. #### A.C: - Downwind means the boat's bearing is aligned with the wind arrow. - Upwind means the boat's bearing is facing directly into the wind arrow. - Pressing the upwind key should turn the boat in the upwind direction. - Pressing the downwind key should turn the boat in the downwind direction. - Facing upwind should result in a boat speed of roughly 0kn. - Facing downwind should result in non-zero boat speed (roughly 14kn with 12kn wind). Fixes #51 See merge request !45	8 years ago
Joseph Gardner	1166c0a4fb	Merged sounds. #story[1196]	8 years ago
David Wu	913452de43	Merge branch 'master' into wind_arrow_direction_5 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java	8 years ago
David Wu	39cfed961c	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7	8 years ago
David Wu	550180f286	Removed countdown pane.	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
fjc40	b59d36f4e5	Actually fixed the wind arrow direction.	8 years ago
fjc40	afd923c9fb	Revert "Appears to fix wind arrow direction." ... This reverts commit 8e6a720558.	8 years ago
hba56	87f3265640	pushed branch ... #story[1195]	8 years ago
Connor Taylor-Brown	f2370485a0	RaceController can now set up collision listeners on each boat. ... #story[1195]	8 years ago
fjc40	e0278fdb85	Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5	8 years ago
fjc40	8e6a720558	Appears to fix wind arrow direction.	8 years ago
David Wu	e3266c3b47	Pane removed.	8 years ago
Connor Taylor-Brown	e354320d74	Replaced camera tracking listeners with animation timer ... - Documented animation timers and mark arrow #story[1195]	8 years ago
Connor Taylor-Brown	b8c4582d2a	Replaced mark arrow listener with animation timer. ... #story[1195]	8 years ago
Joseph Gardner	a6eea88524	Fixed collisions #fix #story[1196]	8 years ago
hba56	81a04c987b	Changed the ip of the matchbrowser to that of the CI.	8 years ago
Fan-Wu Yang	e4a8bd08e7	Merge branch 'story77' into 'master' ... Story77 See merge request !44	8 years ago
Fan-Wu Yang	92500e13ee	Added in windangle for rotated map as it had been lost through merge. #story[1188]	8 years ago
Fan-Wu Yang	1b946b6807	Removed/commented out unecessary print messages #story[1188]	8 years ago
hba56	4c52673fc1	javadoc fixes ... #story[1188]	8 years ago
hba56	e4dbebfcac	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
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
cbt24	de9f4e22eb	Direction to mark arrow is now displayed relative to camera ... #story[1195]	8 years ago
Fan-Wu Yang	7b97e93d3a	Merge branch 'merge_fix_story51' ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
Fan-Wu Yang	54fe37fd3a	Merge branch 'story_51_rounding_fix' into 'master' ... Story 51 rounding fix Acceptance criteria: - The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent. - Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later. - The course must meet the requirements given in the AC35 Protocol. - The course limits should be set to clear all marks by at least several boat-lengths. - The entire race area within the limits must be on the water. (Work with rounding) Tested by playing the first map with a variety of rotation angles. See merge request !43	8 years ago
Connor Taylor-Brown	5f96526fcc	Added "arrow" pointing to next mark on third person view ... #story[1195]	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
Joseph Gardner	0944e5729a	Dimmed the ambient light and specular light. #story[1261]	8 years ago