Anuken
|
2dfb9830a3
|
Merge branch 'master' into v107
|
2020-10-23 09:34:04 -04:00 |
|
Anuken
|
a1de6e5288
|
Merge branch 'master' into patch-7
|
2020-10-23 09:30:23 -04:00 |
|
Anuken
|
a16b9240d6
|
Merge branch 'master' into patch-15
|
2020-10-23 09:28:47 -04:00 |
|
Anuken
|
e163a80ba7
|
Merge pull request #2748 from ballgamer56/patch-2
Update Thai translation
|
2020-10-23 09:25:05 -04:00 |
|
Anuken
|
d66cf13ac6
|
Added buttons to clear campaign saves & research
|
2020-10-23 09:08:17 -04:00 |
|
Anuken
|
4f21ea7799
|
Fixed archipelago map / filters messing with block data
|
2020-10-22 18:11:12 -04:00 |
|
Anuken
|
a2e75df096
|
Map editor tweaks & fixes / New map
|
2020-10-22 15:27:30 -04:00 |
|
Anuken
|
c2ff5a69ef
|
Buffered map-load filter support / Spawn path filter
|
2020-10-22 12:27:22 -04:00 |
|
YellOw139
|
f4fcb8daa6
|
Update bundle_ro.properties
|
2020-10-22 19:14:48 +03:00 |
|
Anuken
|
46b2f4cccb
|
Minor bugfixes & wave tweaks
|
2020-10-22 11:54:27 -04:00 |
|
Felix Corvus
|
c63b98150f
|
Merge branch 'master' into master
|
2020-10-22 18:21:52 +03:00 |
|
Vanguard
|
91164f659b
|
smol breyn
|
2020-10-22 18:02:39 +03:00 |
|
Vanguard
|
70750920fa
|
anuke shenanigans
a lot of them
|
2020-10-22 17:14:41 +03:00 |
|
YellOw139
|
76d2fc0f54
|
Typo
|
2020-10-22 16:23:21 +03:00 |
|
YellOw139
|
4d28b5083c
|
Quezler Status Fielded my mind
|
2020-10-22 14:27:56 +03:00 |
|
YellOw139
|
dabdf514d6
|
Space
|
2020-10-22 07:50:35 +03:00 |
|
Anuken
|
f0d74e2705
|
New map / Unit stat tweaks / FileChooser keyboard input
|
2020-10-21 20:32:35 -04:00 |
|
YellOw139
|
21022436e8
|
Stats are finally consistent and up to date
|
2020-10-21 22:02:24 +03:00 |
|
Anuken
|
a80d0cc457
|
Fixed #3053
|
2020-10-21 14:10:28 -04:00 |
|
Volas171
|
dec9e8d4aa
|
Merge branch 'master' into patch-1
|
2020-10-21 10:53:20 -05:00 |
|
Anuken
|
48f5be6623
|
Merge pull request #3051 from skykatik/patch-1
var -> let
|
2020-10-21 10:48:22 -04:00 |
|
Anuken
|
ee8f18796e
|
Merge remote-tracking branch 'origin/master'
|
2020-10-21 10:37:07 -04:00 |
|
Anuken
|
3517da8214
|
Fixed #3049
|
2020-10-21 10:37:03 -04:00 |
|
Skat
|
aba001f499
|
var deprecated, use let or const
|
2020-10-21 16:05:36 +03:00 |
|
키에르
|
f3f5872159
|
Merge branch 'master' into patch-5
|
2020-10-21 20:14:40 +09:00 |
|
YellOw139
|
eba9578a0d
|
More conflict changes. Should be ok now.
|
2020-10-21 07:30:18 +03:00 |
|
YellOw139
|
b95bf1595b
|
Fog
|
2020-10-21 07:28:27 +03:00 |
|
YellOw139
|
92b8981988
|
Merge branch 'master' into patch-5
|
2020-10-21 07:22:51 +03:00 |
|
YellOw139
|
83c53a541a
|
Wall stats (WIP)
|
2020-10-21 07:10:48 +03:00 |
|
Leonwang4234
|
54fd2e03b4
|
resolve conflicts
|
2020-10-20 15:57:48 -07:00 |
|
Leonwang4234
|
df37ce3cef
|
Merge remote-tracking branch 'upstream/master' into wall-stats
|
2020-10-20 15:49:46 -07:00 |
|
Anuken
|
18e6a43a87
|
Added weather to some built-in maps
|
2020-10-20 17:24:51 -04:00 |
|
Anuken
|
8f58228317
|
More base parts
|
2020-10-20 15:43:06 -04:00 |
|
Anuken
|
30abfc0619
|
Fixed #3045
|
2020-10-20 14:02:10 -04:00 |
|
ballgamer56
|
f0c5c98633
|
Merge branch 'master' into patch-2
|
2020-10-20 20:23:15 +07:00 |
|
ballgamer56
|
8e164269cc
|
Formated to the newest update
Updated to commit 2ff749bd17
|
2020-10-20 20:02:41 +07:00 |
|
Quick-Korc
|
a1a2007b3e
|
Zone description and typo fixed
|
2020-10-20 19:00:13 +07:00 |
|
WinterUnderTheSnow
|
877999dd1e
|
Update bundle_zh_CN.properties
|
2020-10-20 07:13:10 +08:00 |
|
Thomas Widyantoko
|
0ba653ddd0
|
Merge branch 'master' into patch-2
|
2020-10-20 05:55:02 +07:00 |
|
Anuken
|
c27251cfb0
|
Fog
|
2020-10-19 18:28:37 -04:00 |
|
Anuken
|
6e8732387b
|
Better weather classes
|
2020-10-19 16:25:59 -04:00 |
|
Anuken
|
2ff749bd17
|
Unified stat system
|
2020-10-19 11:34:52 -04:00 |
|
Anuken
|
80f801db36
|
Fixed #3023 / Fixed #3020
|
2020-10-19 10:04:10 -04:00 |
|
Thomas Widyantoko
|
e88a2f8437
|
Space block name changed
|
2020-10-19 14:50:56 +07:00 |
|
Thomas Widyantoko
|
4b4cde288b
|
Update bundle_in_ID.properties
Improved translation, new lines and a slight text color format fix.
|
2020-10-19 13:43:59 +07:00 |
|
Petr Gašparík
|
538c198113
|
Czecg translation up to commit 46ec457
|
2020-10-19 07:48:57 +02:00 |
|
Petr Gašparík
|
8f4ac642d1
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into v107
|
2020-10-19 07:34:10 +02:00 |
|
Leonwang4234
|
cff2799c72
|
remove changes in description
|
2020-10-18 14:29:15 -07:00 |
|
Summet
|
8ceb155e38
|
:)
|
2020-10-19 00:14:40 +03:00 |
|
Leonwang4234
|
db3db47ca1
|
Add wall stats + other changes
|
2020-10-18 13:35:20 -07:00 |
|