7bad0e53ff
The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
002cccd5a0
Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
18a689b110
Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
e3e61e5b28
Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
5bb8ba44b8
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
2382585c15
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
4ec2a50d20
Image Scales
...
#story[1193]
8 years ago
d89186d8bf
Finished playable 3D race with first person camera
...
- Camera pivot must be manually updated
- GPS coordinates are scaled by an arbitrary amount to make movement visible
- Model has to be flipped 180 degrees to move forward
#story[1261]
8 years ago
4eac3ea8b5
Updated the HostGame now has images for the maps and the map can be picked
...
#story[1193]
8 years ago
6b9c041c6b
Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
8 years ago
dbd4703e74
javadoc fix
8 years ago
19f4d0fc06
Added marks back to the race view
...
#story[1261]
8 years ago
05a0614246
Boats now rotate correctly in position rather than about the origin
...
#story[1261]
8 years ago
3ecf203cba
Recovered stable rotation of the player's boat
...
- Uses AnimationTimer rather than listeners
- Reduced pre-start time to speed up testing
#story[1261]
8 years ago
8b5a5506e7
Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
8 years ago
c74cc26bf1
Merged with master and changed View3D default background
...
- Removed sparkline from RaceController
#story[1261]
8 years ago
b8c99be201
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
8 years ago
971a061499
View3D within RaceController now tracks boat heading
...
- Race leaves lobby on Warning status for development
- Latest subject added is used as camera pivot
#story[1261]
8 years ago
8287fbf6ba
Updated the HostGame window to support maps
...
#story[1193]
8 years ago
8c1eded926
Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195]
8 years ago
35c595adf8
Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D
8 years ago
addaaf0de3
Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
8 years ago
85eb66d508
Keybindings can be saved and loaded, and work when Jar'd!
...
- trying to solve jar file reading issue
- learnt a lot about jars including their lack of file structure
- changed location of keybindings settings to outside of jar
- added new folder/file that is generated on first run
#story[1197]
8 years ago
dd1cb89b66
Merge remote-tracking branch 'origin/master' into 77_racexml_updates
8 years ago
0ee448e17d
Created wrapper for controlling the position and heading of rendered 3D models.
...
- Updated View3D to use Subject3D wrappers instead of Shape3D
- Fixed HostController for the new architecture
- Made position and heading observable in VisualiserBoat
- Attached listeners to each VisualiserBoat in RaceController
#story[1261]
8 years ago
cd685ae467
Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195]
8 years ago
cfa6fc37e0
User modified keybindings are persistently saved
...
- Works on windows computers
- KeyFactory processes its own XML saving/loading
- Does not work with Jar yet
- Changed keyFactory to static temporarily to work with existing FXML loading architecture
#story[1197]
8 years ago
e3cbb6d482
Start game button actually starts the game.
8 years ago
abf325e5ea
Passing a mark will now play a sound. Currently using placeholder sound so will ned to change. #story[1195]
8 years ago
3fdfbd83e0
User can save, reset or cancel.
...
- Created a notification popups for errors
- Added functionality to save, cancel and reset buttons
- Key bindings are only saved if they're valid
- Added window close event
- Can not exit without saving correctly
- CSS to cancel, save and reset buttons to differentiate between key buttons
- Javadocd
#story[1197]
8 years ago
c3be9665ac
Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195]
8 years ago
086206a623
Controls button in title screen now opens the key mapping menu. #story[1197]
8 years ago
65b960f725
Background of title now changes colour depending on day mode and night mode. Sun image also changes. This is so that the tutorial label is more visible during night mode. #story[1189]
8 years ago
ea029baf22
Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189]
8 years ago
9156bde8af
Moved XML message creation to RaceServer instead of ConnectionAcceptor.
...
RaceServer does not currently generate new XMLMessages - NYI.
Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified.
#story[1188]
8 years ago
716a99aac7
Reset to default button is now functional.
...
- keybindings are reset to built in default
- the table is cleared and reloaded
#story[1197]
8 years ago
3e720a9e16
Modified key bindings can be saved to use in a race.
...
- new key bindings replace old new bindings on save
- javadoc save method and small updates
#story[1197]
8 years ago
278fb65852
Pressing ESC cancels the selected command's key from being replaced
...
- focus is shifted away on esc
- focus is shifted away after successful change
#story[1197]
8 years ago
ce47b0d813
When a new key is bound other commands bound to this key are removed
...
- On binding new key existing keys are searched
- If key is in use the old one is removed
- ControlKey is updated with a placeholder key value
#story[1197]
8 years ago
2188ddc3a3
Fixed errors in making the keybinding replaceable.
...
- Changed KeyFactory to not be a singleton
- Simplified keyBindings initializer
- Modified and simplified keyListener
- Added method to copy existing keyState
- Changed button events
- Changed to newer lambda functions
- Modified updateKey method
- Left option for multiple keys bound to one command
- Updated and wrote new JavaDoc
#story[1197]
8 years ago
c7af4f2eb7
Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189]
8 years ago
8250226bde
Key bindings can be updated with any key.
...
- Changed key press from FXML key event to a listener
- UP, DOWN, ENTER keys now work
- Keys no longer change cells or press buttons
- Added placeholder buttons Cancel, Reset and Save
- Added some JavaDoc
#story[1197]
8 years ago
3cc806dc45
Returned rotation to boat in lobby
...
#story[1196]
8 years ago
fb7bf572d8
Changed View3D add-remove interface to an ObservableList
...
#story[1196]
8 years ago
b6e56d815c
ResizableRaceCanvas no longer depends on VisualiserRaceEvent
...
#story[1196]
8 years ago
ad0e26e882
Created scene to view/update current key bindings.
...
- Current key bindings are shown on buttons
- Added button action events to store the clicked button
- Added key press event to entire pane
- Button text is updated to display its key
- Added functionality to keyFactory to update key bindings
- CSS styling for some components
#story[1197]
8 years ago
c2fd5c9bae
Changed box to boat mesh
...
- Mesh needs to be rotated -90 degrees on X
- STL file has been added to assets
#story[1196]
8 years ago
cc66d63096
Removed unused shapes list from View3D
...
#story[1196]
8 years ago
bb7eb7cb44
Added adapter interface for PerspectiveCamera frustum and transformations in View3D.
...
- Tested interface while initialising HostController
#story[1196]
8 years ago
86f1a608e4
Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
8 years ago
e7164d8a78
View3D perspective camera is now operational
...
#story[1196]
8 years ago
23d58dc809
Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
cf838f2072
Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
...
#story[1196]
8 years ago
d630788a14
Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
8 years ago
43ec179d79
Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
ea41c64c34
Added dependency for stl converter #story[1191]
8 years ago
892320db5f
Added javadoc and extra files to push
8 years ago
0621e1bdb1
Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation.
8 years ago
c63403d1de
Created new lobby menu. Working on animated background for menu.
8 years ago
1b1b0a4591
Added floating test cube in title screen initialiser
...
#story[1191]
8 years ago
eb980c436e
Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 years ago
a9fde95b39
Updated maven version to 2.0.
...
Added a dedicatedServer module.
Removed Visualiser module.
Removed mock module.
Removed network module.
Fixed weird exception non-handling that appeared for some reason.
8 years ago
b886cb426f
guide line last leg fix
8 years ago
37095bfc6c
Merged master into branch.
8 years ago
5234cdea66
Merge branch 'master' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
8 years ago
598275591f
Updated javadoc.
8 years ago
79add59375
Unresizable control screen.
8 years ago
f1ef75fb81
Merge branch 'master' into new_issue#19
8 years ago
03dd937713
Change fxml stuff. Added back to menu buttons.
8 years ago
9f813ab7aa
Merged in development.
8 years ago
288979be3b
Merge branch 'Development' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/app/App.java
8 years ago
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
8 years ago
09eaf6d968
Merged master.
8 years ago
5a188f0582
Merge branch 'master' into new_issue#19
8 years ago
d2f9bfedcb
Merge branch 'issue_18_track_alpha' into 'master'
...
Issue 18 track alpha
This should resolve #18 .
Track point system is now a line, and updated more frequently.
Line fades over time.
The boat wake is also longer, and has a black dot at the end.
See merge request !28
8 years ago
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
8 years ago
2edb6b5249
Merge branch 'issue#40' into 'master'
...
Issue#40
See merge request !30
8 years ago
c08bafa566
Fixed most of issue #19 with new master?
8 years ago
2656efcb4d
Marks are a bit darker.
...
Wake no longer has circle at end.
8 years ago
02ab0e8a00
added javadoc
8 years ago
3cf50c56f8
added a refresh for the info table so no new values are shown when the game is in full screen
8 years ago
a50d460222
Merged master.
8 years ago
0f58270c10
Merge branch 'master' into issue_18_track_alpha
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
8 years ago
7546c65893
Merge branch 'master' into MapWindRotation
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/CompoundMark.java
# racevisionGame/src/main/java/shared/model/Mark.java
8 years ago
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
8 years ago
fa5992bfb2
added App app to app.
8 years ago
62f400b924
Trackpoint line color fades out.
8 years ago
6bc81f566e
Issue 19 changes.
8 years ago
fa26abe10c
Minor tidy.
8 years ago
df2b674b94
update scale for table displaying
8 years ago
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
8 years ago
d7e0bfa86c
Trackpoints are only shown for the player's boat. #story[1098]
8 years ago
47fc55245c
Merged master.
8 years ago
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
8 years ago
109b291973
Merged issue #20 fix and splash screen into development.
8 years ago
317582aae8
Merge branch 'issue#20fix' into Development
8 years ago
4e8b7d3b5a
Merge remote-tracking branch 'origin/master' into issue#20fix
8 years ago
8759ac070e
Merge remote-tracking branch 'origin/splashScreen' into issue#20fix
8 years ago
ee0cc4b704
Merge branch 'issue#40' into Development
8 years ago
114c18763b
Reduced track point period to 1000ms.
...
issue #18
8 years ago
Fan-Wu Yang
David Wu
Connor Taylor-Brown
hba56
Jessica Syder
fjc40
Joseph Gardner