Commit Graph
94 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
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' MounierandGitHub 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
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 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' MounierandAnuken 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
TsjipTsjip 2366d25de7 Add liquid void block. 2019-12-12 21:11:14 +01:00
Anuken 879f90ebf4 Added changelogs / Updated link registry 2019-11-19 22:04:10 -05:00
Patrick 'Quezler' MounierandAnuken 7955b82b1e Add weave layer to phase 〃 icon (#1091)
Makes the block more recognizable in the build menu.
2019-11-19 08:13:43 -05:00
Patrick 'Quezler' MounierandAnuken 7830372477 Beep boop add f-droid (#1087)
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -05:00
Anuken fad6fe9a2a Added armored conduit / Lighting improvements / Moved liquid package 2019-11-17 13:51:36 -05:00
Anuken faf64f11f2 More lights 2019-11-16 19:57:33 -05:00
Patrick 'Quezler' Mounier 8a089ba3c9 Resolve conflicts
# 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
2019-11-12 08:44:26 +01:00
Anuken 56917483d6 Cleaned up diode 2019-11-11 23:32:49 -05:00
Patrick 'Quezler' MounierandAnuken f5c1eb74af 🔩 Add (plastanium) diode (#964)
* Add plastanium diode

* Only rotate the arrow part

* Use the sum of graph batteries from both sides

* Make diode send power overflow

Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.

* Remove redundant block != null check

* Remove free power

* Stash

* Revert "Stash"

This reverts commit 0c14854519.

* Equalize graph storage percentage

* Update sprite

* Move nearby link check

* DRY

* Fire deathstar at extra spaces

* 〃

* Fix ghost rotation

* Please overlord anuke

* Mild cleanup

* Konami code

* 〃

* Lowercase float

* Newline begone

* Fix overclocking issue

* Fix rotation and name
2019-11-11 23:29:03 -05:00
Patrick 'Quezler' Mounier 521da56e70 Add plated conduits
Went with “plated” instead of “armored” since the titanium one wasn’t named like the conveyors as well.
2019-11-05 14:00:50 +01:00
Anuken 91dc25f69d Mobile schematics / Randomized projector reloads 2019-10-31 22:44:07 -04:00
Patrick 'Quezler' MounierandAnuken bd5c98cc0d 🚧 Add insulator wall (#840)
* Stash insulator prototype

* Fix automatic wires when placing non-powernodes

* Implement requested changes

Stopping lightning has yet to be added.

* ❤️

* Implement lightning absorption

* Visually distinguish insulated power lines

* Stop lightning infront of wall

* Highlight insulators instead of recipients

* Attempt to implement requested changes

* Implement requested changes

* Remove spaces between if and (

* Snap lightning to insulated blocks

* Update bundle.properties
2019-10-27 17:41:00 -04:00
Anuken 3d624f7eaf Added inverted sorter 2019-10-13 12:58:58 -04:00
Anuken b6e97c4261 Added armored conveyors 2019-09-22 15:12:15 -04:00
Anuken dc51afdc60 Fixed sprites 2019-09-21 20:24:07 -04:00
Anuken 5134aca723 Put zone previews into atlas 2019-08-27 19:33:41 -04:00
Anuken a818da5eb7 some bad sounds 2019-08-12 23:29:24 -04:00
Anuken c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
Anuken 16f6b51857 Various tweaks, new music tracks 2019-08-09 23:23:45 -04:00
Anuken 81909bd1a9 Moved launch controls to wave button 2019-08-04 08:58:51 -04:00
Anuken c4157d2ec8 New map / Better filters / Sand boulders 2019-07-26 18:59:33 -04:00
Anuken c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken d8d04f2ac3 Moved block icons to UI atlas 2019-07-08 15:49:47 -04:00
Anuken fc9543baa7 Updated sprites/UI colors 2019-07-07 14:11:57 -04:00
Anuken 3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Anuken 121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00