Michael Rausch 00ff771fc3 Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox ...

# 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/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

2017-09-27 14:56:09 +13:00

..

mark

Merged dev onto 1273_Skybox

2017-09-27 14:46:12 +13:00

stream

Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox

2017-09-27 14:56:09 +13:00

token

Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15

2017-09-27 12:06:16 +13:00

ClientYacht.java

Merge remote-tracking branch 'origin/develop' into 1273_Skybox

2017-09-27 14:23:38 +13:00

Colors.java

Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec.

2017-08-17 01:20:16 +12:00

GameKeyBind.java

Merged develop in and reimplemented keybindings for moving the camera.

2017-09-26 18:01:39 +13:00

GeoPoint.java

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

2017-08-16 01:04:16 +12:00

KeyAction.java

Temporarily added more options in key binding dialog. But still need to implement binding after camera story has been merged into develop

2017-09-26 15:49:16 +13:00

Limit.java

New server creation view created. Added templates for custom races. Updated xml generator to remove all hard coded values. Updated XMLParser to parse custom race files. No unit tests exists currently.

2017-09-21 12:59:37 +12:00

Player.java

WIP: Initial commit for seperating server and client yacht classes

2017-08-15 14:18:48 +12:00

PolarTable.java

Fixed wind walker and bumper

2017-09-26 18:57:15 +13:00

RaceState.java

- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.

2017-09-14 14:42:25 +12:00

ScaledPoint.java

Fixed boat trials rendering abnormally

2017-09-26 01:07:02 +13:00

ServerYacht.java

The random token now has a 50% chance of causing your boat to have a speed penalty

2017-09-26 21:13:35 +13:00