|
|
047f479a2f
|
Fixed server
|
2019-12-15 14:00:07 -05:00 |
|
|
|
d78d3daaf9
|
Updated script stub
|
2019-12-15 13:56:01 -05:00 |
|
|
|
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 |
|
|
|
1c1db3990f
|
Fully implemented safe content loading
|
2019-12-15 13:54:51 -05:00 |
|
|
|
bcc8f65ac8
|
More cleanup
|
2019-12-14 20:49:55 -05:00 |
|
|
|
e043f4bb66
|
API cleanup
|
2019-12-14 18:19:02 -05:00 |
|
|
|
9d3dda035c
|
Compile fixes
|
2019-12-14 12:53:37 -05:00 |
|
|
|
6e16aab794
|
Merge remote-tracking branch 'origin/master'
|
2019-12-14 11:05:32 -05:00 |
|
|
|
c1cf3183ac
|
Fixed some Android-related script issues
|
2019-12-14 11:04:22 -05:00 |
|
|
|
252d0f6aa1
|
aaaaa
|
2019-12-14 10:51:36 -05:00 |
|
|
|
1f5a6e1bf8
|
Compile error fixes
|
2019-12-14 10:06:09 -05:00 |
|
|
|
58e3143e2a
|
Content cleaning
|
2019-12-14 09:33:07 -05:00 |
|
|
|
71eb19d4f3
|
Update core/assets/bundles/bundle_fr.properties
Co-Authored-By: YaFou <33806646+YaFou@users.noreply.github.com>
|
2019-12-14 11:12:12 +01:00 |
|
|
|
9033ebcfd7
|
Merge pull request #1019 from Kieaer/patch-4
Add WithdrawEvent
|
2019-12-13 23:19:19 -05:00 |
|
|
|
1f5e773c77
|
Fixed double-event firing
|
2019-12-13 23:15:49 -05:00 |
|
|
|
472069855c
|
Apply French localization.
|
2019-12-13 19:33:34 +01:00 |
|
|
|
7f5e494709
|
Update bundle.properties
|
2019-12-13 14:52:15 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6ce013a1eb
|
Make diagonal placement keybind modify scroll to always zoom
|
2019-12-12 14:56:32 -08:00 |
|
|
|
19675068ea
|
Fixed wave time not saving properly
v101
|
2019-12-12 17:09:29 -05:00 |
|
|
|
5db8520b74
|
Add rotation checks to mobile zoom
|
2019-12-12 13:52:05 -08:00 |
|
|
|
c3e41140e0
|
Disabled smart resource usage for now
|
2019-12-12 16:39:34 -05:00 |
|
|
|
bce379d40d
|
Merge remote-tracking branch 'origin/master'
|
2019-12-12 16:34:37 -05:00 |
|
|
|
8fde8695d0
|
Fixed tests
|
2019-12-12 16:33:24 -05:00 |
|
|
|
8c1c54d49a
|
Merge pull request #1207 from Prosta4okua/master
1 new line
|
2019-12-12 16:31:04 -05:00 |
|
|
|
01e3912827
|
Implemented conservative generators / Closes #804
|
2019-12-12 16:28:02 -05:00 |
|
|
|
e22f853a31
|
1 new line
mod.scripts.unsupported
|
2019-12-13 00:08:23 +03:00 |
|
|
|
1ae20553ff
|
Merge remote-tracking branch 'origin/master'
|
2019-12-12 16:07:40 -05:00 |
|
|
|
c68eaade94
|
Merge pull request #1204 from Prosta4okua/master
Ukrainian translation.
|
2019-12-12 16:07:29 -05:00 |
|
|
|
1461b5b357
|
Merge pull request #1205 from Prosta4okua/patch-2
True Ukrainian translation
|
2019-12-12 16:07:05 -05:00 |
|
|
|
f0dd3b3a39
|
Merge pull request #1109 from ballgamer56/patch-1
Thai translation
|
2019-12-12 15:54:50 -05:00 |
|
|
|
61d724ee2b
|
Added Thai font
|
2019-12-12 15:54:25 -05:00 |
|
|
|
d60c2c5b63
|
Merge branch 'master' into patch-2
|
2019-12-12 22:40:30 +02:00 |
|
|
|
7e696cadaf
|
Update bundle_uk_UA.properties
|
2019-12-12 22:36:54 +02:00 |
|
|
|
0f23bf9d08
|
Merge pull request #1156 from martin-mfg/master
add and fix some German translations
|
2019-12-12 15:34:44 -05:00 |
|
|
|
202d79817a
|
Merge pull request #1149 from itskatt/french-translation
Update the French Translation
|
2019-12-12 15:34:06 -05:00 |
|
|
|
736737f151
|
Make scroll zoom by default, remove zoom hold keybind
|
2019-12-12 12:23:32 -08:00 |
|
|
|
2366d25de7
|
Add liquid void block.
|
2019-12-12 21:11:14 +01:00 |
|
|
|
a29ce3b0b9
|
Merge pull request #1202 from AmateurPotion/patch-23
Update bundle_ko.properties
|
2019-12-12 09:30:18 -05:00 |
|
|
|
fed4842222
|
Update bundle_ko.properties
|
2019-12-12 21:48:38 +09:00 |
|
|
|
fbed11e927
|
Fixed #1198
|
2019-12-11 15:13:45 -05:00 |
|
|
|
45ce4013d0
|
Merge remote-tracking branch 'origin/master'
|
2019-12-11 14:26:51 -05:00 |
|
|
|
6f3d585118
|
Merge pull request #1183 from GioIacca9/patch-2
Update bundle_it.properties
|
2019-12-11 14:24:37 -05:00 |
|
|
|
962ce7bfa6
|
Merge pull request #1187 from AmateurPotion/patch-22
Update bundle_ko.properties
|
2019-12-11 14:24:24 -05:00 |
|
|
|
b6ee157adb
|
Update bundle_zh_TW.properties (#1190)
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
|
2019-12-11 14:24:15 -05:00 |
|
|
|
a45a632726
|
Update bundle_nl_BE.properties (#1194)
|
2019-12-11 14:24:07 -05:00 |
|
|
|
675e15ddca
|
Minor refactor of class names
|
2019-12-11 14:23:53 -05:00 |
|
|
|
f6b9830f82
|
Update bundle_cs.properties (#1192)
|
2019-12-11 10:51:34 -05:00 |
|
