Commit Graph

4304 Commits

Author SHA1 Message Date
Anuken
1f5a6e1bf8 Compile error fixes 2019-12-14 10:06:09 -05:00
Anuken
58e3143e2a Content cleaning 2019-12-14 09:33:07 -05:00
Anuken
9033ebcfd7 Merge pull request #1019 from Kieaer/patch-4
Add WithdrawEvent
2019-12-13 23:19:19 -05:00
Anuken
1f5e773c77 Fixed double-event firing 2019-12-13 23:15:49 -05:00
Anuken
7b1a0a42d4 Merge pull request #1206 from joshuaptfan/zoom-no-hold
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 18:35:29 -05:00
키에르
9d2133814c Update MessageBlock.java 2019-12-13 07:56:50 +09:00
joshuaptfan
6ce013a1eb Make diagonal placement keybind modify scroll to always zoom 2019-12-12 14:56:32 -08:00
Anuken
19675068ea Fixed wave time not saving properly 2019-12-12 17:09:29 -05:00
joshuaptfan
5db8520b74 Add rotation checks to mobile zoom 2019-12-12 13:52:05 -08:00
Anuken
c3e41140e0 Disabled smart resource usage for now 2019-12-12 16:39:34 -05:00
Anuken
01e3912827 Implemented conservative generators / Closes #804 2019-12-12 16:28:02 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00
TsjipTsjip
2366d25de7 Add liquid void block. 2019-12-12 21:11:14 +01:00
Anuken
fbed11e927 Fixed #1198 2019-12-11 15:13:45 -05:00
Anuken
45ce4013d0 Merge remote-tracking branch 'origin/master' 2019-12-11 14:26:51 -05:00
Anuken
675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
TsjipTsjip
324f6351ea "artlleryIncendiary" -> "artilleryIncendiary" (#1196)
* Gracious error with missing link description keys.

* Fix typo. "artlleryIncendiary" -> "artilleryIncendiary"

* Revert "Gracious error with missing link description keys."

This reverts commit ff5a470560.
2019-12-11 10:17:28 -05:00
Anuken
aeb6e6498e Minor server tweaks 2019-12-10 17:00:49 -05:00
Anuken
b74696b312 Fixed effect loading 2019-12-09 22:20:53 -05:00
Anuken
da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
Anuken
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
Anuken
177cea5c5d Added block size error 2019-12-09 11:48:59 -05:00
Anuken
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken
9e07b95223 Functional tweaks 2019-12-08 22:50:54 -05:00
Anuken
2554433f8d Fixed #1184 2019-12-08 21:29:03 -05:00
Anuken
e06d61dcc9 FX cleanup 2019-12-08 18:38:56 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
9f29898713 Better console / Better logging 2019-12-08 15:17:14 -05:00
Anuken
803719b216 Added mod displayName property [for color tags, etc] 2019-12-08 13:44:27 -05:00
Anuken
9f4d44f0f3 Cleanup / Added server support for scripting 2019-12-08 11:00:59 -05:00
Anuken
07fb5aa88e Bugfixes 2019-12-08 10:27:06 -05:00
Anuken
b3e1436074 Fixed #1176 2019-12-08 10:09:29 -05:00
Anuken
fd202421b1 Changed console keybind to prevent confusion 2019-12-08 00:25:13 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
2019-12-08 00:15:42 -05:00
Anuken
477ebc91bf Fixed reloading 2019-12-07 21:53:50 -05:00
Anuken
fd6abaff62 More class support 2019-12-07 21:46:35 -05:00
Anuken
5ca01bf234 Effect parsing 2019-12-07 15:55:51 -05:00
Anuken
d3747f0d4c Content loading improvements 2019-12-07 15:41:52 -05:00
Patrick 'Quezler' Mounier
d81b36d897 Add 1 plastanium to armored conduits recipe (#1181) 2019-12-07 15:25:37 -05:00
Anuken
07598e3f2f Minor tweaks 2019-12-07 14:26:14 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
06abc43aea Fixed slow imports 2019-12-07 11:37:13 -05:00
Patrick 'Quezler' Mounier
8b80a42886 Respect insulated blocks when toggeling a powernode (#1163) 2019-12-07 11:10:59 -05:00
Anuken
93fd6c5bd6 Removed massive import wall 2019-12-07 01:51:09 -05:00
Anuken
96aa3ccee0 Various improvements 2019-12-07 00:34:27 -05:00
Anuken
f3a5798a7f Various fixes 2019-12-06 22:24:32 -05:00
Anuken
2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
Anuken
50a6071cfc Fixed maps not reloading on mod reload 2019-12-06 14:07:18 -05:00
Anuken
ef24e5ecad Merge remote-tracking branch 'origin/master' 2019-12-05 22:06:57 -05:00
Anuken
6f146c6cad Added support for mod map/schematic packs 2019-12-05 21:15:28 -05:00