David Wu
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
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
hba56
e82c59a8a4
New css for the host game window
...
#story[1193]
8 years ago
hba56
cbfcd3aa0d
Images
...
#story[1193]
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
hba56
4ec2a50d20
Image Scales
...
#story[1193]
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
4eac3ea8b5
Updated the HostGame now has images for the maps and the map can be picked
...
#story[1193]
8 years ago
hba56
9560486248
Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
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
David Wu
b22c5c5cd6
Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
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
Jessica Syder
4a0d04d7ab
Created new abstract Controller class with load methods.
...
- loadScene method to load into current stage
- loadPopupScene method to load into a new window
- icon added to popup windows
- load methods return Controller of the new scee
- KeyBindingsController extends new Controller class and works correctly
#story[1261]
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
Jessica Syder
1073113589
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
hba56
8287fbf6ba
Updated the HostGame window to support maps
...
#story[1193]
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
hba56
66699a4660
Added a draft for a new Course layout
...
#story[1193]
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
David Wu
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
hba56
ec5bc9c6aa
Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation)
...
#story[1188]
8 years ago
David Wu
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
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
Jessica Syder
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
Jessica Syder
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
fjc40
3176e76c8c
MockRace:
...
Now uses RaceState as its base class, rather than Race. This aligns it with VisualiserRace. RaceState contains the shared race state between the client and server, and stores most of its data in RaceDataSource etc..., instead of maintaining its own copy.
Moved collider registry member to MockRace.
XMLUtilities:
Added documentation to two important functions, and updated them to use generics instead of Objects.
#story[1188]
8 years ago
zwu18
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
Fan-Wu Yang
9a5d20bdf2
Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186]
8 years ago
Jessica Syder
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
Joseph
0de7780020
Changed wind speed to be non-linear. #story[1187]
8 years ago
Connor Taylor-Brown
3cc806dc45
Returned rotation to boat in lobby
...
#story[1196]
8 years ago
Connor Taylor-Brown
fb7bf572d8
Changed View3D add-remove interface to an ObservableList
...
#story[1196]
8 years ago
Connor Taylor-Brown
b6e56d815c
ResizableRaceCanvas no longer depends on VisualiserRaceEvent
...
#story[1196]
8 years ago
Jessica Syder
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
Connor Taylor-Brown
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
Connor Taylor-Brown
cc66d63096
Removed unused shapes list from View3D
...
#story[1196]
8 years ago
Connor Taylor-Brown
bb7eb7cb44
Added adapter interface for PerspectiveCamera frustum and transformations in View3D.
...
- Tested interface while initialising HostController
#story[1196]
8 years ago
David Wu
86f1a608e4
Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
8 years ago
Connor Taylor-Brown
e04f199fc7
Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Connor Taylor-Brown
e7164d8a78
View3D perspective camera is now operational
...
#story[1196]
8 years ago
Fan-Wu Yang
4910d2712c
Changed STL Importers Version #story[1191]
8 years ago
David Wu
23d58dc809
Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
Fan-Wu Yang
921e0999b8
Testing if dependency for stl works this time #story[1191]
8 years ago
Fan-Wu Yang
0927e62ea3
Changed dependency to see if it will pass the CI runner #story[1191]
8 years ago
Connor Taylor-Brown
cf838f2072
Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
...
#story[1196]
8 years ago
Connor Taylor-Brown
d630788a14
Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
8 years ago
Fan-Wu Yang
43ec179d79
Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Fan-Wu Yang
ea41c64c34
Added dependency for stl converter #story[1191]
8 years ago
David Wu
7df181c759
Minor changes to new lobby fxml. #story[1188]
8 years ago
David Wu
892320db5f
Added javadoc and extra files to push
8 years ago
David Wu
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
Joseph Gardner
b0f7c5e734
Wind speed changes depending on where the wind direction is. #story[1187]
8 years ago
David Wu
c63403d1de
Created new lobby menu. Working on animated background for menu.
8 years ago
Joseph Gardner
d0ba7b93e0
Wind oscillates, replaces random wind with shifting wind. #story[1187]
8 years ago
cbt24
1b1b0a4591
Added floating test cube in title screen initialiser
...
#story[1191]
8 years ago
Joseph Gardner
0be5b731c3
Merge branch 'master' into wind_(story53)
8 years ago
Joseph Gardner
12e2ae9c01
Started implementing wind oscillation. #story[1187]
8 years ago
Joseph Gardner
64e96a1b8b
Class for shifting wind. #story[1187]
8 years ago
fjc40
eb980c436e
Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 years ago
fjc40
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
fjc40
0d2be85d17
Brought over long/latitude fix from "rounding_line_visible_hack" branch.
8 years ago
hba56
b886cb426f
guide line last leg fix
8 years ago
fjc40
666c7b029f
Disabled map rotation - temp fix for the demo.
...
Set race to use 3 boat race.xml file.
8 years ago