 Patrick 'Quezler' Mounier
|
6b091b4d31
|
Make craters affected by overdrive projectors
|
2019-12-29 20:31:11 +01:00 |
|
|
Patrick 'Quezler' Mounier
|
326f75cbda
|
Merge branch 'master' into crater
|
2019-12-29 19:09:27 +01:00 |
|
 Anuken
|
730d30ef98
|
Added core schematic selection setting
|
2019-12-29 11:40:52 -05:00 |
|
|
Anuken
|
c250b1d24a
|
Fixes
|
2019-12-28 11:16:35 -05:00 |
|
|
Patrick 'Quezler' Mounier
|
5d62b1b318
|
Merge branch 'master' into crater
|
2019-12-28 09:39:21 +01:00 |
|
|
Patrick 'Quezler' Mounier
|
e0cfbc7609
|
All hail the cuteness of this crater roomba critter
|
2019-12-27 20:45:27 +01: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
|
c0c0ffa682
|
Bugfixes
|
2019-12-27 01:22:50 -05:00 |
|
|
Anuken
|
de5979f4ee
|
Many various internal changes
|
2019-12-26 17:46:01 -05:00 |
|
|
Anuken
|
8ac0949ddf
|
Added default liquid turret liquid display
|
2019-12-25 14:38:43 -05:00 |
|
|
Anuken
|
c307fc02cf
|
Full merge
|
2019-12-25 13:34:27 -05:00 |
|
|
Anuken
|
c681cc5cf8
|
Compile fixes
|
2019-12-25 13:25:44 -05:00 |
|
|
Anuken
|
1e7c83f0c9
|
Partial merge
|
2019-12-25 13:22:36 -05:00 |
|
|
Anuken
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|