72 Commits (d1f74dec3acf1e2ef4cad49d7511a5c13b01828a)

Author	SHA1	Message	Date
Connor Taylor-Brown	c94e0af69c	Removed remaining println statements	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
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
Fan-Wu Yang	ae1526c457	Merge branch 'master' into vmg_fix ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	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
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	71dcc8ee6c	Added POlar Linear Interpolation #story[1186]	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
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	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
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. ... Added a dedicatedServer module. Removed Visualiser module. Removed mock module. Removed network module. Fixed weird exception non-handling that appeared for some reason.	8 years ago
fjc40	666c7b029f	Disabled map rotation - temp fix for the demo. ... Set race to use 3 boat race.xml file.	8 years ago
David Wu	5234cdea66	Merge branch 'master' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	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 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Mark.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java	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. ... #story[1095]	8 years ago
fjc40	5ae8393126	Fixed null pointer exception when a boat finishes the race. ... Boats now default to have position (0, 0). Added mark rounding data to single player race.xml	8 years ago
Fan-Wu Yang	ac42c07c69	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java	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. ... #story[1092]	8 years ago
fjc40	7366aba5ec	Added empty data sources, to be used by VisualiserRace. ... Created FrameRateTracker which can be used to track framerate. Updated RequestToJoinEnum and JoinAcceptanceEnum to match the agreed connection API. Added AssignPlayerBoat message, which is used internally on the client to assign the player a source ID once they have connected. Fixed some race conditions in the MessageRouter. Updated ConnectionAcceptor.CheckClientConnection to wait slightly longer before removing connection (there was a slight race condition before). Race no longer has a reference to LatestMessages. LatestMessages no longer has specific messages types in it. Created RaceState class, which contains the state that is shared between VisualiserRaceState and MockRaceState (currently only used on visualiser). Split VisualiserRace into VisualiserRaceState and VisualiserRaceService. Added the VisualiserRace commands (BoatLocatonCommand, RaceStatusCommand, etc...). Slightly increased the preferred width of race.fxml table columns. issues #27 #37 #35 #story[1095]	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. ... #story[1095]	8 years ago
fjc40	b625b6ab05	XMLReader.readXMLFileToString no longer throws a Transformer exception.	8 years ago
fjc40	19984772c0	Merge branch 'master' into story_61 ... Also got client-server handshake working. Multiple clients can connect and control their own boat. The client's boat has a larger black triangle drawn around it. Probably needs tidying up. Added isClientBoat boolean to VisualiserBoat. WindGenerator is now an interface, implemented by ConstantWindGenerator (useful for testing) and RandomWindGenerator. Added ConstantWindGeneratorTest. RandomWindGenerator was formerly WindGenerator. The WindGenerator is passed in to MockRace. CommandFactory throws a CommandConstructionException if it cannot create a command. MessageSerialiser and MessageDeserialiser correctly terminate on error. Readded VisualiserInput's switch statement in the main loop, pending a refactor. Removed the sleep statement from LobbyController - it was blocking javaFX thread. Lobby.fxml: moved buttons and text input into grid panes, so they don't break when you resize screen. Added some test object creation functions in several test classes (MockRaceTest.createMockRace(), BoatXMLReaderTest.createBoatDataSource(), etc...). #story[1095]	8 years ago