Commit Graph

769 Commits

Author SHA1 Message Date
9def4eaba4 Unjank Plated Conduit Background Transparency (#1961)
The background transparent part was for some reason 3-6 different colors. Invisible, but still there.
2020-05-01 18:09:39 -04:00
626a06ca00 Bugfixes / Better titan sprite 2020-04-30 18:21:50 -04:00
3397557737 Sprites 2020-04-30 16:04:43 -04:00
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
2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -04:00
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
08f8323465 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png
2020-04-25 22:49:38 -04:00
9b74b69950 Unit tweaks 2020-04-25 22:49:30 -04:00
46762ab0e1 New power cells for everything (#1915)
* Ground Unit Power Cells

* Flying Unit Cells

* Player/Mech Cells
2020-04-25 22:48:58 -04:00
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
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
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
1acc6461e6 Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
9864383300 Revert 〃 2020-04-16 21:15:49 +02:00
41eb51a340 Experiment with visible ports 2020-04-16 21:11:59 +02:00
a05f4338c5 Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
589d4c92d1 Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
83511368f6 Stash shadow draft 2020-04-16 17:44:43 +02:00
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
256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
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
a234949b8c Visual tweaks 2020-04-15 13:03:37 -04:00
c717084cb9 Cleanup 2020-04-13 18:07:00 -04:00
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
603d8b16d0 Various tweaks 2020-04-12 10:26:18 -04:00
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
85e4270536 New water textures 2020-04-04 00:31:29 -04:00
0573160b2f Added sorter cross (#1566) 2020-03-26 17:39:23 -04:00
06e94b1800 Cleaned up weather class 2020-03-11 10:08:27 -04:00
14a97976cc Realign pixels
Bothered me for ages.
2020-03-05 19:48:36 +01:00
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
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05:00
4a40172782 Cleaned up bullet sprites 2020-02-22 00:28:03 -05:00
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
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
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
8c7b688f78 Add layered blendbitz 2020-02-06 20:19:00 +01:00
99d1a2829f Merge branch 'master' into crater 2020-02-06 19:33:57 +01:00
c0d250560a 🐍 is kil 2020-02-06 19:33:42 +01:00
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
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00