Commit Graph

128 Commits

Author SHA1 Message Date
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Anuken
dcbfc2b7aa Storage team colors 2020-09-19 12:38:24 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Anuken
6b6783f201 Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587 2020-09-18 11:21:50 -04:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken
48391219fd Packed sprites for cliff removal 2020-09-13 12:18:41 -04:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
0e61d61dd2 Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
Anuken
58c39e14d6 risse -> risso 2020-07-24 13:27:15 -04:00
Anuken
a48efd971c Removed "naval" sector requirement 2020-07-24 10:53:17 -04:00
Anuken
988da3b8e9 Balancing / Bugfixes 2020-07-22 11:03:38 -04:00
Anuken
810a59f146 Mass driver resprite 2020-06-29 16:23:25 -04:00
Anuken
d90807b29c Bugfixes 2020-06-25 12:51:30 -04:00
Anuken
3b3a1dd496 Editor map fix / Crafter renderer system 2020-06-13 10:33:19 -04:00
Anuken
27522ae494 Icon generation improvements 2020-06-12 19:41:06 -04:00
Anuken
ce9f515543 Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
Anuken
732769524c 🔥🔥🔥 2020-06-11 12:03:27 -04:00
Anuken
2b1bd90dfa Out of atlas space / GL30 progress 2020-06-10 12:55:01 -04:00
Anuken
65f63fd4d2 Re-added Tau 2020-05-23 21:53:11 -04:00
Anuken
f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Patrick 'Quezler' Mounier
5fc8901e0b
Fix plastanium conveyor icon generation (#1920) 2020-04-26 11:08:27 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
2020-04-23 21:10:48 +02:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04: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
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
a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
Anuken
85e4270536 New water textures 2020-04-04 00:31:29 -04:00
Anuken
9081f3ff03 Fixed antialiasing 2020-03-30 12:00:08 -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
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05: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
89d143af8f
Undo part of 〃 2020-01-28 11:00:08 +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
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
26676d60e1 Added underflow gates 2020-01-20 18:54:25 -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
35afc94d34
Blend prototype 2020-01-08 10:27:06 +01:00