From a86325af2df9d704bb17cfa09591b53183fa738a Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 4 Sep 2015 23:12:12 -0700 Subject: [PATCH] fixed collision. --- desktop/gametodos.txt | 2 -- desktop/resources/outsidehouse/collision.png | Bin 18464 -> 18861 bytes 2 files changed, 2 deletions(-) diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index f96a2fea..8fe553a3 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -4,7 +4,6 @@ ART + can walk to top corner in house screen + mark the squeaky board a bit + outside castle trees need to be updated -+ gate z-index PROGRAMMING + fight with blergh at end isn't great @@ -17,7 +16,6 @@ PROGRAMMING + try to have dialogue for every wrong interaction + Have to open curtains + grime on portrait -+ impersonate bubba dialogue tree + Dialogue frozen AUDIO diff --git a/desktop/resources/outsidehouse/collision.png b/desktop/resources/outsidehouse/collision.png index bddba6abc0a68d4b34c82bd838b5f74b219ebcaa..0a8b943bd0dc3f864316b0da01c6a19aec2d32a2 100644 GIT binary patch delta 2947 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