Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater
...
# Conflicts:
# core/assets/icons/icons.properties
# 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/content/Blocks.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/BlockStorage.java
2020-04-16 12:39:52 +02:00
Anuken
a234949b8c
Visual tweaks
2020-04-15 13:03:37 -04:00
Anuken
0573160b2f
Added sorter cross ( #1566 )
2020-03-26 17:39:23 -04:00
Patrick 'Quezler' Mounier
14a97976cc
Realign pixels
...
Bothered me for ages.
2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
e5e4884448
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
# core/src/mindustry/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
Anuken
fb302d49c7
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
Patrick 'Quezler' Mounier
8c7b688f78
Add layered blendbitz
2020-02-06 20:19:00 +01:00
Patrick 'Quezler' Mounier
c0d250560a
🐍 is kil
2020-02-06 19:33:42 +01:00
Patrick 'Quezler' Mounier
0f92f77b55
Draw crater unto plastanium conveyor icon
...
And remove whitespaces from the emoji one.
2020-01-28 10:57:51 +01:00
Patrick 'Quezler' Mounier
58a79d8631
Update to v103
...
# 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/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-24 20:25:03 +01:00
Anuken
26676d60e1
Added underflow gates
2020-01-20 18:54:25 -05:00
Patrick 'Quezler' Mounier
5f047603bf
Revert "Blend prototype"
...
This reverts commit 35afc94d34
2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier
5c485eff04
Ressurect OG corner
2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier
0f2f8f2411
Revert "Stash cursed loading dock"
...
This reverts commit 9bdf475049
2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier
9bdf475049
Stash cursed loading dock
2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier
35afc94d34
Blend prototype
2020-01-08 10:27:06 +01:00
Patrick 'Quezler' Mounier
0b0007502f
Revert "Differentiate texture from armored conveyor"
...
This reverts commit 59451fcc0b
2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b
Differentiate texture from armored conveyor
...
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
2020-01-03 17:09:06 +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
c3186b63ce
Rename compression to plastanium
...
Breaking change.
2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
56351b427b
Revert "Attempt to remove unused regions"
...
This reverts commit 4f5b737f7c
2019-12-30 10:53:50 +01:00
Patrick 'Quezler' Mounier
4f5b737f7c
Attempt to remove unused regions
...
Failed, conveyor code depends to much on it, gonna revert this.
2019-12-30 10:53:45 +01:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter
2019-12-27 20:45:27 +01:00
Patrick 'Quezler' Mounier
f89af1b26a
Override inverted sorter arrow colours ( #1252 )
...
Override hex’s of the arrows by those of the unloader.
2019-12-24 00:32:04 -05:00
Anuken
3d624f7eaf
Added inverted sorter
2019-10-13 12:58:58 -04:00
Anuken
ecd73dcc2c
Various bugfixes / Added new blocks to tech tree
2019-09-24 17:02:34 -04:00
Anuken
b6e97c4261
Added armored conveyors
2019-09-22 15:12:15 -04:00
Anuken
b2a4cb42cf
Sprite updates
2019-06-23 12:36:13 -04:00
Anuken
bc3405d11d
Bugfixes
2019-06-17 15:45:10 -04:00
Anuken
aee800ab7a
Changed turret outlines / Wall block tweaks
2019-06-06 21:18:54 -04:00
Anuken
f0f7b5aaf7
Updated sprites
2019-06-05 21:29:34 -04:00
Anuken
39acb224d1
Merged replacement sprites. Scaling is now disabled by default.
2019-06-04 22:54:01 -04:00
Anuken
563e015c92
Fixed power bug
2019-03-09 09:51:12 -05:00
Anuken
66c27fab13
Bugfixes
2019-02-08 08:44:20 -05:00
Anuken
a8c645f00d
Weapon refactor / New units with edgy names / Spritesheet cleanup
2019-02-03 21:11:26 -05:00
Anuken
b63c02cb10
New UI palette
2018-11-04 19:42:18 -05:00
Anuken
94b6c133f4
Various resprites
2018-10-14 18:39:24 -04:00
Anuken
d90d88c68b
Menu shader / Sprite fixes
2018-09-01 20:16:49 -04:00
Anuken
dcc061af3e
New seed-based AI bases
2018-09-01 14:44:06 -04:00
Anuken
258ab87f6b
Palette swap / Blocks changed and renamed
2018-08-20 21:04:03 -04:00
Anuken
020c6388c2
Block renaming
2018-08-16 18:38:04 -04:00
Anuken
5206079e23
Implemented sandbox mode
2018-08-01 20:13:57 -04:00
Anuken
fe9b11e771
Fully implemented mass driver
2018-07-30 17:00:18 -04:00
Anuken
d552f37daf
Added conveyor autotiling / Fixed autotile update bug
2018-07-15 22:33:14 -04:00
Anuken
92a968217c
Fixed power being set to NaN / Set splitter sprite to router
2018-07-15 11:50:06 -04:00
Anuken
a0e94577fc
Fixed infinite red square, glitchy shadows
2018-07-08 17:04:32 -04:00
Anuken
cc5910f997
Added massive amount of partially-unfinished content to recipe menu
2018-06-30 20:59:05 -04:00
Anuken
5ec495987e
Un-broke editor block icons
2018-06-28 13:25:29 -04:00
Anuken
13bb78ffa0
Added new conveyor animation
2018-06-21 12:41:33 -04:00
Anuken
e1cdf80b17
Changed teleporter name, fixed some bugs
2018-06-16 21:55:38 -04:00
