Commit Graph

707 Commits

Author SHA1 Message Date
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
Anuken
a4a3e7fc48 Merge pull request #1514 from Arkanic/patch-7
make batteries glow based on power contents (a redo that works)
2020-02-11 16:31:14 -05:00
Patrick 'Quezler' Mounier
8c7b688f78 Add layered blendbitz 2020-02-06 20:19:00 +01:00
Patrick 'Quezler' Mounier
99d1a2829f Merge branch 'master' into crater 2020-02-06 19:33:57 +01:00
Patrick 'Quezler' Mounier
c0d250560a 🐍 is kil 2020-02-06 19:33:42 +01:00
Patrick 'Quezler' Mounier
e06d8eabec [formatting] add newline to file(s) (#1508)
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
2020-02-05 18:36:56 -05:00
Arkanic
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00
Patrick 'Quezler' Mounier
05ccdfd51b 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-02-05 10:26:34 +01:00
Arkanic
ff06a005a0 become exist 2020-02-05 00:53:15 +00:00
Patrick 'Quezler' Mounier
9bc24ae47a Darken yellow square on nucleus core (#1497)
#1496
2020-02-03 08:51:19 -05: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
6eb6870bb6 Register crater emoji via ui folder
#1458
2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
883a2a9b59 Bruteforce crater emoji 2020-01-27 18:40:40 +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
a4e820f907 Added default ore flags for modded ores 2020-01-23 20:20:04 -05:00
Anuken
b16ad97d93 Updated font 2020-01-23 19:17:11 -05:00
Anuken
26676d60e1 Added underflow gates 2020-01-20 18:54:25 -05:00
Anuken
85cf7e9d5c Added previously-missing icons 2020-01-19 18:45:25 -05:00
Anuken
95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
Anuken
6e6f8f3cdb Icon cleanup 2020-01-17 22:50:27 -05:00
Anuken
ca519a94af Font improvements 2020-01-17 18:29:18 -05:00
Anuken
d9e5dc8ba2 Added missing icons 2020-01-17 15:24:34 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
4f29c80814 Single-texture font+UI packing 2020-01-16 22:25:57 -05:00
Anuken
ce18e32826 Added font icon generate+merge pipeline 2020-01-16 17:05:20 -05:00
Anuken
eaa86023f9 Visual tweaks 2020-01-14 17:07:39 -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
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Patrick 'Quezler' Mounier
5f047603bf Revert "Blend prototype"
This reverts commit 35afc94d34.

# Conflicts:
#	core/assets/sprites/sprites.png
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
f6af699428 Revert "🎩"
This reverts commit 10e4268dd5.

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
2020-01-03 17:26:19 +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
10e4268dd5 🎩
Leaving this here until it gets merged or something :)
2020-01-02 09:02:37 +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
Patrick 'Quezler' Mounier
c279fda5e4 Suggest liquid void sprite
Uses the color of the corner(s) for the inner ring, just like how the item void is colored based on the item source.
2019-12-23 17:24:38 +01:00
ado1928
5e568eac0d Added Feathub to the "About" tab (#1234)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update Links.java
2019-12-19 19:33:24 -05:00
Anuken
3d8e5bd36a Added new Cyrillic font 2019-12-15 21:31:55 -05:00
Anuken
61d724ee2b Added Thai font 2019-12-12 15:54:25 -05:00
TsjipTsjip
2366d25de7 Add liquid void block. 2019-12-12 21:11:14 +01:00