Fan-Wu Yang
e149255240
Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
Fan-Wu Yang
5bc382304b
Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
Fan-Wu Yang
7bad0e53ff
The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
Fan-Wu Yang
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
Connor Taylor-Brown
e3e61e5b28
Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
hba56
dfd3cb96f3
removed System.out.println
8 years ago
Fan-Wu Yang
ae1526c457
Merge branch 'master' into vmg_fix
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
8 years ago
Fan-Wu Yang
7024cac426
Rotated image of arrow direction #story[1187]
8 years ago
Fan-Wu Yang
8eee282977
Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)
8 years ago
hba56
0886a60911
arrow Flip
8 years ago
hba56
86f495a551
javaDoc
8 years ago
Fan-Wu Yang
5bb8ba44b8
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Fan-Wu Yang
2382585c15
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Connor Taylor-Brown
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
hba56
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
hba56
dbd4703e74
javadoc fix
8 years ago
Fan-Wu Yang
06517b7b47
Tidied up code
...
- Removed prints from tests
- Added Javadocs in necessary places
- Reenabled boat status message to send
- Added boat average angle
- pulled out modulateAngle function
- Commented harder to read loops
- Disabled toggled VMG
#story[1182]
8 years ago
Fan-Wu Yang
d602c1ec6f
VMG is now working and fixed, however, it feels a bit odd #story[1182]
8 years ago
Fan-Wu Yang
7331ad1a20
VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]
8 years ago
cbt24
19f4d0fc06
Added marks back to the race view
...
#story[1261]
8 years ago
cbt24
05a0614246
Boats now rotate correctly in position rather than about the origin
...
#story[1261]
8 years ago
cbt24
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
Fan-Wu Yang
7aaa880f40
VMG now works with some edge cases issues #story[1182]
8 years ago
Connor Taylor-Brown
c74cc26bf1
Merged with master and changed View3D default background
...
- Removed sparkline from RaceController
#story[1261]
8 years ago
Connor Taylor-Brown
b8c99be201
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
8 years ago
cbt24
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
Fan-Wu Yang
71dcc8ee6c
Added POlar Linear Interpolation #story[1186]
8 years ago
Jessica Syder
35c595adf8
Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D
8 years ago
Jessica Syder
addaaf0de3
Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
8 years ago
Jessica Syder
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
fjc40
361856ea1d
Updated timescale.
8 years ago
fjc40
dd1cb89b66
Merge remote-tracking branch 'origin/master' into 77_racexml_updates
8 years ago
Connor Taylor-Brown
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
Connor Taylor-Brown
368bb8ddb3
Changed reporting plugin settings and specified central repository
8 years ago
Jessica Syder
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
fjc40
e3cbb6d482
Start game button actually starts the game.
8 years ago
fjc40
ac891fa91c
Fixed tests.
8 years ago
fjc40
16bf57e333
javadoc fixes.
8 years ago
fjc40
8c76d6c26e
Added boats.xml schema.
...
RaceServer now creates an XMLMessage when the race's BoatDataSource changes.
#story[1188]
8 years ago
fjc40
298fcd03dc
Added regatta schema.
...
RaceServer now creates an XMLMessage when the race's RegattaDataSource changes.
#story[1188]
8 years ago
fjc40
ec58f0c847
Participants can now join during the warning period as well.
...
Added RaceDataSourceToXML.
RaceServer now create an XMLMessage when the race's RaceDataSource changes.
#story[1188]
8 years ago
Fan-Wu Yang
34cfe48df0
Got VMG quad detection working, however, the speeds are completley wrong. #story[1186]
8 years ago
Jessica Syder
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
David Wu
086206a623
Controls button in title screen now opens the key mapping menu. #story[1197]
8 years ago
hba56
ec5bc9c6aa
Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation)
...
#story[1188]
8 years ago
fjc40
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
fjc40
d0eebcdb2f
SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period.
...
RaceLogic now calls MockRace.initialiseBoats() after the prestart period has finished.
MockRace create a VisualiserBoat when a source ID is allocated.
MockOutput now sends updated XML messages during the race, instead of only at the start.
#story[1188]
8 years ago
Jessica Syder
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
Jessica Syder
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
Jessica Syder
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