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
f2f750298c
Added print statements for determining where javaFX is accessed from in the test.
2017-08-13 21:05:28 +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
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
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
2c5fddb695
Implemented zooming and clipping of race border. Implementation is still hackish.
...
#pair[ptg19, cir27] #story[1121]
2017-08-09 16:56:46 +12:00
421ef3c65a
Started progress on zooming, can now use z and x keys to zoom into map.
...
Nothing scales correctly asides from the map itself (the boats stay in the same position).
#story[1121]
2017-08-08 19:41:51 +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
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
f97b18d594
Sailsin graphics moving and working as expected.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 16:48:30 +12:00
c7857872ce
Luffing sails animation working correctly, working on sailsin animation now.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 15:24:01 +12:00
a3ce5998ff
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-07 10:58:07 +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
ae28ccf228
Made sails luff in the right direction.
...
#story[1111]
2017-08-04 16:24:34 +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
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
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
8e24c204fd
Fixed build.
...
Google map does not work
tags: #issue[34]
2017-08-03 11:26:44 +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
47c5e6f155
Reverting some new graphics classes back to how they were on master.
2017-07-31 23:35:28 +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
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
6242ab0b2e
Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox.
...
Also implemented various other small fixes and further refactored code.
#refactor
2017-07-25 20:45:27 +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
3ec1242a9a
Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-07-21 11:13:04 +12:00
881f7f8e30
Changed package heirachy. Merged Controller and StartScreenController.
...
#refactor
2017-07-21 09:22:55 +12:00
Kusal Ekanayake
Zhi You Tan
Calum
Zhi You Tan
Michael Rausch
Alistair McIntyre
William Muir