TorqueGameEngines · greenfire27 · Aug 17, 2026 · Aug 8, 2026 · Aug 8, 2026 · Aug 8, 2026
diff --git a/.gitignore b/.gitignore
@@ -103,13 +103,22 @@ engine/compilers/android-studio/app/.cxx/
 # tests build to have something to edit. A test that adds a project folder wants
 # a line here too; ProjectManager.setProjectFolder names them.
 /shots/
+# One console log per test, written by tests/run.ps1 and run-unit.ps1 so a run
+# neither collides with a hand-started editor nor throws away the log of the
+# suite that failed.
+/tests/logs/
+/assetLibrarySmokeProject/
 /assetPickerSmokeProject/
 /borderPaneSmokeProject/
 /borderSmokeProject/
 /colorPopupShotProject/
 /colorPopupSmokeProject/
+/cursorPaneSmokeProject/
+/cursorSlotsSmokeProject/
 /fontShotProject/
 /fontSmokeProject/
+/inspectorTextSmokeProject/
+/inspectorVariantsSmokeProject/
 /profileFormShotProject/
 /profileFormSmokeProject/
 /smokeThemeProject/

diff --git a/PlanetX/PlanetXGame/gui/images/upgradePlaceholder.image.taml b/PlanetX/PlanetXGame/gui/images/upgradePlaceholder.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgradePlaceholder"
-    ImageFile="upgradePlaceholder.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgradePlaceholder.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_autorepair.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_autorepair.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_autorepair"
-    ImageFile="upgrade_autorepair.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_autorepair.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_damage.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_damage.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_damage"
-    ImageFile="upgrade_damage.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_damage.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_firerate.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_firerate.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_firerate"
-    ImageFile="upgrade_firerate.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_firerate.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_lessheat.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_lessheat.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_lessheat"
-    ImageFile="upgrade_lessheat.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_lessheat.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_maxheat.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_maxheat.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_maxheat"
-    ImageFile="upgrade_maxheat.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_maxheat.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_selfdestruct.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_selfdestruct.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_selfdestruct"
-    ImageFile="upgrade_selfdestruct.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_selfdestruct.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_split.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_split.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_split"
-    ImageFile="upgrade_split.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_split.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_tighten.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_tighten.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_tighten"
-    ImageFile="upgrade_tighten.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_tighten.png" />
diff --git a/PlanetX/PlanetXGame/gui/images/upgrade_ventfast.image.taml b/PlanetX/PlanetXGame/gui/images/upgrade_ventfast.image.taml
@@ -1,3 +1,4 @@
 <ImageAsset
     AssetName="upgrade_ventfast"
-    ImageFile="upgrade_ventfast.png"/>
+    AssetCategory="card"
+    ImageFile="@assetFile=upgrade_ventfast.png" />
diff --git a/PlanetX/PlanetXGame/particles/bugDeath.particle.taml b/PlanetX/PlanetXGame/particles/bugDeath.particle.taml
@@ -1,5 +1,6 @@
 <ParticleAsset
     AssetName="bugDeath"
+    AssetCategory="badguy"
     Lifetime="0.119999997"
     LifeMode="STOP">
     <ParticleAssetEmitter

diff --git a/PlanetX/PlanetXGame/sound/enemyChase.audio.taml b/PlanetX/PlanetXGame/sound/enemyChase.audio.taml
@@ -1,4 +1,6 @@
 <AudioAsset
     AssetName="enemyChase"
-    AudioFile="enemyChase.wav"
+    AssetCategory="badguy"
+    AssetAutoUnload="false"
+    AudioFile="@assetFile=enemyChase.wav"
     VolumeChannel="1" />
diff --git a/PlanetX/PlanetXGame/sound/enemyDeath.audio.taml b/PlanetX/PlanetXGame/sound/enemyDeath.audio.taml
@@ -1,4 +1,6 @@
 <AudioAsset
     AssetName="enemyDeath"
-    AudioFile="enemyDeath.wav"
+    AssetCategory="badguy"
+    AssetAutoUnload="false"
+    AudioFile="@assetFile=enemyDeath.wav"
     VolumeChannel="1" />
diff --git a/PlanetX/PlanetXGame/sprites/alien_brute.animation.taml b/PlanetX/PlanetXGame/sprites/alien_brute.animation.taml
@@ -1,5 +1,6 @@
 <AnimationAsset
     AssetName="bruteWalkAnim"
+    AssetCategory="badguy"
     Image="@asset=PlanetXGame:alienBrute"
-    animationFrames="0 1 2 3"
-    animationTime="0.6" />
+    AnimationFrames="0 1 2 3"
+    animationTime="0.600000024" />
diff --git a/PlanetX/PlanetXGame/sprites/alien_brute.image.taml b/PlanetX/PlanetXGame/sprites/alien_brute.image.taml
@@ -1,8 +1,9 @@
 <ImageAsset
     AssetName="alienBrute"
-    ImageFile="alien_brute.png"
+    AssetCategory="badguy"
+    ImageFile="@assetFile=alien_brute.png"
     FilterMode="NEAREST"
-    CellCountX="2"
-    CellCountY="2"
     CellWidth="64"
-    CellHeight="40" />
+    CellCountX="2"
+    CellHeight="40"
+    CellCountY="2" />
diff --git a/PlanetX/PlanetXGame/sprites/alien_walk.animation.taml b/PlanetX/PlanetXGame/sprites/alien_walk.animation.taml
@@ -1,5 +1,6 @@
 <AnimationAsset
     AssetName="alienWalkAnim"
+    AssetCategory="badguy"
     Image="@asset=PlanetXGame:alienWalk"
-    animationFrames="0 1 2 3"
+    AnimationFrames="0 1 2 3"
     animationTime="0.5" />
diff --git a/PlanetX/PlanetXGame/sprites/alien_walk.image.taml b/PlanetX/PlanetXGame/sprites/alien_walk.image.taml
@@ -1,8 +1,9 @@
 <ImageAsset
     AssetName="alienWalk"
-    ImageFile="alien_walk.png"
+    AssetCategory="badguy"
+    ImageFile="@assetFile=alien_walk.png"
     FilterMode="NEAREST"
-    CellCountX="4"
-    CellCountY="1"
     CellWidth="32"
-    CellHeight="32" />
+    CellCountX="4"
+    CellHeight="32"
+    CellCountY="1" />
diff --git a/PlanetX/PlanetXGame/sprites/spaceman_idle.image.taml b/PlanetX/PlanetXGame/sprites/spaceman_idle.image.taml
@@ -1,4 +1,5 @@
 <ImageAsset
     AssetName="spacemanIdle"
-    ImageFile="spaceman_idle.png"
+    AssetCategory="unit"
+    ImageFile="@assetFile=spaceman_idle.png"
     FilterMode="NEAREST" />
diff --git a/PlanetX/PlanetXGame/sprites/spaceman_idle2.image.taml b/PlanetX/PlanetXGame/sprites/spaceman_idle2.image.taml
@@ -1,4 +1,5 @@
 <ImageAsset
     AssetName="spacemanIdle2"
-    ImageFile="spaceman_idle2.png"
+    AssetCategory="unit"
+    ImageFile="@assetFile=spaceman_idle2.png"
     FilterMode="NEAREST" />
diff --git a/PlanetX/PlanetXGame/sprites/spaceman_walk.animation.taml b/PlanetX/PlanetXGame/sprites/spaceman_walk.animation.taml
@@ -1,5 +1,6 @@
 <AnimationAsset
     AssetName="spacemanWalkAnim"
+    AssetCategory="unit"
     Image="@asset=PlanetXGame:spacemanWalk"
-    animationFrames="0 1 2 3"
-    animationTime="0.4" />
+    AnimationFrames="0 1 2 3"
+    animationTime="0.400000006" />
diff --git a/PlanetX/PlanetXGame/sprites/spaceman_walk.image.taml b/PlanetX/PlanetXGame/sprites/spaceman_walk.image.taml
@@ -1,8 +1,9 @@
 <ImageAsset
     AssetName="spacemanWalk"
-    ImageFile="spaceman_walk.png"
+    AssetCategory="unit"
+    ImageFile="@assetFile=spaceman_walk.png"
     FilterMode="NEAREST"
-    CellCountX="4"
-    CellCountY="1"
     CellWidth="32"
-    CellHeight="32" />
+    CellCountX="4"
+    CellHeight="32"
+    CellCountY="1" />
diff --git a/PlanetX/PlanetXGame/sprites/spaceman_walk2.animation.taml b/PlanetX/PlanetXGame/sprites/spaceman_walk2.animation.taml
@@ -1,5 +1,6 @@
 <AnimationAsset
     AssetName="spacemanWalkAnim2"
+    AssetCategory="unit"
     Image="@asset=PlanetXGame:spacemanWalk2"
-    animationFrames="0 1 2 3"
-    animationTime="0.4" />
+    AnimationFrames="0 1 2 3"
+    animationTime="0.400000006" />
diff --git a/PlanetX/PlanetXGame/sprites/spaceman_walk2.image.taml b/PlanetX/PlanetXGame/sprites/spaceman_walk2.image.taml
@@ -1,8 +1,9 @@
 <ImageAsset
     AssetName="spacemanWalk2"
-    ImageFile="spaceman_walk2.png"
+    AssetCategory="unit"
+    ImageFile="@assetFile=spaceman_walk2.png"
     FilterMode="NEAREST"
-    CellCountX="4"
-    CellCountY="1"
     CellWidth="32"
-    CellHeight="32" />
+    CellCountX="4"
+    CellHeight="32"
+    CellCountY="1" />
diff --git a/cmake/EngineSources.cmake b/cmake/EngineSources.cmake
@@ -202,6 +202,10 @@ set(TORQUE_ENGINE_SOURCES
     ${TORQUE_SRC}/gui/editor/guiEditorCursorCtrl.cc
     ${TORQUE_SRC}/gui/editor/guiDebugger.cc
     ${TORQUE_SRC}/gui/editor/guiEditCtrl.cc
+    ${TORQUE_SRC}/gui/editor/guiEditFramePaletteCtrl.cc
+    ${TORQUE_SRC}/gui/editor/guiEditFrameStripCtrl.cc
+    ${TORQUE_SRC}/gui/editor/guiEditFrameTimelineCtrl.cc
+    ${TORQUE_SRC}/gui/editor/guiEditParticleColorGraph.cc
     ${TORQUE_SRC}/gui/editor/guiEditorExplorerTree.cc
     ${TORQUE_SRC}/gui/editor/guiGraphCtrl.cc
     ${TORQUE_SRC}/gui/editor/guiInspector.cc
@@ -339,13 +343,20 @@ set(TORQUE_ENGINE_SOURCES
     # ---- testing ----
     ${TORQUE_SRC}/testing/unitTesting.cc
     # ---- testing/tests ----
+    ${TORQUE_SRC}/testing/tests/animationFrameConversionTests.cc
+    ${TORQUE_SRC}/testing/tests/assetStateCopyTests.cc
+    ${TORQUE_SRC}/testing/tests/bitmapFontParseTests.cc
     ${TORQUE_SRC}/testing/tests/guiControlReparentTests.cc
     ${TORQUE_SRC}/testing/tests/guiCursorHotSpotTests.cc
+    ${TORQUE_SRC}/testing/tests/guiFrameStripLayoutTests.cc
     ${TORQUE_SRC}/testing/tests/guiHitTestTests.cc
+    ${TORQUE_SRC}/testing/tests/guiParticleColorGraphTests.cc
     ${TORQUE_SRC}/testing/tests/guiProfileThemeTests.cc
     ${TORQUE_SRC}/testing/tests/guiScrollLayoutTests.cc
     ${TORQUE_SRC}/testing/tests/guiTextEditTests.cc
+    ${TORQUE_SRC}/testing/tests/guiTextWrapTests.cc
     ${TORQUE_SRC}/testing/tests/guiTreeRowLayoutTests.cc
+    ${TORQUE_SRC}/testing/tests/imageAssetCellNameTests.cc
     ${TORQUE_SRC}/testing/tests/namespaceLinkTests.cc
     ${TORQUE_SRC}/testing/tests/platformFileIoTests.cc
     ${TORQUE_SRC}/testing/tests/platformMemoryTests.cc