Aetheria/Assets
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Meta Vens d9f85dc639 Merge origin/master into mining: resolve five conflicts by owner, delete the belt-task machine
Mining owns belts, chunks and target picking; scenarios owns admission and run
staging; master owns ships and fire control (rule scenarios-cut.md S4).

- AetheriaStores.CatalogTypes: nine-type union, master's list plus FieldKindData, no Scenario.
- tools/AetherDb/Program.cs: both cases (ship-authoring, field-kinds), one usage string.
- Zone.cs: master's MineAsteroid dropped (mining deleted its inputs); scenarios' SettleBelts and its three calls deleted.
- RunStartTests: the two belt-task tests deleted (they read belt.Transforms and MineAsteroid).
- FireControlCut124Tests: master's strict Exact assertions; mining's CompatibleDrift allowance and its comment dropped.
- GameData/Aetheria.cc: master's pointer 70a7b0a9. This commit lacks the Asteroid field kind in the catalog, so
  TheShippedCatalogHasAPickableFieldKind fails here by design; the next commit rebuilds it.

Builds: this commit builds (verified at the end with commit 2); the catalog pin test fails at this commit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-06 15:29:29 +02:00
..
AddressableAssetsData Add Addressables as a direct dependency and settings, Content group entry 2026-09-18 04:31:28 +02:00
Audio Combat & Visibility & Collisions 2021-02-26 19:01:47 +00:00
Content Ship S2: the game composes and loads mod ships 2026-09-30 06:43:52 +02:00
Editor Restore the stable legacy Unity project 2026-08-10 14:57:50 +01:00
Fonts Action Bar (WIP) 2021-04-18 05:13:20 +01:00
Images Upgrade to Unity 6000.3.24f1 2026-09-11 22:04:28 +02:00
Materials Restore the stable legacy Unity project 2026-08-10 14:57:50 +01:00
Models Shields 2025-01-30 01:58:05 +00:00
Plugins Delete the in-tree cache, JsonKnownTypes and vendored MessagePack 2026-09-14 18:42:09 +02:00
Prefabs A new run replaces the saved run only once it has staged; a failed start says why and leaves the saved run 2026-10-03 22:03:50 +02:00
Resources Cut 2 fix batch: drop dead MiningDifficulty from Settings.asset 2026-09-25 12:50:32 +02:00
Scenes A new run replaces the saved run only once it has staged; a failed start says why and leaves the saved run 2026-10-03 22:03:50 +02:00
Scripts Merge origin/master into mining: resolve five conflicts by owner, delete the belt-task machine 2026-10-06 15:29:29 +02:00
Shaders Shield panel: gate reuse and Hit on the panel's own radius 2026-09-18 21:02:18 +02:00
StreamingAssets Unified Volumetric Flow 2021-06-18 12:32:03 +01:00
TextMesh Pro Bugfixes & Reactive Refactor 2025-07-18 00:21:33 +01:00
Textures Upgrade to Unity 6000.3.24f1 2026-09-11 22:04:28 +02:00
AddressableAssetsData.meta Add Addressables as a direct dependency and settings, Content group entry 2026-09-18 04:31:28 +02:00
Audio.meta Combat & Visibility & Collisions 2021-02-26 19:01:47 +00:00
Content.meta Add Addressables as a direct dependency and settings, Content group entry 2026-09-18 04:31:28 +02:00
Editor.meta Add Epiphany Unity editor bridge 2026-04-30 15:03:15 +01:00
Fonts.meta Menu Prototype 2020-03-23 14:36:59 +00:00
HoverCursorChange.cs Playability 2022-08-08 22:43:55 +01:00
HoverCursorChange.cs.meta Trade Menu Spreadsheet 2021-01-14 03:20:27 +00:00
Images.meta Menu Prototype 2020-03-23 14:36:59 +00:00
MainMenuMusic.cs NEW CLOUDS NEW CLOUDS NEW CLOUDS WHOOO 2022-07-10 02:53:09 +01:00
MainMenuMusic.cs.meta Music & SFX 2021-04-30 11:19:25 +01:00
Materials.meta Old Aetheria Code 2020-03-09 01:28:55 +00:00
Models.meta Initial ARPG Port 2020-11-27 22:47:33 +00:00
MouseRotate.cs Move the remaining Assets scripts off Unity.Mathematics 2026-09-14 18:01:54 +02:00
MouseRotate.cs.meta Playability 2022-08-08 22:43:55 +01:00
Plugins.meta Initial Client/Server Communication 2020-02-26 17:48:40 +00:00
Prefabs.meta Smooth AF Tab Menu 2020-03-24 21:51:38 +00:00
Resources.meta Old Aetheria Code 2020-03-09 01:28:55 +00:00
Scenes.meta Created Unity Project 2020-02-19 15:09:31 +00:00
Scripts.meta Initial Client/Server Communication 2020-02-26 17:48:40 +00:00
Shaders.meta Copy Aetheria Code 2020-02-27 18:51:07 +00:00
Steel.mat Combat & Visibility & Collisions 2021-02-26 19:01:47 +00:00
Steel.mat.meta Combat & Visibility & Collisions 2021-02-26 19:01:47 +00:00
StreamingAssets.meta Initial Wwise Integration 2021-02-27 20:53:36 +00:00
TextMesh Pro.meta Smooth AF Tab Menu 2020-03-24 21:51:38 +00:00
Textures.meta Initial ARPG Port 2020-11-27 22:47:33 +00:00