images.

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

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
+wizard/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
@@ -116,14 +123,7 @@ inside-house/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-outsidehouse/dot
+inside-jail/dot
-  rotate: false
-  xy: 729, 621
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-wizard/dot
   rotate: false
   xy: 729, 621
   size: 1, 1

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])