Commit Graph

98 Commits

Author SHA1 Message Date
Anuken
275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00
Anuken
501a65e9a3 reorganization 2021-11-09 12:57:14 -05:00
Anuken
09a934385e "stuff" 2021-11-06 22:21:46 -04:00
Anuken
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken
ed302d978c sprites 2021-11-05 19:50:47 -04:00
Anuken
52a88e7301 removed unused sprites 2021-11-05 16:41:27 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Voz-Duh
45e1700237 Fix 2020-09-28 21:58:37 +03:00
Voz-Duh
81ceec8d03 Fix 2020-09-28 21:47:42 +03:00
Voz-Duh
aef09a18b7 Fix 2020-09-28 17:38:11 +03:00
Voz-Duh
332365adc6 Fix 2020-09-28 17:36:35 +03:00
Voz-Duh
2c3813c94b Cleaner Sprites 2020-09-28 17:34:05 +03:00
Anuken
b9ff4ba9c5 Bugfixes 2020-08-20 16:21:40 -04:00
Felix Corvus
916a00b6ff textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
Anuken
0555e4dfa7 Various palette changes 2020-07-11 14:44:50 -04:00
Anuken
810a59f146 Mass driver resprite 2020-06-29 16:23:25 -04:00
Anuken
f55fb48ea7 Slightly higher contrast black palette 2020-06-13 12:24:50 -04:00
Anuken
803f9e8eb6 Made save format support removed blocks 2020-06-04 14:50:08 -04:00
Anuken
7f6dcbd75a Cleanup 2020-06-03 01:27:40 -04:00
Anuken
0382d40dcc Payload router 2020-06-03 01:13:44 -04:00
Anuken
1ae9d04f47 Experimental: block loader/unloaders 2020-05-25 14:36:40 -04:00
Patrick 'Quezler' Mounier
a226cd390c
Cleanup stack conveyor code (#1946)
- removes now obsolete adhoc boosteffect listing
- clarrify comments a bit more
- monospace align some code
- retexture to avoid shadow conflict
2020-04-30 15:16:19 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Patrick 'Quezler' Mounier
1acc6461e6
Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier
9864383300
Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier
41eb51a340
Experiment with visible ports 2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier
a05f4338c5
Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
Patrick 'Quezler' Mounier
589d4c92d1
Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier
83511368f6
Stash shadow draft 2020-04-16 17:44:43 +02:00
Patrick 'Quezler' Mounier
a1d4804fae
Merge branch '6.0' into crater
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
2020-04-16 17:13:18 +02:00
Anuken
256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
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.

# 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
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