77001324e9
Update EventType.java
2019-11-14 09:59:33 -05:00
0fd6207689
Cleanup
2019-11-14 08:51:12 -05:00
dd175747ab
Permissive extensions
2019-11-13 19:40:03 -05:00
3106389f6a
Switched to HJson content parsing
2019-11-13 19:12:12 -05:00
d8c997b355
Methods renamed / Better build request handling
2019-11-12 23:40:45 -05:00
103f655fa4
Removed boolean usage
2019-11-12 15:59:44 -05:00
1dfaf3897c
Proper node intersect
2019-11-12 08:23:23 -05:00
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
56917483d6
Cleaned up diode
2019-11-11 23:32:49 -05:00
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
dcdec7f55f
Add mouse-based movement ( #1037 )
...
* Add mouse-based movement
* Rename keybind to 'Follow Mouse'
2019-11-11 14:00:35 -05:00
8d19c8b7af
Update overflow gate description ( #1040 )
2019-11-11 14:00:06 -05:00
52f592a357
Lighting improvements
2019-11-10 16:18:47 -05:00
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
fbb1f012e2
Add item and amount properties to DepositEvent ( #1025 )
2019-11-10 10:15:52 -05:00
6141b135fe
Fix style
2019-11-10 09:25:23 +01:00
e827bb17e7
Move blend check to autotiler
2019-11-10 09:24:24 +01:00
4c0607aba8
Bugfixes
2019-11-09 17:19:29 -05:00
2af13a31dc
Bugfixes
2019-11-09 16:36:28 -05:00
2dec6af231
Merge remote-tracking branch 'origin/master'
2019-11-09 15:30:12 -05:00
c70fb5940f
Display document import errors on iOS
2019-11-09 15:30:02 -05:00
4a987677ac
Add 'Show Block Select Keys' graphics option, implement requested changes
2019-11-09 07:59:00 -05:00
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
fb15c44383
Fix links in a hacky way
2019-11-08 21:11:49 -05:00
4f4113d3d1
Merge remote-tracking branch 'origin/master'
2019-11-08 19:09:45 -05:00
52355de1c0
use // for comments
2019-11-08 19:08:07 -05:00
ebee4fa5da
Implement build autopausing ( #1017 )
...
Automatically pause building after current build queue is empty
2019-11-08 16:56:06 -05:00
796241b40a
Add TapEvent/TapConfigEvent ( #1018 )
...
* Update EventType.java
* Update InputHandler.java
2019-11-08 14:58:24 -05:00
505f802e20
Use ## for comments, just in case
2019-11-08 14:55:32 -05:00
e9f9194f73
Added json comments
2019-11-08 14:40:15 -05:00
effd4e959a
Power cleanup
2019-11-08 13:04:24 -05:00
f58eb75639
🐬 Factorio flavoured powerlines ( #997 )
...
* Stash initial prototype
* Fix 〃to connect the chain
* Add comments
* Hook onto convejor pathfinding
* Cleanup remnant discovered via pull request diff
* Toggle placement between diagonal and pathfinding
* Stash questionable prototype
* 〃
* Attempt to rewrite away the skip array
* Revert "Attempt to rewrite away the skip array"
This reverts commit 12753a9b5c
2019-11-08 12:28:49 -05:00
8b2934c60e
Update ForceProjector.java
2019-11-07 19:05:15 -05:00
d05f56c5b1
Cleanup
2019-11-07 17:16:09 -05:00
d1196f8e85
Fixed #745
2019-11-07 16:55:26 -05:00
8a6d39d5d0
Revert changes to localization files
2019-11-07 07:20:43 -08:00
1e7c21c1ae
Bugfixes
2019-11-06 13:59:35 -05:00
82ae378edc
Fixed mech pads not working
2019-11-05 21:51:58 -05:00
dbb64f1d87
Add hotkey tutorial to tutorial mission
2019-11-05 17:25:21 -08:00
ccac67ced6
Fixed unit tests, power problems
2019-11-05 19:20:23 -05:00
ce6f3ddb5a
Updated bundles
2019-11-05 19:03:14 -05:00
d86997e388
Add files via upload ( #979 )
2019-11-05 18:55:31 -05:00
60717bdaad
Update bundle_zh_TW.properties ( #972 and #945 included) ( #1002 )
...
This includes the contents in the previous two pull requests.(#945 and #972 )
Also improved another few translations.
2019-11-05 18:54:15 -05:00
0738a7dbf0
Merge remote-tracking branch 'origin/master'
2019-11-05 18:09:49 -05:00
a539bb8e57
Better oil bar color
2019-11-05 17:58:30 -05:00
b2d417f207
Display pump output during placement ( #1003 )
2019-11-05 17:58:19 -05:00
4352ab92f1
fix Japanese translation for Mods ( #991 )
2019-11-05 17:42:28 -05:00
5c522069b1
Update bundle_pt_BR.properties ( #1007 )
...
a few more fixes at translation
2019-11-05 17:39:57 -05:00
49d12f36b9
Power productivity & Drone pad standby ( #998 )
...
* Introduce power productivity
Allows power consumers to scale down their intake.
* Make drone pads only use power when constructing
* Implement requested changes
* Begone
2019-11-05 17:31:32 -05:00
e4697bae27
Merge remote-tracking branch 'origin/master'
2019-11-05 17:29:33 -05:00
