 Alistair McIntyre
|
c52c345e53
|
Merge branch 'develop' into Story64_SailsAnimations
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
|
2017-08-14 14:04:53 +12:00 |
|
 Kusal Ekanayake
|
f97b18d594
|
Sailsin graphics moving and working as expected.
#story[1111] #pair[kre39,ptg19]
|
2017-08-07 16:48:30 +12:00 |
|
|
Kusal Ekanayake
|
c7857872ce
|
Luffing sails animation working correctly, working on sailsin animation now.
#story[1111] #pair[kre39,ptg19]
|
2017-08-07 15:24:01 +12:00 |
|
 Calum
|
a3ce5998ff
|
Action packets now sent at regular 20ms intervals
#issue[38] #implement
|
2017-08-07 10:58:07 +12:00 |
|
|
Kusal Ekanayake
|
ecf2c52cfa
|
Added tests, and sails to all clients.
#story[1111]
|
2017-08-06 15:43:22 +12:00 |
|
|
Kusal Ekanayake
|
ae28ccf228
|
Made sails luff in the right direction.
#story[1111]
|
2017-08-04 16:24:34 +12:00 |
|
|
Kusal Ekanayake
|
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 |
|
|
Kusal Ekanayake
|
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 |
|
 William Muir
|
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 |
|
|
Calum
|
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 |
|
|
Calum
|
908c0749cf
|
Boats now move on screen as intended.
TODO - Make the client connect to the server.
|
2017-08-01 02:37:55 +12:00 |
|
|
Calum
|
47c5e6f155
|
Reverting some new graphics classes back to how they were on master.
|
2017-07-31 23:35:28 +12:00 |
|
|
Calum
|
b82d0d0137
|
Boats and map are now updated using the observer pattern.
#implement
|
2017-07-31 05:23:41 +12:00 |
|
|
Calum
|
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 |
|
|
Calum
|
6cae338c1e
|
Began fixing bugs with caused by asynchronous listener calls.
#bug
|
2017-07-30 20:12:19 +12:00 |
|
|
Calum
|
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 |
|
|
Calum
|
08e369f1ae
|
Merged with develop. Fixed many bugs in Visualiser.
#bugs
|
2017-07-26 02:49:31 +12:00 |
|
|
Calum
|
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 |
|