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

# 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/GameClient.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/java/seng302/visualiser/controllers/StartScreenController.java
#	src/main/resources/views/LobbyView.fxml
#	src/main/resources/views/RaceView.fxml
#	src/main/resources/views/StartScreenView.fxml

src/main/java/seng302/visualiser/controllers/StartScreenController.java

@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
@@ -19,10 +20,14 @@ import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import seng302.gameServer.ServerAdvertiser;
 import seng302.gameServer.ServerDescription;
+import seng302.gameServer.GameState;
+import seng302.utilities.Sounds;
 import seng302.visualiser.GameClient;
 import seng302.visualiser.ServerListener;
 import seng302.visualiser.ServerListenerDelegate;
@@ -49,6 +54,23 @@ public class StartScreenController implements Initializable{
     private Logger logger = LoggerFactory.getLogger(StartScreenController.class);
 
     private List<ServerDescription> servers;
+    public void initialize(URL url,  ResourceBundle resourceBundle) {
+        Sounds.stopMusic();
+        Sounds.stopSoundEffects();
+        Sounds.playMenuMusic();
+        if (Sounds.isMusicMuted()) {
+            muteMusicButton.setText("UnMute Music");
+        } else {
+            muteMusicButton.setText("Mute Music");
+        }
+        if (Sounds.isSoundEffectsMuted()) {
+            muteSoundsButton.setText("UnMute Sounds");
+        } else {
+            muteSoundsButton.setText("Mute Sounds");
+        }
+        Sounds.setMutes();
+//        gameClient = new GameClient(holder);
+    }
 
     private void setInitialDropShadow(){
         DropShadow dropShadow = new DropShadow();
@@ -57,7 +79,25 @@ public class StartScreenController implements Initializable{
         dropShadow.setOffsetY(4.0);
         dropShadow.setColor(Color.color(0, 0, 0, 0.5));
         headText.setEffect(dropShadow);
+    /**
+     * Creates an instance of GameClient and runs it as a host.
+     */
+    @FXML
+    public void hostButtonPressed() {
+        Sounds.playButtonClick();
+        gameClient = new GameClient(holder);
+        gameClient.runAsHost(getLocalHostIp(), 4942);
+    }
 
+    /**
+     * Creates an instance of GameClient and runs it has a client.
+     */
+    @FXML
+    public void connectButtonPressed() {
+        // TODO: 10/07/17 wmu16 - Finish function
+        Sounds.playButtonClick();
+        gameClient = new GameClient(holder);
+        gameClient.runAsClient(ipTextField.getText().trim().toLowerCase(), 4942);
     }
 
     private void preloadServerListView(){
@@ -88,4 +128,27 @@ public class StartScreenController implements Initializable{
 
     }
 
+    public void toggleMusic(ActionEvent actionEvent) {
+        Sounds.toggleMuteMusic();
+        Sounds.playButtonClick();
+        if (Sounds.isMusicMuted()) {
+            muteMusicButton.setText("UnMute Music");
+        } else {
+            muteMusicButton.setText("Mute Music");
+        }
+    }
+
+    public void toggleSounds(ActionEvent actionEvent) {
+        Sounds.toggleMuteEffects();
+        Sounds.playButtonClick();
+        if (Sounds.isSoundEffectsMuted()) {
+            muteSoundsButton.setText("UnMute Sounds");
+        } else {
+            muteSoundsButton.setText("Mute Sounds");
+        }
+    }
+
+    public void playButtonHoverSound(MouseEvent mouseEvent) {
+        Sounds.playHoverSound();
+    }
 }