Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,610 Commits 4 Branches 180 Tags
8132cd9ba70da17c477b6874b759edb1967ba0db
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub 35460f0b5f Merge pull request #2692 from Prosta4okua/master 
immediate RU L10n update
 2020-09-23 23:03:54 -04:00
Anuken 0288cb34fb Cleanup 2020-09-23 22:15:14 -04:00
AnukenandGitHub 75ebaab3a3 Merge pull request #2660 from J-VdS/schematic 
Server disable schematic option (fix #2382)
 2020-09-23 22:01:06 -04:00
Anuken ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken f9b46fbf18 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-23 19:16:53 -04:00
Anuken 764b93154e Turret sprite tweaks 2020-09-23 19:16:33 -04:00
AnukenandGitHub e4d97d790f Merge pull request #2576 from MWestfall/patch-3 
Update servers.json
 2020-09-23 19:02:24 -04:00
AnukenandGitHub 5fa31b5625 Merge pull request #2577 from MWestfall/patch-4 
Update servers_v6.json
 2020-09-23 19:01:29 -04:00
AnukenandGitHub 414d3eb3c4 Merge pull request #2637 from AydenRennaker/patch-7 
Add Atanner Gaming V6 Server
 2020-09-23 19:01:11 -04:00
AnukenandGitHub abd8356385 Update .travis.yml 2020-09-23 18:47:29 -04:00
AnukenandGitHub ae78054188 Update .travis.yml 2020-09-23 18:37:45 -04:00
Anuken 28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Anuken d7bd4bd0c8 Merge remote-tracking branch 'origin/master' 2020-09-23 18:26:09 -04:00
Anuken 3a618761b3 Pre-release tweaks 2020-09-23 18:26:05 -04:00
AnukenandGitHub 8efba6ada7 Merge pull request #2564 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-09-23 18:25:36 -04:00
AnukenandGitHub c12263078a Merge pull request #2626 from YellOw139/patch-2 
[Bundle][RO] Translation Update
 2020-09-23 18:25:24 -04:00
AnukenandGitHub fcff922370 Merge branch 'master' into patch-2 2020-09-23 18:25:12 -04:00
AnukenandGitHub 14627dbbf7 Merge pull request #2639 from PetrGasparik/6.0-aplha-2 
Czech translation track for 6.0 aplha 2
 2020-09-23 18:24:48 -04:00
Anuken 5df5a6e39f tweak 2020-09-23 18:01:12 -04:00
Anuken 3db2ffb843 Launch pad destination selection 2020-09-23 18:00:24 -04:00
Anuken 1cc8d7e3f4 Balance 2020-09-23 15:21:06 -04:00
AnukenandGitHub 84aa4ad602 Merge pull request #2675 from Voz-Duh/turrets-shadow 
Turrets Shadow
 2020-09-23 10:50:47 -04:00
Anuken 8ed83964a2 Bugfixes 2020-09-23 09:33:56 -04:00
Anuken ec11e60c7c Fixed #2679 2020-09-23 09:32:27 -04:00
Anuken 6b43697891 (2) 2020-09-22 23:32:34 -04:00
Anuken b601dc5deb Fixed fuse length being less than expected 2020-09-22 23:25:44 -04:00
Anuken a4375f9c85 Merge remote-tracking branch 'origin/master' 2020-09-22 23:22:56 -04:00
Anuken 0058d45352 Fixed #2672 2020-09-22 23:22:53 -04:00
AnukenandGitHub 2eaa7d2745 Merge pull request #2669 from genNAowl/camelcasing1 
rotatespeed > rotateSpeed
 2020-09-22 23:08:50 -04:00
Anuken cf13717cc8 Fixed #2671 2020-09-22 22:52:55 -04:00
Anuken 39aeab5f11 cleanup 2020-09-22 21:58:59 -04:00
Anuken 3f403a26cc ? ? 2020-09-22 21:54:09 -04:00
Anuken 721e79eb90 Fixed #2670 2020-09-22 21:48:42 -04:00
Anuken 3592b36f85 ??? 2020-09-22 21:45:07 -04:00
Anuken 36fc6959f4 Removed redundant revision code 2020-09-22 21:42:49 -04:00
Anuken 7a6f69fc88 log revision changes 2020-09-22 21:39:12 -04:00
Anuken f685c30178 testing if travis messed up codegen 2020-09-22 21:28:31 -04:00
Anuken ba6ab8483e Various tweaks 2020-09-22 20:42:36 -04:00
Anuken 4a02315ee5 Small bugfixes 2020-09-22 17:59:37 -04:00
Anuken f3e08f9cb6 Internal refactoring & cleanup 2020-09-22 15:50:33 -04:00
Anuken 0256a475cf Fixed #2662 2020-09-22 13:38:08 -04:00
Anuken 3a466475fd Better error handling on Steam 2020-09-22 13:12:21 -04:00
Anuken 5895e2f23c #2647 2020-09-22 12:24:40 -04:00
Anuken 08ff36c43e Bugfixes 2020-09-22 12:16:17 -04:00
Anuken b2b8949e26 Cleanup 2020-09-22 11:16:19 -04:00
Anuken ce4f67341c Merge remote-tracking branch 'origin/master' 2020-09-22 10:03:10 -04:00
Anuken a6c10a97f2 Fixed #2654 / Fixed #2651 / fine I'll add a base 2020-09-22 10:03:05 -04:00
AnukenandGitHub d4044c3b27 Merge pull request #2609 from DeltaNedas/crashlog 
more info in crash reports
 2020-09-22 09:30:29 -04:00
Anuken 87032c82b1 T4/5 support mechs 2020-09-21 23:32:30 -04:00
Anuken 1d8f837fb1 Fixed #2646 2020-09-21 14:35:39 -04:00
Anuken ff7c87bec0 Bugfixes 2020-09-21 14:33:15 -04:00
Anuken ff58ccf659 Sprite tweaks 2020-09-21 13:22:07 -04:00
Anuken 45e77fe3b4 Balance 2020-09-21 12:05:24 -04:00
Anuken 74fadfe603 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-21 11:41:15 -04:00
Anuken 1aa8bb9dd2 T5 air support unit 2020-09-21 11:41:11 -04:00
AnukenandGitHub b732da09df Merge pull request #2643 from Remint32/patch-4 
Make Pal.java colors changable for texturepack-mods tweaks
 2020-09-21 11:10:37 -04:00
AnukenandGitHub 6b56fef512 Merge pull request #2636 from genNAowl/wall-sound-effects 
Add sound variables for when a wall is releasing lightning/deflecting bullets
 2020-09-21 09:11:57 -04:00
Anuken 63e35bd462 T4 air carrier unit (*unfinished*) 2020-09-20 19:34:12 -04:00
Anuken 401384ae5b Anuken/Mindustry-Suggestions/issues/548 2020-09-20 16:35:25 -04:00
Anuken b2d054c1f2 Merge remote-tracking branch 'origin/master' 2020-09-20 15:23:41 -04:00
Anuken 0a314e142e Fixed #2632 (among other things) 2020-09-20 15:23:34 -04:00
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