111 Commits (2383915c782a3c5ea3ee6377a5c3e88f27153e9f)

Author SHA1 Message Date
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 09eaf6d968 Merged master.
8 years ago
David Wu 5a188f0582 Merge branch 'master' into new_issue#19
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
Fan-Wu Yang 7546c65893 Merge branch 'master' into MapWindRotation
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
Connor Taylor-Brown 4b3cc8e126 Created ack number generator for use by multiple services
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 130ffcbf07 Fixed some merge issues.
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
fjc40 b1922fc3fc Added RaceStatusEncoder.
8 years ago
fjc40 b486f99dbe Added XMLMessageEncoder.
8 years ago
fjc40 8ef906472b Renamed Heartbeat to HeartBeat.
8 years ago
fjc40 c3ed30019c Added BoatLocationEncoder.
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
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
Jessica Syder 402df18b71 Merge remote-tracking branch 'remotes/origin/master' into css
9 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
zwu18 88604df66d Merge branch 'cbt-multi-controller' into css
9 years ago
zwu18 9c9b98f882 Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
9 years ago
Connor Taylor-Brown 7e3e865563 Host starts with button in ConnectionController
9 years ago
Fan-Wu Yang eec0cb3493 Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010]
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
fjc40 4bcfc01ceb shared.dataInput:
9 years ago
fjc40 10e80bca05 Moved mock.app.App#readFile(...) to shared.dataInput.XMLReader#readXMLFileToString(...).
9 years ago
fjc40 7d3cf6ee80 I had accidentally broken the raceXML construction - fixed it.
9 years ago
fjc40 abbbf70146 Refactored Race, MockRace, and VisualiserRace to use RaceClock instead of keeping their own timers.
9 years ago
fjc40 f057ad58b7 LatestMessages can hold MarkRounding messages. It also holds XMLMessage for each message type.
9 years ago
fjc40 8e18ad62ca Added LatestMessages to network.Messages. This is an object that encapsulates the latest up to date set of race messages.
9 years ago
fjc40 3a0b81834f Refactored mock.Event to work with MockRace.
9 years ago
fjc40 8d36d89570 Refactored and moved RaceXMLReader to shared/dataInput.
9 years ago
fjc40 d0d63ca236 Copied remaining files into appropriate package. These need to be refactored and put into the shared package.
9 years ago