Joseph Gardner
55de754164
Stuff
2017-09-28 15:05:35 +13:00
Joseph Gardner
685b508f1e
Merge branch 'tom' into nightmode
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
2017-09-28 14:58:53 +13:00
Joseph Gardner
38bcc9fa66
Sailer tom 8)
2017-09-28 14:53:21 +13:00
Joseph Gardner
c0e00899ef
Merge branch 'master' into tom
2017-09-28 14:51:54 +13:00
Joseph Gardner
4f681ced4e
Sailer tom 8)
2017-09-28 14:18:13 +13:00
Joseph Gardner
fa4a2b28d2
Merge remote-tracking branch 'origin/raceView_UI' into nightmode
2017-09-28 12:01:08 +13:00
Joseph Gardner
a2d605fd5b
Added nightmode skybox. Changed how next mark arrow works.
2017-09-28 11:56:49 +13:00
Joseph
e434af0728
fixed boat collisions. Increased boat collision radius 15 -> 50
2017-09-28 01:29:58 +13:00
Joseph Gardner
7ac181f33d
Fixed null pointer when race finishes #story[1299]
2017-09-27 13:08:29 +13:00
Joseph Gardner
13f3f595d2
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
2017-09-27 12:52:50 +13:00
Joseph Gardner
5eeb65ad41
Merge branch 'raceLength' into 'master'
...
Race length
AC's:
- Scale map to selected duration of user
See merge request !64
2017-09-27 12:47:32 +13:00
Joseph Gardner
08c097f153
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
2017-09-27 12:38:40 +13:00
Joseph Gardner
6e913d6c45
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
2017-09-27 12:38:29 +13:00
Joseph Gardner
ea1170a48e
Merge remote-tracking branch 'origin/master' into raceLength
2017-09-27 12:05:09 +13:00
Joseph Gardner
26e2035ea2
Changed 3d arrow to point downwards #story[1299]
2017-09-27 11:39:12 +13:00
Joseph
569204b771
New skin for 2d next mark arrow. #story[1299]
2017-09-27 00:36:05 +13:00
Joseph
699df2e775
Using new arrow / arrow textures. Made sails not clickable.
2017-09-26 18:30:29 +13:00
Joseph
affbb69029
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
2017-09-26 17:54:49 +13:00
Joseph
d86d043992
Merge branch 'master' into story1299_next_mark_direction
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
2017-09-26 17:53:46 +13:00
Joseph
3f04485b78
Added manual connections works while also receiving available games from the server. #story[1352]
2017-09-26 13:16:09 +13:00
Joseph
5ebee27baa
Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
2017-09-26 13:11:39 +13:00
Joseph Gardner
44268cc30b
Fixed not being able to add custom connections. Still need to test if it works with the http match browser (can't test it atm. #story[1352]
2017-09-25 15:30:49 +13:00
Joseph Gardner
7d789c04bb
Fixed sails out / colliding issue. #story[1297]
2017-09-25 14:07:29 +13:00
Joseph Gardner
332722e099
Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]
2017-09-25 13:48:03 +13:00
Joseph Gardner
f9f5cfef7d
Chanegd next mark arrow to fit with new UI. #story[1299]
2017-09-25 13:11:09 +13:00
Joseph Gardner
327c052b1d
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
2017-09-25 12:15:10 +13:00
Joseph Gardner
9212ec91f0
mailmap
2017-09-25 11:58:42 +13:00
Joseph
bf6282c697
3D arrow added for zoomed view. Shows relative direction to mark. #story[1299]
2017-09-24 17:28:13 +13:00
Joseph
4cf9b67db8
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
2017-09-21 22:44:30 +12:00
Joseph
322d7b38b6
Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
2017-09-21 22:33:31 +12:00
Joseph Gardner
b1657e8bfc
Merge branch 'minimap_test' into 'master'
...
Minimap
AC's:
-Minimap of current map with player boats is shown
-Boats and marks are shown on the minimap
-Minimap can be minimized and maximised
-Some annotations displayed on maximised minimap
See merge request !55
2017-09-21 22:27:57 +12:00
Joseph
91c442e465
Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299]
2017-09-21 22:25:39 +12:00
Joseph
2cf0cca157
Can no longer click around the boat highlighting. #fix #story[1298]
2017-09-21 16:51:00 +12:00
Joseph Gardner
a82d3081fc
Replace the class use of highlight with shockwave. #story[1298]
2017-09-19 15:43:22 +12:00
Joseph Gardner
9fbd5df626
Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
2017-09-19 15:35:13 +12:00
Joseph Gardner
cfdbf5896f
Added basic highlighting to player boat. #story[1298]
2017-09-19 14:42:21 +12:00
Joseph Gardner
3ca62e6c2b
Added basic highlighting to player boat. #story[1298]
2017-09-19 14:39:25 +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
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
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
Joseph Gardner
1166c0a4fb
Merged sounds. #story[1196]
2017-09-14 14:37:53 +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
Joseph Gardner
a6eea88524
Fixed collisions #fix #story[1196]
2017-09-14 11:58:40 +12:00
Joseph Gardner
0944e5729a
Dimmed the ambient light and specular light. #story[1261]
2017-09-13 15:18:27 +12:00
Joseph
0b3ef992bc
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
2017-09-13 12:45:02 +12:00
Joseph
253a16a664
Made the sky box use sky box planes they cannot be scaled. #story[1261]
2017-09-13 12:44:25 +12:00
Joseph
771068966e
Just rotated the images to make them look like the plane is rotated properly... #story[1261]
2017-09-13 11:45:49 +12:00
Joseph Gardner
bcc827b554
Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
2017-09-12 18:16:08 +12:00
Joseph
7a8ea7fea7
Made seasurface overlay to enable skybox to be smaller. #story[1261]
2017-09-12 12:37:25 +12:00
Joseph
49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
2017-09-12 01:55:24 +12:00
Joseph Gardner
0da6931f8f
Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
2017-09-11 18:24:21 +12:00
Joseph Gardner
2868f921e2
Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]
2017-09-08 15:55:29 +12:00
Joseph Gardner
df624a8437
Angular movement when auto vmg is pressed is smoothed. #story[1196]
2017-09-08 15:34:22 +12:00
Joseph Gardner
d2c8ccd98e
Course image for a type M2 course has been made. #story[1193]
2017-09-08 14:20:14 +12:00
Joseph Gardner
3157ac88b5
Course layout for a type M2 course has been made. #story[1193]
2017-09-08 13:27:30 +12:00
Joseph Gardner
00cedf4d4d
TackGybeCommand now smooths the rotation of the boat. #story[1196]
2017-09-06 15:19:30 +12:00
Joseph
f4cb1a3ac4
Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]
2017-09-05 12:40:34 +12:00
Joseph
f1c07bca46
Linked table to show games from received packets. #story[1188]
2017-09-04 09:53:26 +12:00
Joseph
f8e1a539c2
Linked table to show games from received packets. #story[1188]
2017-09-04 09:46:13 +12:00
Joseph
0de7780020
Changed wind speed to be non-linear. #story[1187]
2017-08-31 12:26:30 +12:00
Joseph Gardner
b0f7c5e734
Wind speed changes depending on where the wind direction is. #story[1187]
2017-08-29 15:53:41 +12:00
Joseph Gardner
d0ba7b93e0
Wind oscillates, replaces random wind with shifting wind. #story[1187]
2017-08-29 14:40:52 +12:00
Joseph Gardner
0be5b731c3
Merge branch 'master' into wind_(story53)
2017-08-29 13:22:15 +12:00
Joseph Gardner
12e2ae9c01
Started implementing wind oscillation. #story[1187]
2017-08-29 13:21:34 +12:00
Joseph Gardner
64e96a1b8b
Class for shifting wind. #story[1187]
2017-08-29 12:14:28 +12:00
Joseph Gardner
0490237c0c
Merge branch 'story_64_sails' into 'master'
...
Story 64 sails
See merge request !29
2017-08-17 16:59:50 +12:00
Joseph Gardner
5ba6f52669
fixed autovmg.
2017-08-17 16:50:13 +12:00
Joseph Gardner
dcd1df2999
Merged master.
2017-08-17 16:26:00 +12:00
Joseph Gardner
014b78f166
Merge branch 'master' into story_64_sails
2017-08-17 16:25:40 +12:00
Joseph Gardner
e26fb73627
Merged master.
2017-08-17 16:08:23 +12:00
Joseph Gardner
d41e52766b
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
2017-08-17 16:04:53 +12:00
Joseph Gardner
37fe7389ff
Rounding marks works.
2017-08-17 13:55:33 +12:00
Joseph Gardner
610aa96241
Merge branch 'MapWindRotation' into 'master'
...
Map wind rotation
Note: we'd like to generate a realistic course layout, that can vary from race to race (but not within a race, for now.) The generated layout must be sent through the API in the format given by the race.xml section of the AC35 Streaming Data Interface Specification. The AC35 Protocol (sections 31.4 and 31.5) specifies the requirements for a course:
* First leg of the course (from start line to first mark) must be a reaching leg
* Next legs are windward/leeward, and boats complete either two or three laps of this section
* Final leg to finish line may be a reaching leg
* A boat should take around 25 minutes to complete the course in the wind conditions at the start of the race (AC35 protocol, section 31.5)
You should assume that the windward/leeward marks and start/finish lines are always compounds of two marks.
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.
See merge request !22
2017-08-17 13:50:21 +12:00
Joseph Gardner
a50d460222
Merged master.
2017-08-17 13:02:14 +12:00
Joseph Gardner
20c9870fea
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
2017-08-17 12:59:25 +12:00
Joseph Gardner
a3fe57ed5a
Removed print statement. #story[1092]
2017-08-17 12:27:59 +12:00
Joseph Gardner
4cf8846cda
Map wind rotation works with multiplayer xml. #story[1092]
2017-08-17 12:17:45 +12:00
Joseph Gardner
1e7ba8cd51
Merge branch 'master' into MapWindRotation
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
# racevisionGame/src/main/java/shared/model/CompoundMark.java
# racevisionGame/src/main/java/shared/model/Mark.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
2017-08-17 11:46:09 +12:00
Joseph
d7e0bfa86c
Trackpoints are only shown for the player's boat. #story[1098]
2017-08-17 10:13:30 +12:00
Joseph
47fc55245c
Merged master.
2017-08-17 09:27:41 +12:00
Joseph
f60809bdd4
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/MockOutput.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java
# racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java
# racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
# racevisionGame/src/main/resources/visualiser/scenes/connect.fxml
# racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
# racevisionGame/src/test/java/mock/model/MockRaceTest.java
# racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java
# racevisionGame/src/test/java/network/XMLMessageEncoderTest.java
2017-08-17 09:13:49 +12:00
Joseph Gardner
7d4f1cd925
Fixed first key press not working. #story[1098]
2017-08-14 12:41:21 +12:00
Joseph Gardner
d8628b4289
Boats now start the race with sails out. #story[1098]
2017-08-10 13:25:57 +12:00
Joseph Gardner
20302496f0
Made SailsInCommand and SailsOutCommand one class. #story[1098]
2017-08-10 13:14:58 +12:00
Joseph Gardner
1a7152f54e
Boats stop when the sails are out. Merged dev. #story[1098]
2017-08-10 12:32:05 +12:00
Joseph Gardner
1302769a50
Merge branch 'Development' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
# racevisionGame/src/test/java/mock/model/MockBoatTest.java
2017-08-10 11:56:09 +12:00
Joseph
e23f20753d
Merged master. Added commands for sails in and out. Added logic to stop boat from moving when sails are out. Testing if the boat stops with sails out is blocked until command factory is merged. #story[1098]
2017-08-10 09:42:59 +12:00
Joseph
41d09f587e
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java
# racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
# racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
2017-08-10 08:58:43 +12:00
Joseph Gardner
f6cdf66bfe
Sails can be toggled on the visualiser and the rotate sails button rotates the sail visually. #story[1098]
2017-08-07 15:01:16 +12:00
Joseph Gardner
0bf2c6106b
Boat updating speed after key press has been fixed. #fix #story[1094]
2017-08-07 12:03:34 +12:00
Joseph Gardner
40a3ed1bb0
Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
2017-08-03 16:56:52 +12:00
Joseph Gardner
27cf0e1539
Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
2017-08-02 16:31:55 +12:00
Joseph Gardner
b258e94a54
Merged wind generator into this branch. #story[1094]
2017-08-02 15:19:32 +12:00
Joseph Gardner
577a1d1b5a
Merge remote-tracking branch 'origin/RaceFactory' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
2017-08-02 15:10:36 +12:00
Joseph Gardner
fba256113a
Merged wind generator into this branch. #story[1094]
2017-08-02 15:09:59 +12:00
Joseph Gardner
51bbdf9a50
Merge branch 'issue_26_wind' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/shared/model/Race.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
2017-08-02 15:04:55 +12:00
Joseph Gardner