This commit is contained in:
Bryce Covert
2015-09-25 20:06:42 -07:00
parent 260d411336
commit 74999606dc
12 changed files with 17 additions and 18 deletions

View File

@@ -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

View File

@@ -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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

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