Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,060 Commits 4 Branches 180 Tags
d8d04f2ac39950783b5c0e2e2939bf4d82e9eb40
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AnukenandGitHub 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
AnukenandGitHub b0eaca091a Merge pull request #541 from CinExPL/patch-8 
Update bundle_pl.properties
 2019-07-06 17:13:12 -06:00
AnukenandGitHub aab13a5582 Merge branch 'master' into patch-8 2019-07-06 17:13:06 -06:00
AnukenandGitHub f852ba02d8 Merge pull request #546 from Natchuz/polish-translation 
Updated bundle_pl.properties
 2019-07-06 17:12:35 -06:00
AnukenandGitHub 4aa074b9fc Merge pull request #547 from etaoinshrdlcumwfgypbvkjxqz/zh-TW 
Update Chinese (Taiwan) translation
 2019-07-06 17:12:19 -06:00
AnukenandGitHub 2f7503c752 Merge pull request #548 from Prosta4okua/patch-3 
Update bundle_uk_UA.properties
 2019-07-06 17:12:03 -06:00
AnukenandGitHub 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
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
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
Anuken d2bb3800e3 Added version display, info dialog back 2019-07-05 13:41:22 -04:00
Anuken f0959ab356 More UI and layout changes 2019-07-05 12:02:02 -04:00
Anuken 2c5546c6fb Slight cleanup 2019-07-04 23:40:19 -04:00
Anuken a7a565b93e Hacky pad fix 2019-07-04 17:29:31 -04:00
Anuken ed074bd08b UI stuff 2019-07-04 17:11:30 -04:00
Anuken d938b22729 Fixed incorrect blend/median previews on mobile 2019-07-04 09:22:13 -04:00
Anuken 0371126ccf Various menu fixes 2019-07-04 00:51:42 -04:00
Anuken ab36b6a2e1 Random flyers 2019-07-03 23:46:55 -04:00
Anuken d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
Anuken 0837c476a1 T 2019-07-03 20:24:11 -04:00
Anuken 77a41b1783 Actually fixed FPS cap 2019-07-03 19:11:22 -04:00
Anuken 0d39400f8b Fixed performance regression / Removed useless fallback sprites 2019-07-03 17:07:22 -04:00
Anuken d3c8678f80 Splitting UI atlas 2019-07-03 15:59:50 -04:00
Anuken b7008072f8 Rendering cleanup 2019-07-03 15:35:10 -04:00
Anuken 15737810f0 Fixed unit tests 2019-07-03 13:06:18 -04:00
Anuken 5036c57372 Fixed incorrect fps cap 2019-07-03 13:00:57 -04:00
Anuken 5799e6f567 Laser optimization 2019-07-03 10:41:16 -04:00
Anuken 310e8afc25 Fixed loading of older saves 2019-07-03 10:11:22 -04:00
Anuken 78215363dc Work on fixing entity ID mapping 2019-07-03 09:50:33 -04:00
Anuken 4e873f8bf3 oh no it's broken 2019-07-02 22:44:55 -04:00
Anuken 79dc116e6a Nothing interesting 2019-07-02 22:38:25 -04:00
Anuken a7480ae656 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-07-02 18:53:43 -04:00
Anuken 62e310a776 Updated gradle to 5.5 2019-07-02 18:53:27 -04:00
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
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
AnukenandGitHub 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
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
AnukenandGitHub ab5319f3d1 Merge pull request #515 from Kieaer/patch-6 
Update bundle_ko.properties
 2019-06-29 13:31:49 -04:00
AnukenandGitHub 6128df0062 Merge pull request #517 from DVanatic/patch-1 
Request Update (bundle.in_ID.properties)
 2019-06-29 13:31:40 -04:00
AnukenandGitHub 142938cdca Merge pull request #521 from Prosta4okua/patch-1 
Patch 1. Fight!
 2019-06-29 13:31:24 -04:00
AnukenandGitHub b32efe129e Merge pull request #523 from Predator127/patch-8 
Update bundle_pt_BR.properties
 2019-06-29 13:31:14 -04:00
AnukenandGitHub 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 04dfda0c55 Some minor map tweaks and fixes 2019-06-28 23:47:43 -04:00
Anuken b6df916700 Map updates 2019-06-28 23:16:26 -04:00
Anuken 266744b1dd Fixed salvo range 2019-06-24 19:44: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
AnukenandGitHub 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
Anuken 8c91aca838 New maps / New generation filter(s) and tweaks 2019-06-22 20:40:53 -04:00
Anuken b47e282747 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-21 16:16:28 -04:00
AnukenandGitHub ffb5eee62a Update BuilderTrait.java 2019-06-21 09:11:17 -04:00
Anuken 387d9b39da Icon fixes 2019-06-20 22:20:25 -04:00
Anuken 43b5cb62bb Fixed #530 / Better icons / Server list ordering 2019-06-20 22:12:17 -04:00
Anuken 580923a646 Render tests 2019-06-20 16:27:57 -04:00
Anuken 06444f497b Internal tool changes 2019-06-20 15:34:48 -04:00
Anuken 1676ad5f1b Bugfixes 2019-06-20 09:14:47 -04:00
Anuken 478d86677d Fixed boulder sprites 2019-06-20 00:16:22 -04:00
Anuken c5e0db8de9 Why are these synced? 2019-06-19 22:59:28 -04:00
Anuken 228690b400 Fixed net disconnect error 2019-06-19 22:20:45 -04:00
Anuken 1fe30bc466 Branch created 2019-06-19 22:20:17 -04:00
Anuken 8e95be0ac2 Crash fix + drill balance 2019-06-19 21:41:49 -04:00
Anuken 47b1e700ea Fixed travis syntax error 2019-06-19 18:11:08 -04:00
Anuken 3ad1949727 Minor tweaks before release 2019-06-19 18:04:31 -04:00
Anuken 441680861e Player spawning bugfix 2019-06-19 13:32:38 -04:00
Anuken c9520e607f Implemented craters map, again / Disabled unit editing 2019-06-18 20:45:21 -04:00
Anuken 40a8c52ba1 Testing travis build again 2019-06-18 18:41:03 -04:00
Anuken cb6ffd7810 Testing travis wiki building 2019-06-18 18:30:43 -04:00
Anuken 185a7bb7d8 Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks 2019-06-17 21:35:19 -04:00