c52c345e53
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 14:04:53 +12:00
9420717b44
Added Messages to MessageType, continued working on request.
...
tags: #story[1142]
2017-08-14 13:38:41 +12:00
9c1fe72f6b
Merge and tests fix
2017-08-14 13:35:18 +12:00
2e892f35ea
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 13:32:57 +12:00
bedd742c93
Started on Request/Response packets for the Boat customization to begin the boat customization process.
...
tags: #story[1142]
2017-08-14 13:26:51 +12:00
add6856727
Merge remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-14 13:22:56 +12:00
e4cc5a0950
Fixing develop (sort of)
2017-08-14 12:52:58 +12:00
c77adf385e
Terminating client thread before server thread to prevent alert box popping up
2017-08-14 11:21:33 +12:00
9b7f4a93d8
Merge remote-tracking branch 'origin/issue38_irregular_key_event_packets' into issue38_irregular_key_event_packets
2017-08-14 11:02:19 +12:00
e780b47160
Fix javafx error on ci
2017-08-14 11:02:07 +12:00
028fc44dce
Yacht now extends observable and can notify server to client thread to broadcast message.
...
#story[1124]
2017-08-14 10:48:11 +12:00
52e10997f1
Build issues caused by vm unable to open socket connections. Leaving as is for now.
...
#bug
2017-08-13 21:07:21 +12:00
f2f750298c
Added print statements for determining where javaFX is accessed from in the test.
2017-08-13 21:05:28 +12:00
1755b00079
Unncommented test to see if it breaks the build at remote repo.
2017-08-13 20:59:03 +12:00
a844585faf
Empty tests to check where bug is occuring
2017-08-13 20:54:13 +12:00
b7fe79a5cc
Attempted fix for build issues due to javaFX toolkit not being initialized.
2017-08-13 20:44:23 +12:00
2d5492601f
Fixed build issues caused by changes to a yacht step turn constant.
...
#bug
2017-08-13 20:40:18 +12:00
0ee12021e2
Fixed bug that stopped clients from getting updated xml data.
...
#issue[46] #bug
2017-08-13 20:29:10 +12:00
6218d5506b
Fixed bug that stopped clients from getting updated xml data.
...
#issue[48] #bug
2017-08-13 20:24:03 +12:00
d79b0421c2
Fixed merged conflicts with merge onto develop.
...
#bug
2017-08-13 19:00:06 +12:00
8cb5b8caec
Merge branch 'develop' into issue38_irregular_key_event_packets
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-13 18:44:34 +12:00
2093e79b6a
Rather than a high frequency loop sending all packets a low frequency loop is made then destroyed on button press for sending turn packets. This means a fast response time on button press but fewer packets sent.
...
#implement #issue[38]
2017-08-13 18:38:24 +12:00
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
Alistair McIntyre
Kusal Ekanayake
William Muir
Zhi You Tan
Haoming Yin
Calum
Zhi You Tan
Michael Rausch
alistairjmcintyre