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
a5fbc07561
Texture overrides / Potential mod texture binding optimizations
2019-11-25 20:50:32 -05:00
Patrick 'Quezler' Mounier
7830372477
Beep boop add f-droid ( #1087 )
...
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -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
84968c9f73
Added color picker / Customizable lighting rules
2019-11-16 23:27:42 -05:00
Anuken
913a703d41
Illuminator textures
2019-11-16 20:06:11 -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' 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
7d9963d542
Merge
2019-11-11 19:09:37 -05:00
Anuken
52f592a357
Lighting improvements
2019-11-10 16:18:47 -05:00
Anuken
c70fb5940f
Display document import errors on iOS
2019-11-09 15:30:02 -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
Anuken
91dc25f69d
Mobile schematics / Randomized projector reloads
2019-10-31 22:44:07 -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
ef2817513a
Layout fixes
2019-10-27 16:26:33 -04:00
Anuken
7179b147b2
Added Reddit link
2019-10-23 20:13:22 -04:00
Anuken
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
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
9f9e838a3a
Alpha stuff
2019-10-16 18:57:19 -04:00
Anuken
0f52fc1f4f
Alpha sprite
2019-10-16 18:36:02 -04:00
Anuken
b2ea1b7ca5
Some refactoring
2019-10-16 14:22:54 -04:00
Anuken
47f423540d
Vanguard mech visuals
2019-10-15 20:35:43 -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
002a052371
Fixed #748 / Better mod loading
2019-09-29 21:41:32 -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
e4cdf515c9
More workshop implementation
2019-09-10 20:53:31 -04:00
Anuken
c4c0f45228
cleaning up what remains
2019-09-08 22:55:36 -04:00
Anuken
d981bb95b9
it is gone
2019-09-08 22:32:47 -04:00
Anuken
c9f0a59339
time for a crusade against dialogs
2019-09-08 15:08:55 -04:00
Anuken
5651d1b023
Support for built-in servers
2019-09-05 19:23:17 -04:00
Anuken
209f0902c9
message blocks
2019-09-03 16:11:01 -04:00
Anuken
5cc32b9001
Fixed map loading bugs
2019-09-01 10:46:44 -04:00
Anuken
26d44ea030
Save slot previews
2019-08-30 15:01:38 -04:00
Anuken
5134aca723
Put zone previews into atlas
2019-08-27 19:33:41 -04:00
Anuken
e314d199f0
By popular demand, re-added command center
2019-08-24 15:39:01 -04:00
Anuken
89ee04c942
Machine ambient sounds
2019-08-15 13:32:36 -04:00
Anuken
c9178c3f2f
Fixed power nodes in multiplayer
2019-08-13 22:47:31 -04:00
Anuken
f2f6dc89a2
fire
2019-08-13 12:04:09 -04:00
Anuken
c4aa0b2863
New discord app ID / New testing sounds
2019-08-12 12:32:13 -04:00
