Merge

Browse Source

...

This commit is contained in:

Anuken

2019-03-10 22:51:04 -04:00

parent 51f5d04889 0f4d574115

commit ebd44d3b60

880 changed files with 19481 additions and 12588 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

core/assets-raw/fonts/cyrillic/Exo2-Regular.ttf → core/assets-raw/fonts/Exo2-Regular.ttf

core/assets-raw/fonts/NanumBarunGothic.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/OpenSansEmoji.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/chinese/wqy-microhei.ttc

BIN

Binary file not shown.

core/assets-raw/fonts/font_latin.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/korean/Sunflower-Medium.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/pixel_UNEDITED.ttf

BIN

Binary file not shown.

core/assets-raw/sprites/blocks/distribution/mass-driver-base.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 273 B

core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 405 B

core/assets-raw/sprites/blocks/distribution/mass-driver.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 273 B After Width:  |  Height:  |  Size: 405 B

core/assets-raw/sprites/blocks/distribution/warp-gate-top.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 216 B

core/assets-raw/sprites/blocks/distribution/warp-gate.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 271 B

core/assets-raw/sprites/blocks/drills/blast-drill-rim.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 119 B After Width:  |  Height:  |  Size: 253 B

core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 206 B

core/assets-raw/sprites/blocks/drills/blast-drill-top.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 155 B After Width:  |  Height:  |  Size: 172 B

core/assets-raw/sprites/blocks/drills/blast-drill.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 294 B After Width:  |  Height:  |  Size: 3.3 KiB

core/assets-raw/sprites/blocks/drills/laser-drill-rim.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 B

core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 136 B After Width:  |  Height:  |  Size: 3.2 KiB

core/assets-raw/sprites/blocks/drills/laser-drill-top.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 143 B After Width:  |  Height:  |  Size: 3.0 KiB

core/assets-raw/sprites/blocks/drills/laser-drill.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 170 B After Width:  |  Height:  |  Size: 5.1 KiB

core/assets-raw/sprites/blocks/drills/oil-extractor-top.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 170 B After Width:  |  Height:  |  Size: 3.3 KiB

core/assets-raw/sprites/blocks/drills/oil-extractor.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 268 B After Width:  |  Height:  |  Size: 5.6 KiB

core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 253 B

core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 206 B

core/assets-raw/sprites/blocks/drills/plasma-drill-top.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 172 B

core/assets-raw/sprites/blocks/drills/plasma-drill.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 362 B

core/assets-raw/sprites/blocks/environment/blackrock1.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 128 B

core/assets-raw/sprites/blocks/environment/blackstone1.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 98 B

core/assets-raw/sprites/blocks/environment/blackstone2.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 101 B

core/assets-raw/sprites/blocks/environment/blackstone3.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 102 B

core/assets-raw/sprites/blocks/environment/blackstoneedge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 116 B

core/assets-raw/sprites/blocks/environment/char1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 113 B

core/assets-raw/sprites/blocks/environment/char2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 B

core/assets-raw/sprites/blocks/environment/char3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 115 B

core/assets-raw/sprites/blocks/environment/cliffs1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 130 B

core/assets-raw/sprites/blocks/environment/craters1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/craters2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/craters3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/craters4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 106 B

core/assets-raw/sprites/blocks/environment/craters5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 93 B

core/assets-raw/sprites/blocks/environment/craters6.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 98 B

core/assets-raw/sprites/blocks/environment/deepwater.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 75 B After Width:  |  Height:  |  Size: 113 B

core/assets-raw/sprites/blocks/environment/dirt1.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 103 B

core/assets-raw/sprites/blocks/environment/dirt2.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 94 B

core/assets-raw/sprites/blocks/environment/dirt3.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 101 B

core/assets-raw/sprites/blocks/environment/dirtedge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 116 B

core/assets-raw/sprites/blocks/environment/dunerocks-large.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 189 B

core/assets-raw/sprites/blocks/environment/dunerocks1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 121 B

core/assets-raw/sprites/blocks/environment/dunerocks2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 118 B

core/assets-raw/sprites/blocks/environment/edge-stencil-blocky.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 354 B

core/assets-raw/sprites/blocks/environment/edge-stencil-smooth.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 336 B

core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 100 B

core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 93 B

core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 95 B

core/assets-raw/sprites/blocks/environment/generic-cliff-side.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 96 B

core/assets-raw/sprites/blocks/environment/grass1.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 181 B After Width:  |  Height:  |  Size: 102 B

core/assets-raw/sprites/blocks/environment/grass2.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 169 B After Width:  |  Height:  |  Size: 95 B

core/assets-raw/sprites/blocks/environment/grass3.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 181 B After Width:  |  Height:  |  Size: 99 B

core/assets-raw/sprites/blocks/environment/grassedge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 244 B

core/assets-raw/sprites/blocks/environment/holostone1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 B

core/assets-raw/sprites/blocks/environment/holostone2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 B

core/assets-raw/sprites/blocks/environment/holostone3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 106 B

core/assets-raw/sprites/blocks/environment/hotrock1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/hotrock2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/hotrock3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/ice-edge.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 390 B

core/assets-raw/sprites/blocks/environment/ice-snow1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 132 B

core/assets-raw/sprites/blocks/environment/ice-snow2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 131 B

core/assets-raw/sprites/blocks/environment/ice-snow3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 B

core/assets-raw/sprites/blocks/environment/ice1.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 87 B After Width:  |  Height:  |  Size: 105 B

core/assets-raw/sprites/blocks/environment/ice2.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 95 B After Width:  |  Height:  |  Size: 108 B

core/assets-raw/sprites/blocks/environment/ice3.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 92 B After Width:  |  Height:  |  Size: 109 B

core/assets-raw/sprites/blocks/environment/iceedge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 116 B

core/assets-raw/sprites/blocks/environment/icerock1.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 130 B

core/assets-raw/sprites/blocks/environment/icerock2.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 130 B

core/assets-raw/sprites/blocks/environment/icerocks-large.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 180 B

core/assets-raw/sprites/blocks/environment/icerocks1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 B

core/assets-raw/sprites/blocks/environment/icerocks2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 B

core/assets-raw/sprites/blocks/environment/ignarock1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1005 B

core/assets-raw/sprites/blocks/environment/ignarock2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 999 B

core/assets-raw/sprites/blocks/environment/ignarock3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/lava.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 75 B

core/assets-raw/sprites/blocks/environment/lavaedge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 119 B

core/assets-raw/sprites/blocks/environment/magmarock1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/magmarock2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/magmarock3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1015 B

core/assets-raw/sprites/blocks/environment/metal-floor-5.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-damaged4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1018 B

core/assets-raw/sprites/blocks/environment/metal-floor-damaged5.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor-damaged6.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metal-floor.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/metalfloor1.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 89 B

core/assets-raw/sprites/blocks/environment/metalfloor2.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 93 B

core/assets-raw/sprites/blocks/environment/metalfloor3.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 81 B

core/assets-raw/sprites/blocks/environment/metalfloor4.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 91 B

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