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
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
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
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
b976186c7d
Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
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
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
83b0c0a6b4
Fixed issue using File from java.io.File which did not like maven
8 years ago
a3fe57ed5a
Removed print statement. #story[1092]
8 years ago
8d87da6206
fixed java doc issues on my side #story[1092]
8 years ago
b5e414f97a
Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class.
...
#story[1092]
8 years ago
70d5447e88
Moving stuff from school pc to home
8 years ago
7c6f0931ba
Transferring files from my laptop to desktop to work on, may be broken.
8 years ago
0f9b191ccb
Added doc strings to RaceXML Creator #story[1096]
8 years ago
fef35d0b00
The race is rotated with it's initial rotation in mind
...
- RaceXMLCreator now checks the bearing of the race with getLineAngle()
- Split some methods into functions so that it is more readable
#story[1096]
8 years ago
2ce1c0786e
The course points can now be rotated,
...
- Created markToGPSCoordinate Class
- Added Rotation to marks
#story[1092]
8 years ago
f23c3f854d
Seperated race xml creation into a class of its own
...
- Created RaceXMLCreator class
- made a function to convert limit to GPS Coordinate (limitToGPSCoordinate)
- can rotate a GPS Coordinate around a point (rotate)
- can get center of a race with (getCenter)
#story[1092]
8 years ago
fjc40
Jessica Syder
David Wu
Fan-Wu Yang
Joseph Gardner