Anuken
|
77b89d45d6
|
Cleanup / Desktop dead camera panning
|
2019-12-29 00:09:46 -05:00 |
|
Anuken
|
186a2aaa45
|
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/ai/BlockIndexer.java
# core/src/mindustry/core/World.java
# core/src/mindustry/entities/traits/Entity.java
# core/src/mindustry/entities/type/BaseEntity.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/world/blocks/defense/MendProjector.java
# core/src/mindustry/world/blocks/defense/OverdriveProjector.java
# core/src/mindustry/world/blocks/production/Drill.java
# gradle.properties
|
2019-12-27 01:41:06 -05:00 |
|
Anuken
|
d6d6dc29dc
|
More plugin customization / Renamed Rectangle
|
2019-12-26 22:44:15 -05:00 |
|
Anuken
|
c339a0ecdf
|
Merge
|
2019-12-26 20:44:05 -05:00 |
|
Anuken
|
684f3075cb
|
Team#toString()
|
2019-12-26 20:20:12 -05:00 |
|
Anuken
|
954e26fc14
|
Method cleanup
|
2019-12-26 20:08:53 -05:00 |
|
Anuken
|
4858e602ed
|
Fixed compilation
|
2019-12-26 19:40:54 -05:00 |
|
Anuken
|
de5979f4ee
|
Many various internal changes
|
2019-12-26 17:46:01 -05:00 |
|
Anuken
|
2b22b7e7e4
|
Condensed unit group array
|
2019-12-25 22:26:51 -05:00 |
|
Anuken
|
9016c12d16
|
Made team a separate class
|
2019-12-25 19:07:04 -05:00 |
|
Anuken
|
1e7c83f0c9
|
Partial merge
|
2019-12-25 13:22:36 -05:00 |
|
Anuken
|
475794640d
|
More cleanup
|
2019-12-25 11:16:54 -05:00 |
|
Anuken
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|