Commit Graph
591 Commits
Author SHA1 Message Date
Anuken b1df52e0c8 Added self-destruct bullet property 2020-01-19 10:43:38 -05:00
Anuken b2f9b2ef77 Planet cleanup 2020-01-18 17:03:03 -05:00
Anuken f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken f7c4ea3e58 Weapon mount cleanup 2020-01-16 10:52:20 -05:00
Anuken eaa86023f9 Visual tweaks 2020-01-14 17:07:39 -05:00
Anuken bbf87df373 a revelation 2020-01-11 23:41:12 -05:00
Anuken 35835cacd3 Fixed #1355 2020-01-11 12:47:54 -05:00
Anuken 6f3c771d73 Refactoring 2020-01-10 17:28:37 -05:00
Anuken e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
2020-01-10 15:19:07 -05:00
Anuken b123b8b074 Removed Mech/UnitType 2020-01-10 15:08:13 -05:00
Anuken f7791a2bb2 Merge; internal changes 2020-01-10 11:30:42 -05:00
Patrick 'Quezler' Mounier ed765ad10a Merge branch 'master' into crater
# 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
2020-01-10 12:02:07 +01:00
Anuken 50355b45d5 Tech tree balance 2020-01-08 23:28:25 -05:00
Anuken 8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken 3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Patrick 'Quezler' Mounier 2948738e33 Refractor away overhead 2020-01-05 10:28:43 +01:00
Patrick 'Quezler' Mounier d843f29e09 Make crater speed configurable 2020-01-03 12:19:33 +01:00
Patrick 'Quezler' Mounier e289f13d27 - newline 2020-01-02 21:40:04 +01:00
Patrick 'Quezler' Mounier 0ae6527584 Sacrifice hivemind to convert craters to drawings
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.

Forgive me future ai overlord <3
2020-01-02 21:29:19 +01:00
Patrick 'Quezler' Mounier 7f434fb625 ❤️
https://youtu.be/gzkItR1jkKY?t=105
2020-01-01 20:55:20 +01:00
Patrick 'Quezler' Mounier c3186b63ce Rename compression to plastanium
Breaking change.
2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier 8cd03c8a06 Add techtree entry 2020-01-01 13:34:08 +01:00
Patrick 'Quezler' Mounier 830f67e001 Merge branch 'master' into crater 2019-12-31 17:31:09 +01:00
Anuken 51bd74fcc1 Build time increase of basic blocks 2019-12-30 12:55:35 -05:00
Anuken f2e1d17ce9 Made junction harder to spam 2019-12-30 12:49:27 -05:00
Patrick 'Quezler' Mounier 296f195a7e Unload only in facing direction 2019-12-30 14:24:09 +01:00
Patrick 'Quezler' Mounier 971b1542ba Balance capacity 2019-12-29 20:38:44 +01:00
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