 Alistair McIntyre
|
39cfaf6780
|
Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization
# 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/gameServer/messages/ChatterMessage.java
# src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
|
2017-08-17 13:31:27 +12:00 |
|
|
Alistair McIntyre
|
faf4600f51
|
Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu.
tags : #story[1142]
|
2017-08-17 13:13:07 +12:00 |
|
 Calum
|
87acce71ea
|
Merge branch 'develop' into story1118_map_arrows
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
|
2017-08-17 00:52:41 +12:00 |
|
|
Calum
|
ac47e9d88a
|
Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work.
#bug #refactor #implement #story[1118]
|
2017-08-16 03:51:48 +12:00 |
|