Skip to content

Commit 04a76be

Browse files
authored
Merge pull request #689 from HolterPhylo/UpdateFor22075928
Update for 22075928
2 parents 79a3622 + 83fc94e commit 04a76be

4 files changed

Lines changed: 15 additions & 3 deletions

File tree

Tools/auto_extract/extractor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"cCollisionShapeType"
132132
]
133133
# Classes that don't look like globals but actually are.
134-
ACTUALLY_GLOBALS = ['GcSceneOptions', 'GcSmokeTestOptions', 'GcDebugOptions']
134+
ACTUALLY_GLOBALS = ['GcSceneOptions', 'GcSmokeTestOptions', 'GcDebugOptions', 'GcCollisionTable']
135135
NAME_MAPPING = {
136136
'GcDefaulMissionProduct': 'GcDefaultMissionProduct',
137137
'GcDefaulMissionSubstance': 'GcDefaultMissionSubstance',
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using libMBIN.NMS.GameComponents;
2+
using System.Collections.Generic;
3+
4+
namespace libMBIN.NMS.Globals
5+
{
6+
[NMS(GUID = 0x1523805BD7445AE4, NameHash = 0x36E3583)]
7+
public class GcCollisionTable : NMSTemplate
8+
{
9+
[NMS(Index = 0)]
10+
/* 0x0 */ public List<GcPhysicsCollisionGroupCollidesWith> CollisionTable;
11+
}
12+
}

libMBIN/Source/Version.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static class Version {
2525
// the Prerelease version should be reset to 1
2626
// When the Release version is incremented:
2727
// the Prerelease version should be reset to 0
28-
internal const string VERSION_STRING = "6.24.0.1";
28+
internal const string VERSION_STRING = "6.24.0.2";
2929

3030
/// <summary>Shorthand for AssemblyVersion.Major</summary>
3131
public static int Major => AssemblyVersion.Major;

libMBIN/libMBIN-Shared.projitems

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@
315315
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcCloudProperties.cs" />
316316
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcCockpitComponentData.cs" />
317317
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcCollisionCapsule.cs" />
318-
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcCollisionTable.cs" />
319318
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcColourModifier.cs" />
320319
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcColourPaletteData.cs" />
321320
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcColouriseComponentData.cs" />
@@ -2331,6 +2330,7 @@
23312330
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcBuildingGlobals.cs" />
23322331
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcCameraGlobals.cs" />
23332332
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcCharacterGlobals.cs" />
2333+
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcCollisionTable.cs" />
23342334
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcCreatureGlobals.cs" />
23352335
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcDebugEditorGlobals.cs" />
23362336
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\Globals\GcDebugOptions.cs" />

0 commit comments

Comments
 (0)