Anuken
39939f8a51
Merge https://github.com/joshuaptfan/Mindustry
...
# Conflicts:
# core/assets/bundles/bundle.properties
# core/src/io/anuke/mindustry/content/Blocks.java
# core/src/io/anuke/mindustry/input/Binding.java
2019-11-18 19:40:45 -05:00
Anuken
ad25cd8074
Illuminator description
2019-11-18 17:00:52 -05:00
Anuken
6bc98bbe67
Configurable lights
2019-11-18 16:58:39 -05:00
Anuken
425f63c673
Update Blocks.java
2019-11-18 12:43:04 -05:00
Anuken
fad6fe9a2a
Added armored conduit / Lighting improvements / Moved liquid package
2019-11-17 13:51:36 -05:00
Anuken
629999a1cd
More unit tests / Lighting improvements
2019-11-16 23:45:31 -05:00
Anuken
4d3e268972
Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry
2019-11-16 23:29:33 -05:00
Anuken
5d949f6bc0
Correct reactor consumption display
2019-11-16 20:05:52 -05:00
Anuken
faf64f11f2
More lights
2019-11-16 19:57:33 -05:00
Fayti1703
76c63443af
Deduplicate requirements assignment for Tar Fields ( #1065 )
2019-11-15 20:02:27 -05:00
Joshua Fan
cafd95859f
Clean up text capitalization, misc UI ( #1072 )
2019-11-15 20:01:59 -05:00
Patrick 'Quezler' Mounier
74212771dc
Might as well add a tech tree entry
2019-11-14 21:36:58 +01:00
Patrick 'Quezler' Mounier
6bcea7af66
Pressurize identically as the pulse conduit
2019-11-14 21:33:36 +01:00
Patrick 'Quezler' Mounier
3ec7e40213
Merge branch 'master' into armored-conduit
2019-11-14 21:32:15 +01:00
Patrick 'Quezler' Mounier
836e72119c
🗜 Pressure conduit ( #949 )
...
* Suggest pressure conduit
* Revert "Suggest pressure conduit"
This reverts commit 721dd9255e
2019-11-14 15:21:29 -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
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
52f592a357
Lighting improvements
2019-11-10 16:18:47 -05:00
Joshua Fan
4a987677ac
Add 'Show Block Select Keys' graphics option, implement requested changes
2019-11-09 07:59:00 -05:00
Anuken
a539bb8e57
Better oil bar color
2019-11-05 17:58:30 -05:00
Anuken
21b7016fb5
Bugfixes
2019-11-05 15:32:13 -05:00
Patrick 'Quezler' Mounier
a48baa1356
Rename class to whats logical
2019-11-05 14:48:10 +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
Anuken
08b730a349
Replaced 'loadout' class with schematics / Small sound tweaks
2019-11-03 22:15:05 -05:00
joshuaptfan
71d67b9d8f
Implement number and directional category/block selection hotkeys
2019-11-02 22:14:18 -07:00
Anuken
685c41ebf5
Slight balancing
2019-10-27 18:16:41 -04:00
Patrick 'Quezler' Mounier
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
56e5705ed6
Bugfixes
2019-10-22 20:17:43 -04:00
Anuken
d7ebbbf2b6
Better organization
2019-10-21 21:22:35 -04:00
Anuken
01f6fff823
Correct liquid boost display for turrets
2019-10-21 17:50:26 -04:00
Anuken
0faae5d5ca
Bugfix
2019-10-19 19:11:54 -04:00
Anuken
88e1770f2e
Bugfixes
2019-10-18 19:31:01 -04:00
Anuken
a0c93ea7d3
Made incend bullets apply status instead of creating fire
2019-10-17 17:00:38 -04:00
Anuken
8556b7eef7
Block build visibility
2019-10-15 00:23:38 -04:00
Anuken
3d624f7eaf
Added inverted sorter
2019-10-13 12:58:58 -04:00
Anuken
0509c28576
Fixed bizzare single type generator initialization
2019-10-12 18:39:08 -04:00
Anuken
80a4e67ddf
Better replacement
2019-10-10 16:47:46 -04:00
Anuken
4b99f7c819
Cleanup, bugfixes
2019-10-05 15:51:29 -04:00
Anuken
c1ff7812d8
Zone objective abstraction, cleanup
2019-10-05 00:21:48 -04:00
Anuken
2db3060a03
Made content icon system more sane
2019-10-01 23:46:40 -04:00
Anuken
d9b8335e0e
Block tech tree mods
2019-10-01 21:47:02 -04:00
Anuken
5b8c237a1e
Modding improvements
2019-10-01 21:33:51 -04:00
Anuken
8ccdba5be2
Disabled Player-Player and Player-Drone collisions
2019-10-01 20:28:40 -04:00
Anuken
985918b870
Fixed power node config
2019-09-30 21:08:56 -04:00
Anuken
94733515e4
Reduced spirit factory to 1 drone, 2x power
2019-09-30 17:12:08 -04:00
Anuken
002a052371
Fixed #748 / Better mod loading
2019-09-29 21:41:32 -04:00
Anuken
b0503d9930
Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry
...
# Conflicts:
# core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
# gradle.properties
2019-09-29 17:03:28 -04:00
Anuken
33416aadef
Parsing fixes / Moved annotations to Arc
2019-09-29 16:09:43 -04:00
Anuken
000b23d703
Workshop crash fix / Mine balancing
2019-09-28 15:14:29 -04:00
