Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,732 Commits 4 Branches 180 Tags
48daf128106fb1f152386df77f4a7813caf654a9
Commit Graph

906 Commits

Author SHA1 Message Date
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
TsjipTsjip
5ce66b0dbb 'arilleryPlastic' -> 'artilleryPlastic' 2019-12-16 19:55:10 +01:00
TsjipTsjip
324f6351ea "artlleryIncendiary" -> "artilleryIncendiary" (#1196) 
* Gracious error with missing link description keys.

* Fix typo. "artlleryIncendiary" -> "artilleryIncendiary"

* Revert "Gracious error with missing link description keys."

This reverts commit ff5a470560.
 2019-12-11 10:17:28 -05:00
Anuken
da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
Anuken
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken
e06d61dcc9 FX cleanup 2019-12-08 18:38:56 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
Patrick 'Quezler' Mounier
d81b36d897 Add 1 plastanium to armored conduits recipe (#1181) 2019-12-07 15:25:37 -05:00
Anuken
06abc43aea Fixed slow imports 2019-12-07 11:37:13 -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
Patrick 'Quezler' Mounier
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
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
Anuken
edfe58cb38 Refactoring of tile storage, filters 2019-11-16 12:34:29 -05:00
Anuken
8798fa101a Merge 2019-11-16 00:15:45 -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.

* Increase pulse conduit output pressure

* Remove `tile.block().`
 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.

* 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
Anuken
52f592a357 Lighting improvements 2019-11-10 16:18:47 -05:00
Anuken
8952dd7f56 Begin work on 6.0 2019-11-10 14:05:29 -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