Skip to content

Commit 0b89d0d

Browse files
committed
Merge branch 'no-win-sdk'
2 parents a4ec063 + a8c9f8d commit 0b89d0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+5151
-4235
lines changed

AlienBML

CathodeLib/CathodeLib.csproj

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -10,13 +10,21 @@
1010
<Authors>Matt Filer</Authors>
1111
<Description>Provides support for parsing and writing common Alien: Isolation formats from the Cathode engine.</Description>
1212
<Copyright>Matt Filer 2023</Copyright>
13-
<Version>0.3.3</Version>
13+
<Version>0.4.0</Version>
1414
<OutputType>Library</OutputType>
15-
<AssemblyVersion>0.3.3.0</AssemblyVersion>
16-
<FileVersion>0.3.3.0</FileVersion>
15+
<AssemblyVersion>0.4.0.0</AssemblyVersion>
16+
<FileVersion>0.4.0.0</FileVersion>
1717
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
1818
</PropertyGroup>
1919

20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21+
<DefineConstants>$(DefineConstants)TRACE;CATHODE_FAIL_HARD</DefineConstants>
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
25+
<DefineConstants>$(DefineConstants)TRACE</DefineConstants>
26+
</PropertyGroup>
27+
2028
<ItemGroup>
2129
<Compile Remove="CathodeBIN\NewFolder\**" />
2230
<EmbeddedResource Remove="CathodeBIN\NewFolder\**" />
@@ -28,34 +36,29 @@
2836
</ItemGroup>
2937

3038
<ItemGroup>
31-
<None Remove="Resources\NodeDBs\cathode_enum_lut.bin" />
3239
<None Remove="Resources\NodeDBs\cathode_generic_lut.bin" />
3340
<None Remove="Resources\NodeDBs\cathode_id_map.bin" />
3441
<None Remove="Resources\NodeDBs\cathode_id_map_DUMP_ONLY.bin" />
35-
<None Remove="Resources\NodeDBs\composite_entity_names.bin" />
36-
<None Remove="Resources\NodeDBs\composite_paths.bin" />
37-
<None Remove="Resources\NodeDBs\entity_parameter_names.bin" />
3842
<None Remove="Resources\NodeDBs\node_friendly_names.bin" />
3943
</ItemGroup>
4044

4145
<ItemGroup>
4246
<Compile Include="..\AlienBML\BML.cs" Link="Scripts\CATHODE\BML.cs" />
4347
</ItemGroup>
4448

45-
<ItemGroup>
46-
<EmbeddedResource Include="Resources\NodeDBs\cathode_enum_lut.bin" />
47-
<EmbeddedResource Include="Resources\NodeDBs\composite_entity_names.bin" />
48-
<EmbeddedResource Include="Resources\NodeDBs\composite_paths.bin" />
49-
<EmbeddedResource Include="Resources\NodeDBs\entity_parameter_names.bin" />
50-
</ItemGroup>
51-
5249
<ItemGroup>
5350
<PackageReference Include="System.Buffers" Version="4.5.1" />
5451
<PackageReference Include="System.Memory" Version="4.5.4" />
5552
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
5653
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
5754
</ItemGroup>
5855

56+
<ItemGroup>
57+
<Reference Include="PresentationCore">
58+
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\PresentationCore.dll</HintPath>
59+
</Reference>
60+
</ItemGroup>
61+
5962
<ItemGroup>
6063
<Compile Update="Properties\Resources.Designer.cs">
6164
<DesignTime>True</DesignTime>

CathodeLib/Properties/Resources.Designer.cs

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CathodeLib/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,7 @@
130130
<data name="entity_parameter_names" type="System.Resources.ResXFileRef, System.Windows.Forms">
131131
<value>..\Resources\NodeDBs\entity_parameter_names.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133+
<data name="sound_names" type="System.Resources.ResXFileRef, System.Windows.Forms">
134+
<value>..\Resources\sound_names.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135+
</data>
133136
</root>
2.6 MB
Binary file not shown.

CathodeLib/Scripts/AssetPAKs/AssetPAK.cs

Lines changed: 0 additions & 58 deletions
This file was deleted.

CathodeLib/Scripts/AssetPAKs/Handlers/MaterialMapping.cs

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)