network test + main menu start

Saarg · Jan 26, 2018 · dce1d49 · dce1d49
1 parent b4cb0bd
commit dce1d49
Show file tree

Hide file tree

Showing 23 changed files with 3,587 additions and 47,302 deletions.
diff --git a/Assets/Imports/Battlehub/MeshDeformer2/DemoPackage.unitypackage.meta b/Assets/Imports/Battlehub/MeshDeformer2/DemoPackage.unitypackage.meta
diff --git a/Assets/Imports/VRTK/Examples/ExampleResources/Models/hexprism.obj.meta b/Assets/Imports/VRTK/Examples/ExampleResources/Models/hexprism.obj.meta
diff --git a/Assets/Imports/VRTK/Examples/ExampleResources/Models/lightring.obj.meta b/Assets/Imports/VRTK/Examples/ExampleResources/Models/lightring.obj.meta
diff --git a/Assets/Imports/VRTK/Examples/ExampleResources/Models/lightseg.obj.meta b/Assets/Imports/VRTK/Examples/ExampleResources/Models/lightseg.obj.meta
diff --git a/Assets/Imports/VRTK/Examples/ExampleResources/Models/teleportbeam.obj.meta b/Assets/Imports/VRTK/Examples/ExampleResources/Models/teleportbeam.obj.meta
diff --git a/Assets/Prefabs/Players/PlayerTest.prefab b/Assets/Prefabs/Players/PlayerTest.prefab
@@ -3017,7 +3017,7 @@ MonoBehaviour:
     i14: 129
     i15: 118
   m_ServerOnly: 0
-  m_LocalPlayerAuthority: 0
+  m_LocalPlayerAuthority: 1
 --- !u!114 &114694921262727194
 MonoBehaviour:
   m_ObjectHideFlags: 11

diff --git a/Assets/Scenes/NetworkTest/AdditiveSceneLoader.cs b/Assets/Scenes/NetworkTest/AdditiveSceneLoader.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class AdditiveSceneLoader : MonoBehaviour {
+
+	public string[] scenes;
+
+	// Use this for initialization
+	void Start () {
+		foreach (string s in scenes)
+		{
+			if (SceneManager.GetSceneByName(s).isLoaded == false)
+				SceneManager.LoadSceneAsync(s, LoadSceneMode.Additive);
+			else
+				Debug.Log("Scene " + s + " already loaded");
+		}
+
+		Destroy(gameObject);
+	}
+}
diff --git a/Assets/Scenes/NetworkTest/AdditiveSceneLoader.cs.meta b/Assets/Scenes/NetworkTest/AdditiveSceneLoader.cs.meta