diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index db6dc1a1..e871ce92 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -14,7 +14,6 @@ IOS + pngcrush breaks colors + renable pickup sound once it's been replaced + update-override slow on IOS -+ branching logic in shader = not a good time AUDIO + Walking diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 9092aa40..0aa494c3 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -81,6 +81,20 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 +outsidehouse/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 dream/dot rotate: false xy: 729, 621 @@ -95,14 +109,7 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot - rotate: false - xy: 729, 621 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -inside-antique/dot +wizard/dot rotate: false xy: 729, 621 size: 1, 1 @@ -116,14 +123,7 @@ inside-house/dot orig: 1, 1 offset: 0, 0 index: -1 -outsidehouse/dot - rotate: false - xy: 729, 621 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -wizard/dot +inside-jail/dot rotate: false xy: 729, 621 size: 1, 1 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 182dd4a8..45874fae 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index b22344ea..1f59ae79 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index cc6ea7c5..58f0fc93 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index a0ada63d..f83de621 100644 Binary files a/desktop/resources/packed/pack4.png and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png index 96315fed..cfd63f97 100644 Binary files a/desktop/resources/packed/pack5.png and b/desktop/resources/packed/pack5.png differ diff --git a/desktop/resources/packed/pack6.png b/desktop/resources/packed/pack6.png index a22e6197..1b12b910 100644 Binary files a/desktop/resources/packed/pack6.png and b/desktop/resources/packed/pack6.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index e71f19e4..1dc9fb4e 100644 Binary files a/desktop/resources/packed/pack7.png and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png index c6a81b77..e023b27b 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/resources/packed/pack9.png b/desktop/resources/packed/pack9.png index a729b1a8..bbdc0952 100644 Binary files a/desktop/resources/packed/pack9.png and b/desktop/resources/packed/pack9.png differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 9324016a..c5b6f915 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1060,7 +1060,7 @@ void main() (set! (. camera zoom) (:zoom (:cam entities))) (set! (.. camera position x) (:x (:cam entities) 160.0)) (set! (.. camera position y) (:y (:cam entities) 120.0))) - (let [entities entities #_(utils/update-override screen entities)] + (let [entities (utils/update-override screen entities)] (when (= (get-in entities [:fade :opacity])