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
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
a2ee4411be
Merge branch 'develop' into Story71_TackAndGybeSmoothly
2017-08-10 17:59:19 +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
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
30a6cb98ec
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-09 14:03:21 +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
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
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
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
a470cb66a2
Updated initialise boat function so it can now initialise boats with distance apart in meters.
...
Created a second prototype function which is more testable compared to the initial design. New function takes in parameters (starting marks, yacht starting position, yacht) and initialise yacht correctly with position.
#story[1117]
2017-08-06 21:16:14 +12:00
e90a0ce435
Merge branch '1124_Mark_Sequence_From_RaceXML' into 'develop'
...
Loading mark sequence from RaceXML
# Loading mark sequence from RaceXML
## Change Log
1. Added MarkOrder class
* Mark order is read from the generated RaceXML and stored
* Added .getNextMark() to get the next mark in the race
* Added .equals() and .hashCode() for Marks
* NEW: Added RacePosition class to hold players position in the race
* NEW: Fixed issue where the duplicates weren't stored in the mark order
## Testing
* Unit tests in models/MarkOrderTest.java
## Acceptance Criteria
* Use the mark sequence in the raceXML
* Met by change log item (1)
* Store relevant mark details with each participating boat (Last mark, next mark)
* Method in MarkOrder to get next mark, however the last mark and next mark will need to be stored by whoever implements the second task.
See merge request !52
2017-08-05 15:18:26 +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
8af80e6c3a
WIP: Connected game client to main server thread to pass compound mark variable.
...
Boats are initialised in main server thread behind start line before game starts.
#story[1117]
2017-08-03 18:39:15 +12:00
db078538ff
Minor cleaning in yacht class
...
tags: #story[1124]
2017-08-03 13:53:30 +12:00
f9e6df46c1
Fixed issues caused by merge.
...
#bug
2017-08-03 13:23:43 +12:00
5228c078bc
Merge branch 'develop' into 1124_Mark_Sequence_From_RaceXML
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/server/simulator/Simulator.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/visualiser/map/CanvasMap.java
2017-08-03 12:27:11 +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
7885b3fae2
Loading course mark order from RaceXML
...
- Mark order is read from the generated RaceXML and stored
- Added .getNextMark() to get the next mark in the race
- Added .equals() and .hashCode() for Marks
Tags: #story[1124] (Task 1)
2017-08-02 22:03:10 +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
908c0749cf
Boats now move on screen as intended.
...
TODO - Make the client connect to the server.
2017-08-01 02:37:55 +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
25d8c8f9c4
Minor bug fixes.
...
Server will now only save incoming connections if in lobbying mode as it should
Commented out boat status printing
tags: #story[1047]
2017-07-27 14:15:55 +12:00
96ed5e445e
Replaced print stack trace with print statements
2017-07-27 12:47:18 +12:00
870dc07fd2
Slight improvements to hosting.
...
Allow a host/client to disconnect and reconnect/make lobby, leave lobby and play the game.
#pair[kre39,hyi25] #story[1047]
2017-07-27 12:45:22 +12:00
34704bd93d
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 23:32:32 +12:00
201c88a253
Fixed a bug that program crashes when it receive regatta xml during the race, as it doesn't know how to handle the xml.
...
#story[984]
2017-07-26 23:32:16 +12:00
6c4da58d9d
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 22:42:48 +12:00
9cedbeb6f6
Fixed latency issues caused by clientside movement packets queueing up but currently the trails aren't working anymore #fix #refactor
2017-07-26 22:02:46 +12:00
f99f8a0d7c
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 20:13:09 +12:00
7db716f51c
Boat should move towards optimal angle upwind and downwind when pressing spacebar (VMG)
...
#story[988]
2017-07-26 20:12:57 +12:00
6e9535d78f
Fixed race timer & Added boats to team position list
...
- Race status messages are sent at regular intervals instead of once at race start
- Boat positions are initialised on the Team Position list
- Timer counts up from when host clicks ready
Tags: #story[377]
2017-07-26 19:35:59 +12:00
4e5b67abfa
Merge branch 'develop' into story61_player_highlighting
2017-07-26 15:52:29 +12:00
12d081a1af
Added highlighting for the player and moved all their assets to the foreground
...
#story[987]
2017-07-26 15:49:00 +12:00
5e6b402bf5
Minor structural changes. GameState now has a thread which updates itself so its update
...
rate can be independent of sending packets to the client in the MainServerThread
#story[986] #pair[wmu16, ptg19]
2017-07-26 14:48:32 +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
a56dac1e87
Polar velocities should now work as intended.
...
Snapping to VMG still needs to be implemented.
Still an issue of not being able to pass the total upwind or downwind point
tags: #story[986]
2017-07-25 22:19:03 +12:00
acd54dec7a
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/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.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/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Boat.java
# src/main/java/seng302/models/stream/XMLParser.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/MainView.fxml
2017-07-25 21:05:15 +12:00
c8a96dcce9
Fixed XML Loading error, used VMG to calculate boat velocity
...
- XML read from stream instead of file
- Started implementing VMG to calculate boat velocity dynamically
Tags: #pair[wmu16, mra106] #story[986]
2017-07-25 20:14:50 +12:00
e569574c01
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 17:17:45 +12:00
f544734b4d
Fixed sending wrong race xml when a player disconnected because xml is getting data from gamestate yacht but the yachts are not updated is player disconnect.
...
Heartbeat packet was sent out at wrong rate which cause the player disconnect detection to be slow. Heartbeat packet is send out every 200ms now.
#story[1055] #pair[hyi25, zyt10]
2017-07-25 17:17:36 +12:00
80b439470b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 15:22:56 +12:00
539197cef5
Added a visual indicator of wind speed during race (text box)
...
#pair[kre39,mra106] #story[1040]
2017-07-25 15:22:46 +12:00
1a867be387
Added keystroke frequency limit
...
Updated client and server log format
#story[988] #pair[hyi25, zyt10]
2017-07-25 15:13:48 +12:00
Michael Rausch
Zhi You Tan
Alistair McIntyre
William Muir
Calum
Zhi You Tan
Kusal Ekanayake
Haoming Yin
Peter Galloway