Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,971 Commits 4 Branches 180 Tags
6fa9abd896d7b2a4dccf32e58c503b47ad0b6d91
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 6fa9abd896 discard 2019-06-28 23:04:43 -04: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
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 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
Anuken bc3405d11d Bugfixes 2019-06-17 15:45:10 -04:00
Anuken 2804361436 Bugfix 2019-06-17 12:18:10 -04:00
Anuken 4f40f3c4b2 More sprite updates 2019-06-17 10:08:24 -04:00
Anuken 897c55c410 Bugfixes 2019-06-16 23:38:50 -04:00
Anuken 9e97b5851e Where did that go? 2019-06-16 19:11:41 -04:00
Anuken 625fbdb2d7 Auto-rebuilding enemy drones / GC improvements 2019-06-16 18:50:51 -04:00
Anuken 273c74b275 Many things 2019-06-15 23:26:43 -04:00
Anuken 2500d0a930 Fixed maps getting rejected even with cores 2019-06-14 23:03:19 -04:00
Anuken 25bf3be009 Merge remote-tracking branch 'origin/master' 2019-06-14 21:07:10 -04:00
Anuken 910dab1896 More drone changes 2019-06-14 21:06:58 -04:00
Anuken 89b3d3b670 Removed difficulty 2019-06-14 15:53:09 -04:00
Anuken 122f43ddb9 Fixed unit tests 2019-06-14 15:07:39 -04:00
Anuken 50104d2532 Fixed door toggle 2019-06-14 13:29:40 -04:00
Anuken 114cd48521 Actually functional builder drones 2019-06-13 22:34:24 -04:00
Anuken 548da3ea5f Further drone splitting / Even drone player distribution 2019-06-13 22:22:25 -04:00
Anuken 2a8b8d040b Fixed deconstruction exploit 2019-06-13 20:17:48 -04:00
Anuken 8ac497354a Miner drone / Editor bugfixes 2019-06-12 22:09:24 -04:00
Anuken 0cbbcc00a5 Zone rules moved to maps 2019-06-12 19:25:22 -04:00
Anuken 5cfab33ada Fixed unit tests / Fixed zones having incorrect waves 2019-06-12 18:42:12 -04:00
Anuken 18328320c1 Fixed black blocks/units after quit / Fixed intense wave spawn lag 2019-06-12 18:07:19 -04:00
Anuken 73c48afc99 Save loading regression tests 2019-06-12 15:52:47 -04:00
Anuken 62bd0442df Testing loading of old saves 2019-06-12 15:29:41 -04:00
Anuken 0aee75c1c1 Splitting of building+mining into separate traits 2019-06-12 14:03:50 -04:00
Anuken dc3c27297f Team drawing 2019-06-12 10:28:38 -04:00
Anuken 9363946874 Fixed terminology 2019-06-11 23:39:01 -04:00
Anuken df78412896 Desktop/mobile descriptive tool modes 2019-06-11 23:31:57 -04:00
Anuken 16190aa878 Better server discovery 2019-06-11 13:01:28 -04:00
Anuken 75a5bbdbb1 Start on multicast 2019-06-11 10:05:35 -04:00
Anuken af1746932f Fixed incorrect scaling 2019-06-11 08:47:16 -04:00
Anuken 0dd15f3141 Fixed build errors 2019-06-10 18:51:06 -04:00
Anuken 72fb7b9df7 Net refactor 2019-06-10 18:46:58 -04:00
Anuken d7e1297cce Tweaks 2019-06-10 15:14:57 -04:00
Anuken 3c9d4ee38f Merge remote-tracking branch 'origin/master' 2019-06-10 13:55:40 -04:00
Anuken 828e6bb1b7 New changes, possible fixes to UI layout bugs 2019-06-10 13:55:18 -04:00
Anuken 6d1b8b81fa Bugfixes 2019-06-10 10:11:28 -04:00
Anuken 340bc5f2f7 Ground zero map updated 2019-06-09 23:29:10 -04:00
Anuken ea0788f56c Better wave timer / Sprite tweaks / Core wave spawns 2019-06-09 21:09:29 -04:00
Anuken 4199702b9b Updated turret sprites 2019-06-09 14:46:48 -04:00
Anuken 5946aaa31f Merge remote-tracking branch 'origin/master' 2019-06-09 12:04:49 -04:00
Anuken 444b5dbd97 Turret balance / Bugfixes 2019-06-09 12:04:45 -04:00
Anuken bd4d8efd78 Fixed invisible ship bug 2019-06-08 22:20:30 -04:00
Anuken 53baad766f More balancing and cleanup 2019-06-08 17:34:29 -04:00
Anuken 8ac746188b Unit pad balance 2019-06-08 17:22:46 -04:00
Anuken fd5d0b2cbb Fixed PvP core assignment 2019-06-08 14:41:35 -04:00
Anuken 6226e0c5a3 Fixed old pathfinding targets not resetting on death 2019-06-08 13:04:26 -04:00
Anuken 01a9be835f what 2019-06-08 12:29:27 -04:00
Anuken 97eb66b0a5 Bundle update 2019-06-08 12:11:32 -04:00
Anuken 048c5e68f1 Crash fix 2019-06-08 11:28:33 -04:00
Anuken 8f39def993 Changed wiki link to point to unfinished 4.0 wiki 2019-06-08 10:56:47 -04:00
Anuken 0be674d7af Changed back overflow gate speed 2019-06-08 10:48:32 -04:00
Anuken e6499f7e5a Bugfixes 2019-06-08 10:41:22 -04:00
Anuken 10bd1d1969 Fixed #509 2019-06-08 10:05:08 -04:00
AnukenandGitHub ec94267b8e Update ServerControl.java 2019-06-08 09:23:15 -04:00
AnukenandGitHub d3ad113bf5 Update ServerControl.java 
;
 2019-06-08 09:18:39 -04:00
AnukenandGitHub 8d7242a1ef Update ServerControl.java 2019-06-08 09:08:49 -04:00
Anuken 13879dd374 Fixed #513 2019-06-07 18:58:07 -04:00
Anuken 0f519fd358 Bugfixes for 78.1 2019-06-07 17:34:46 -04:00
Anuken e7fb128499 Fixed sorter loading 2019-06-07 16:13:48 -04:00
Anuken c2d619cb7f Save IO fixes 2019-06-07 16:06:23 -04:00
Anuken 78176cca90 unused -> unchecked 2019-06-07 15:06:17 -04:00
Anuken dbc49649c0 Merge remote-tracking branch 'origin/master' 2019-06-07 15:04:43 -04:00
Anuken 49ee821029 More stuff fixed / Contributor list 2019-06-07 15:03:01 -04:00
AnukenandGitHub e1499330bc Merge pull request #508 from VizardAlpha/patch-21 
Updates bundle_fr_BE.properties
 2019-06-07 14:19:21 -04:00
AnukenandGitHub 222175e005 Merge pull request #497 from ZacBytes/patch-5 
Update bundle_zh_CN.properties
 2019-06-07 14:18:40 -04:00
AnukenandGitHub 388927715e Merge branch 'master' into patch-5 2019-06-07 14:18:33 -04:00
AnukenandGitHub ac9e1febfb Merge pull request #492 from MrPickles14/patch-2 
Update bundle_fr.properties
 2019-06-07 14:16:08 -04:00
AnukenandGitHub e47836cc64 Merge branch 'master' into patch-2 2019-06-07 14:16:00 -04:00
AnukenandGitHub f8f48f1c88 Merge pull request #491 from MrPickles14/patch-1 
Update bundle_fr.properties
 2019-06-07 14:14:29 -04:00