Commit Graph

5221 Commits

Author SHA1 Message Date
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
iczero
fbb1f012e2 Add item and amount properties to DepositEvent (#1025) 2019-11-10 10:15:52 -05: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
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
키에르
796241b40a Add TapEvent/TapConfigEvent (#1018)
* Update EventType.java

* Update InputHandler.java
2019-11-08 14:58:24 -05:00
Anuken
505f802e20 Use ## for comments, just in case 2019-11-08 14:55:32 -05:00
Anuken
e9f9194f73 Added json comments 2019-11-08 14:40:15 -05:00
Anuken
effd4e959a Power cleanup 2019-11-08 13:04:24 -05:00
Patrick 'Quezler' Mounier
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.

* Slight cleanup

* Subtract conveyor placement

* Refractor each to for

* Apply @anuke’s coding stype
2019-11-08 12:28:49 -05:00
Anuken
8b2934c60e
Update ForceProjector.java 2019-11-07 19:05:15 -05:00
Anuken
d05f56c5b1 Cleanup 2019-11-07 17:16:09 -05:00
Anuken
d1196f8e85 Fixed #745 2019-11-07 16:55:26 -05:00
Anuken
c71b5d6f87 Copy Steam DLLs into folder 2019-11-07 14:58:51 -05:00
Anuken
1e7c21c1ae Bugfixes 2019-11-06 13:59:35 -05:00
Anuken
82ae378edc Fixed mech pads not working 2019-11-05 21:51:58 -05:00
Anuken
ccac67ced6 Fixed unit tests, power problems 2019-11-05 19:20:23 -05:00
Anuken
ce6f3ddb5a Updated bundles 2019-11-05 19:03:14 -05:00
Mateus Auler
4c4e93c88a Added Portuguese (Brazil) translation to Steam description and fixed small mistake in the English description (#890)
* Added missing list tag in English Steam description

* Added Portuguese (Brazil) translation to Steam description and achievements
2019-11-05 19:02:02 -05:00
12358abc
d86997e388 Add files via upload (#979) 2019-11-05 18:55:31 -05:00
Ali-C-Ila
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
AmateurPotion
4454b6f29d Update achievements.vdf (#983)
* Update achievements.vdf

* Update achievements.vdf
2019-11-05 18:52:58 -05:00
Anuken
0738a7dbf0 Merge remote-tracking branch 'origin/master' 2019-11-05 18:09:49 -05:00
Anuken
a539bb8e57 Better oil bar color 2019-11-05 17:58:30 -05:00
Patrick 'Quezler' Mounier
b2d417f207 Display pump output during placement (#1003) 2019-11-05 17:58:19 -05:00
kirina
4352ab92f1 fix Japanese translation for Mods (#991) 2019-11-05 17:42:28 -05:00
ElerTheMagnanimous
5c522069b1 Update bundle_pt_BR.properties (#1007)
a few more fixes at translation
2019-11-05 17:39:57 -05:00
Patrick 'Quezler' Mounier
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
Anuken
e4697bae27 Merge remote-tracking branch 'origin/master' 2019-11-05 17:29:33 -05:00
Anuken
3691ab7f8f Remove canProduce as a method 2019-11-05 17:29:19 -05:00
Joshua Fan
a47e03de0a Fix key hints to display string names instead of internal names (#1004) 2019-11-05 16:08:45 -05:00
Anuken
21b7016fb5 Bugfixes 2019-11-05 15:32:13 -05:00
Anuken
3e43f5577e Bugfixes 2019-11-04 23:47:51 -05:00
Anuken
f1f8130718 arc, again 2019-11-04 22:55:04 -05:00
Anuken
f38bf9262d Arc update 2 2019-11-04 22:35:32 -05:00
Anuken
be6af55616 Arc update 2019-11-04 22:28:11 -05:00
Anuken
53d004d91e Merge remote-tracking branch 'origin/master' 2019-11-04 22:18:39 -05:00
Anuken
6153764c0d Bugfixes for Steam 2019-11-04 22:18:34 -05:00
AmateurPotion
a6fd244be2 Update bundle_ko.properties (#995) 2019-11-04 19:52:25 -05:00
Paulao17
a54d72d00c Update bundle_fr.properties (#947)
* Update bundle_fr.properties

Added new keys from new updates.
Also paralleled large wall names.

* Large Thorium wall syntax correction

* Add max connections for power nodes french

Updated for [#988](https://github.com/Anuken/Mindustry/pull/988) (merged at this time)
2019-11-04 19:52:14 -05:00
ElerTheMagnanimous
b3eacd841f Update bundle_pt_BR.properties (#993)
Translation error at the thorium, they translated it as uranium
2019-11-04 17:37:34 -05:00
Anuken
08b730a349 Replaced 'loadout' class with schematics / Small sound tweaks 2019-11-03 22:15:05 -05:00
Anuken
08d0a7ada7 Bugfixes / Better power link priority 2019-11-03 21:27:58 -05:00