Skip to content

Commit

Permalink
Merge pull request #16 from JPLRepo/Develop
Browse files Browse the repository at this point in the history
KSP 1.3.1
  • Loading branch information
JPLRepo authored Oct 7, 2017
2 parents 9dda216 + 1f56ebf commit 538002d
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 116 deletions.
2 changes: 2 additions & 0 deletions Distribution/GameData/Endurance/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
V1.6
Re-Compile for KSP 1.3.1
V1.5
Fix Lander RCS thruster causing it to roll and pitch.
Adjusted CoM and CoL for lander.
Expand Down
8 changes: 4 additions & 4 deletions Distribution/GameData/Endurance/Endurance.version
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"NAME":"Endurance Continued",
"URL":"http://ksp-avc.cybutek.net/version.php?id=258",
"DOWNLOAD":"http://spacedock.info/mod/357/Endurance%20%28from%20Interstellar%29%20Continued...",
"VERSION":{"MAJOR":1,"MINOR":5,"PATCH":0,"BUILD":0},
"KSP_VERSION":{"MAJOR":1,"MINOR":3,"PATCH":0},
"KSP_VERSION_MIN":{"MAJOR":1,"MINOR":3,"PATCH":0},
"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":3,"PATCH":0}
"VERSION":{"MAJOR":1,"MINOR":6,"PATCH":0,"BUILD":0},
"KSP_VERSION":{"MAJOR":1,"MINOR":3,"PATCH":1,
"KSP_VERSION_MIN":{"MAJOR":1,"MINOR":3,"PATCH":1,
"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":3,"PATCH":1
}
Binary file modified Distribution/GameData/Endurance/Plugins/ENHabitat.dll
Binary file not shown.
Binary file modified Distribution/GameData/Endurance/Plugins/Endurance.dll
Binary file not shown.
216 changes: 108 additions & 108 deletions Endurance/Endurance.csproj
Original file line number Diff line number Diff line change
@@ -1,109 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{ECD03D1C-255C-45A2-ACFA-D35B500538C9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Endurance</RootNamespace>
<AssemblyName>Endurance</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\KSPDLLs - 1.3\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\KSPDLLs - 1.3\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\KSPDLLs - 1.3\UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AnimState.cs" />
<Compile Include="IControlledModule.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ENAnimateControlled.cs" />
<Compile Include="ENControlledModule.cs" />
<Compile Include="ENExtensions.cs" />
<Compile Include="ENLandingLeg.cs" />
<Compile Include="ENUtils.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="PostBuildMacros">
<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
<Output TaskParameter="Assemblies" ItemName="Targets" />
</GetAssemblyIdentity>
<ItemGroup>
<VersionNumber Include="@(Targets->'%(Version)')" />
</ItemGroup>
</Target>
<PropertyGroup>
<PostBuildEventDependsOn>
$(PostBuildEventDependsOn);
PostBuildMacros;
</PostBuildEventDependsOn>
<PostBuildEvent>set /p KSP_DIR=&lt;"$(SolutionDir)LocalDev\ksp_dir.txt"

set /p MONO_EXE_DIR=&lt;"$(SolutionDir)LocalDev\mono_exe.txt"

set /p PDB2MDB_EXE_DIR=&lt;"$(SolutionDir)LocalDev\pdb2mdb_exe.txt"

set /p ZA_DIR=&lt;"$(SolutionDir)LocalDev\7za_dir.txt"

xcopy "$(TargetPath)" "$(SolutionDir)Distribution\GameData\$(ProjectName)\Plugins\" /Y
xcopy "$(TargetDir)$(ProjectName).pdb" "$(SolutionDir)Distribution\GameData\$(ProjectName)\Plugins\" /Y

cd "$(TargetDir)"
"%25MONO_EXE_DIR%25" "%25PDB2MDB_EXE_DIR%25" "$(TargetFileName)"
xcopy "$(TargetDir)$(ProjectName).dll.mdb" "$(SolutionDir)Distribution\GameData\$(ProjectName)\Plugins\" /Y

where /q %25ZA_DIR%25:7za.exe
if %25ERRORLEVEL%25 == 1 ( echo Cannot find 7-zip to package build) else ( echo Packaging build )

if exist "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip" del "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip"
%25ZA_DIR%257za.exe a -tzip "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip" "$(SolutionDir)Distribution\GameData"
%25ZA_DIR%257za.exe d -r "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip" "*.ddsified" "*.xcf" "*.blend" "thumbs.db" "*.pdb" "*.dll.mdb"
xcopy /E /Y "$(SolutionDir)Distribution\GameData" "%25KSP_DIR%25\GameData"</PostBuildEvent>
</PropertyGroup>
<!-- 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">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{ECD03D1C-255C-45A2-ACFA-D35B500538C9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Endurance</RootNamespace>
<AssemblyName>Endurance</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\KSPDLLs - 1.3\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\KSPDLLs - 1.3\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\KSPDLLs - 1.3\UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AnimState.cs" />
<Compile Include="IControlledModule.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ENAnimateControlled.cs" />
<Compile Include="ENControlledModule.cs" />
<Compile Include="ENExtensions.cs" />
<Compile Include="ENLandingLeg.cs" />
<Compile Include="ENUtils.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="PostBuildMacros">
<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
<Output TaskParameter="Assemblies" ItemName="Targets" />
</GetAssemblyIdentity>
<ItemGroup>
<VersionNumber Include="@(Targets->'%(Version)')" />
</ItemGroup>
</Target>
<PropertyGroup>
<PostBuildEventDependsOn>
$(PostBuildEventDependsOn);
PostBuildMacros;
</PostBuildEventDependsOn>
<PostBuildEvent>set /p KSP_DIR=&lt;"$(SolutionDir)LocalDev\ksp_dir.txt"

set /p MONO_EXE_DIR=&lt;"$(SolutionDir)LocalDev\mono_exe.txt"

set /p PDB2MDB_EXE_DIR=&lt;"$(SolutionDir)LocalDev\pdb2mdb_exe.txt"

set /p ZA_DIR=&lt;"$(SolutionDir)LocalDev\7za_dir.txt"

xcopy "$(TargetPath)" "$(SolutionDir)Distribution\GameData\$(ProjectName)\Plugins\" /Y
xcopy "$(TargetDir)$(ProjectName).pdb" "$(SolutionDir)Distribution\GameData\$(ProjectName)\Plugins\" /Y

cd "$(TargetDir)"
"%25MONO_EXE_DIR%25" "%25PDB2MDB_EXE_DIR%25" "$(TargetFileName)"
xcopy "$(TargetDir)$(ProjectName).dll.mdb" "$(SolutionDir)Distribution\GameData\$(ProjectName)\Plugins\" /Y

where /q %25ZA_DIR%25:7za.exe
if %25ERRORLEVEL%25 == 1 ( echo Cannot find 7-zip to package build) else ( echo Packaging build )

if exist "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip" del "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip"
%25ZA_DIR%257za.exe a -tzip "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip" "$(SolutionDir)Distribution\GameData"
%25ZA_DIR%257za.exe d -r "$(SolutionDir)Distribution\$(ProjectName)_V@(VersionNumber).zip" "*.ddsified" "*.xcf" "*.blend" "thumbs.db" "*.pdb" "*.dll.mdb"
xcopy /E /Y "$(SolutionDir)Distribution\GameData" "%25KSP_DIR%25\GameData\"</PostBuildEvent>
</PropertyGroup>
<!-- 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">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
4 changes: 2 additions & 2 deletions Endurance/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// 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.5.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]
4 changes: 2 additions & 2 deletions Habitat/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// 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.5.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]

0 comments on commit 538002d

Please sign in to comment.