Merge pull request #765 from jrodrigv/master

New release for KSP 1.9.1
PapaJoesSoup · Apr 9, 2020 · 4b21c9f · 4b21c9f
2 parents ff5624a + 60493ef
commit 4b21c9f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -160,3 +160,4 @@ BDArmory/LocalDev/Refs/UnityEngine.dll
 /BDArmory/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.BDArmory.01
 /_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.00
 /BDArmory/_ReSharper.Caches/ReSharperPlatformVs16193_4011600b.BDArmory.00
+/_ReSharper.Caches/ReSharperPlatformVs16193_4011600b.00
diff --git a/BDArmory.Core/Properties/AssemblyInfo.cs b/BDArmory.Core/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
 [assembly: KSPAssembly("BDArmory.Core", 1, 0)]
diff --git a/BDArmory/Distribution/GameData/BDArmory/AssetBundles/bdarmoryshaders_linux.bundle b/BDArmory/Distribution/GameData/BDArmory/AssetBundles/bdarmoryshaders_linux.bundle
diff --git a/BDArmory/Distribution/GameData/BDArmory/AssetBundles/bdarmoryshaders_macosx.bundle b/BDArmory/Distribution/GameData/BDArmory/AssetBundles/bdarmoryshaders_macosx.bundle
diff --git a/BDArmory/Distribution/GameData/BDArmory/AssetBundles/bdarmoryshaders_windows.bundle b/BDArmory/Distribution/GameData/BDArmory/AssetBundles/bdarmoryshaders_windows.bundle
diff --git a/BDArmory/Distribution/GameData/BDArmory/BDArmory.version b/BDArmory/Distribution/GameData/BDArmory/BDArmory.version
@@ -12,14 +12,14 @@
     {
         "MAJOR":1,
         "MINOR":3,
-        "PATCH":3,
+        "PATCH":4,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":9,
-        "PATCH":0
+        "PATCH":1
     },
     "KSP_VERSION_MIN":
     {

diff --git a/BDArmory/Distribution/GameData/BDArmory/ChangeLog.txt b/BDArmory/Distribution/GameData/BDArmory/ChangeLog.txt
@@ -1,4 +1,11 @@
-v1.3.3
+v1.3.4
+* NEW FEATURES:
+	* Recompiled for KSP 1.9.1
+* FIXES
+	* Shaders compatibility for Mac / Linux
+	* Missiles problem regarding locking and losing lock affecting heat and radar missiles. (Thanks to TheKurgan to find the problematic commit)
+
+v1.3.3
 * NEW FEATURES:
 	* Recompiled for KSP 1.9.0
 	* Localization en-us and zh-cn (Thanks to tinygrox!)

diff --git a/BDArmory/Properties/AssemblyInfo.cs b/BDArmory/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

diff --git a/BDArmory/Shaders/BulletShader.shader b/BDArmory/Shaders/BulletShader.shader
@@ -27,6 +27,7 @@
 				Pass
 				{
 					CGPROGRAM
+					#pragma target 3.5
 					#pragma vertex vert
 					#pragma fragment frag
 					#pragma fragmentoption ARB_precision_hint_fastest

diff --git a/BDArmory/Shaders/GrayscaleEffectShader.shader b/BDArmory/Shaders/GrayscaleEffectShader.shader
@@ -12,6 +12,7 @@
 		Fog{ Mode off }
 
 		CGPROGRAM
+#pragma target 3.5 
 #pragma vertex vert_img
 #pragma fragment frag
 #pragma fragmentoption ARB_precision_hint_fastest

diff --git a/BDArmory/Shaders/rcsShader.shader b/BDArmory/Shaders/rcsShader.shader
@@ -15,6 +15,7 @@ Shader "Custom/rcsShader"
 			CGPROGRAM
 
 			// DEFINES
+			#pragma target 3.5
 			#pragma vertex RCSVertexShader
 			#pragma fragment RCSFragmentShader