Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

Browse Source

...

This commit is contained in:

Bryce Covert

2015-10-10 21:32:33 -07:00

parent 6c95471e89 48cde82d75

commit 6d7f03d79b

1599 changed files with 11818 additions and 755 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

desktop/resources/Bluezone-Abyss-sound-017.wav → desktop/asset-work/Bluezone-Abyss-sound-017.wav

0

desktop/resources/aoeu.psd → desktop/asset-work/aoeu.psd

0

desktop/resources/behindhouse/Untitled-1.psd → desktop/asset-work/behindhouse/Untitled-1.psd

0

desktop/resources/behindhouse/abc.png → desktop/asset-work/behindhouse/abc.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

0

desktop/resources/behindhouse/backgroudn.psd → desktop/asset-work/behindhouse/backgroudn.psd

0

desktop/resources/behindhouse/background.png → desktop/asset-work/behindhouse/background.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 18 KiB

0

desktop/resources/behindhouse/background.psd → desktop/asset-work/behindhouse/background.psd

0

desktop/resources/behindhouse/brush.png → desktop/asset-work/behindhouse/brush.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

desktop/resources/behindhouse/fg.png → desktop/asset-work/behindhouse/fg.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.9 KiB After Width:  |  Height:  |  Size: 7.9 KiB

0

desktop/resources/behindhouse/fg2.png → desktop/asset-work/behindhouse/fg2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.9 KiB After Width:  |  Height:  |  Size: 7.9 KiB

0

desktop/resources/behindhouse/fgleft.png → desktop/asset-work/behindhouse/fgleft.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 2.0 KiB

0

desktop/resources/behindhouse/house-cover.png → desktop/asset-work/behindhouse/house-cover.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

desktop/resources/behindhouse/house.png → desktop/asset-work/behindhouse/house.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.2 KiB After Width:  |  Height:  |  Size: 8.2 KiB

0

desktop/resources/behindhouse/stick.png → desktop/asset-work/behindhouse/stick.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

desktop/resources/bg.png → desktop/asset-work/bg.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.8 KiB After Width:  |  Height:  |  Size: 9.8 KiB

0

desktop/resources/bg2.png → desktop/asset-work/bg2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.4 KiB After Width:  |  Height:  |  Size: 9.4 KiB

0

desktop/resources/bg2.pxi → desktop/asset-work/bg2.pxi

0

desktop/resources/bg3.png → desktop/asset-work/bg3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 11 KiB

0

desktop/resources/bg3.pxi → desktop/asset-work/bg3.pxi

0

desktop/resources/bg4.png → desktop/asset-work/bg4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.0 KiB After Width:  |  Height:  |  Size: 9.0 KiB

0

desktop/resources/bg4.png.pxi → desktop/asset-work/bg4.png.pxi

0

desktop/resources/bg4.pxi → desktop/asset-work/bg4.pxi

0

desktop/resources/bg5.png → desktop/asset-work/bg5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 28 KiB After Width:  |  Height:  |  Size: 28 KiB

0

desktop/resources/black.png → desktop/asset-work/black.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

desktop/resources/blink-other.wav → desktop/asset-work/blink-other.wav

0

desktop/resources/blink.wav → desktop/asset-work/blink.wav

0

desktop/resources/butterfly.png → desktop/asset-work/butterfly.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

desktop/resources/castle-gate/Untitled.png → desktop/asset-work/castle-gate/Untitled.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

0

desktop/resources/castle-gate/background.png → desktop/asset-work/castle-gate/background.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

desktop/resources/castle-gate/castle-door.psd → desktop/asset-work/castle-gate/castle-door.psd

0

desktop/resources/castle-gate/coinflip.png → desktop/asset-work/castle-gate/coinflip.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

desktop/resources/castle-gate/coinflip.pxa/0.pxi → desktop/asset-work/castle-gate/coinflip.pxa/0.pxi

0

desktop/resources/castle-gate/coinflip.pxa/1.pxi → desktop/asset-work/castle-gate/coinflip.pxa/1.pxi

0

desktop/resources/castle-gate/coinflip.pxa/2.pxi → desktop/asset-work/castle-gate/coinflip.pxa/2.pxi

0

desktop/resources/castle-gate/coinflip.pxa/3.pxi → desktop/asset-work/castle-gate/coinflip.pxa/3.pxi

0

desktop/resources/castle-gate/coinflip.pxa/4.pxi → desktop/asset-work/castle-gate/coinflip.pxa/4.pxi

0

desktop/resources/castle-gate/coinflip.pxa/CelData.plist → desktop/asset-work/castle-gate/coinflip.pxa/CelData.plist

0

desktop/resources/castle-gate/frankie.png → desktop/asset-work/castle-gate/frankie.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

desktop/resources/castle-gate/frankie.psd → desktop/asset-work/castle-gate/frankie.psd

0

desktop/resources/castle-gate/frankie.pxa/0.pxi → desktop/asset-work/castle-gate/frankie.pxa/0.pxi

0

desktop/resources/castle-gate/frankie.pxa/1.pxi → desktop/asset-work/castle-gate/frankie.pxa/1.pxi

0

desktop/resources/castle-gate/frankie.pxa/10.pxi → desktop/asset-work/castle-gate/frankie.pxa/10.pxi

0

desktop/resources/castle-gate/frankie.pxa/11.pxi → desktop/asset-work/castle-gate/frankie.pxa/11.pxi

0

desktop/resources/castle-gate/frankie.pxa/12.pxi → desktop/asset-work/castle-gate/frankie.pxa/12.pxi

0

desktop/resources/castle-gate/frankie.pxa/2.pxi → desktop/asset-work/castle-gate/frankie.pxa/2.pxi

0

desktop/resources/castle-gate/frankie.pxa/3.pxi → desktop/asset-work/castle-gate/frankie.pxa/3.pxi

0

desktop/resources/castle-gate/frankie.pxa/4.pxi → desktop/asset-work/castle-gate/frankie.pxa/4.pxi

0

desktop/resources/castle-gate/frankie.pxa/5.pxi → desktop/asset-work/castle-gate/frankie.pxa/5.pxi

0

desktop/resources/castle-gate/frankie.pxa/6.pxi → desktop/asset-work/castle-gate/frankie.pxa/6.pxi

0

desktop/resources/castle-gate/frankie.pxa/7.pxi → desktop/asset-work/castle-gate/frankie.pxa/7.pxi

0

desktop/resources/castle-gate/frankie.pxa/8.pxi → desktop/asset-work/castle-gate/frankie.pxa/8.pxi

0

desktop/resources/castle-gate/frankie.pxa/9.pxi → desktop/asset-work/castle-gate/frankie.pxa/9.pxi

0

desktop/resources/castle-gate/frankie.pxa/CelData.plist → desktop/asset-work/castle-gate/frankie.pxa/CelData.plist

0

desktop/resources/castle-gate/goon-1.png → desktop/asset-work/castle-gate/goon-1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

desktop/resources/castle-gate/goon-1.pxa/0.pxi → desktop/asset-work/castle-gate/goon-1.pxa/0.pxi

0

desktop/resources/castle-gate/goon-1.pxa/1.pxi → desktop/asset-work/castle-gate/goon-1.pxa/1.pxi

0

desktop/resources/castle-gate/goon-1.pxa/CelData.plist → desktop/asset-work/castle-gate/goon-1.pxa/CelData.plist

0

desktop/resources/castle-gate/goon-2-flip.png → desktop/asset-work/castle-gate/goon-2-flip.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

desktop/resources/castle-gate/goon-2-flip.pxa/0.pxi → desktop/asset-work/castle-gate/goon-2-flip.pxa/0.pxi

0

desktop/resources/castle-gate/goon-2-flip.pxa/1.pxi → desktop/asset-work/castle-gate/goon-2-flip.pxa/1.pxi

0

desktop/resources/castle-gate/goon-2-flip.pxa/2.pxi → desktop/asset-work/castle-gate/goon-2-flip.pxa/2.pxi

0

desktop/resources/castle-gate/goon-2-flip.pxa/3.pxi → desktop/asset-work/castle-gate/goon-2-flip.pxa/3.pxi

0

desktop/resources/castle-gate/goon-2-flip.pxa/CelData.plist → desktop/asset-work/castle-gate/goon-2-flip.pxa/CelData.plist

0

desktop/resources/castle-gate/goon-2-search.png → desktop/asset-work/castle-gate/goon-2-search.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 2.6 KiB

0

desktop/resources/castle-gate/goon-2-search.pxa/0.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/0.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/1.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/1.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/2.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/2.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/3.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/3.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/4.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/4.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/5.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/5.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/6.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/6.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/7.pxi → desktop/asset-work/castle-gate/goon-2-search.pxa/7.pxi

0

desktop/resources/castle-gate/goon-2-search.pxa/CelData.plist → desktop/asset-work/castle-gate/goon-2-search.pxa/CelData.plist

0

desktop/resources/castle-gate/goon-2-talk.png → desktop/asset-work/castle-gate/goon-2-talk.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi → desktop/asset-work/castle-gate/goon-2-talk.pxa/0.pxi

0

desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi → desktop/asset-work/castle-gate/goon-2-talk.pxa/1.pxi

0

desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist → desktop/asset-work/castle-gate/goon-2-talk.pxa/CelData.plist

0

desktop/resources/castle-gate/goon-2-walk.png → desktop/asset-work/castle-gate/goon-2-walk.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

0

desktop/resources/castle-gate/goon-2-walk.pxa/0.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/0.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/1.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/1.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/2.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/2.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/3.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/3.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/4.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/4.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/5.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/5.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/6.pxi → desktop/asset-work/castle-gate/goon-2-walk.pxa/6.pxi

0

desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist → desktop/asset-work/castle-gate/goon-2-walk.pxa/CelData.plist

0

desktop/resources/castle-gate/goon-2.png → desktop/asset-work/castle-gate/goon-2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

desktop/resources/castle-gate/goon-2.pxa/0.pxi → desktop/asset-work/castle-gate/goon-2.pxa/0.pxi

0

desktop/resources/castle-gate/goon-2.pxa/1.pxi → desktop/asset-work/castle-gate/goon-2.pxa/1.pxi

0

desktop/resources/castle-gate/goon-2.pxa/CelData.plist → desktop/asset-work/castle-gate/goon-2.pxa/CelData.plist

0

desktop/resources/castle-gate/overlay.png → desktop/asset-work/castle-gate/overlay.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.4 KiB After Width:  |  Height:  |  Size: 8.4 KiB

0

desktop/resources/castle-gate/stash-closed.png → desktop/asset-work/castle-gate/stash-closed.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

desktop/asset-work/castle-gate/throw-walkie-8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

Some files were not shown because too many files have changed in this diff Show More