From 53b17f0d175ec06bc61e1ca59d17205ab875ac1c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 29 Dec 2015 18:15:36 -0800 Subject: [PATCH] new fight incorporated. --- desktop/asset-work/inside-castle/big-tick.psd | Bin 582137 -> 617439 bytes desktop/resources/packed/pack.atlas | 3670 +++++++++-------- desktop/resources/packed/pack.png | Bin 231845 -> 220834 bytes desktop/resources/packed/pack2.png | Bin 244769 -> 223458 bytes desktop/resources/packed/pack3.png | Bin 227527 -> 192326 bytes desktop/resources/packed/pack4.png | Bin 103315 -> 71902 bytes desktop/resources/packed/pack5.png | Bin 107079 -> 176040 bytes desktop/resources/packed/pack6.png | Bin 270367 -> 252684 bytes desktop/resources/packed/pack7.png | Bin 79071 -> 101461 bytes desktop/resources/packed/pack8.png | Bin 186374 -> 198532 bytes .../advent/screens/rooms/inside_cafeteria.clj | 26 +- 11 files changed, 1898 insertions(+), 1798 deletions(-) diff --git a/desktop/asset-work/inside-castle/big-tick.psd b/desktop/asset-work/inside-castle/big-tick.psd index 7e95b163cbbe3853da6db1cd3559ad96c73b9a0b..4d932d03cc9e73fe9f56f4f0bc33553f892d8b3b 100644 GIT binary patch delta 115624 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