1db75a8ae4
Request Messages now sending to server, need to update game and send response packet.
...
tags: #story[1142]
2017-08-16 14:54:50 +12:00
bd213bcd9e
Merge branch 'develop' into Story80_BoatCustomization
2017-08-16 13:06:31 +12:00
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
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
baacd8a9c0
Refactor. Taken Rounding logic out of yacht and into game state.
...
tags: #story[1124]
2017-08-14 23:52:06 +12:00
e1dddd317d
WIP: Minor fixes
2017-08-14 17:57:41 +12:00
1a39b6e4a3
Merge branch 'develop' into 1124_broadcast_mark_rounding_message
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-08-14 16:16:04 +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
1f09005147
Message types for Request and Response created, and Messages for them also created.
...
tags: #story[1142]
2017-08-14 15:30:42 +12:00
3754b71f4d
Merged updated develop into branch.
...
tags: #story[1142]
2017-08-14 14:31:02 +12:00
9420717b44
Added Messages to MessageType, continued working on request.
...
tags: #story[1142]
2017-08-14 13:38:41 +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
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
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
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
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
8a40119a98
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-06 22:17:08 +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
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
Alistair McIntyre
Calum
Zhi You Tan
William Muir
Zhi You Tan
Michael Rausch