0a7a9018f3
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-13 15:27:25 +12:00
93cb0ca600
Updated yacht-yacht collision to push back both yacht.
...
Tweaked acceleration to increase time to top speed.
#story[1117] #pair[ptg19, zyt10]
2017-08-13 15:14:14 +12:00
25c2de63a2
Working cucumber tests for sails toggle.
...
When sails in will send a sails out message when sails out will send a sails in message and then checks for the new status of the sail
#story[1111]
2017-08-13 14:55:33 +12:00
2411a3cc2c
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-13 14:34:42 +12:00
fda233f5ad
Merge branch 'Story71_TackAndGybeSmoothly' into 'develop'
...
Story 71 Tack/Gybe, Story 65 VMG Autopilot
# Implementation
- Added autopilot functionality to move boat towards a given heading with a single function call.
- Added functionality to move boat from one side of the wind to the other (tack/gybe) with a single button press.
- Added functionality to move boat to correct VMG from polars with single button press.
- Pressing a button a second time will disable the autopilot, as will pressing the Upwind/Downwind keys.
# Testing
- Fairly simple JUnit testing for a set of beginning headings and expected ends for the autopilot
- Unsure how cucumber testing would actually be better than simple junit testing in this case.
See merge request !55
2017-08-13 14:22:28 +12:00
c58cb1a476
WIP: Researched and implemented a simple right of way calculation (might be wrong).
...
#story[1117]
2017-08-11 23:57:27 +12:00
d2fd9ebaea
Started work on start screen
...
- Server now sends out race start status messages during lobby & pre-start stages
- Added timer in lobby
Tags: #story[1109]
2017-08-11 19:03:57 +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
6ddaaa0dfa
Removed extra print statement from test.
2017-08-10 20:18:36 +12:00
a7b8b0dbc3
Removed redundant input & output streams
2017-08-10 20:15:08 +12:00
7e1686a980
Packets are sent out when collision happens and receiver is able to interpret and display as visual alert. Updated visual alert to looks better.
...
- Created yacht event code message to be sent out as packet.
- Added observers to main server thread on yacht so when collision detected, main server thread will send out yacht event message to all server to client threads.
- Updated collision visual alert using circle and animation timer.
#story[1117]
2017-08-10 19:50:30 +12:00
32b231e78a
Added testing for the vmg autopilot
...
tags: #story[1107]
2017-08-10 19:19:41 +12:00
3ad37faedc
Merge branch 'develop' into MessageExtensions
2017-08-10 19:01:46 +12:00
09c4f98056
Implemented new client - server handshake protocol
...
- Implemented new packet types
- Changed server & client logic to use new protocol
Tags: #story[1124] (Issue 39)
2017-08-10 19:01:30 +12:00
1c2870649a
Added testing for the tack/gybe settings.
...
tags: #story[1105]
2017-08-10 18:58:38 +12:00
a2ee4411be
Merge branch 'develop' into Story71_TackAndGybeSmoothly
2017-08-10 17:59:19 +12:00
a23352ef85
Merge branch 'develop' into Story71_TackAndGybeSmoothly
2017-08-10 17:59:10 +12:00
f9d5bd10b1
Merge branch 'develop' into Story71_TackAndGybeSmoothly
2017-08-10 17:58:19 +12:00
0b8ad137b3
Minor fixes for merge
...
#story[1124] #pair[wmu16, hyi25]
2017-08-10 17:47:24 +12:00
a746191dba
VMG works correctly, auto pilot is interupted by a repeated keypress or an upwind/downwind press.
...
tags: #story[1105]
2017-08-10 17:46:28 +12:00
1d7b527130
Tidied code. Added tests
...
#story[1124] #pair[wmu16, hyi25]
2017-08-10 16:45:30 +12:00
430779c943
Boat auto pilots correctly for tacking/gybing. Needs proper testing.
...
#story[1105]
2017-08-10 14:53:24 +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
07386ed2db
Improved boat bounce-back calculation
...
- Changed boat bounce back send the boat n meters in the opposite direction.
- Improved test to use the minimum of yacht and mark collision distances
Tags: #story[1117]
2017-08-10 13:01:31 +12:00
abb15f6edf
Fixed Mark rounding Algorithm
...
Algorithm now knows when a player has to round a gate or just pass right through
#story[1124] #pair[wmu16, hyi25]
2017-08-10 12:08:03 +12:00
87f2f1fe63
Fixed Mark rounding Algorithm
...
Algorithm now knows when a player has to round a gate or just pass right through
#story[1124] #pair[wmu16, hyi25]
2017-08-10 12:07:47 +12:00
249ad9e5c0
Fixed Mark rounding Algorithm
...
Algorithm now knows when a player has to round a gate or just pass right through
#story[1124] #pair[wmu16, hyi25]
2017-08-10 12:02:19 +12:00
9d02d2fbea
Implemented a fairly simple auto pilot setting for the yacht, on update if the boat is set to autopilot it will adjust the heading towards the desired heading. Needs some refinement.
...
#story[1105]
2017-08-10 02:04:51 +12:00
b1598ccb0f
Changed testUpdateYachtWithCollision to use MARK_COLLISION_DISTANCE
...
Changed testUpdateYachtWithCollision to use MARK_COLLISION_DISTANCE constant.
#story[1117]
2017-08-09 22:36:34 +12:00
08304f9c3e
Fixed failing test
2017-08-09 22:05:49 +12:00
4cc48a355e
Added mark collisions
...
- Boats now collide with marks
- Added method to MarkOrder to get all marks
- Reduced the frequency at which collisions are detected. This fixed some performance issues
- Added method to bounce the boat off a mark
Tags: #story[1117]
2017-08-09 21:57:50 +12:00
2c5fddb695
Implemented zooming and clipping of race border. Implementation is still hackish.
...
#pair[ptg19, cir27] #story[1121]
2017-08-09 16:56:46 +12:00
126d8ea870
Added factory class for producing mark arrows.
...
#story[1118]
2017-08-09 15:24:32 +12:00
30a6cb98ec
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-09 14:03:21 +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
0fbca89030
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-08 19:45:08 +12:00
421ef3c65a
Started progress on zooming, can now use z and x keys to zoom into map.
...
Nothing scales correctly asides from the map itself (the boats stay in the same position).
#story[1121]
2017-08-08 19:41:51 +12:00
5937f8b640
Merge remote-tracking branch 'origin/develop' into Story66_Collision
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/model/Yacht.java
2017-08-08 17:04:34 +12:00
5ec67d0b80
Added junit for update yacht (after collision implementation). Removed another version of initialise boat positions.
...
#story[1117]
2017-08-08 16:51:29 +12:00
941febaf62
Tried to fix cucumber tests, getting closer.
...
#story[1111]
2017-08-08 16:31:27 +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
97696cc95b
Started work on cucumber tests. Trying to sort through threads, getting inconsistent results.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 17:54:34 +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
f97b18d594
Sailsin graphics moving and working as expected.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 16:48:30 +12:00
c7857872ce
Luffing sails animation working correctly, working on sailsin animation now.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 15:24:01 +12:00
79105a1bdc
Created a simple collision detection by iterating each boats per update. Working but sequential checks can be costly.
...
#story[1117]
2017-08-07 12:01:26 +12:00
a4b22190c0
Changed the spawn point to behind start line and calculated quadrant to make sure yachts spawn behind start line in different map scenario.
...
#story[1117]
2017-08-07 11:50:07 +12:00
a3ce5998ff
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-07 10:58:07 +12:00
Kusal Ekanayake
Zhi You Tan
Zhi You Tan
Michael Rausch
alistairjmcintyre
Alistair McIntyre
William Muir
Calum
Haoming Yin