Commit Graph

4083 Commits

Author SHA1 Message Date
Anuken
5a594f7d9a Bugfixes / unfinished new zones 2019-07-22 18:47:23 -04:00
Anuken
aff87a26ce Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-07-22 17:01:55 -04:00
Anuken
18aae0cfa5 Zones 2019-07-22 16:09:50 -04:00
Anuken
6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
Anuken
8d2a637bd8 Fixed build errors 2019-07-22 00:56:00 -04:00
Anuken
54180c4768 Menu fix 2019-07-22 00:45:09 -04:00
Anuken
4e22384ed1 Merge branches 'master' and 'uiscale' of https://github.com/Anuken/Mindustry 2019-07-17 21:19:16 -04:00
Anuken
029f801159 Added UI scale slider 2019-07-17 17:20:21 -04:00
L5474
fd53671430 Removed duplicate of my name (#558)
just saw #557 and got reminded of this file and checked it out. Why is my name on here twice lol.
2019-07-14 15:25:42 -06:00
Anuken
7b09548261 Merge remote-tracking branch 'origin/master' 2019-07-14 15:25:38 -04:00
Anuken
63e1311656 Bugfixes / Incomplete zone description field 2019-07-14 15:25:30 -04:00
Arkanic
36a303a86f I meekly request (#557) 2019-07-14 12:19:35 -06:00
Anuken
61f903dcf1
Update InputHandler.java 2019-07-14 12:54:24 -04:00
Anuken
2a10562e9e Merge remote-tracking branch 'origin/master' 2019-07-13 14:04:06 -04:00
Anuken
d64796f32a Clamping of tree views 2019-07-13 14:04:01 -04:00
Franciszek Zaranowicz
f2d67d0a5d Loadout for non-zones maps (#535)
* Loadout for non-zones maps

* Requested Changes

* Fixed Import

* Requested Changes #2
2019-07-13 10:28:04 -06:00
Anuken
ad39a51fe8 nothing 2019-07-12 23:52:31 -04:00
Anuken
14d0927fb6 Basic deploy background 2019-07-12 01:03:01 -04:00
Anuken
1697465d0d Core balancing 2019-07-11 23:30:11 -04:00
Anuken
e52965d039 Bugfixes 2019-07-10 09:55:31 -04:00
Anuken
a8d957bf7d
Update OverdriveProjector.java 2019-07-10 09:05:47 -04:00
Anuken
b6b5343e04 Cleanup 2019-07-09 15:43:11 -04:00
Anuken
d4c318438d Removed buggy limited respawns 2019-07-09 12:12:43 -04:00
Anuken
d8d04f2ac3 Moved block icons to UI atlas 2019-07-08 15:49:47 -04:00
Anuken
1c38e73290 a warning 2019-07-08 11:07:45 -04:00
Anuken
7fc6b9b940 Removed quit button on iOS as per guidelines 2019-07-08 10:54:02 -04:00
Prosta4okua
ed50ed8550 Update bundle.properties (#553)
* Update bundle.properties

* Update bundle.properties

* Update bundle.properties

* Update bundle.properties
2019-07-08 07:20:08 -06:00
Anuken
fb4c65dae0
Update AboutDialog.java 2019-07-08 08:58:31 -04:00
Anuken
fc9543baa7 Updated sprites/UI colors 2019-07-07 14:11:57 -04:00
Anuken
b0eaca091a
Merge pull request #541 from CinExPL/patch-8
Update bundle_pl.properties
2019-07-06 17:13:12 -06:00
Anuken
aab13a5582
Merge branch 'master' into patch-8 2019-07-06 17:13:06 -06:00
Anuken
f852ba02d8
Merge pull request #546 from Natchuz/polish-translation
Updated bundle_pl.properties
2019-07-06 17:12:35 -06:00
Anuken
4aa074b9fc
Merge pull request #547 from etaoinshrdlcumwfgypbvkjxqz/zh-TW
Update Chinese (Taiwan) translation
2019-07-06 17:12:19 -06:00
Anuken
2f7503c752
Merge pull request #548 from Prosta4okua/patch-3
Update bundle_uk_UA.properties
2019-07-06 17:12:03 -06:00
Anuken
d754593c2b
Merge pull request #549 from Prosta4okua/patch-4
Update bundle_ru.properties
2019-07-06 17:11:43 -06:00
Anuken
07ea938885 Mobile fix / Readme updated 2019-07-06 19:08:16 -04:00
Anuken
ac87930672 Balancing 2019-07-06 19:02:28 -04:00
Anuken
3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Prosta4okua
120faf3806
Update bundle_ru.properties 2019-07-06 21:31:01 +03:00
Prosta4okua
f51f04d170
Update bundle_uk_UA.properties 2019-07-06 21:30:38 +03:00
Anuken
ec7bb78ee4 Basic UI improvements 2019-07-06 14:08:43 -04:00
Anuken
5ae1e59b5c UI 2019-07-06 12:22:10 -04:00
Anuken
e3956ebcf2 Regression fixes 2019-07-06 11:02:55 -04:00
Anuken
bb75e8f2e0 Removed loading screen 2019-07-06 10:15:21 -04:00
Anuken
a77b1416e5 Merge branches 'master' and 'new-ui' of https://github.com/Anuken/Mindustry 2019-07-06 10:13:11 -04:00
Anuken
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
Anuken
988aee3078 Fixed editor saving incorrect map size 2019-07-05 23:34:04 -04:00
William So
2bb99bb100
Update Chinese (Taiwan) translation 2019-07-06 10:55:14 +08:00
Anuken
4e7ddc7e71 Fill tool fix 2019-07-05 14:39:45 -04:00
Anuken
174caef7ca Added turret damage / Removed changelog dialog 2019-07-05 14:01:54 -04:00