Merge 98d50cffc7 into 73c963e9c4

Browse source

...

This commit is contained in:

Matthew Lowe 2014-10-03 14:56:14 +00:00

parent 73c963e9c4 98d50cffc7

commit 4b94cde360

29 changed files with 7900 additions and 430 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

cockatrice/resources/appicon.icns

View file

Binary file not shown.

BIN

cockatrice/resources/appicon.ico

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 345 KiB After Width:  |  Height:  |  Size: 15 KiB

986

cockatrice/resources/back.svg

View file

File diff suppressed because one or more lines are too long

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

BIN

cockatrice/resources/cockatrice.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 6.1 KiB

884

cockatrice/resources/cockatrice.svg

View file

File diff suppressed because one or more lines are too long

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 43 KiB

4289

cockatrice/resources/hand.svg

View file

File diff suppressed because one or more lines are too long

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 192 KiB

BIN

cockatrice/resources/layout_wip/Untitled.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 46 KiB

BIN

cockatrice/resources/layout_wip/Untitled2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 40 KiB

BIN

cockatrice/resources/layout_wip/Untitled3.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 129 KiB

BIN

cockatrice/resources/layout_wip/Untitled4.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 147 KiB

BIN

cockatrice/resources/layout_wip/Untitled5.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 637 KiB

BIN

cockatrice/resources/layout_wip/logos/cockatrice_new.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 46 KiB

370

cockatrice/resources/layout_wip/logos/cockatrice_new.svg Normal file

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 24 KiB

BIN

cockatrice/resources/layout_wip/logos/cockatrice_new_c.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 35 KiB

546

cockatrice/resources/layout_wip/logos/cockatrice_new_c.svg Normal file

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

cockatrice/resources/layout_wip/logos/cockatrice_new_square.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 26 KiB

396

cockatrice/resources/layout_wip/logos/cockatrice_new_square.svg Normal file

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 25 KiB

BIN

cockatrice/resources/layout_wip/logos/cockatrice_new_square_c.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 14 KiB

538

cockatrice/resources/layout_wip/logos/cockatrice_new_square_c.svg Normal file

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

cockatrice/resources/layout_wip/logos/cockatrice_new_square_white_c.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 27 KiB

291

cockatrice/resources/layout_wip/logos/cockatrice_new_square_white_c.svg Normal file

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 127 KiB

BIN

cockatrice/resources/layout_wip/logos/cockatrice_new_square_white_large_bw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 16 KiB

BIN

cockatrice/resources/layout_wip/new.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 138 KiB

BIN

cockatrice/resources/layout_wip/new2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 381 KiB

BIN

cockatrice/resources/layout_wip/old.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 155 KiB

BIN

cockatrice/resources/layout_wip/old2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 357 KiB