Merged with develop. Moved all collision logic into game state.

#refactor
This commit is contained in:
Calum
2017-08-16 01:04:16 +12:00
parent a7a667b4bc
commit 720ce0ae5b
12 changed files with 190 additions and 935 deletions
@@ -347,7 +347,7 @@ public class GameClient {
//TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet)
case SHIFT: // sails in/sails out
socketThread.sendBoatAction(BoatAction.SAILS_IN);
raceView.getGameView().getPlayerYacht().toggleClientSail();
raceView.getGameView().getPlayerYacht().toggleSail();
break;
case PAGE_UP:
case PAGE_DOWN: