2a3231d334
Merge remote-tracking branch 'origin/develop' into Story66_Collision
...
# 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/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-15 14:30:01 +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
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
6218d5506b
Fixed bug that stopped clients from getting updated xml data.
...
#issue[48] #bug
2017-08-13 20:24:03 +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
c58cb1a476
WIP: Researched and implemented a simple right of way calculation (might be wrong).
...
#story[1117]
2017-08-11 23:57:27 +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
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
1c2870649a
Added testing for the tack/gybe settings.
...
tags: #story[1105]
2017-08-10 18:58:38 +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
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
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
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
0fbca89030
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-08 19:45:08 +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
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
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
a3ce5998ff
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-07 10:58:07 +12:00
7f0329dda6
WIP: Implemented basic mark rounding algorithm.
...
Removed RacePosition class. Instead marks are just grabbed from the mark order class when necessary.
No marks are stored as an attribute in the yacht class but the 'currentMarkSeqID' which is used to get current, and surrounding marks.
Works for all marks in between but not including starting and finishing gate as no angle can be made with them. Still to work out how to implement this
#story[1124]
2017-08-07 00:23:54 +12:00
8a40119a98
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-06 22:17:08 +12:00
ecf2c52cfa
Added tests, and sails to all clients.
...
#story[1111]
2017-08-06 15:43:22 +12:00
a727014fcb
Implemented boats spawning in parallel at the start line with spacing.
...
Added two more colours to support up to eight boats.
#story[1117]
2017-08-05 00:31:36 +12:00
f8af9cc259
Works for clients and server.
...
Due to the information being sent and received, it only currently works on client side boats.
#story[1111]
2017-08-03 19:07:30 +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
99d5545ed3
Made the sails work properly by toggling.
...
Need to remove the unneeded code I added.
#story[1111]
2017-08-03 16:33:51 +12:00
454e9ac9f1
Added an attribute to each yacht: 'DistanceToNextMark'
...
This attribute is calculated at each update of the boat as prompted by the game state regularly
Removed the lat and lng attribute from the Yacht class and replaced its usage with the GeoPoint object instead
Removed redundant test files and merged GeoUtility and testGeoUtil test classes into one
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-03 16:29:12 +12:00
db078538ff
Minor cleaning in yacht class
...
tags: #story[1124]
2017-08-03 13:53:30 +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
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
7894e31926
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientState.java
# src/main/java/seng302/client/ClientStateQueryingRunnable.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/stream/StreamReceiver.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/test/java/seng302/model/stream/StreamReceiverTest.java
2017-07-30 18:07:28 +12:00
8ac44d13df
Began fixing conflicts with LobbyController
...
#bug
2017-07-26 12:05:03 +12:00
9c9f6e4e80
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-07-26 02:56:46 +12:00
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +12:00
aad93d8913
Parsing classes now static utilities. Data now moved to model via controller class. Race logic shifted out of grpahics classes. Several improvements to code readability.
...
#story[986] #refactor
2017-07-24 12:14:08 +12:00
Zhi You Tan
Kusal Ekanayake
Calum
Zhi You Tan
Alistair McIntyre
William Muir
Michael Rausch
alistairjmcintyre
Haoming Yin