Commit Graph

5712 Commits

Author SHA1 Message Date
Vanguard
2e110bff20 1 new line
link.feathub.description
2019-12-20 18:20:07 +03:00
Vanguard
f5b21c954e Merge branch 'master' into master 2019-12-18 13:22:37 +03:00
Vanguard
040f3d0254 2 changed lines
mods.guide
mod.import.github
2019-12-18 13:19:33 +03:00
Anuken
1c816be5ce Fixed crash occuring with block overload 2019-12-17 18:15:24 -05:00
Anuken
f504dd2b5a Minor tweaks v101.1 2019-12-17 17:10:29 -05:00
Vanguard
f2687e4a1a 3 new lines, 3 changed lines
New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details
2019-12-17 21:27:48 +03:00
Anuken
26881fbdb9 Added server mod error check 2019-12-17 10:58:43 -05:00
Anuken
8d921199fb Merge remote-tracking branch 'origin/master' 2019-12-16 18:37:18 -05:00
Anuken
4ffe233321 Added repair point range display 2019-12-16 18:37:11 -05:00
Anuken
e076de9dcd Merge pull request #1221 from TsjipTsjip/typoFixes
'arilleryPlastic' -> 'artilleryPlastic'
2019-12-16 13:58:59 -05:00
TsjipTsjip
5ce66b0dbb 'arilleryPlastic' -> 'artilleryPlastic' 2019-12-16 19:55:10 +01:00
Anuken
6971a76c8e І 2019-12-16 12:50:18 -05:00
Anuken
d47f86cc21 Cleanup 2019-12-16 10:12:39 -05:00
Anuken
487607e1d6 Removed references to GWT completely 2019-12-16 00:08:14 -05:00
Anuken
3cefc085bd Tentative RU bundle changes 2019-12-15 22:11:07 -05:00
Anuken
3d8e5bd36a Added new Cyrillic font 2019-12-15 21:31:55 -05:00
Anuken
e9ed0512f7 Removed Path API usage 2019-12-15 21:12:41 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken
95a1474b9a Merge remote-tracking branch 'origin/master' 2019-12-15 19:36:38 -05:00
Anuken
53aedcee2c Cleanup 2019-12-15 19:35:04 -05:00
Anuken
9758a05002 Merge pull request #1218 from joshuaptfan/break-cancel
Prevent right-click from deconstructing when schematic is selected
2019-12-15 18:38:08 -05:00
joshuaptfan
18bb7ba936 Prevent right-click from deconstructing when schematic is selected; allow deconstruct cancel with left-click 2019-12-15 14:26:13 -08:00
Anuken
9f3dcdf727 Fixed #1215 - made all valid floors show up in drill mine list 2019-12-15 16:29:11 -05:00
Anuken
7d2354a653 Mod path resolving fixes 2019-12-15 16:00:50 -05:00
Anuken
ab21b88001 Mod sort fix 2019-12-15 15:22:19 -05:00
Anuken
a560978dcf Sync fixes / Fixed linear filtering resetting on mod load 2019-12-15 14:30:28 -05:00
Anuken
047f479a2f Fixed server 2019-12-15 14:00:07 -05:00
Anuken
d78d3daaf9 Updated script stub 2019-12-15 13:56:01 -05:00
Anuken
976d0f54b3 Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
# Conflicts:
#	core/src/io/anuke/mindustry/mod/Mods.java
2019-12-15 13:55:30 -05:00
Anuken
1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Vanguard
17ae17dced 1 changed line
tutorial.intro
2019-12-15 16:15:51 +03:00
Anuken
bcc8f65ac8 More cleanup 2019-12-14 20:49:55 -05:00
Anuken
e043f4bb66 API cleanup 2019-12-14 18:19:02 -05:00
Anuken
9d3dda035c Compile fixes 2019-12-14 12:53:37 -05:00
Anuken
6e16aab794 Merge remote-tracking branch 'origin/master' 2019-12-14 11:05:32 -05:00
Anuken
c1cf3183ac Fixed some Android-related script issues 2019-12-14 11:04:22 -05:00
Anuken
252d0f6aa1 aaaaa 2019-12-14 10:51:36 -05:00
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
Vanguard
601f6af3c8 1 changed line, 1 removed line
Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties
2019-12-13 19:10:59 +03: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
Anuken
3d78175e50 Merge pull request #1208 from Kieaer/patch-6
Update MessageBlock.java
2019-12-12 18:33:20 -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 v101 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
bce379d40d Merge remote-tracking branch 'origin/master' 2019-12-12 16:34:37 -05:00