Merge remote-tracking branch 'upstream/master' into unit-stats · 490beb242a - Mindustry - Gitea: Git with a cup of tea

Astronand/Mindustry

Merge remote-tracking branch 'upstream/master' into unit-stats

This commit is contained in:

Leonwang4234

2020-11-08 15:21:27 -08:00

parent 82348d4fff 58c3af4291

commit 490beb242a

86 changed files with 260 additions and 210 deletions

core/assets/contributors

+4

View File

@@ -96,3 +96,7 @@ YellOw139
 PetrGasparik
 LeoDog896
 Summet
 jalastram (freesound.org)
 newlocknew (freesound.org)
 dsmolenaers (freesound.org)
 Headphaze (freesound.org)

core/assets/maps/fungalPass.msav

BIN

View File

Binary file not shown.

core/assets/sounds/artillery.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/bang.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/boom.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/combustion.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/cutter.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/drill.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/empty.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/grinding.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/hum.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/laserblast.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/lasercharge.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/lasercharge2.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/lasershoot.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/mud.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/pew.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/pew_.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/pulse.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/railgun.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/rain.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/sap.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/shield.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/shootSnap.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/smelter.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/splash.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/spray.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/steam.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/swish.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/techloop.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/tractorbeam.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/wind.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/wind2.ogg

BIN

View File

Binary file not shown.

core/assets/sounds/windhowl.ogg

BIN

View File

Binary file not shown.

core/assets/sprites/block_colors.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 826 B

After

Width: | Height: | Size: 825 B

core/assets/sprites/fallback/sprites5.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 190 KiB

After

Width: | Height: | Size: 184 KiB

core/assets/sprites/sprites2.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 191 KiB

After

Width: | Height: | Size: 185 KiB