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
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
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
e4b267d757
Merge pull request #838 from ado1928/master
...
Added more rubble pngs
2019-10-20 16:32:07 -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
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
Anuken
cb7b6eb3f8
More menu
2019-07-02 10:01:34 -04:00
Anuken
3021cc29da
Fixed tops of some generator blocks
2019-06-30 11:25:39 -04:00
Anuken
ab716e96e2
Bugfixes
2019-06-24 16:54:50 -04:00
Anuken
b2a4cb42cf
Sprite updates
2019-06-23 12:36:13 -04:00
Anuken
8c91aca838
New maps / New generation filter(s) and tweaks
2019-06-22 20:40:53 -04:00
Anuken
478d86677d
Fixed boulder sprites
2019-06-20 00:16:22 -04:00
Anuken
185a7bb7d8
Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks
2019-06-17 21:35:19 -04:00
Anuken
bc3405d11d
Bugfixes
2019-06-17 15:45:10 -04:00
Anuken
4f40f3c4b2
More sprite updates
2019-06-17 10:08:24 -04:00
Anuken
910dab1896
More drone changes
2019-06-14 21:06:58 -04:00
Anuken
8ac497354a
Miner drone / Editor bugfixes
2019-06-12 22:09:24 -04:00
Anuken
df78412896
Desktop/mobile descriptive tool modes
2019-06-11 23:31:57 -04:00
Anuken
af1746932f
Fixed incorrect scaling
2019-06-11 08:47:16 -04:00
Anuken
ea0788f56c
Better wave timer / Sprite tweaks / Core wave spawns
2019-06-09 21:09:29 -04:00
Anuken
4199702b9b
Updated turret sprites
2019-06-09 14:46:48 -04:00
Anuken
444b5dbd97
Turret balance / Bugfixes
2019-06-09 12:04:45 -04:00
Anuken
aee800ab7a
Changed turret outlines / Wall block tweaks
2019-06-06 21:18:54 -04:00
Anuken
895b46307a
Sprite tweaks
2019-06-06 18:47:53 -04:00
