Merge branch 'development'

allista · May 3, 2020 · a08945a · a08945a
2 parents 1220b3f + 332036d
commit a08945a
Show file tree

Hide file tree

Showing 47 changed files with 1,980 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,7 +58,6 @@ build/
 *_i.c
 *_p.c
 *.ilk
-*.meta
 *.obj
 *.pch
 *.pdb
@@ -69,14 +68,12 @@ build/
 *.tlb
 *.tli
 *.tlh
-*.tmp
 *.tmp_proj
 *.log
 *.vspscc
 *.vssscc
 .builds
 *.pidb
-*.log
 *.scc
 
 # Visual C++ cache files
@@ -194,7 +191,6 @@ $RECYCLE.BIN/
 *.egg
 *.egg-info
 dist/
-build/
 eggs/
 parts/
 var/

diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 #if NIGHTBUILD
 [assembly: AssemblyVersion("3.6.*")]
 #else
-[assembly: AssemblyVersion("3.6.2.1")]
+[assembly: AssemblyVersion("3.6.2.2")]
 #endif
 [assembly: KSPAssembly("ThrottleControlledAvionics", 3, 6)]
 
@@ -51,7 +51,7 @@ public ModInfo()
 
             VersionURL = "https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version";
             UpgradeURL = "http://spacedock.info/mod/198/Throttle%20Controlled%20Avionics";
-            ChangeLogURL = "https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/ChanegLog.md";
+            ChangeLogURL = "https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/ChangeLog.md";
         }
     }
 }
diff --git a/ChanegLog.md → ChangeLog.md b/ChanegLog.md → ChangeLog.md
@@ -2,7 +2,11 @@
 
 _**BUT** do not delete the ThrottleControlledAvionics.user and config.xml files to preserve your settings_
 
-* **v3.6.2.1**
+* **v3.6.2.2**
+    * Fixed HUD panels disappearing after scene switch
+    * Compiled against AT_Utils 1.9.2
+
+* v3.6.2.1
     * **Compatible with KSP-1.9**
     * Compiled against AT_Utils 1.9.2
 

diff --git a/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version b/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version
@@ -2,13 +2,13 @@
     "NAME":"ThrottleControlledAvionics",
     "URL":"https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version",
     "DOWNLOAD":"http://spacedock.info/mod/198/Throttle%20Controlled%20Avionics",
-    "CHANGE_LOG_URL":"https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/ChanegLog.md",
+    "CHANGE_LOG_URL":"https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/ChangeLog.md",
     "VERSION":
      {
          "MAJOR":3,
          "MINOR":6,
          "PATCH":2,
-         "BUILD":1
+         "BUILD":2
      },
     "KSP_VERSION_MIN":
      {

diff --git a/TCA.UI/Assets/AttitudeUI.prefab.meta b/TCA.UI/Assets/AttitudeUI.prefab.meta
diff --git a/TCA.UI/Assets/InfoUI.prefab.meta b/TCA.UI/Assets/InfoUI.prefab.meta
diff --git a/TCA.UI/Assets/ManeuverUI.prefab.meta b/TCA.UI/Assets/ManeuverUI.prefab.meta
diff --git a/TCA.UI/Assets/StatusUI.prefab.meta b/TCA.UI/Assets/StatusUI.prefab.meta
diff --git a/TCA.UI/Assets/TCA.unity.meta b/TCA.UI/Assets/TCA.unity.meta
diff --git a/TCA.UI/Assets/VFlightUI.prefab.meta b/TCA.UI/Assets/VFlightUI.prefab.meta
diff --git a/TCA.UI/Assets/icons.meta b/TCA.UI/Assets/icons.meta
diff --git a/TCA.UI/Assets/icons/SmartEngines.png.meta b/TCA.UI/Assets/icons/SmartEngines.png.meta
diff --git a/TCA.UI/Assets/icons/VTOLAssist.png.meta b/TCA.UI/Assets/icons/VTOLAssist.png.meta
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,6 @@ build/ @@
     *_i.c
     *_p.c
     *.ilk
-    *.meta
     *.obj
     *.pch
     *.pdb
@@ Expand All / @@ -69,14 +68,12 @@ build/ @@
     *.tlb
     *.tli
     *.tlh
-    *.tmp
     *.tmp_proj
     *.log
     *.vspscc
     *.vssscc
     .builds
     *.pidb
-    *.log
     *.scc
     # Visual C++ cache files
@@ Expand Down Expand Up / @@ -194,7 +191,6 @@ $RECYCLE.BIN/ @@
     *.egg
     *.egg-info
     dist/
-    build/
     eggs/
     parts/
     var/
@@ Expand Down @@