 Michael Rausch
|
8fb5ea2223
|
Merge branch 'develop' into StartScreen
# 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/utilities/StreamParser.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
|
2017-08-16 14:31:14 +12:00 |
|
 Haoming Yin
|
d6a436d2eb
|
WIP: Initial commit for seperating server and client yacht classes
tags: #story[1124]
|
2017-08-15 14:18:48 +12:00 |
|
|
Michael Rausch
|
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
|
47c5e6f155
|
Reverting some new graphics classes back to how they were on master.
|
2017-07-31 23:35:28 +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
|
08e369f1ae
|
Merged with develop. Fixed many bugs in Visualiser.
#bugs
|
2017-07-26 02:49:31 +12:00 |
|