Added AssemblyFileVersion

Updated version file for 1.12 Fixed custom icons
linuxgurugamer · Oct 17, 2021 · 3580555 · 3580555
1 parent a54607d
commit 3580555
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 15 deletions.
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,6 +1,8 @@
 Changelog
 
-2.8.3.2
+2.8.3.3
+	Added AssemblyFileVersion
+	Updated version file for 1.12
 	Fixed custom icons
 
 2.8.3.1

diff --git a/GameData/WaypointManager/Plugins/WaypointManager.dll b/GameData/WaypointManager/Plugins/WaypointManager.dll
diff --git a/WaypointManager.version b/WaypointManager.version
@@ -11,21 +11,16 @@
     "MAJOR": 2,
     "MINOR": 8,
     "PATCH": 3,
-    "BUILD": 2
+    "BUILD": 3
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 8,
-    "PATCH": 0
+    "MINOR": 12,
+    "PATCH": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 12,
     "PATCH": 0
-  },
-  "KSP_VERSION_MAX": {
-    "MAJOR": 1,
-    "MINOR": 99,
-    "PATCH": 99
   }
 } 
diff --git a/WaypointManager/AssemblyVersion.cs b/WaypointManager/AssemblyVersion.cs
@@ -5,4 +5,5 @@
 
  using System.Reflection;
 
+ [assembly: AssemblyFileVersion("2.8.3.2")]
  [assembly: AssemblyVersion("2.8.3.2")]
diff --git a/WaypointManager/AssemblyVersion.tt b/WaypointManager/AssemblyVersion.tt
@@ -97,4 +97,5 @@
 
  using System.Reflection;
 
+ [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
  [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
diff --git a/WaypointManager/CustomWaypointGUI.cs b/WaypointManager/CustomWaypointGUI.cs
@@ -469,8 +469,8 @@ private static void WindowGUI(int windowID)
             GUILayout.Space(4);
 
             GUILayout.BeginVertical();
-;
-            if (GUILayout.Button(Util.GetContractIcon(template.id, template.seed)))
+
+            if (GUILayout.Button(Util.GetContractIcon(template.id, template.seed), GUILayout.Width(40), GUILayout.Height(40)))
             {
                 showIconPicker = !showIconPicker;
 
@@ -627,6 +627,7 @@ private static void IconPickerGUI(int windowID)
         /// </summary>
         public static void DrawMarker()
         {
+            //Log.Info("DrawMarker, template.id: " + template.id);
             // Only handle on repaint events
             if (windowMode == WindowMode.Add && Event.current.type == EventType.Repaint)
             {

diff --git a/WaypointManager/Properties/AssemblyInfo.cs b/WaypointManager/Properties/AssemblyInfo.cs
@@ -33,6 +33,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0")]
-[assembly: AssemblyFileVersion("2.8.1")]
+//[assembly: AssemblyFileVersion("2.8.1")]
+
 [assembly: AssemblyInformationalVersion("2.8.1")]
 [assembly: KSPAssembly("WaypointManager", 1, 0)]
diff --git a/WaypointManager/Util.cs b/WaypointManager/Util.cs
@@ -334,6 +334,7 @@ public static double TerrainHeight(double latitude, double longitude, CelestialB
 
         public static void DrawWaypoint(CelestialBody targetBody, double latitude, double longitude, double altitude, string id, int seed, float alpha = -1.0f)
         {
+            Log.Info("DrawWaypoint, id: " + id);
             // Translate to scaled space
             Vector3d localSpacePoint = targetBody.GetWorldSurfacePosition(latitude, longitude, altitude);
             Vector3d scaledSpacePoint = ScaledSpace.LocalToScaledSpace(localSpacePoint);
@@ -379,6 +380,7 @@ public static void DrawWaypoint(CelestialBody targetBody, double latitude, doubl
             // Draw the icon
             Graphics.DrawTexture(iconRect, /* ContractDefs.sprites[id].texture */
                 GetContractIcon(id, seed), new Rect(0.0f, 0.0f, 1f, 1f), 0, 0, 0, 0, SystemUtilities.RandomColor(seed, alpha));
+            Log.Info("id: " + id);
         }
 
     }

diff --git a/WaypointManager/WaypointFlightRenderer.cs b/WaypointManager/WaypointFlightRenderer.cs
@@ -9,6 +9,7 @@
 using FinePrint;
 using FinePrint.Utilities;
 using ClickThroughFix;
+using static WaypointManager.RegisterToolbar;
 
 namespace WaypointManager
 {

diff --git a/deploy.bat b/deploy.bat
@@ -9,8 +9,6 @@ rem    but not always
 
 set H=%KSPDIR%
 
-rem set H=R:\KSP_1.12.0_Tetrix
-
 set GAMEDIR=WaypointManager
 set GAMEDATA="GameData"
 set VERSIONFILE=%GAMEDIR%.version