New data pack system

2018-03-08 20:16:05 +01:00 · 2018-03-08 20:16:05 +01:00 · b24dd86a66
parent 49c7c35342
commit b24dd86a66
271 changed files with 2559 additions and 730 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,7 +2,7 @@
 coverage
 /node_modules
 /out/vendor
-/out/assets/atlas*
+/out/assets
 /out/build.*
 /graphics/**/*.blend?*
 /typings/
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -1,25 +0,0 @@
-{
-    "version": "0.1.0",
-    "command": ".venv/node/bin/npm",
-    "isShellCommand": true,
-    "args": [
-        "run",
-        "--silent"
-    ],
-    "tasks": [
-        {
-            "taskName": "build",
-            "isBuildCommand": true,
-            "isTestCommand": false,
-            "showOutput": "never",
-            "problemMatcher": "$tsc"
-        },
-        {
-            "taskName": "test",
-            "isBuildCommand": false,
-            "isTestCommand": true,
-            "showOutput": "always",
-            "problemMatcher": "$tsc"
-        }
-    ]
-}
--- a/TODO.md
+++ b/TODO.md
@ -94,7 +94,8 @@ Common UI
 Technical
 ---------

-* Pack all images in atlases, and split them by stage
+* Remove testing code from optimized build
+* Fix alpha being altered in atlases
 * Pack sounds
 * Add toggles for shaders, automatically disable them if too slow, and initially disable them on mobile

--- a/data/stage1/image/common/arrow-down.png
+++ b/data/stage1/image/common/arrow-down.png
--- a/data/stage1/image/common/arrow-left.png
+++ b/data/stage1/image/common/arrow-left.png
--- a/data/stage1/image/common/arrow-right.png
+++ b/data/stage1/image/common/arrow-right.png
--- a/data/stage1/image/common/arrow-up.png
+++ b/data/stage1/image/common/arrow-up.png
--- a/data/stage1/image/common/arrow.png
+++ b/data/stage1/image/common/arrow.png
--- a/data/stage1/image/common/button-cancel.png
+++ b/data/stage1/image/common/button-cancel.png
--- a/data/stage1/image/common/button-ok.png
+++ b/data/stage1/image/common/button-ok.png
--- a/data/stage1/image/common/debug.png
+++ b/data/stage1/image/common/debug.png
--- a/data/stage1/image/common/dialog-close-hover.png
+++ b/data/stage1/image/common/dialog-close-hover.png
--- a/data/stage1/image/common/dialog-close.png
+++ b/data/stage1/image/common/dialog-close.png
--- a/data/stage1/image/common/dialog-textbutton-hover.png
+++ b/data/stage1/image/common/dialog-textbutton-hover.png
--- a/data/stage1/image/common/dialog-textbutton.png
+++ b/data/stage1/image/common/dialog-textbutton.png
--- a/data/stage1/image/common/dialog.png
+++ b/data/stage1/image/common/dialog.png
--- a/data/stage1/image/common/transparent.png
+++ b/data/stage1/image/common/transparent.png
--- a/data/stage1/image/menu/button-hover.png
+++ b/data/stage1/image/menu/button-hover.png
--- a/data/stage1/image/menu/button.png
+++ b/data/stage1/image/menu/button.png
--- a/data/stage1/image/menu/load-bg.png
+++ b/data/stage1/image/menu/load-bg.png
--- a/data/stage1/image/menu/title.png
+++ b/data/stage1/image/menu/title.png
--- a/data/stage1/image/options/background.png
+++ b/data/stage1/image/options/background.png
--- a/data/stage1/image/options/button-hover.png
+++ b/data/stage1/image/options/button-hover.png
--- a/data/stage1/image/options/button.png
+++ b/data/stage1/image/options/button.png
--- a/data/stage1/image/options/option-fullscreen.png
+++ b/data/stage1/image/options/option-fullscreen.png
--- a/data/stage1/image/options/option-music.png
+++ b/data/stage1/image/options/option-music.png
--- a/data/stage1/image/options/option-sound.png
+++ b/data/stage1/image/options/option-sound.png
--- a/data/stage1/image/options/toggle-hover.png
+++ b/data/stage1/image/options/toggle-hover.png
--- a/data/stage1/image/options/toggle-on.png
+++ b/data/stage1/image/options/toggle-on.png
--- a/data/stage1/image/options/toggle.png
+++ b/data/stage1/image/options/toggle.png
--- a/data/stage1/image/translucent.png
+++ b/data/stage1/image/translucent.png
--- a/data/stage1/sound/music/supernatural.mp3
+++ b/data/stage1/sound/music/supernatural.mp3
--- a/data/stage1/sound/ui/button-click.wav
+++ b/data/stage1/sound/ui/button-click.wav
--- a/data/stage1/sound/ui/button-down.wav
+++ b/data/stage1/sound/ui/button-down.wav
--- a/data/stage1/sound/ui/button-up.wav
+++ b/data/stage1/sound/ui/button-up.wav
--- a/data/stage1/sound/ui/dialog-close.wav
+++ b/data/stage1/sound/ui/dialog-close.wav
--- a/data/stage1/sound/ui/dialog-open.wav
+++ b/data/stage1/sound/ui/dialog-open.wav
--- a/data/stage2/image/action/damageprotector.png
+++ b/data/stage2/image/action/damageprotector.png
--- a/data/stage2/image/action/endturn.png
+++ b/data/stage2/image/action/endturn.png
--- a/data/stage2/image/action/forcefield.png
+++ b/data/stage2/image/action/forcefield.png
--- a/data/stage2/image/action/fractalhull.png
+++ b/data/stage2/image/action/fractalhull.png
--- a/data/stage2/image/action/gatlinggun.png
+++ b/data/stage2/image/action/gatlinggun.png
--- a/data/stage2/image/action/gravitshield.png
+++ b/data/stage2/image/action/gravitshield.png
--- a/data/stage2/image/action/hardcoatedhull.png
+++ b/data/stage2/image/action/hardcoatedhull.png
--- a/data/stage2/image/action/invertershield.png
+++ b/data/stage2/image/action/invertershield.png
--- a/data/stage2/image/action/ionthruster.png
+++ b/data/stage2/image/action/ionthruster.png
--- a/data/stage2/image/action/ironhull.png
+++ b/data/stage2/image/action/ironhull.png
--- a/data/stage2/image/action/kelvingenerator.png
+++ b/data/stage2/image/action/kelvingenerator.png
--- a/data/stage2/image/action/move.png
+++ b/data/stage2/image/action/move.png
--- a/data/stage2/image/action/nuclearreactor.png
+++ b/data/stage2/image/action/nuclearreactor.png
--- a/data/stage2/image/action/powerdepleter.png
+++ b/data/stage2/image/action/powerdepleter.png
--- a/data/stage2/image/action/precisionboost.png
+++ b/data/stage2/image/action/precisionboost.png
--- a/data/stage2/image/action/prokhorovlaser.png
+++ b/data/stage2/image/action/prokhorovlaser.png
--- a/data/stage2/image/action/repairdrone.png
+++ b/data/stage2/image/action/repairdrone.png
--- a/data/stage2/image/action/rocketengine.png
+++ b/data/stage2/image/action/rocketengine.png
--- a/data/stage2/image/action/shieldtransfer.png
+++ b/data/stage2/image/action/shieldtransfer.png
--- a/data/stage2/image/action/submunitionmissile.png
+++ b/data/stage2/image/action/submunitionmissile.png
--- a/data/stage2/image/action/voidhawkengine.png
+++ b/data/stage2/image/action/voidhawkengine.png
--- a/data/stage2/image/attribute/hull_capacity.png
+++ b/data/stage2/image/attribute/hull_capacity.png
--- a/data/stage2/image/attribute/maneuvrability.png
+++ b/data/stage2/image/attribute/maneuvrability.png
--- a/data/stage2/image/attribute/power_capacity.png
+++ b/data/stage2/image/attribute/power_capacity.png
--- a/data/stage2/image/attribute/precision.png
+++ b/data/stage2/image/attribute/precision.png
--- a/data/stage2/image/attribute/shield_capacity.png
+++ b/data/stage2/image/attribute/shield_capacity.png
--- a/data/stage2/image/battle/actionbar/actions-background.png
+++ b/data/stage2/image/battle/actionbar/actions-background.png
--- a/data/stage2/image/battle/actionbar/background.png
+++ b/data/stage2/image/battle/actionbar/background.png
--- a/data/stage2/image/battle/actionbar/bottom-disabled.png
+++ b/data/stage2/image/battle/actionbar/bottom-disabled.png
--- a/data/stage2/image/battle/actionbar/bottom-enabled.png
+++ b/data/stage2/image/battle/actionbar/bottom-enabled.png
--- a/data/stage2/image/battle/actionbar/bottom-targetting.png
+++ b/data/stage2/image/battle/actionbar/bottom-targetting.png
--- a/data/stage2/image/battle/actionbar/bottom-toggled.png
+++ b/data/stage2/image/battle/actionbar/bottom-toggled.png
--- a/data/stage2/image/battle/actionbar/button-menu-hover.png
+++ b/data/stage2/image/battle/actionbar/button-menu-hover.png
--- a/data/stage2/image/battle/actionbar/button-menu.png
+++ b/data/stage2/image/battle/actionbar/button-menu.png
--- a/data/stage2/image/battle/actionbar/consumption-disabled.png
+++ b/data/stage2/image/battle/actionbar/consumption-disabled.png
--- a/data/stage2/image/battle/actionbar/consumption-enabled.png
+++ b/data/stage2/image/battle/actionbar/consumption-enabled.png
--- a/data/stage2/image/battle/actionbar/consumption-targetting.png
+++ b/data/stage2/image/battle/actionbar/consumption-targetting.png
--- a/data/stage2/image/battle/actionbar/consumption-toggled.png
+++ b/data/stage2/image/battle/actionbar/consumption-toggled.png
--- a/data/stage2/image/battle/actionbar/cooldown-front.png
+++ b/data/stage2/image/battle/actionbar/cooldown-front.png
--- a/data/stage2/image/battle/actionbar/cooldown-one.png
+++ b/data/stage2/image/battle/actionbar/cooldown-one.png
--- a/data/stage2/image/battle/actionbar/frame-disabled.png
+++ b/data/stage2/image/battle/actionbar/frame-disabled.png
--- a/data/stage2/image/battle/actionbar/frame-enabled.png
+++ b/data/stage2/image/battle/actionbar/frame-enabled.png
--- a/data/stage2/image/battle/actionbar/frame-fading.png
+++ b/data/stage2/image/battle/actionbar/frame-fading.png
--- a/data/stage2/image/battle/actionbar/hotkey.png
+++ b/data/stage2/image/battle/actionbar/hotkey.png
--- a/data/stage2/image/battle/actionbar/power-available.png
+++ b/data/stage2/image/battle/actionbar/power-available.png
--- a/data/stage2/image/battle/actionbar/power-background.png
+++ b/data/stage2/image/battle/actionbar/power-background.png
--- a/data/stage2/image/battle/actionbar/power-fire.png
+++ b/data/stage2/image/battle/actionbar/power-fire.png
--- a/data/stage2/image/battle/actionbar/power-generated.png
+++ b/data/stage2/image/battle/actionbar/power-generated.png
--- a/data/stage2/image/battle/actionbar/power-move.png
+++ b/data/stage2/image/battle/actionbar/power-move.png
--- a/data/stage2/image/battle/actionbar/power-used.png
+++ b/data/stage2/image/battle/actionbar/power-used.png
--- a/data/stage2/image/battle/actionbar/ship.png
+++ b/data/stage2/image/battle/actionbar/ship.png
--- a/data/stage2/image/battle/actionbar/sticky-disabled.png
+++ b/data/stage2/image/battle/actionbar/sticky-disabled.png
--- a/data/stage2/image/battle/actionbar/sticky-overheat.png
+++ b/data/stage2/image/battle/actionbar/sticky-overheat.png
--- a/data/stage2/image/battle/actionbar/sticky-toggled.png
+++ b/data/stage2/image/battle/actionbar/sticky-toggled.png
--- a/data/stage2/image/battle/actionbar/sticky-untoggled.png
+++ b/data/stage2/image/battle/actionbar/sticky-untoggled.png
--- a/data/stage2/image/battle/arena/background.png
+++ b/data/stage2/image/battle/arena/background.png
--- a/data/stage2/image/battle/background.jpg
+++ b/data/stage2/image/battle/background.jpg
--- a/data/stage2/image/battle/effects/blast.png
+++ b/data/stage2/image/battle/effects/blast.png
--- a/data/stage2/image/battle/effects/bullets.png
+++ b/data/stage2/image/battle/effects/bullets.png
--- a/data/stage2/image/battle/effects/default.png
+++ b/data/stage2/image/battle/effects/default.png
--- a/data/stage2/image/battle/effects/hot.png
+++ b/data/stage2/image/battle/effects/hot.png
--- a/data/stage2/image/battle/effects/laser.png
+++ b/data/stage2/image/battle/effects/laser.png
--- a/data/stage2/image/battle/effects/shield-impact.png
+++ b/data/stage2/image/battle/effects/shield-impact.png
--- a/Show More
+++ b/Show More