Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D ...

# Conflicts:
#	.gitignore
#	racevisionGame/src/main/java/mock/model/RaceServer.java
#	racevisionGame/src/main/java/mock/model/collider/Collider.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/shared/model/Boat.java
#	racevisionGame/src/main/java/shared/model/Mark.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/layout/Plane3D.java
#	racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
#	racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
#	racevisionGame/src/main/resources/visualiser/scenes/title.fxml

2017-09-14 16:34:28 +12:00

..

schema

Re-enabled source id allocator check.

2017-09-13 00:41:23 +12:00

boatsSinglePlayer.xml

Merge branch 'master' into story_61

2017-08-10 23:49:21 +12:00

boatTest.xml

Participants can now join during the warning period as well.

2017-09-02 00:27:44 +12:00

boatTutorial.xml

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]

2017-08-31 19:54:22 +12:00

iMapLayout.xml

removed sout and added a longer startup time. Also fixed race xmls to remove set boats

2017-09-09 15:37:35 +12:00

mMapLayout.xml

removed sout and added a longer startup time. Also fixed race xmls to remove set boats

2017-09-09 15:37:35 +12:00

oMapLayout.xml

removed sout and added a longer startup time. Also fixed race xmls to remove set boats

2017-09-09 15:37:35 +12:00

raceSchemaTest.xml

Moving stuff from school pc to home

2017-08-13 23:03:16 +12:00

raceSinglePlayer.xml

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]

2017-09-10 17:11:20 +12:00

raceSixPlayers.xml

Merge remote-tracking branch 'remotes/origin/master' into Story_76

2017-09-09 15:35:02 +12:00

raceThreePlayers.xml

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]

2017-09-10 17:11:20 +12:00

raceTutorial.xml

Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]

2017-09-10 18:11:52 +12:00

regattaTest.xml

I had accidentally broken the raceXML construction - fixed it.

2017-07-10 08:35:43 +12:00

regattaTutorial.xml

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]

2017-08-31 19:54:22 +12:00