fjc40
2ad947b57d
The start time of the race is no longer scaled by the race speed scalar.
...
Changed the prestart time to 30 seconds (was 3 minutes).
Changed the preparatory time to 10 seconds (was 1 minute).
Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished.
8 years ago
fjc40
ab96884dc6
Javadoc.
8 years ago
fjc40
55402136ed
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
Also added keybindings.xml to git ignore.
#story[1185]
8 years ago
fjc40
9fa1b9ee67
Re-enabled source id allocator check.
...
Re-enabled rotation of map at startup.
Changed race.xml schema so that yacht elements aren't required inside the participants element.
#story[1185]
8 years ago
fjc40
3fa6b9200d
Finished MarkRoundingSequence class. Added MarkRoundingData class.
...
RaceState has a MarkRoundingSequenceMember.
The temporary rounding line drawing in canvas uses MarkRoundingSequence.
MockRace now uses MarkRoundingSequence.
#story[1185]
8 years ago
Jessica Syder
b808056567
Host boat isnt disappearing anymore (I think).
...
#story[1261]
8 years ago
Jessica Syder
c30391ef23
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
8 years ago
Jessica Syder
669a303e9b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
8 years ago
Jessica Syder
108643b59d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
8 years ago
David Wu
b976186c7d
Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu
c97706d86e
Merge branch 'master' into story70
...
# Conflicts:
# dedicatedServer/src/main/java/app/App.java
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml
8 years ago
fjc40
346aa148ef
Added some debug statements, and WIP MarkRoundingSequence class.
...
Temporarily disabled source id allocator time checks.
Added mark rounding stuff to race canvas to help debug.
#story[1185]
8 years ago
David Wu
d2d5ae62eb
Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
David Wu
28ec4b9246
Merge branch 'master' into story70
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/app/App.java
8 years ago
hba56
ae8fa312a3
removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
hba56
ea1594a839
Merge remote-tracking branch 'remotes/origin/master' into Story_76
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
8 years ago
hba56
5e516b0508
re added the standard race
...
#story[1193]
8 years ago
Jessica Syder
a5050b8ea8
Adding back lost changes and finishing splitting last controllers.
...
- renamed fxml and their controllers to match
- removed old controllers
- finished lobby and lobbyhost controllers
#story[1261]
8 years ago
Joseph Gardner
3157ac88b5
Course layout for a type M2 course has been made. #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
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
hba56
86f495a551
javaDoc
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
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
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
Fan-Wu Yang
7aaa880f40
VMG now works with some edge cases issues #story[1182]
8 years ago
Fan-Wu Yang
71dcc8ee6c
Added POlar Linear Interpolation #story[1186]
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
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
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
Joseph
0de7780020
Changed wind speed to be non-linear. #story[1187]
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
Joseph Gardner
b0f7c5e734
Wind speed changes depending on where the wind direction is. #story[1187]
8 years ago
Joseph Gardner
d0ba7b93e0
Wind oscillates, replaces random wind with shifting wind. #story[1187]
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