Merge pull request #214 from misternebula/dev

master <- dev

.gitignore

@@ -357,5 +357,7 @@ MigrationBackup/
 
 # Unecessary asset bundle file
 /AssetBundles/AssetBundles*
-
-QSB.csproj.user
+QSB.csproj.user
+GameAssets/
+Chert/
+Riebeck/

AssetBundles/conversation.manifest

@@ -0,0 +1,32 @@
+ManifestFileVersion: 0
+CRC: 3469869292
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 55d90dfc169d4fd552679840c1474222
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 6ce89620af51ba381c9e4f226a2ebb1b
+HashAppended: 0
+ClassTypes:
+- Class: 1
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+- Class: 222
+  Script: {instanceID: 0}
+- Class: 223
+  Script: {instanceID: 0}
+- Class: 224
+  Script: {instanceID: 0}
+Assets:
+- Assets/DialogueBubble.prefab
+Dependencies: []

AssetBundles/instruments.manifest

@@ -0,0 +1,34 @@
+ManifestFileVersion: 0
+CRC: 2593345828
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: d97fbc9cde41b6514223a2f68ba96af8
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: ff0e1233df027a80b5add90668c49830
+HashAppended: 0
+ClassTypes:
+- Class: 43
+  Script: {instanceID: 0}
+- Class: 74
+  Script: {instanceID: 0}
+- Class: 91
+  Script: {instanceID: 0}
+Assets:
+- Assets/Riebeck/Idle_to_playing.anim
+- Assets/Chert/Chert_Drum_Panicked.anim
+- Assets/Riebeck/Traveller_Riebeck.controller
+- Assets/Chert/Traveller_Chert.controller
+- Assets/Chert/Chert_Drum_Chipper.anim
+- Assets/Riebeck/Riebeck_DreamIdle.anim
+- Assets/Chert/Chert_Chatter_Chipper.anim
+- Assets/Riebeck/Riebeck_Playing.anim
+- Assets/Chert/Chert_Chatter_Panicked.anim
+- Assets/Chert/Chert_Chatter_Nervous.anim
+- Assets/Chert/hourglasstwinsmeshescharacters2.asset
+- Assets/Riebeck/Playing_banjo.anim
+- Assets/Riebeck/Playing_to_idle.anim
+- Assets/Chert/Chert_Dream.anim
+- Assets/Riebeck/Riebeck_Talking.anim
+Dependencies: []

QSB.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QSB", "QSB\QSB.csproj", "{1F00090A-C697-4C55-B401-192F3CFB9DC2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuantumUNET", "QuantumUNET\QuantumUNET.csproj", "{C8C53004-1508-4F86-A419-4292C188DC2A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{1F00090A-C697-4C55-B401-192F3CFB9DC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F00090A-C697-4C55-B401-192F3CFB9DC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F00090A-C697-4C55-B401-192F3CFB9DC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8C53004-1508-4F86-A419-4292C188DC2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8C53004-1508-4F86-A419-4292C188DC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8C53004-1508-4F86-A419-4292C188DC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8C53004-1508-4F86-A419-4292C188DC2A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

QSB/Animation/AnimControllerPatch.cs

@@ -3,24 +3,24 @@
 
 namespace QSB.Animation
 {
-    public static class AnimControllerPatch
-    {
-        public static RuntimeAnimatorController SuitedAnimController { get; private set; }
+	public static class AnimControllerPatch
+	{
+		public static RuntimeAnimatorController SuitedAnimController { get; private set; }
 
-        public static void Init()
-        {
-            QSB.Helper.Events.Subscribe<PlayerAnimController>(OWML.Common.Events.BeforeStart);
-            QSB.Helper.Events.Event += OnEvent;
-        }
+		public static void Init()
+		{
+			QSBCore.Helper.Events.Subscribe<PlayerAnimController>(OWML.Common.Events.BeforeStart);
+			QSBCore.Helper.Events.Event += OnEvent;
+		}
 
-        private static void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev)
-        {
-            if (behaviour is PlayerAnimController playerAnimController &&
-                ev == OWML.Common.Events.BeforeStart &&
-                SuitedAnimController == null)
-            {
-                SuitedAnimController = playerAnimController.GetValue<RuntimeAnimatorController>("_baseAnimController");
-            }
-        }
-    }
-}
+		private static void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev)
+		{
+			if (behaviour is PlayerAnimController playerAnimController &&
+				ev == OWML.Common.Events.BeforeStart &&
+				SuitedAnimController == null)
+			{
+				SuitedAnimController = playerAnimController.GetValue<RuntimeAnimatorController>("_baseAnimController");
+			}
+		}
+	}
+}

QSB/Animation/AnimFloatParam.cs

@@ -2,17 +2,17 @@
 
 namespace QSB.Animation
 {
-    public class AnimFloatParam
-    {
-        public float Current { get; private set; }
-        public float Target { get; set; }
+	public class AnimFloatParam
+	{
+		public float Current { get; private set; }
+		public float Target { get; set; }
 
-        private float _velocity;
+		private float _velocity;
 
-        public float Smooth(float smoothTime)
-        {
-            Current = Mathf.SmoothDamp(Current, Target, ref _velocity, smoothTime);
-            return Current;
-        }
-    }
+		public float Smooth(float smoothTime)
+		{
+			Current = Mathf.SmoothDamp(Current, Target, ref _velocity, smoothTime);
+			return Current;
+		}
+	}
 }