28 Commits (028428da2c60c8dd4dc8b9f251374955eb713519)

Author	SHA1	Message	Date
David Wu	028428da2c	Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]	9 years ago
David Wu	d2f0c1105a	Merged 3d branch. Added 3d item to one of the player pane. #story[1188]	9 years ago
David Wu	b724a814b1	Merge branch 'story86-3D' into story77_lobby ... # Conflicts: # racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml	9 years ago
David Wu	88782182d7	Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188]	9 years ago
Connor Taylor-Brown	cf838f2072	Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working. ... #story[1196]	9 years ago
David Wu	892320db5f	Added javadoc and extra files to push	9 years ago
David Wu	0621e1bdb1	Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation.	9 years ago
David Wu	c63403d1de	Created new lobby menu. Working on animated background for menu.	9 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.	9 years ago
David Wu	5234cdea66	Merge branch 'master' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	9 years ago
David Wu	f1ef75fb81	Merge branch 'master' into new_issue#19	9 years ago
David Wu	03dd937713	Change fxml stuff. Added back to menu buttons.	9 years ago
Joseph Gardner	d41e52766b	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java	9 years ago
David Wu	c08bafa566	Fixed most of issue #19 with new master?	9 years ago
David Wu	6bc81f566e	Issue 19 changes.	9 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	9 years ago
Joseph	f60809bdd4	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/app/MockOutput.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java # racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java # racevisionGame/src/main/resources/visualiser/scenes/connect.fxml # racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml # racevisionGame/src/test/java/mock/model/MockRaceTest.java # racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java # racevisionGame/src/test/java/network/XMLMessageEncoderTest.java	9 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	9 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]	9 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]	9 years ago
fjc40	7cc39abe57	WIP. Probably need to cherry pick stuff out of here. ... Added ClientConnection and server-side handshake. Added MessageSerialiser and Deserialiser. #story[1095]	9 years ago
Jessica Syder	7c5670f8c2	Sails are displayed on first boat in a race. Optimised imports. ... - Implemented drawSails method - Sail position is displayed and updated using a boat's heading - Sails conform to 'Points of sail' - Javadoc'd new method and tidied up existing - Sped up track point frequency (visualiserBoat class) - Optimised imports (any other classes changed) - A lot of canvas drawing and sail rotating issues were discovered and eventually overcome along the way. Using a sail image to draw and rotate on the existing canvas rather than a JavaFX shape on a new canvas was the final decision. #story[1098]	9 years ago
Fan-Wu Yang	442920f9f6	DOD, and added javadocs/fixed javadocs #story[1087]	9 years ago
David Wu	2b8b334486	Updated host to show the hosted address and port. Fixed css issue with lobby text field. ... #story[1087]	9 years ago
David Wu	90f9ec2b98	Changed host menu. Will update soon. ... #story[1087]	9 years ago
zwu18	243c450790	Merged with multi visualiser branch so now multiple visualisers can connect to the same host. ... #story[1087]	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. ... #story[1087]	9 years ago
David Wu	9159e16a21	Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host. ... #story[1087]	9 years ago