Commit Graph

4264 Commits

Author SHA1 Message Date
Anuken
bb398a2f1e Crash fixes 2019-07-02 18:52:04 -04:00
Anuken
79ab2d122d Changed layout structure 2019-07-02 18:40:39 -04:00
Anuken
3a2f73a176 Merge branches 'master' and 'new-ui' of https://github.com/Anuken/Mindustry into new-ui 2019-07-02 18:40:14 -04:00
Anuken
217237b57e New menu background, unfinished 2019-07-02 14:42:24 -04:00
Anuken
cb7b6eb3f8 More menu 2019-07-02 10:01:34 -04:00
Anuken
6e21d7f560 menu 2019-07-01 14:30:46 -04:00
CinExPL
09d905b96f
Update bundle_pl.properties
few changes ;)
2019-07-01 17:55:16 +02:00
Anuken
8f29d4871d Moved version info 2019-07-01 10:27:56 -04:00
Anuken
94f175e2cd Moved map dialog 2019-07-01 09:31:39 -04:00
Anuken
5e15c5574a menu stuff 2019-06-30 16:52:34 -04:00
Anuken
1c530a6c7a Merge + update 2019-06-30 14:13:13 -04:00
Anuken
8fc0872b90
Merge pull request #540 from xslendix/master
Fixed gradlew
2019-06-30 12:17:46 -04:00
Anuken
3021cc29da Fixed tops of some generator blocks 2019-06-30 11:25:39 -04:00
Anuken
c77f51b7ae Bugfixes 2019-06-30 10:09:20 -04:00
xSlendiX
aa39d36663
Merge pull request #1 from xslendix/xslendix-patch-1
Update gradlew
2019-06-30 13:14:58 +03:00
xSlendiX
40907db32d
Update gradlew 2019-06-30 13:13:05 +03:00
Anuken
12bff75586 Various fixes 2019-06-30 00:07:04 -04:00
Anuken
8bc59fb67c Fixed startup logo not fitting on screen 2019-06-29 13:50:59 -04:00
Anuken
ab5319f3d1
Merge pull request #515 from Kieaer/patch-6
Update bundle_ko.properties
2019-06-29 13:31:49 -04:00
Anuken
6128df0062
Merge pull request #517 from DVanatic/patch-1
Request Update (bundle.in_ID.properties)
2019-06-29 13:31:40 -04:00
Anuken
142938cdca
Merge pull request #521 from Prosta4okua/patch-1
Patch 1. Fight!
2019-06-29 13:31:24 -04:00
Anuken
b32efe129e
Merge pull request #523 from Predator127/patch-8
Update bundle_pt_BR.properties
2019-06-29 13:31:14 -04:00
Anuken
2b20272a61
Merge pull request #525 from VizardAlpha/patch-22
Updates bundle_fr_BE.properties
2019-06-29 13:31:01 -04:00
Anuken
d9ef79a7b5 Regression fix / Slightly better server dialog 2019-06-29 13:19:53 -04:00
Anuken
576f0be4ab Fixed incorrect game-overs on zone attack maps 2019-06-29 11:02:27 -04:00
Anuken
89a4e6506f Bloom option 2019-06-29 10:40:52 -04:00
키에르
47099a8a9b
Update bundle_ko.properties 2019-06-29 15:00:06 +09:00
Anuken
04dfda0c55 Some minor map tweaks and fixes 2019-06-28 23:47:43 -04:00
Anuken
22656a40b2 Bloom fix 2019-06-28 23:31:34 -04:00
Anuken
b6df916700 Map updates 2019-06-28 23:16:26 -04:00
Anuken
6fa9abd896 discard 2019-06-28 23:04:43 -04:00
Prosta4ok_ua
e239406199 Нові переклади 2019-06-25 23:16:07 +03:00
Anuken
b7a0ebad17 Merge branch 'master' of https://github.com/Anuken/Mindustry into bloom 2019-06-24 19:45:13 -04:00
Anuken
266744b1dd Fixed salvo range 2019-06-24 19:44:57 -04:00
Anuken
f8526e1ac7 Bloom 2019-06-24 19:39:57 -04:00
Anuken
ab716e96e2 Bugfixes 2019-06-24 16:54:50 -04:00
Anuken
649d527dcf Temporary loading screen 2019-06-23 14:09:29 -04:00
Anuken
c5e7ddaf7a
Added option to set TextField length for showTextInput() (#534)
* Add files via upload

* Added option to set TextField length for showTextInput()

the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name.
(I actually have no idea if this PR can be delivered correctly, wish me luck.)

* Rename UI.java to core\src\io\anuke\mindustry\ui/UI.java

* Rename SaveDialog.java to core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java

* Delete UI.java

* Added option to set TextField length for showTextInput()

the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name. (I actually have no idea if this PR can be delivered correctly, wish me luck.)

* Delete UI.java

* Delete SaveDialog.java

* Add files via upload

* Add files via upload

* Delete UI.java

* Delete SaveDialog.java

* Delete core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java

* Delete Mindustry-64.zip
2019-06-23 12:45:37 -04:00
Anuken
b2a4cb42cf Sprite updates 2019-06-23 12:36:13 -04:00
Anuken
3fc5941f54 Wiki whitespace fix 2019-06-23 11:16:11 -04:00
Anuken
741360022b Typo 2019-06-23 11:03:05 -04:00
Anuken
86e2f62aed Fixed locales not generating 2019-06-23 10:52:03 -04:00
Anuken
e552915637 Test 2 2019-06-23 10:33:25 -04:00
Anuken
98a51c1f61 Testing improved deployment script 2019-06-23 10:29:22 -04:00
(G_H)
aa84eefa8f
Merge branch 'master' into GH-v80 2019-06-23 21:07:06 +08:00
(G_H)
22e12ce3e5
Delete Mindustry-64.zip 2019-06-23 20:22:22 +08:00
(G_H)
f4a82b5c01
Delete core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java 2019-06-23 20:22:13 +08:00
(G_H)
60520ea855
Delete SaveDialog.java 2019-06-23 17:59:36 +08:00
(G_H)
b70a0869cd
Delete UI.java 2019-06-23 17:59:24 +08:00
(G_H)
7bdd21bb75
Add files via upload 2019-06-23 17:59:14 +08:00