fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,343 Commits 1 Branch 0 Tags
eb2ed45ed2faf4cf261fabe4c9c6f9377f0ac251
Commit Graph
383 Commits
Author SHA1 Message Date
Connor Taylor-Brown d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D 2017-08-29 22:55:07 +12:00
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D 2017-08-29 20:36:15 +12:00
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191] 2017-08-29 20:36:08 +12:00
David Wu 892320db5f Added javadoc and extra files to push 2017-08-29 19:03:34 +12:00
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. 2017-08-29 19:02:02 +12:00
David Wu c63403d1de Created new lobby menu. Working on animated background for menu. 2017-08-29 15:11:09 +12:00
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser 
#story[1191]
 2017-08-29 14:38:27 +12:00
fjc40 eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....). 2017-08-18 22:58:47 +12:00
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.
 2017-08-18 22:55:50 +12:00
hba56 b886cb426f guide line last leg fix 2017-08-17 22:38:31 +12:00
David Wu 37095bfc6c Merged master into branch. 2017-08-17 17:02:24 +12:00
David Wu 5234cdea66 Merge branch 'master' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-08-17 17:00:39 +12:00
David Wu 598275591f Updated javadoc. 2017-08-17 16:50:51 +12:00
David Wu 79add59375 Unresizable control screen. 2017-08-17 16:37:31 +12:00
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19 2017-08-17 16:34:19 +12:00
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons. 2017-08-17 16:33:52 +12:00
David Wu 9f813ab7aa Merged in development. 2017-08-17 16:14:09 +12:00
David Wu 288979be3b Merge branch 'Development' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
 2017-08-17 16:05:59 +12:00
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
 2017-08-17 16:04:53 +12:00
David Wu 09eaf6d968 Merged master. 2017-08-17 13:55:49 +12:00
David Wu 5a188f0582 Merge branch 'master' into new_issue#19 2017-08-17 13:52:04 +12:00
Hamish Ball d2f9bfedcb Merge branch 'issue_18_track_alpha' into 'master' 
Issue 18 track alpha

This should resolve #18.

Track point system is now a line, and updated more frequently.
Line fades over time.

The boat wake is also longer, and has a black dot at the end.

See merge request !28
 2017-08-17 13:50:44 +12:00
Joseph Gardner 610aa96241 Merge branch 'MapWindRotation' into 'master' 
Map wind rotation

Note: we'd like to generate a realistic course layout, that can vary from race to race (but not within a race, for now.) The generated layout must be sent through the API in the format given by the race.xml section of the AC35 Streaming Data Interface Specification. The AC35 Protocol (sections 31.4 and 31.5) specifies the requirements for a course:

*    First leg of the course (from start line to first mark) must be a reaching leg
*    Next legs are windward/leeward, and boats complete either two or three laps of this section
*    Final leg to finish line may be a reaching leg
*    A boat should take around 25 minutes to complete the course in the wind conditions at the start of the race (AC35 protocol, section 31.5)

You should assume that the windward/leeward marks and start/finish lines are always compounds of two marks.

Acceptance criteria:

 *   The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent.
 *   Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later.
 *   The course must meet the requirements given in the AC35 Protocol.
 *   The course limits should be set to clear all marks by at least several boat-lengths.
 *   The entire race area within the limits must be on the water.

See merge request !22
 2017-08-17 13:50:21 +12:00
Hamish Ball 2edb6b5249 Merge branch 'issue#40' into 'master' 
Issue#40



See merge request !30
 2017-08-17 13:49:58 +12:00
David Wu c08bafa566 Fixed most of issue #19 with new master? 2017-08-17 13:49:43 +12:00
fjc40 2656efcb4d Marks are a bit darker. 
Wake no longer has circle at end.
 2017-08-17 13:30:10 +12:00
hba56 02ab0e8a00 added javadoc 2017-08-17 13:16:47 +12:00
hba56 3cf50c56f8 added a refresh for the info table so no new values are shown when the game is in full screen 2017-08-17 13:15:33 +12:00
Joseph Gardner a50d460222 Merged master. 2017-08-17 13:02:14 +12:00
fjc40 0f58270c10 Merge branch 'master' into issue_18_track_alpha 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
 2017-08-17 13:00:13 +12:00
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
 2017-08-17 12:59:54 +12:00
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
 2017-08-17 12:59:25 +12:00
David Wu fa5992bfb2 added App app to app. 2017-08-17 12:58:05 +12:00
fjc40 62f400b924 Trackpoint line color fades out. 2017-08-17 12:56:11 +12:00
David Wu 6bc81f566e Issue 19 changes. 2017-08-17 12:50:41 +12:00
fjc40 fa26abe10c Minor tidy. 2017-08-17 12:18:17 +12:00
hwball df2b674b94 update scale for table displaying 2017-08-17 11:51:33 +12:00
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
 2017-08-17 11:46:09 +12:00
Joseph d7e0bfa86c Trackpoints are only shown for the player's boat. #story[1098] 2017-08-17 10:13:30 +12:00
Joseph 47fc55245c Merged master. 2017-08-17 09:27:41 +12:00
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
 2017-08-17 09:13:49 +12:00
zwu18 109b291973 Merged issue #20 fix and splash screen into development. 2017-08-17 01:36:55 +12:00
zwu18 317582aae8 Merge branch 'issue#20fix' into Development 2017-08-17 01:35:33 +12:00
zwu18 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix 2017-08-17 01:30:43 +12:00
zwu18 8759ac070e Merge remote-tracking branch 'origin/splashScreen' into issue#20fix 2017-08-17 01:30:38 +12:00
hba56 ee0cc4b704 Merge branch 'issue#40' into Development 2017-08-16 22:41:49 +12:00
fjc40 114c18763b Reduced track point period to 1000ms. 
issue #18
 2017-08-16 19:44:42 +12:00
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
 2017-08-16 18:10:30 +12:00
fjc40 f1e41d5d8f Merge branch 'master' into issue_18_trackpoint 2017-08-16 16:52:32 +12:00
cbt24 f44929f376 Spun off Locatable interface to make collision code more reusable 
#story[1100]
 2017-08-16 16:05:25 +12:00