Merge fire control (codex/fire-control-12) into master
Fire-control batches 1-8 with Soul passes, verified headless (Aetheria Shared tests). Play smoke 2026-09-30: compile clean, steps 3-6 played (pass/partial), steps 7-20 and fire-control checks A-F unplayed. The operator preferred to merge now; Self ruled merge, with the unplayed checks carried as open behaviours to verify through authored main-menu scenarios (new Eureka cut). Report: docs/merge-to-master-checklist.md section 8. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
dcd7bbc5f6
802 changed files with 37427 additions and 1749 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -100,6 +100,7 @@ Vault/Aetheria/.obsidian/plugins/copilot/data.json
|
|||
# come back.
|
||||
.scratch-*
|
||||
scratch-*
|
||||
tests/_scratch_*
|
||||
.codex/
|
||||
.codex-tmp/
|
||||
.evepkg/
|
||||
|
|
@ -108,3 +109,6 @@ scratch-*
|
|||
.nuget-sandbox/
|
||||
.dotnet-sandbox/
|
||||
.appdata-sandbox/
|
||||
|
||||
# Stryker.NET mutation reports (regenerated per run)
|
||||
StrykerOutput/
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -24,7 +24,7 @@
|
|||
<Compile Include="$(Assets)Plugins\Ink\**\*.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(CultLibRoot)\packages\cultmath\src\CultMath\CultMath.csproj" />
|
||||
<ProjectReference Include="$(CultMathRoot)\packages\cultmath\src\CultMath\CultMath.csproj" />
|
||||
<ProjectReference Include="$(CultLibRoot)\src\GameCult.Caching\GameCult.Caching.csproj" />
|
||||
<ProjectReference Include="$(CultLibRoot)\src\GameCult.Caching.MessagePack\GameCult.Caching.MessagePack.csproj" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
|
|
|
|||
8
Assets/AddressableAssetsData.meta
Normal file
8
Assets/AddressableAssetsData.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: afcac10c400670e449f5fc5036bc8f33
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/AddressableAssetSettings.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/AddressableAssetSettings.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 50ac72e1e2474804287a2d4f1693f9b8
|
||||
guid: 9afa7f178037c2542b634eefddca5a76
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
8
Assets/AddressableAssetsData/AssetGroupTemplates.meta
Normal file
8
Assets/AddressableAssetsData/AssetGroupTemplates.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2634fb27aecdd0848b0d29dcb1c046eb
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8e73e89daf00b8447b2410427953df25
|
||||
guid: 28a572c267988bc4dbf1f42e4e5904df
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
8
Assets/AddressableAssetsData/AssetGroups.meta
Normal file
8
Assets/AddressableAssetsData/AssetGroups.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 82bd9e776cbf4834f88206161b46a8ae
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 70345ecc9f78fcb47b1f6f5afed2681a
|
||||
guid: 7633ca2c7c5d68748b1143acbc5d3055
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
8
Assets/AddressableAssetsData/AssetGroups/Schemas.meta
Normal file
8
Assets/AddressableAssetsData/AssetGroups/Schemas.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 76d1075a6428daf46ae7e6c4435679eb
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8525ebaeff3478247bbeb4d8eb71ef35
|
||||
guid: e100c3f53063351499abbf5ce47e9352
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
BIN
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 21b66eceac2d0e3458024bf6683bb82a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/AddressableAssetsData/DataBuilders.meta
Normal file
8
Assets/AddressableAssetsData/DataBuilders.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 45fe9f1406ef90144ba81be38ff309a5
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a411416dac5dbce4b998447a1d0d6425
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 49b1641b1c4ec2049871e35911caab38
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cad6f30924c70ae44832566c0439562d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/AddressableAssetsData/DefaultObject.asset
(Stored with Git LFS)
Normal file
BIN
Assets/AddressableAssetsData/DefaultObject.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
8
Assets/AddressableAssetsData/DefaultObject.asset.meta
Normal file
8
Assets/AddressableAssetsData/DefaultObject.asset.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fcb9b650d8f542f4cb0bb445384274c8
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Content.meta
Normal file
8
Assets/Content.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 20272a470f27e964d9c77b7b0300226e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue