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

Browse Source

...

This commit is contained in:

Remington Covert

2015-03-18 15:53:29 -07:00

parent 8f3889c155 5cd6c108d4

commit 137a4e8430

14 changed files with 9 additions and 5 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

BIN

desktop/resources/inside-antique/background.psd

Binary file not shown.

BIN

desktop/resources/inside-antique/glow.png Normal file

Binary file not shown.

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

BIN

desktop/resources/inside-cafeteria/background.psd

Binary file not shown.

BIN

desktop/resources/inside-cafeteria/glow.png Normal file

Binary file not shown.

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

BIN

desktop/resources/inside-house/background.psd

Binary file not shown.

BIN

desktop/resources/inside-house/desk.png

Binary file not shown.

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

BIN

desktop/resources/inside-jail/background.png

Binary file not shown.

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

BIN

desktop/resources/inside-jail/fg.png Normal file

Binary file not shown.

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

BIN

desktop/resources/inside-jail/glow.png

Binary file not shown.

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