a7a667b4bc
Merge branch 'develop' into 1124_switching_to_finish_screen
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
2017-08-15 23:45:50 +12:00
c125708a4a
Final commit for yacht refactor
...
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-15 14:49:16 +12:00
baacd8a9c0
Refactor. Taken Rounding logic out of yacht and into game state.
...
tags: #story[1124]
2017-08-14 23:52:06 +12:00
58446ffaed
MarkRounding Message now sent out correctly.
...
Added submark seqID attribute to each mark of a compound mark from parsing xml
Added Rounding side attribute to each individual mark as read from the xml
RoundingSide enum now has a method to get Enum from String literal
Now store the closest mark to each yacht in each update for purpose of knowing which mark they round
Minor code tidying, Added logger to serverToClientThread, removed 'serverLog' method
removed obsolete code
2017-08-14 16:11:32 +12:00
fda6625256
Merge remote-tracking branch 'origin/develop' into Story66_Collision
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-10 20:23:56 +12:00
9c79897e01
Tidied code, added MidPoint to CompoundMark class
...
Compound Mark class is now constructed with a list of marks.
A mid point is created on its construction for use in Geo Calculations
#story[1124] #pair[wmu16, hyi25]
2017-08-10 13:58:32 +12:00
8813d06010
Created a simple red blink on a top of a yacht given source id.
...
Created and updated methods reading yacht event packet to translate to collision alert on visualiser.
WIP: sending yacht event packet to inform collision
#story[1117]
2017-08-09 01:26:59 +12:00
a545e9dbc3
Removing '>' characters from docstrings to fix build
...
Note: This is probably a XML style guid thing and is stupid. Can probably fix this
2017-08-08 16:14:13 +12:00
b0e7dddaf3
Fixed gate passing algorithm
...
boats now must pass through the correct way. This works for start in-race and finish gates
Refactored yacht algorithm code for better readability
Logging function added or seeing mark roundings occur
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-08 15:58:13 +12:00
ed0a783374
Fixed the bug that boats could round over a gate but still "across" it. Added unit test to ensure the algorithm works.
...
tags: #story[1124]
2017-08-08 10:42:36 +12:00
4375b73257
Implemented algorithm for checking if boat passes through a mark.
...
Mark rounding works for whole course (WITH BUGS)
Still some gate logic to work out.
Moved gate function to GeoUtil class
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-07 17:28:12 +12:00
43788bd153
Added a method to test if a geo point is located in a triangle which is formed by other three geo points.
...
The method helps to check the mark rounding.
Also unit tests have been done for this method.
tags: #story[1124]
2017-08-06 12:36:57 +12:00
874cdec654
Added booleans: has entered rounding zone, has crossed first line, has crossed second line
...
All for purposes of checking mark rounding.
Currently not yet finished
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-03 17:39:07 +12:00
c655cb3fab
Fixed build. (Actually this time)
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:45:14 +12:00
8e24c204fd
Fixed build.
...
Google map does not work
tags: #issue[34]
2017-08-03 11:26:44 +12:00
87ef37a689
Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.
...
#refactor #bug #issue[34, 35]
2017-08-02 00:26:57 +12:00
b82d0d0137
Boats and map are now updated using the observer pattern.
...
#implement
2017-07-31 05:23:41 +12:00
f1ad03e913
Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.
...
#refactor
2017-07-31 02:19:19 +12:00
6cae338c1e
Began fixing bugs with caused by asynchronous listener calls.
...
#bug
2017-07-30 20:12:19 +12:00
c7e5f93bc4
Merged GeoUtility and GeometryUtils classes
...
#story[1047]
2017-07-16 21:58:40 +12:00
fcb1e5e593
Removed unnecessary Position and GeoPoint classes to clear the code base.
...
- put utility classes in a package
#story[1047]
2017-07-10 23:51:01 +12:00
Calum
Haoming Yin
William Muir
Zhi You Tan
Zhi You Tan