Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,486 Commits 4 Branches 180 Tags
eb0a5d4d14adc6df3dd4d4bdee98432fd6e14bed
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub 8a3ed9c80b Merge pull request #2628 from Remint32/patch-5 
[Bundle] Little improvements for convenience
 2020-09-20 09:51:29 -04:00
Anuken 415380f25e Merge remote-tracking branch 'origin/master' 2020-09-19 21:54:18 -04:00
Anuken b9fd38a76e Various tweaks and speculative changes 2020-09-19 21:54:08 -04:00
AnukenandGitHub b4d83f33e9 Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors 
F O R C E P R O J E C T O R S
 2020-09-19 21:15:45 -04:00
AnukenandGitHub 3b8b762a1c Removed phase radius display *(see description)* 
Phased radius has been proposed in numerous PRs, but I don't know how to handle it properly yet. New players may be confused about the extra circle/hexagon indicator around blocks - it's not clear what it means. An extra radius easy to implement, so I'll leave it out of this PR and handle it later.
 2020-09-19 21:15:18 -04:00
Anuken cdd1e90d1a Fixed #2622 2020-09-19 17:35:32 -04:00
Anuken eb8658e140 Mud tweaks / Unit count tweaks 2020-09-19 16:04:50 -04:00
Anuken 84b1c0348d Merge remote-tracking branch 'origin/master' 2020-09-19 14:11:51 -04:00
Anuken 0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
AnukenandGitHub c470c0abe1 Merge pull request #2612 from sk7725/patch-17 
[KO] Update bundle_ko.properties
 2020-09-19 13:26:31 -04:00
Anuken dcbfc2b7aa Storage team colors 2020-09-19 12:38:24 -04:00
Anuken ce8e060f29 Merge remote-tracking branch 'origin/master' 2020-09-19 12:31:06 -04:00
Anuken 9b0947a6e5 Fixed #2607 / Fixed #2604 2020-09-19 12:30:58 -04:00
AnukenandGitHub c865dbb465 Merge pull request #2610 from DeltaNedas/pubtree 
make techtree funcs public
 2020-09-19 12:14:26 -04:00
AnukenandGitHub eb60b60b4a Merge pull request #2615 from Remint32/patch-4 
[Bundle] Missing keybind lines
 2020-09-19 12:12:52 -04:00
Anuken e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Anuken b29c0ab401 Unit production limit tweaks 2020-09-18 22:42:05 -04:00
Anuken 8a99a89f57 how many times do I neet to press refresh before IntelliJ sees the files that were there all along 2020-09-18 21:19:26 -04:00
Anuken c038ef200a arc 2020-09-18 21:16:40 -04:00
Anuken aae045b5dd Outline changes 2020-09-18 21:14:04 -04:00
Anuken 8dd1c5f1f8 hhhhh 2020-09-18 18:56:01 -04:00
Anuken f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Anuken 6b6783f201 Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587 2020-09-18 11:21:50 -04:00
Anuken c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken 4c241f9867 Bugfixes 2020-09-17 23:53:35 -04:00
Anuken f242a2b2cd Fixed #2585 2020-09-17 22:25:56 -04:00
Anuken 0c7a7e00eb Merge remote-tracking branch 'origin/master' 2020-09-17 21:05:23 -04:00
Anuken ea224bd1f1 many things 2020-09-17 21:05:16 -04:00
AnukenandGitHub c5fffb9ddd Merge pull request #2579 from DeltaNedas/logicops 
add lua-style integer division with //
 2020-09-17 14:47:17 -04:00
AnukenandGitHub dfb96dcdd9 Merge pull request #2557 from Vortetty/patch-1 
Update servers_be.json
 2020-09-17 11:15:07 -04:00
AnukenandGitHub b0bb048c35 Merge branch 'master' into patch-1 2020-09-17 11:14:54 -04:00
Anuken ce2dd89f44 Fixed #2571 2020-09-16 23:34:56 -04:00
Anuken 7b55ce94fe Merge remote-tracking branch 'origin/master' 2020-09-16 18:38:30 -04:00
Anuken bdf814c9b9 Removed sector data cache system 2020-09-16 18:38:23 -04:00
AnukenandGitHub 53f5c69d40 Merge pull request #2569 from Mayonez-bat/patch-1 
Update servers_v6.json
 2020-09-16 18:08:32 -04:00
Anuken 030542890e Bugfixes 2020-09-16 16:04:11 -04:00
Anuken 5c98512e4f Bugfixes 2020-09-16 14:53:44 -04:00
Anuken 0847fc9f09 Crash fix 2020-09-16 12:58:26 -04:00
Anuken 47b4da59e0 Fixed #2567 2020-09-16 12:56:32 -04:00
Anuken ddcfd0728d Merge remote-tracking branch 'origin/master' 2020-09-16 11:44:46 -04:00
Anuken 9cfd78ee1f Fixed #2565 2020-09-16 11:44:39 -04:00
AnukenandGitHub 90978b54da Merge pull request #2558 from sk7725/patch-16 
[KO] Unit name changes
 2020-09-16 10:50:39 -04:00
AnukenandGitHub 7e9f5f5dc4 Merge pull request #2562 from Quezler/patch-44 
+ commander
 2020-09-16 10:49:39 -04:00
AnukenandGitHub edb776a549 Merge pull request #2521 from YellOw139/patch-1 
Create bundle_ro.properties
 2020-09-16 10:29:07 -04:00
Anuken bc2d4267ee Merge remote-tracking branch 'origin/master' 2020-09-16 09:57:16 -04:00
Anuken d015e878c8 Visual fixes 2020-09-16 09:57:12 -04:00
AnukenandGitHub bdda8dbd38 Merge pull request #2559 from BasedUser/patch-2 
Update servers_v6.json
 2020-09-16 09:51:12 -04:00
AnukenandGitHub b200b198ed Merge branch 'master' into patch-2 2020-09-16 09:51:05 -04:00
AnukenandGitHub 5b6da6039f Merge pull request #2560 from Somka000/patch-5 
Update servers_v6.json
 2020-09-16 09:33:34 -04:00
AnukenandGitHub 5fbc3b8dd4 Merge pull request #2561 from Somka000/patch-7 
Update servers_be.json
 2020-09-16 09:26:24 -04:00
Anuken e2a838a715 Fixed #2563 2020-09-16 09:23:57 -04:00
Anuken 3974497c31 Merge remote-tracking branch 'origin/master' 2020-09-15 23:49:47 -04:00
Anuken 462e6733ed Cliff-spam cache fix 2020-09-15 23:49:40 -04:00
AnukenandGitHub 2877bdf0d6 Update bundle_ko.properties (#2475) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2020-09-15 20:36:18 -04:00
Anuken 52ff09d024 Fixed deployment 2020-09-15 20:18:21 -04:00
Anuken 23c56974b2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
 2020-09-15 19:28:57 -04:00
Anuken a5ce57e56d Deployment fixes 2020-09-15 19:28:38 -04:00
Anuken 234649bd68 Weather tweaks 2020-09-15 18:20:56 -04:00
Anuken d655f95b67 Random weather wind direction 2020-09-15 18:15:26 -04:00
Anuken a3abad34e3 arc 2020-09-15 18:00:49 -04:00
Anuken 903a2c069e Merge remote-tracking branch 'origin/master' 2020-09-15 18:00:39 -04:00
Anuken 306a660e87 Custom map weather definition 2020-09-15 18:00:29 -04:00
Anuken 24baa77c47 Merge remote-tracking branch 'origin/master' 2020-09-15 14:01:23 -04:00
Anuken b06a9cbf16 Query V6 servers on non-BE instead of standard servers 2020-09-15 14:01:20 -04:00
AnukenandGitHub c53bb52d94 Added list for v6 servers (currently empty) 2020-09-15 13:59:32 -04:00
Anuken f609ee77a4 Bridge align fix 2020-09-15 13:56:42 -04:00
Anuken d1b5b7eb3c Fixed #2556 2020-09-15 13:47:00 -04:00
Anuken 2e8d6b56df arc 2020-09-15 13:19:17 -04:00
Anuken b3d7515dcd Line optimization & cleanup 2020-09-15 13:19:02 -04:00
Anuken 1327a2bef4 Mega repair AI 2020-09-15 10:39:45 -04:00
Anuken 757e0fbda0 Cleanup 2020-09-14 16:56:32 -04:00
Anuken b603409f74 arc 2020-09-14 14:09:33 -04:00
Anuken 50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken d6447cb31a Fixed #2553 2020-09-14 11:13:27 -04:00
Anuken 8901838c19 Fixed #2551 2020-09-14 09:41:54 -04:00
Anuken 5c63ff889a what 2020-09-13 23:30:51 -04:00
Anuken 3f1ed6d4a4 Bugfixes 2020-09-13 23:11:24 -04:00
Anuken bbb9b3ef62 Bugfixes & unit status polish 2020-09-13 22:30:05 -04:00
Anuken 0e78751c6c Turret ammo display 2020-09-13 21:22:39 -04:00
Anuken 7ce93c7f85 Prototype health/ammo indication 2020-09-13 21:08:24 -04:00
Anuken be229f441e click fix 2020-09-13 14:32:15 -04:00
Anuken 30c45e6a43 arc 2020-09-13 14:30:45 -04:00
Anuken f3921e3dcc Minor optimization 2020-09-13 14:30:31 -04:00
Anuken 48391219fd Packed sprites for cliff removal 2020-09-13 12:18:41 -04:00
Anuken 27e9b5aeb9 Removed cliffs / Nerfed explosion bombing 2020-09-13 12:13:42 -04:00
Anuken bab43859f5 Bugfixes 2020-09-13 10:02:10 -04:00
Anuken 1fd98fe07c Bugfixes (2) 2020-09-12 23:43:03 -04:00
Anuken 4d6c8ade98 Bugfixes 2020-09-12 23:41:25 -04:00
Anuken 8234f31e83 Various tweaks 2020-09-12 21:41:43 -04:00
Anuken e5ff429241 ??? 2020-09-12 15:32:35 -04:00
Anuken b58b6c7361 Fixed #2544 2020-09-12 14:57:00 -04:00
Anuken 640a45ea66 Rhino update 2020-09-12 13:03:36 -04:00
Anuken 5ce8e6339d Merge remote-tracking branch 'origin/master' 2020-09-12 12:47:29 -04:00
Anuken fa9611e28c Bugfixes 2020-09-12 12:47:18 -04:00
Anuken 197b67f8c1 Fixed #2543 2020-09-12 09:51:57 -04:00
Anuken c95f0674b6 Fixed outdated fuse schematic 2020-09-11 23:28:22 -04:00
Anuken 1c6fed8df8 Many things that won't fit in a commit message 2020-09-11 23:04:19 -04:00
Anuken 3feb9e76f0 Allowed Steam name change / T4+5 reconstructor cost increase 2020-09-11 19:57:46 -04:00
Anuken 3d8fb1b6ca Bridge fixes 2020-09-11 13:36:10 -04:00
Anuken 83d9bd7d81 Difficulty indicator for sectors / Power sense FPS scale 2020-09-11 10:42:16 -04:00