Merge branch 'master' into nalc-1.2

Browse Source

...

This commit is contained in:

Sys Quatre

2019-05-10 00:36:23 +02:00

parent 70dbd3519e 2f34184047

commit e181d37bca

24 changed files with 335 additions and 211 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

textures/maptools_copper_coin.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 213 B

BIN

textures/maptools_gold_coin.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 213 B

BIN

textures/maptools_silver_coin.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 213 B

BIN

textures/maptools_smoke.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 303 B After Width:  |  Height:  |  Size: 296 B

BIN

textures/maptools_superapple.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 231 B After Width:  |  Height:  |  Size: 230 B