Anuken 48d568978b Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	core/src/mindustry/entities/Damage.java

2021-08-28 14:17:29 -04:00

..

ai

Add unitSpawnEvent (#5876)

2021-08-28 10:53:19 -04:00

async

()

2021-08-10 15:12:58 -04:00

audio

#5742

2021-08-11 16:42:25 -04:00

content

Fixed #5856

2021-08-24 19:14:40 -04:00

core

Implemented #5851 properly

2021-08-24 12:45:28 -04:00

ctype

Make hiding details optional (#5871)

2021-08-26 20:47:35 -04:00

editor

Implemented #5853

2021-08-25 10:09:00 -04:00

entities

Merge remote-tracking branch 'origin/master'

2021-08-28 14:17:29 -04:00

game

Add unitSpawnEvent (#5876)

2021-08-28 10:53:19 -04:00

graphics

Allow empty maps in FileMapGenerator

2021-08-25 21:57:18 -04:00

input

Fixed floorSpeedMultiplier being squared

2021-08-22 15:53:07 -04:00

io

Fixed #5725

2021-08-09 11:41:39 -04:00

logic

Allow logic itemDrop to @air

2021-08-22 11:43:14 -04:00

maps

Allow empty maps in FileMapGenerator

2021-08-25 21:57:18 -04:00

mod

Fixed incorrect work of TextureRegion.found() when creating icons (#5879)

2021-08-27 11:08:04 -04:00

net

Fixed #5878

2021-08-27 09:58:08 -04:00

service

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

type

Added unit decal system for mods/future units

2021-08-19 14:20:18 -04:00

ui

Fixed #5878

2021-08-27 09:58:08 -04:00

world

Merge remote-tracking branch 'origin/master'

2021-08-28 14:17:29 -04:00

ClientLauncher.java

Redundant cast cleanup

2021-08-27 09:31:18 -04:00

Vars.java

Made various fields/methods public

2021-08-17 17:23:02 -04:00