Commit Graph

1752 Commits

Author SHA1 Message Date
c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
52374ce06d Zone changes 2019-07-23 11:45:46 -04:00
5a594f7d9a Bugfixes / unfinished new zones 2019-07-22 18:47:23 -04:00
6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
4e22384ed1 Merge branches 'master' and 'uiscale' of https://github.com/Anuken/Mindustry 2019-07-17 21:19:16 -04:00
029f801159 Added UI scale slider 2019-07-17 17:20:21 -04:00
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
7b09548261 Merge remote-tracking branch 'origin/master' 2019-07-14 15:25:38 -04:00
63e1311656 Bugfixes / Incomplete zone description field 2019-07-14 15:25:30 -04:00
36a303a86f I meekly request (#557) 2019-07-14 12:19:35 -06:00
14d0927fb6 Basic deploy background 2019-07-12 01:03:01 -04:00
e52965d039 Bugfixes 2019-07-10 09:55:31 -04:00
d8d04f2ac3 Moved block icons to UI atlas 2019-07-08 15:49:47 -04:00
1c38e73290 a warning 2019-07-08 11:07:45 -04:00
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
fc9543baa7 Updated sprites/UI colors 2019-07-07 14:11:57 -04:00
aab13a5582 Merge branch 'master' into patch-8 2019-07-06 17:13:06 -06:00
f852ba02d8 Merge pull request #546 from Natchuz/polish-translation
Updated bundle_pl.properties
2019-07-06 17:12:35 -06:00
4aa074b9fc Merge pull request #547 from etaoinshrdlcumwfgypbvkjxqz/zh-TW
Update Chinese (Taiwan) translation
2019-07-06 17:12:19 -06:00
2f7503c752 Merge pull request #548 from Prosta4okua/patch-3
Update bundle_uk_UA.properties
2019-07-06 17:12:03 -06:00
d754593c2b Merge pull request #549 from Prosta4okua/patch-4
Update bundle_ru.properties
2019-07-06 17:11:43 -06:00
3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
120faf3806 Update bundle_ru.properties 2019-07-06 21:31:01 +03:00
f51f04d170 Update bundle_uk_UA.properties 2019-07-06 21:30:38 +03:00
5ae1e59b5c UI 2019-07-06 12:22:10 -04:00
e3956ebcf2 Regression fixes 2019-07-06 11:02:55 -04:00
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
2bb99bb100 Update Chinese (Taiwan) translation 2019-07-06 10:55:14 +08:00
174caef7ca Added turret damage / Removed changelog dialog 2019-07-05 14:01:54 -04:00
d2bb3800e3 Added version display, info dialog back 2019-07-05 13:41:22 -04:00
f0959ab356 More UI and layout changes 2019-07-05 12:02:02 -04:00
a7a565b93e Hacky pad fix 2019-07-04 17:29:31 -04:00
ed074bd08b UI stuff 2019-07-04 17:11:30 -04:00
bd88a2378f Updated bundle_pl.properties 2019-07-04 13:21:44 +02:00
d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
0d39400f8b Fixed performance regression / Removed useless fallback sprites 2019-07-03 17:07:22 -04:00
d3c8678f80 Splitting UI atlas 2019-07-03 15:59:50 -04:00
79dc116e6a Nothing interesting 2019-07-02 22:38:25 -04:00
217237b57e New menu background, unfinished 2019-07-02 14:42:24 -04:00
cb7b6eb3f8 More menu 2019-07-02 10:01:34 -04:00
09d905b96f Update bundle_pl.properties
few changes ;)
2019-07-01 17:55:16 +02:00
94f175e2cd Moved map dialog 2019-07-01 09:31:39 -04:00
5e15c5574a menu stuff 2019-06-30 16:52:34 -04:00
1c530a6c7a Merge + update 2019-06-30 14:13:13 -04:00
3021cc29da Fixed tops of some generator blocks 2019-06-30 11:25:39 -04:00
12bff75586 Various fixes 2019-06-30 00:07:04 -04:00
ab5319f3d1 Merge pull request #515 from Kieaer/patch-6
Update bundle_ko.properties
2019-06-29 13:31:49 -04:00
6128df0062 Merge pull request #517 from DVanatic/patch-1
Request Update (bundle.in_ID.properties)
2019-06-29 13:31:40 -04:00
142938cdca Merge pull request #521 from Prosta4okua/patch-1
Patch 1. Fight!
2019-06-29 13:31:24 -04:00
b32efe129e Merge pull request #523 from Predator127/patch-8
Update bundle_pt_BR.properties
2019-06-29 13:31:14 -04:00