58 Commits (28ec4b92465c66ef78fe91e41abe9cb4c14fa599)

Author SHA1 Message Date
David Wu 28ec4b9246 Merge branch 'master' into story70
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
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
Fan-Wu Yang 71dcc8ee6c Added POlar Linear Interpolation #story[1186]
8 years ago
fjc40 ec58f0c847 Participants can now join during the warning period as well.
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.
8 years ago
fjc40 3176e76c8c MockRace:
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
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
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
fjc40 a9fde95b39 Updated maven version to 2.0.
8 years ago
fjc40 666c7b029f Disabled map rotation - temp fix for the demo.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19
8 years ago
Joseph Gardner dcd1df2999 Merged master.
8 years ago
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
David Wu 6bc81f566e Issue 19 changes.
8 years ago
Joseph Gardner 4cf8846cda Map wind rotation works with multiplayer xml. #story[1092]
8 years ago
Joseph Gardner 1e7ba8cd51 Merge branch 'master' into MapWindRotation
8 years ago
Fan-Wu Yang 8d87da6206 fixed java doc issues on my side #story[1092]
8 years ago
fjc40 bcb6b79f8d Fixed player boat not being highlighted.
8 years ago
fjc40 5ae8393126 Fixed null pointer exception when a boat finishes the race.
8 years ago
Fan-Wu Yang ac42c07c69 Merge branch 'master' into MapWindRotation
8 years ago
Fan-Wu Yang b5e414f97a Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class.
8 years ago
fjc40 7366aba5ec Added empty data sources, to be used by VisualiserRace.
8 years ago
Fan-Wu Yang 70d5447e88 Moving stuff from school pc to home
8 years ago
Fan-Wu Yang 7c6f0931ba Transferring files from my laptop to desktop to work on, may be broken.
8 years ago
fjc40 6e5fb62880 Added REQUEST_RECEIVED and DECLINED to ConnnectionStateEnum.
8 years ago
fjc40 b625b6ab05 XMLReader.readXMLFileToString no longer throws a Transformer exception.
8 years ago
fjc40 19984772c0 Merge branch 'master' into story_61
8 years ago
fjc40 805c12bf41 Merge remote-tracking branch 'origin/master' into issue_28_36_decoders
8 years ago
fjc40 7cc39abe57 WIP. Probably need to cherry pick stuff out of here.
8 years ago
Connor Taylor-Brown 55798447ab Cherry-picked CommandFactory connection between ControllerServer and RaceLogic.
8 years ago
fjc40 634d78ab70 Added names to threads created.
8 years ago
Fan-Wu Yang f23c3f854d Seperated race xml creation into a class of its own
8 years ago
Fan-Wu Yang 4e8d4f2433 Created Schema for Race xml's and generated classes for reading xml with xjc, made the RaceXMLReader read Corner classes in as well as making a corner class #story[1092]
8 years ago
Connor Taylor-Brown 2672c2b13b Separated RaceLogic from MockRace
8 years ago
Joseph Gardner 6492ba89ab Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
Connor Taylor-Brown cc264f318e Added ControllerClient and ControllerServer
9 years ago
Connor Taylor-Brown 7e3e865563 Host starts with button in ConnectionController
9 years ago
Fan-Wu Yang cfd858194e Removed Unecessary Print Messages
9 years ago
Fan-Wu Yang 9f99e21232 Added functionality for more than one visualiser to connect to the mock.
9 years ago
hba56 0d5bede349 java doc fixes to fix the ci build problems
9 years ago
fjc40 5cddaaed8e mock.app.App now tells mock.app.Event that the xml file strings are XMLFileType.Contents.
9 years ago