Calum d9c832168b Merge branch 'story1275_host_customization' into 1273_Skybox ...

# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
#	src/main/java/seng302/visualiser/controllers/ViewManager.java
#	src/main/resources/views/LobbyView.fxml
#	src/main/resources/views/RaceView.fxml

2017-09-26 01:19:47 +13:00

..

css

Merge branch 'story1275_host_customization' into 1273_Skybox

2017-09-26 01:19:47 +13:00

icons

Added most sound functionality.

2017-08-28 16:37:09 +12:00

images

Added local skybox texture, and changed water color

2017-09-25 19:19:46 +13:00

maps

Refactored the 2D and 3D game view class setups. Made scaling more logical.

2017-09-26 00:55:28 +13:00

meshes

Merge branch 'story1275_host_customization' into 1273_Skybox

2017-09-26 01:19:47 +13:00

server_config

Merge branch 'develop' into story1275_host_customization

2017-09-25 23:25:33 +13:00

sounds

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

2017-09-11 15:54:30 +12:00

views

Merge branch 'story1275_host_customization' into 1273_Skybox

2017-09-26 01:19:47 +13:00

PP.png

Updated PartyParrot logo

2017-09-20 15:41:20 +12:00