Zachary
7feed8828c
Increase time taken for reactor to explode ( #1067 )
...
yes
2019-11-16 00:16:09 -05:00
Anuken
8798fa101a
Merge
2019-11-16 00:15:45 -05:00
Anuken
1f6ef9d9ae
Merge remote-tracking branch 'origin/master'
2019-11-15 21:12:12 -05:00
Anuken
e6afe584e5
Fixed 'underwater' ores
2019-11-15 21:12:08 -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
Anuken
016823d446
Bridge cleanup
2019-11-14 18:53:24 -05:00
Anuken
0cf9ef66fa
Merge remote-tracking branch 'origin/master'
2019-11-14 18:48:21 -05:00
Anuken
1f583dc7a2
Bugfixes
2019-11-14 18:48:12 -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
Anuken
618a050414
Fix getProgressIncrease
2019-11-14 15:02:09 -05:00
Anuken
ec7f49c94b
Merge remote-tracking branch 'origin/master'
2019-11-14 14:59:10 -05:00
Anuken
30ea285ca0
Change power "satisfaction" -> "status", use efficiency() in blocks
2019-11-14 14:59:04 -05:00
Joshua Fan
a9b822089f
Make Esc mirror back button behavior in settings ( #1061 )
2019-11-14 14:41:15 -05:00
Anuken
c5a4d7331f
Switched to using core attack events
2019-11-14 14:40:42 -05:00
Anuken
230428f2e0
Update CoreBlock.java
2019-11-14 12:35:59 -05:00
Anuken
1a26a1bf63
Update CoreBlock.java
2019-11-14 12:28:35 -05:00
Anuken
77001324e9
Update EventType.java
2019-11-14 09:59:33 -05:00
Anuken
0fd6207689
Cleanup
2019-11-14 08:51:12 -05:00
Anuken
dd175747ab
Permissive extensions
2019-11-13 19:40:03 -05:00
Anuken
3106389f6a
Switched to HJson content parsing
2019-11-13 19:12:12 -05:00
Anuken
d8c997b355
Methods renamed / Better build request handling
2019-11-12 23:40:45 -05:00
Anuken
e6647484bd
Prototyping mechs
2019-11-12 23:01:10 -05:00
Anuken
4b70b2fbcc
Cleanup & refactor of projectors
2019-11-12 17:18:27 -05:00
Anuken
103f655fa4
Removed boolean usage
2019-11-12 15:59:44 -05:00
Anuken
1dfaf3897c
Proper node intersect
2019-11-12 08:23:23 -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
Joshua Fan
dcdec7f55f
Add mouse-based movement ( #1037 )
...
* Add mouse-based movement
* Rename keybind to 'Follow Mouse'
2019-11-11 14:00:35 -05:00
Anuken
52f592a357
Lighting improvements
2019-11-10 16:18:47 -05:00
Anuken
39a0dde1f4
Merge branch 'master' of https://github.com/Anuken/Mindustry into lights
...
# Conflicts:
# core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
2019-11-10 14:12:43 -05:00
Anuken
8952dd7f56
Begin work on 6.0
2019-11-10 14:05:29 -05:00
iczero
fbb1f012e2
Add item and amount properties to DepositEvent ( #1025 )
2019-11-10 10:15:52 -05:00
Patrick 'Quezler' Mounier
6141b135fe
Fix style
2019-11-10 09:25:23 +01:00
Patrick 'Quezler' Mounier
e827bb17e7
Move blend check to autotiler
2019-11-10 09:24:24 +01:00
Anuken
4c0607aba8
Bugfixes
2019-11-09 17:19:29 -05:00
Anuken
2af13a31dc
Bugfixes
2019-11-09 16:36:28 -05:00
Anuken
2dec6af231
Merge remote-tracking branch 'origin/master'
2019-11-09 15:30:12 -05:00
Anuken
c70fb5940f
Display document import errors on iOS
2019-11-09 15:30:02 -05:00
Joshua Fan
4a987677ac
Add 'Show Block Select Keys' graphics option, implement requested changes
2019-11-09 07:59:00 -05:00
danmw3
ee88cd33b1
Allow for toggling the visibility of power line lasers ( #1022 )
...
* Allow for toggling the visibility of power line lasers
Configurable key-bind in controls and obeys the power line opacity setting.
* Last power opacity is saved after being toggled off.
* Moved key-bind into the View category.
2019-11-09 00:00:02 -05:00
Anuken
fb15c44383
Fix links in a hacky way
2019-11-08 21:11:49 -05:00
Anuken
4f4113d3d1
Merge remote-tracking branch 'origin/master'
2019-11-08 19:09:45 -05:00
Anuken
52355de1c0
use // for comments
2019-11-08 19:08:07 -05:00
iczero
ebee4fa5da
Implement build autopausing ( #1017 )
...
Automatically pause building after current build queue is empty
2019-11-08 16:56:06 -05:00
