fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,030 Commits 1 Branch 0 Tags
f8e1a539c2abb8afc60d7e9e036ca926278f60df
Commit Graph
306 Commits
Author SHA1 Message Date
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188] 2017-09-04 09:46:13 +12:00
hba56 5676d435b0 hosts now send info then wait rather than wait then send 
#story[1188]
 2017-09-01 12:20:48 +12:00
hba56 d1c0797db7 hosting a game now continues to send out the info of the race 
#story[1188]
 2017-08-31 15:06:43 +12:00
hba56 9161f69547 updating match table to store ip and port of clients and hosts 
#story[1188]
 2017-08-31 13:45:04 +12:00
hba56 960b1213fb fix so that test pass 
#story[1188]
 2017-08-30 15:31:28 +12:00
hba56 83f756d7d8 packets can now be sent from client to match server 
#story[1188]
 2017-08-30 15:26:54 +12:00
hba56 b2bd4fdc1c network interface 2017-08-30 12:13:17 +12:00
hba56 ca0a3f2a8b encoders and decoders for the hosted games request message with datatype and test 
#story[1188]
 2017-08-29 15:28:03 +12:00
hba56 cb8e81a7b2 encoders and decoders for the host game message with datatype and test 
#story[1188]
 2017-08-29 14:38:42 +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
fjc40 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch. 2017-08-18 21:58:31 +12:00
hba56 b886cb426f guide line last leg fix 2017-08-17 22:38:31 +12:00
fjc40 666c7b029f Disabled map rotation - temp fix for the demo. 
Set race to use 3 boat race.xml file.
 2017-08-17 22:26:56 +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
Joseph Gardner 5ba6f52669 fixed autovmg. 2017-08-17 16:50:13 +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
Joseph Gardner dcd1df2999 Merged master. 2017-08-17 16:26:00 +12:00
Joseph Gardner 014b78f166 Merge branch 'master' into story_64_sails 2017-08-17 16:25:40 +12:00
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven 2017-08-17 16:24:54 +12:00
David Wu 9f813ab7aa Merged in development. 2017-08-17 16:14:09 +12:00
Joseph Gardner e26fb73627 Merged master. 2017-08-17 16:08:23 +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
Joseph Gardner 37fe7389ff Rounding marks works. 2017-08-17 13:55:33 +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
Fan-Wu Yang 2e9c6fe593 Merged most recent master in, #story[1092] 2017-08-17 13:23:55 +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
Joseph Gardner a3fe57ed5a Removed print statement. #story[1092] 2017-08-17 12:27:59 +12:00
fjc40 fa26abe10c Minor tidy. 2017-08-17 12:18:17 +12:00
Joseph Gardner 4cf8846cda Map wind rotation works with multiplayer xml. #story[1092] 2017-08-17 12:17:45 +12:00
hwball 86d94ef27e javadoc fix 2017-08-17 11:58:13 +12:00