fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,387 Commits 1 Branch 0 Tags
c43633f197b93856f623a1a6e9cd4088ff8349e4
Commit Graph
1387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hba56 88f1a393f2 Made the info tab into an overlay 
#story[1195]
 2017-09-14 23:40:02 +12:00
fjc40 24b068f249 Collision effect uses color.transparent instead of a custom transparent color. 2017-09-14 23:33:23 +12:00
fjc40 536428ce16 There was a null pointer exception related to going into/leaving third person camera and the arrow annotation. 2017-09-14 23:11:52 +12:00
fjc40 f308f5b8f3 Visualiser model thread was updating GUI instead of fx thread. 2017-09-14 23:08:58 +12:00
Connor Taylor-Brown 8d9624db96 Recovered sails smoothing 
- Boat default position is now overridden only by collision command
- Sails command overrides boat velocity

#story[1195]
 2017-09-14 23:01:29 +12:00
Connor Taylor-Brown 90c258e9e9 Reset collision tag on visualiser boat after displaying collision 
- Modified View3D to index subjects rather than shapes by source ID
- Enforced one collision per boat on server to reduce rendering load
- Changed collision radius to less than bounce radius
- Fixed game-breaking null command bug

#story[1195]
 2017-09-14 22:36:18 +12:00
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable 2017-09-14 22:25:33 +12:00
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
 2017-09-14 16:57:17 +12:00
David Wu e345ecdec1 Removed sout statements. 2017-09-14 16:52:45 +12:00
Joseph Gardner f794aec4c8 boundaries are annotations. 2017-09-14 16:43:42 +12:00
Joseph Gardner 7fa2037753 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D 2017-09-14 16:42:39 +12:00
Fan-Wu Yang 2383915c78 Merged #story[1195] 2017-09-14 16:42:23 +12:00
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D 2017-09-14 16:39:55 +12:00
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
 2017-09-14 16:37:58 +12:00
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195] 2017-09-14 16:36:17 +12:00
Joseph Gardner 7bea2fee73 Merge branch 'storyA_sounds' into storyD-3D 2017-09-14 16:36:05 +12:00
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
 2017-09-14 16:34:28 +12:00
hba56 86de4e7c0c Merge remote-tracking branch 'origin/master' 2017-09-14 16:27:54 +12:00
hba56 004aebceb5 fix null pointer when playing tutorial 2017-09-14 16:27:36 +12:00
cbt24 02b4146fa3 Amended collision effect radius 
#story[1195]
 2017-09-14 16:24:14 +12:00
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] 2017-09-14 16:23:56 +12:00
cbt24 7d58b05e38 Fixed collision not fading to zero 
#story[1195]
 2017-09-14 16:23:21 +12:00
cbt24 cdc7b642db Boat now shows a fading collision effect 
#story[1195]
 2017-09-14 16:22:04 +12:00
Fan-Wu Yang f541a13235 Tried to get lobby working #story[1188] 2017-09-14 15:54:48 +12:00
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
 2017-09-14 14:45:51 +12:00
Joseph Gardner 1166c0a4fb Merged sounds. #story[1196] 2017-09-14 14:37:53 +12:00
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game. 
#story[1194]
 2017-09-14 14:33:21 +12:00
David Wu 913452de43 Merge branch 'master' into wind_arrow_direction_5 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
 2017-09-14 14:30:45 +12:00
David Wu 39cfed961c Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-09-14 14:29:01 +12:00
David Wu 550180f286 Removed countdown pane. 2017-09-14 14:28:42 +12:00
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
 2017-09-14 14:16:53 +12:00
Joseph Gardner c23fcfcaa3 new skybox textures. Still need to fix two planes having a small gap between them. #story[1196] 2017-09-14 14:03:36 +12:00
hba56 083eb5a4bc updated race view that does not use a split pane 2017-09-14 13:45:46 +12:00
fjc40 b59d36f4e5 Actually fixed the wind arrow direction. 2017-09-14 13:32:23 +12:00
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction." 
This reverts commit 8e6a720558.
 2017-09-14 13:22:35 +12:00
hba56 87f3265640 pushed branch 
#story[1195]
 2017-09-14 13:06:39 +12:00
Connor Taylor-Brown f2370485a0 RaceController can now set up collision listeners on each boat. 
#story[1195]
 2017-09-14 12:48:02 +12:00
fjc40 e0278fdb85 Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5 2017-09-14 12:40:23 +12:00
fjc40 8e6a720558 Appears to fix wind arrow direction. 2017-09-14 12:39:41 +12:00
David Wu e3266c3b47 Pane removed. 2017-09-14 12:27:07 +12:00
Connor Taylor-Brown e354320d74 Replaced camera tracking listeners with animation timer 
- Documented animation timers and mark arrow

#story[1195]
 2017-09-14 12:20:55 +12:00
Connor Taylor-Brown b8c4582d2a Replaced mark arrow listener with animation timer. 
#story[1195]
 2017-09-14 12:06:47 +12:00
Joseph Gardner a6eea88524 Fixed collisions #fix #story[1196] 2017-09-14 11:58:40 +12:00
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI. 2017-09-13 23:50:55 +12:00
Fan-Wu Yang e4a8bd08e7 Merge branch 'story77' into 'master' 
Story77



See merge request !44
 2017-09-13 21:37:57 +12:00
Fan-Wu Yang 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188] 2017-09-13 21:30:16 +12:00
Fan-Wu Yang 1b946b6807 Removed/commented out unecessary print messages #story[1188] 2017-09-13 21:21:19 +12:00
hba56 4c52673fc1 javadoc fixes 
#story[1188]
 2017-09-13 17:12:24 +12:00
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
 2017-09-13 16:14:07 +12:00
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
 2017-09-13 16:13:14 +12:00