bb0c1d1780
Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
b0857debeb
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
b550afcca7
Merged race scaling with Http Match Discovery.
8 years ago
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
db27d673de
Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
928f5e31f0
Hopefully final version of Hosting #story[1188]
8 years ago
f7da497743
Resizing maps to time taking now works #story[1323]
8 years ago
424cd63c59
Should fix the race xml issues where boats get unassigned sometimes.
...
This removes the static raceServer stuff.
The Race/Boat/Regatta XML commands only execute if they contain newer data (it checks the sequence number).
8 years ago
acd99f58cd
Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
9d1145b298
Changed back to CI IP to test on CI
8 years ago
75c15d492e
There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
11a50b6f09
Merge branch 'boat_movement_smooth' into 'master'
...
Boats move about smoothly instead of jumping about
See merge request !51
8 years ago
eacbe8d8ea
Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
d660cd9e78
Merge branch 'network_on_VPS' into 'master'
...
Network on vps
Can connect to host network
See merge request !52
8 years ago
0348b0c642
Merged in master
8 years ago
c91c4e5d7c
Merge branch 'master' into network_on_VPS
8 years ago
4970f52c3a
Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
34a803f92e
More changes
8 years ago
22e9db473e
Removed test that took a manditory socket
8 years ago
2c92102b2a
Changed GraphCoordinate to use double instead of int.
...
This results in waaaaay smoother movement. Boats no longer jump around.
8 years ago
97aa917403
Merge branch 'boat_color_and_speed' into 'master'
...
Boat color and speed
- Boats are colored by their assigned color.
- Boat name is displayed in lobby.
- Boats don't move quite so fast.
See merge request !50
8 years ago
191f249bfb
Speed scale is 2, rather than 10.
...
Server simulates frames every 16ms rather than 50ms.
8 years ago
5c58ca11ff
Boats use their assigned color.
...
Boat name is displayed in lobby instead of source ID.
8 years ago
a6aeab5ee3
Merge branch 'scoreTable' into 'master'
...
Score table
See merge request !48
8 years ago
e0d886ffb2
overlay off by default
...
#story[1195]
8 years ago
3131d67cf2
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
94b5f06ede
Merge branch 'issue55-collision' into 'master'
...
Resolve issue #55 - only one collision displayed per boat
Resolves issues #55 and #57 .
See merge request !47
8 years ago
ae9594f8c3
Removed a println and fixed some javadoc warnings.
8 years ago
47d013612a
Fix for null pointer exception when finishing race.
8 years ago
88f1a393f2
Made the info tab into an overlay
...
#story[1195]
8 years ago
24b068f249
Collision effect uses color.transparent instead of a custom transparent color.
8 years ago
536428ce16
There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.
8 years ago
f308f5b8f3
Visualiser model thread was updating GUI instead of fx thread.
8 years ago
8d9624db96
Recovered sails smoothing
...
- Boat default position is now overridden only by collision command
- Sails command overrides boat velocity
#story[1195]
8 years ago
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]
8 years ago
c17900a461
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
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
e345ecdec1
Removed sout statements.
8 years ago
f794aec4c8
boundaries are annotations.
8 years ago
7fa2037753
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
2383915c78
Merged #story[1195]
8 years ago
c42e25df86
Merge branch 'master' into storyD-3D
8 years ago
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
d70f556741
Changed arrow to next mark appearance #story[1195]
8 years ago
7bea2fee73
Merge branch 'storyA_sounds' into storyD-3D
8 years ago
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
86de4e7c0c
Merge remote-tracking branch 'origin/master'
8 years ago
004aebceb5
fix null pointer when playing tutorial
8 years ago
02b4146fa3
Amended collision effect radius
...
#story[1195]
8 years ago
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
Fan-Wu Yang
fjc40
Hamish Ball
Connor Taylor-Brown
David Wu
Joseph Gardner