4e68cf31cf
Fixed finish screen switch
...
tags: #fix
2017-08-15 23:30:27 +12:00
d03460d69e
Implemented boat tracking when boat is selected by either clicking or selecting from sidebar combo box. Clicking tracked boat will cancel tracking, but using combobox will always result in one boat being selected.
...
#story[1121] #pair[wmu16, zyt10]
2017-08-15 23:16:25 +12:00
50baf6f85b
implemented race finish functionality, finish screen not loading properly yet #story[1124]
2017-08-15 20:48:51 +12:00
23a04facbe
ServerYachts now send now have their own boat status.
...
This allows clients to know when this boat has finished
tags: #story[1124]
2017-08-15 20:24:51 +12:00
7fbecc8b3d
Fixed juttery movements when zooming and sometimes tracking.
...
Need to look into getting the boat propery fixed in the center.
#story[1121]
2017-08-15 19:14:16 +12:00
9cb5956f3c
Updated lobby controller to pass the player ID through, and the lobby view to have a customize button.
...
tags: #story[1142]
2017-08-15 16:48:23 +12:00
c00d165f47
Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
2017-08-15 15:13:40 +12:00
d2bb15471a
Changed the velocity equation for boats to handle outlying scenarios such as 0 velocity.
...
#bug
2017-08-15 15:12:39 +12:00
ce5424cc79
Fixed develop merge and now collision works
2017-08-15 14:53:15 +12:00
c125708a4a
Final commit for yacht refactor
...
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-15 14:49:16 +12:00
2dc0ba07d9
WIP: Second commit for seperating server and client yacht classes
...
tags: #story[1124]
2017-08-15 14:30:39 +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
d6a436d2eb
WIP: Initial commit for seperating server and client yacht classes
...
tags: #story[1124]
2017-08-15 14:18:48 +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
b9ae9c4730
made server send appropriate racestatus flags in the race status packet #pair[mra106, ptg19] #story[1109]
2017-08-14 17:55:53 +12:00
fab5f9229f
Got the boat's to track and center correctly.
...
As well as allowing selecting different boats to track them, doesn't work as intuitively as I would like but will need to sort out a boat selection feature first made specifically for the selection of only one boat.
#story[1121]
2017-08-14 17:27:14 +12:00
ff92262a78
fixed race clock countdown/count up #story[1109]
2017-08-14 16:32:50 +12:00
a4547e12cb
Merged develop into this branch and resolved conflicts
...
tags: #story[1124] #pair[wmu16, hyi25]
2017-08-14 16:21:18 +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
1d2222b599
Merge branch 'develop' into Story80_BoatCustomization
2017-08-14 14:23:05 +12:00
9420717b44
Added Messages to MessageType, continued working on request.
...
tags: #story[1142]
2017-08-14 13:38:41 +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
4dc6b2af2b
Merge fix
2017-08-14 13:20:15 +12:00
e65558b8ac
Merge branch 'develop' into Story40_Zooming
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 13:17:39 +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
a185c9dc96
Implemented a factory class that creates mark arrows as needed. Needs to integrated with the real world data and tested to work. Works with all test data so far.
...
#implement #story[1118]
2017-08-14 03:44:46 +12:00
f2f750298c
Added print statements for determining where javaFX is accessed from in the test.
2017-08-13 21:05:28 +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
0b978593d4
Solved the fps counter zoom together with canvas problem. Workaround used was changing fps counter on game view to race view.
...
#story[1117] #pair[ptg19, zyt10]
2017-08-13 18:52:42 +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
8ec6490627
Started trying to get the zoomed in gave view to follow the boat.
...
Can easily make the boat stay put at the origin. can make it perfectly center, also weary of the weird jittery effect that is present when tracking. Tracking is active when the zoom scale is greater than 1.
#story[1121]
2017-08-13 17:02:35 +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
Calum
Zhi You Tan
Peter Galloway
William Muir
Kusal Ekanayake
Alistair McIntyre
Haoming Yin
Zhi You Tan
Michael Rausch