Commit Graph

535 Commits

Author SHA1 Message Date
Anuken
39939f8a51 Merge https://github.com/joshuaptfan/Mindustry
# Conflicts:
#	core/assets/bundles/bundle.properties
#	core/src/io/anuke/mindustry/content/Blocks.java
#	core/src/io/anuke/mindustry/input/Binding.java
2019-11-18 19:40:45 -05:00
Anuken
2593e96999 Bugfixes 2019-11-17 11:20:36 -05:00
Joshua Fan
cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -05:00
Anuken
1f583dc7a2 Bugfixes 2019-11-14 18:48:12 -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
iczero
fbb1f012e2 Add item and amount properties to DepositEvent (#1025) 2019-11-10 10:15:52 -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
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
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
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
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
Anuken
c249485a4f Mobile schematic fixes 2019-11-03 13:04:27 -05:00
Anuken
cf6d2c7593 Added schematics dialog to desktop menu 2019-11-03 08:59:51 -05:00
joshuaptfan
71d67b9d8f Implement number and directional category/block selection hotkeys 2019-11-02 22:14:18 -07:00
Anuken
2209968963 Auto-pathfinding diagonals 2019-11-02 14:09:16 -04:00
Anuken
b8ea0f3aa6 Initial setup 2019-11-02 10:49:21 -04:00
Anuken
49adf1fae7 Fixed to mobile input 2019-11-02 10:45:23 -04:00
Anuken
ea9e23f924 Bugfixes 2019-11-02 09:40:41 -04:00
Anuken
59401ab5f5 Prevent locked block replacement 2019-11-01 19:23:01 -04:00
Anuken
ad23cbc03c Schematic fixes 2019-11-01 17:48:30 -04:00
Anuken
2c59288969 Auto-junctions 2019-11-01 17:30:09 -04:00
Anuken
91dc25f69d Mobile schematics / Randomized projector reloads 2019-10-31 22:44:07 -04:00
Anuken
53248f6e00 Some minor cleanup 2019-10-31 18:27:09 -04:00
Anuken
b86218b75a Cleanup (1) 2019-10-29 15:59:53 -04:00
Anuken
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
Anuken
e103d62b75 Bugfixes / Rework of save discovery system 2019-10-27 14:58:26 -04:00
Anuken
4e946ae52b Fixed #903 / Fixed #902 2019-10-26 21:20:05 -04:00
Anuken
bd0a6636e6 Minor bugfixes 2019-10-25 14:00:38 -04:00
Anuken
3280bceaa1 Bugfixes 2019-10-25 13:05:04 -04:00
Anuken
b7e788d529 Fixed #877 / Fixed #871 / Other fixes 2019-10-25 12:58:07 -04:00
Anuken
955dc5f48d Bugfixes / Copy over plugins to mod folder 2019-10-24 18:04:39 -04:00
Anuken
74366f10e9 Bugfix 2019-10-23 17:49:29 -04:00
Anuken
56e5705ed6 Bugfixes 2019-10-22 20:17:43 -04:00
Anuken
eb1d3c27c5 Mods + crash message for iOS/Android 2019-10-21 00:02:36 -04:00
Anuken
83b3bd9a2e Fixed flip not taking into account offset 2019-10-20 20:39:58 -04:00
Anuken
b1d9be707d Merge pull request #847 from clfer/feature/build-queue-improvement
Allow to replace previous build request in queue
2019-10-20 16:57:25 -04:00
Anuken
2e0e351228 Bugfixes 2019-10-20 16:50:04 -04:00
clfer
a238d7278f Allow to replace previous build request in queue 2019-10-20 21:52:27 +02:00
Anuken
4b428c6636 Bugfixes 2019-10-20 14:06:43 -04:00
Anuken
b5e9f280e6 Schematic preview improvements 2019-10-20 12:48:39 -04:00
Anuken
3c65e366e8 Clear previous schematic when selecting new one 2019-10-20 10:56:17 -04:00
Anuken
00054e2c61 Bugfixes 2019-10-19 21:09:59 -04:00
Anuken
f6899cf3c3 Mobile bugfixes 2019-10-19 20:45:17 -04:00
Anuken
a2a4c8c43d Bugfixes 2019-10-19 19:54:41 -04:00
Anuken
2586c53f0d Complete refactoring of workshop / Schematic+mod support 2019-10-19 18:53:27 -04:00
Anuken
f7be953bb5 Schematic import 2019-10-19 01:19:32 -04:00