Release 0.10.3 (#178)

post-kerbin-mining-corporation · Oct 13, 2024 · 30a09cb · 30a09cb
1 parent cb1cfeb
commit 30a09cb
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ bin/
 obj/
 *.swp
 **/*.csproj.user
+/Source/Waterfall/packages/
diff --git a/GameData/Waterfall/Plugins/Waterfall.dll b/GameData/Waterfall/Plugins/Waterfall.dll
diff --git a/GameData/Waterfall/Versioning/Waterfall.version b/GameData/Waterfall/Versioning/Waterfall.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":10,
-        "PATCH":2,
+        "PATCH":3,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Source/Waterfall/Modules/ModuleWaterfallFX.cs b/Source/Waterfall/Modules/ModuleWaterfallFX.cs
@@ -254,6 +254,13 @@ protected void LateUpdate()
           {
             awakeControllerMask |= controller.mask;
           }
+          else if ((awakeControllerMask & controller.mask) != 0)
+          {
+            // when we call Initialize(), we force awakeControllerMask to ~0 in order to make sure that everything updates for one frame
+            // but the modifiers check controller.awake instead of the mask, so they won't update anyway
+            // TODO: remove controller.awake and use the mask everywhere (this will remove some code smells)
+            controller.awake = true;
+          }
         }
         luControllers.End();
 

diff --git a/Source/Waterfall/Waterfall.csproj b/Source/Waterfall/Waterfall.csproj
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RepoRootPath>$(MSBuildThisFileDirectory)../..</RepoRootPath>
+    <BinariesOutputRelativePath>GameData/Waterfall/Plugins</BinariesOutputRelativePath>
+  </PropertyGroup>
+    <!-- allow KSPBuildTools to use ReferencePath before Microsoft.CSharp.targets is imported -->
+  <Import Project="$(MSBuildThisFile).user" Condition="Exists('$(MSBuildThisFile).user')"/>
+  <Import Project="packages\KSPBuildTools.0.0.1\build\KSPBuildTools.props" Condition="Exists('packages\KSPBuildTools.0.0.1\build\KSPBuildTools.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,6 +21,8 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <LangVersion>9</LangVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,67 +50,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\</ReferencePath>
-    <KSPExecutable Condition="$([MSBuild]::IsOsPlatform('Windows'))">KSP_x64.exe</KSPExecutable>
-    <KSPExecutable Condition="$([MSBuild]::IsOsPlatform('OSX'))">KSP.app</KSPExecutable>
-    <KSPExecutable Condition="$([MSBuild]::IsOsPlatform('Linux'))">KSP.x86_64</KSPExecutable>
-    <ManagedRelativePath Condition="$([MSBuild]::IsOsPlatform('Windows'))">KSP_x64_Data\Managed</ManagedRelativePath>
-    <ManagedRelativePath Condition="$([MSBuild]::IsOsPlatform('OSX'))">KSP.app\Contents\Resources\Data\Managed</ManagedRelativePath>
-    <ManagedRelativePath Condition="$([MSBuild]::IsOsPlatform('Linux'))">KSP_Data\Managed</ManagedRelativePath>
-    <ManagedPath>$(ReferencePath)\$(ManagedRelativePath)</ManagedPath>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ReferencePath)\$(KSPExecutable)</StartProgram>
-    <StartWorkingDirectory>$(ReferencePath)</StartWorkingDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="$(ManagedPath)\Assembly-CSharp.dll">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\KSPAssets.dll">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="$(ManagedPath)\UnityEngine.dll">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.AnimationModule.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.AssetBundleModule.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.CoreModule.dll">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.IMGUIModule.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.InputLegacyModule.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.ParticleSystemModule.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.TextRenderingModule.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.UI.dll">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="$(ManagedPath)\UnityEngine.UIModule.dll">
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="AssetLibrary\AssetLibraries.cs" />
     <Compile Include="AssetLibrary\WaterfallAsset.cs" />
@@ -221,10 +169,16 @@
   <ItemGroup>
     <None Include=".editorconfig" />
     <Compile Include="EffectModifiers\EffectParticleMultiNumericModifier.cs" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <PropertyGroup>
-    <PostBuildEvent>copy /Y "$(TargetDir)$(TargetName).*" "$(SolutionDir)\..\..\GameData\Waterfall\Plugins\"</PostBuildEvent>
-  </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\KSPBuildTools.0.0.1\build\KSPBuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\KSPBuildTools.0.0.1\build\KSPBuildTools.props'))" />
+    <Error Condition="!Exists('packages\KSPBuildTools.0.0.1\build\KSPBuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\KSPBuildTools.0.0.1\build\KSPBuildTools.targets'))" />
+  </Target>
+  <Import Project="packages\KSPBuildTools.0.0.1\build\KSPBuildTools.targets" Condition="Exists('packages\KSPBuildTools.0.0.1\build\KSPBuildTools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">

diff --git a/Source/Waterfall/packages.config b/Source/Waterfall/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="KSPBuildTools" version="0.0.1" targetFramework="net48" />
+</packages>
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+v0.10.3
+-------
+- Fixed an issue where certain effects would miss their first update (SEP, Tundra RCS blocks) and get stuck in a bad state
+
 v0.10.2
 -------
 - Fixed an issue with shader compilation on OpenGL (#173)

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ================
-Waterfall 0.10.2
+Waterfall 0.10.3
 ================
 
 Waterfall is a mod for Kerbal Space Program that provides a cool new way to create and drive engine effects for smooth rocket plumes. It has