324 Commits (368bb8ddb382154c742798ec42d6521bdda5e932)

Author	SHA1	Message	Date
hba56	02ab0e8a00	added javadoc	8 years ago
hba56	3cf50c56f8	added a refresh for the info table so no new values are shown when the game is in full screen	8 years ago
Joseph Gardner	a50d460222	Merged master.	8 years ago
fjc40	0f58270c10	Merge branch 'master' into issue_18_track_alpha ... # Conflicts: # racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java	8 years ago
Fan-Wu Yang	7546c65893	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Mark.java	8 years ago
Joseph Gardner	20c9870fea	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java	8 years ago
David Wu	fa5992bfb2	added App app to app.	8 years ago
fjc40	62f400b924	Trackpoint line color fades out.	8 years ago
David Wu	6bc81f566e	Issue 19 changes.	8 years ago
Joseph Gardner	a3fe57ed5a	Removed print statement. #story[1092]	8 years ago
fjc40	fa26abe10c	Minor tidy.	8 years ago
Joseph Gardner	4cf8846cda	Map wind rotation works with multiplayer xml. #story[1092]	8 years ago
hwball	86d94ef27e	javadoc fix	8 years ago
hwball	df2b674b94	update scale for table displaying	8 years ago
Connor Taylor-Brown	4b3cc8e126	Created ack number generator for use by multiple services ... #story[1100]	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
Joseph	d7e0bfa86c	Trackpoints are only shown for the player's boat. #story[1098]	8 years ago
Joseph	47fc55245c	Merged master.	8 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	8 years ago
zwu18	109b291973	Merged issue #20 fix and splash screen into development.	8 years ago
zwu18	317582aae8	Merge branch 'issue#20fix' into Development	8 years ago
zwu18	4e8b7d3b5a	Merge remote-tracking branch 'origin/master' into issue#20fix	8 years ago
zwu18	8759ac070e	Merge remote-tracking branch 'origin/splashScreen' into issue#20fix	8 years ago
Connor Taylor-Brown	f8150ef449	Added YachtEvent message with encoder and decoder ... - Updated Encoder and Decoder factories for the new message type - Added an enum for handling yacht event types #story[1100]	8 years ago
hba56	ee0cc4b704	Merge branch 'issue#40' into Development	8 years ago
fjc40	114c18763b	Reduced track point period to 1000ms. ... issue #18	8 years ago
fjc40	20055b1883	Removed redunant calls in VisualiserRaceState.initialiseBoats(). ... Slightly refactored ResizableRaceCanvas - removed a redundant drawPoint() function, functions which alter the gc stroke call save/restore. Text is drawn black, at 20pts. The drawBoats() function: instead of drawing everything for each boat, one boat at a time, it draws the track points for all boats, then wake for all boats, etc..., to have better layering. issue #18	8 years ago
cbt24	f7d0e9d466	Boats bounce during collision if pointing into collision ... #story[1100]	8 years ago
cbt24	eaa0d2e82b	Boats bounce away from marks. ... - Changed onCollisionEnter signature to pass boat info #story[1100]	8 years ago
cbt24	8113867576	Bubbles collision events to RaceLogic ... - ColliderRegistry collects and forwards all Collision events - RaceLogic observes the ColliderRegistry of its single Race instance #story[1100]	8 years ago
fjc40	f1e41d5d8f	Merge branch 'master' into issue_18_trackpoint	8 years ago
cbt24	79f3c41d45	Moved generic ray casting to Collider abstract class ... - Boat is now collider - Collider subclasses specify their own collision ray and collision handler #story[1100]	8 years ago
cbt24	8498701091	Removed commented-out file from master	8 years ago
cbt24	f44929f376	Spun off Locatable interface to make collision code more reusable ... #story[1100]	8 years ago
cbt24	ce14e93404	Removed CI-breaking docstring	8 years ago
cbt24	f0d750cae1	Merge remote-tracking branch 'remotes/origin/master' into story66-collision ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockBoat.java # racevisionGame/src/main/java/mock/model/RaceLogic.java # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Race.java # racevisionGame/src/test/java/mock/model/MockBoatTest.java	8 years ago
cbt24	d63641c1e2	Cherry-picked multiple changes from master	8 years ago
hba56	fdd0b30a51	Added the ability to hide and show info table with a key press ... -the wind arrow also scales with the new size of the screen	8 years ago
fjc40	85e703cba5	RaceController/info table now makes a copy of the boat list, to avoid race conditions. ... #story[1095]	8 years ago
Fan-Wu Yang	9f7c5d8c0c	Fixed other javadocs that were causing the build to fail #story[1092]	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
zwu18	5e0bcd2af5	Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.	8 years ago
fjc40	a4755ed88b	Maybe fixed updating boat list on FX thread.	8 years ago
Fan-Wu Yang	a4e1dfb3d7	Fixed import that was messing up the build #story[1092]	8 years ago
fjc40	0483859c40	Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale). ... issue #32	8 years ago
fjc40	9ab12a9c58	MockBoat: Removed redundant isAutoVMG() function. ... TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.	8 years ago
fjc40	dc4610d6eb	Fixed sparkline not updating. ... #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
fjc40	3a0bd10a57	Merge remote-tracking branch 'origin/master' into story_61 ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/resources/visualiser/scenes/race.fxml	8 years ago
fjc40	c9875f3987	RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).	8 years ago
cbt24	9ca50aa66c	Ray casting now only supports distance specification. ... #story[1100]	8 years ago
cbt24	7d64a43350	Allow collision checking to provide collision parameters to ray casting method ... - Added tests for MockBoat collision direction and distance #story[1100]	8 years ago
cbt24	2fbb96afd7	Created ray casting methods for MockBoat and CompoundMark ... - Added ColliderRegistry to Race - Added collision triggering to RaceLogic - Created basic collision handlers for MockBoat and CompoundMark	8 years ago
cbt24	da52082d70	Deleted duplicate method (again -.-)	8 years ago
Connor Taylor-Brown	847cd1251e	Merge remote-tracking branch 'remotes/origin/master' into CommandFactory ... # Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java	8 years ago
Connor Taylor-Brown	b97bfe62a6	Fixed documentation bugs not relevant to story.	8 years ago
fjc40	5a03d97713	Added comment.	8 years ago
fjc40	b07c30704a	The trackpoint line is now a line (poly-line) instead of a sequence of circles. A point along the poly-line is added every 250ms. ... issue #18	8 years ago
Joseph Gardner	7d4f1cd925	Fixed first key press not working. #story[1098]	8 years ago
hba56	1bdf80417d	javadoc ... #story[1087]	8 years ago
Jessica Syder	0558629dc6	Added luffing sails image. ... - Created transparent gif of luffing sail - Displayed image when sail is luffing - Repositioned luffing sail #story[1098]	8 years ago
Fan-Wu Yang	a5b21799d3	Fixed java doc issue #story[1092]	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	175fb11178	Javadoc fixes. ... #story[1095]	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	8999cddf8b	Pre merge commit	8 years ago
hba56	dc9317fe2e	remove system.out statments ... #story[1101]	8 years ago
hba56	67bb7b81dc	Merge remote-tracking branch 'origin/story68' into story68	8 years ago
hba56	0d786f381b	fix for boats finishing the race ... #story[1101]	8 years ago
hba56	2acc36225e	Fix for placement of invis gates and checks that boats pass through these gates ... -see wiki on rounding #story[1101]	8 years ago
Jessica Syder	8b1561cdc7	Fixed nullpointer when boat passes finish line. ... - Added a condition in calculateBearingToNextMethod to avoid nullpointer	8 years ago
Fan-Wu Yang	820898d92c	pushed work from school computer to do at home	8 years ago
hba56	f90648e4ce	Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) ... #story[1101]	8 years ago
Fan-Wu Yang	7c6f0931ba	Transferring files from my laptop to desktop to work on, may be broken.	8 years ago
hba56	a05ffd023d	Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) ... #story[1101]	8 years ago
hba56	f386a4b989	added checks for gates and moved second rounding check to be in line with the next mark to move towards ... #story[1101]	8 years ago
hba56	fe91264aec	fix for the tests ... #story[1101]	8 years ago
fjc40	89b0aa8b77	Implemented MessageRouter. ... Added ConnectionToServerCommandFactory, and JoinSuccessfulCommand, RaceParticipantsFullCOmmand, ServerFullCommand. Added IncomingHeartBeatCommandFactory, and IncomingHeartBeatCommand. Added ConnectionToServerState, which represents the client's connection state to server. Renamed VisualiserInput to VisualiserRaceController. Added ConnectionToServer, which tracks the client's connection to server. Added ConnectionToServerController, which accepts JoinAcceptance messages, turns them into commands, and passes them to ConnectionToServer. Added IncomingHeartBeatService, which tracks the heart beat status of the connection. Added IncomingHeartBeatController, which accepts HeartBeat messages, turns them into commands, and passes them to IncomingHeartBeatService. Refactored ServerConnection a bit. #story[1095]	8 years ago
zwu18	a31eb078a6	Created a splash screen for application.	8 years ago
hba56	62e37489ee	starboard rounding update ... #story[1101]	8 years ago
hba56	d70a711a3d	Merge branch 'master' into story68 ... -updated port and starboard boat checks -added gps method to check if on correct side of a line -updated pos check method to make boats round marks with the new tech # Conflicts: # racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java	8 years ago
hba56	499a409d4f	Merge branch 'master' into story68 ... -updated port and starboard boat checks -added gps method to check if on correct side of a line -updated pos check method to make boats round marks with the new tech # Conflicts: # racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java	8 years ago
zwu18	848edfc6a4	Removed commented out code. Merged master in. ... #story[1097]	8 years ago
zwu18	c3ea62dfee	Merge branch 'master' into CommandFactory ... # Conflicts: # racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	8 years ago
zwu18	9c902dab46	Added javadoc to classes. ... #story[1097]	8 years ago
fjc40	6e5fb62880	Added REQUEST_RECEIVED and DECLINED to ConnnectionStateEnum. ... #story[1095]	8 years ago
fjc40	41b0a5d7f7	Merge branch 'story_61' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into story_61	8 years ago
fjc40	b625b6ab05	XMLReader.readXMLFileToString no longer throws a Transformer exception.	8 years ago
zwu18	e4b72fdfeb	Update appearance on client arrow. ... #story[1095]	8 years ago
Connor Taylor-Brown	7474de9816	Created foundation classes and interfaces for collision architecture. ... - Added Collider interface - Added Collision class - Added ColliderRegistry class #story[1100]	8 years ago
fjc40	61d18f85c5	javadoc fixes.	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
Joseph Gardner	d8628b4289	Boats now start the race with sails out. #story[1098]	8 years ago
fjc40	5bc51343f5	Merge remote-tracking branch 'origin/master' into pom_profile_fix	8 years ago
fjc40	130ffcbf07	Fixed some merge issues.	8 years ago
Joseph Gardner	20302496f0	Made SailsInCommand and SailsOutCommand one class. #story[1098]	8 years ago
fjc40	805c12bf41	Merge remote-tracking branch 'origin/master' into issue_28_36_decoders ... # Conflicts: # racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	8 years ago