Commit Graph

571 Commits

Author SHA1 Message Date
Anuken
434a754c9a Better pad animations / Balancing 2020-05-14 23:16:26 -04:00
Anuken
a4987f864f Refactoring / Launch pad tweaks 2020-05-14 22:00:04 -04:00
Anuken
f6d8658ee2 Fixed #2040 / Fixed #2039 / Fixed #2038 / Fixed #2037 / Fixed #2035 2020-05-12 09:34:26 -04:00
Anuken
9cca79adaa Fixed #2032 2020-05-11 13:20:27 -04:00
Anuken
626a06ca00 Bugfixes / Better titan sprite 2020-04-30 18:21:50 -04:00
Anuken
2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -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
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -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
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04: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
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
0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Anuken
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
Anuken
603d8b16d0 Various tweaks 2020-04-12 10:26:18 -04:00
Anuken
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -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
Anuken
60d28fb01b Bugfixes 2020-03-06 16:07:07 -05: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
4a40172782 Cleaned up bullet sprites 2020-02-22 00:28:03 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
e215772f30 Added backwards compatibility for legacy saves 2020-02-17 11:13:46 -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
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -05:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05:00
Arkanic
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00: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
26676d60e1 Added underflow gates 2020-01-20 18:54:25 -05:00
Anuken
8d61ddbbd4 Added chat icons for in-game items and blocks 2020-01-17 18:08:23 -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
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