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
Anuken
186a2aaa45
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# 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/ai/BlockIndexer.java
# core/src/mindustry/core/World.java
# core/src/mindustry/entities/traits/Entity.java
# core/src/mindustry/entities/type/BaseEntity.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/world/blocks/defense/MendProjector.java
# core/src/mindustry/world/blocks/defense/OverdriveProjector.java
# core/src/mindustry/world/blocks/production/Drill.java
# gradle.properties
2019-12-27 01:41:06 -05:00
Anuken
32d28a4070
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# 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/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/io/anuke/mindustry/ctype/ContentType.java
# core/src/io/anuke/mindustry/ctype/UnlockableContent.java
# core/src/io/anuke/mindustry/io/LegacyMapIO.java
# core/src/io/anuke/mindustry/type/WeatherEvent.java
# gradle.properties
2019-12-24 12:40:23 -05:00
Patrick 'Quezler' Mounier and Anuken
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
9e3870acbe
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# 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/io/anuke/mindustry/world/blocks/defense/MendProjector.java
# gradle.properties
2019-12-02 22:45:05 -05:00
Anuken
78f146fbcf
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# 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/io/anuke/mindustry/graphics/Shaders.java
# gradle.properties
2019-12-01 17:42:56 -05:00
Anuken
9b732017a9
Added contribution guide
2019-11-18 00:55:33 -05:00
Anuken
fad6fe9a2a
Added armored conduit / Lighting improvements / Moved liquid package
2019-11-17 13:51:36 -05:00
Anuken
913a703d41
Illuminator textures
2019-11-16 20:06:11 -05:00
Anuken
8798fa101a
Merge
2019-11-16 00:15:45 -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' Mounier and Anuken
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
2019-11-11 23:29:03 -05:00
Anuken
7d9963d542
Merge
2019-11-11 19:09:37 -05:00
Anuken
8952dd7f56
Begin work on 6.0
2019-11-10 14:05:29 -05:00
Patrick 'Quezler' Mounier
8e2c12848c
Add a cap against leaking
...
Doesn’t fully prevent leaking, there are intentional gaps, but its significantly slower.
2019-11-05 14:30:46 +01: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
Patrick 'Quezler' Mounier and Anuken
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 and GitHub
e4b267d757
Merge pull request #838 from ado1928/master
...
Added more rubble pngs
2019-10-20 16:32:07 -04:00
Anuken
4c7259843c
Merge branch 'master' of https://github.com/Anuken/Mindustry into mech-rework
...
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
2019-10-20 10:21:35 -04:00
ado1928 and GitHub
7fdbd27ebb
Add files via upload
2019-10-19 10:58:34 +02:00
Anuken
4977f598fd
Config drawing
2019-10-17 21:58:49 -04:00
Anuken
a3871cca90
Added correctly named mech pads for alpha/dart
2019-10-15 18:32:47 -04:00
Anuken
3d624f7eaf
Added inverted sorter
2019-10-13 12:58:58 -04:00
Anuken
989e0d8fd1
Removal of drone requests
2019-10-07 17:17:01 -04:00
Anuken
ecd73dcc2c
Various bugfixes / Added new blocks to tech tree
2019-09-24 17:02:34 -04:00
Anuken
b6e97c4261
Added armored conveyors
2019-09-22 15:12:15 -04:00
Anuken
3f293190cf
Merge branch 'master' of https://github.com/Anuken/Mindustry into messages
...
# 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/sprites5.png
2019-09-21 18:59:49 -04:00
Anuken
dda1f18f67
Unit enemy spawnpoint camping
2019-09-20 23:09:11 -04:00
Anuken
209f0902c9
message blocks
2019-09-03 16:11:01 -04:00
Anuken
e314d199f0
By popular demand, re-added command center
2019-08-24 15:39:01 -04:00
Anuken
c4aa0b2863
New discord app ID / New testing sounds
2019-08-12 12:32:13 -04:00
Anuken
2341da995e
Random in-game music, untested
2019-08-10 18:56:20 -04:00
Anuken
16f6b51857
Various tweaks, new music tracks
2019-08-09 23:23:45 -04:00
Anuken
8346d5fc13
Fixed connection not resetting on game load / Experimental click changes
2019-08-05 10:26:24 -04:00
Anuken
77d4b0972d
Balancing
2019-08-02 12:39:21 -04:00
Anuken
8b3995686f
Misc. in-game UI polish
2019-08-01 20:49:03 -04:00
Anuken
b1980a17ac
Fixed editor not showing after second view
2019-08-01 11:26:28 -04:00
Anuken
69ee5257f2
Display current ammo type in turret info
2019-08-01 11:03:20 -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
3dfef06bba
Bugfixes
2019-07-06 18:42:05 -04:00
Anuken
121e0a433b
Final tweaks before merge
2019-07-06 10:12:22 -04:00
Anuken
0371126ccf
Various menu fixes
2019-07-04 00:51:42 -04:00
Anuken
d43d4a1773
Cleanup, main menu progress
2019-07-03 23:36:51 -04:00
Anuken
0d39400f8b
Fixed performance regression / Removed useless fallback sprites
2019-07-03 17:07:22 -04:00
Patrick 'Quezler' Mounier
Anuken
TsjipTsjip
ado1928andGitHub