Anuken
|
c0844304a6
|
Merge
|
2020-01-19 11:10:14 -05:00 |
|
Anuken
|
f7c4ea3e58
|
Weapon mount cleanup
|
2020-01-16 10:52:20 -05:00 |
|
Anuken
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05:00 |
|
Anuken
|
71da1f1135
|
Added mod listing data class
|
2020-01-05 00:08:48 -05:00 |
|
Simon Woodburry-Forget
|
439605f6e8
|
use findAll to iterate through mod content (#1313)
|
2020-01-04 00:32:03 -05:00 |
|
Anuken
|
e214a8e7c0
|
Merge remote-tracking branch 'origin/master'
|
2020-01-02 14:10:22 -05:00 |
|
Anuken
|
cb76e80836
|
Bugfixes
|
2020-01-02 14:08:41 -05:00 |
|
KSean222
|
d161ba442f
|
Set primitive wrapping to false for scripts (#1302)
* Set primitive wrapping to false for scripts
* Added one newline cause why not
|
2020-01-02 14:07:38 -05:00 |
|
Anuken
|
ddb0d7eff2
|
Fixed #1304
|
2020-01-01 12:16:23 -05:00 |
|
Anuken
|
566052cabf
|
Fixed #1272
|
2019-12-29 12:24:51 -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
|
c0c0ffa682
|
Bugfixes
|
2019-12-27 01:22:50 -05:00 |
|
Anuken
|
98f8a1732e
|
Renamed Calls -> Call
|
2019-12-26 23:00:26 -05:00 |
|
Anuken
|
6080a7e4bc
|
Possibly fixed tests / Added support for mod icons
|
2019-12-26 20:53:53 -05:00 |
|
Anuken
|
c7ea4e85c9
|
Serialize fixes
|
2019-12-25 12:47:14 -05:00 |
|
Anuken
|
c0f14185a8
|
More fixes
|
2019-12-25 12:35:23 -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 |
|