Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,773 Commits 4 Branches 180 Tags
0c4750781a716fadc6c7362207847448b667983a
Commit Graph
2958 Commits
Author SHA1 Message Date
Anuken 735cb74483 Merge remote-tracking branch 'origin/master' 2020-11-25 11:15:50 -05:00
Anuken bc55e43def Fixed #3591 2020-11-25 11:15:46 -05:00
AnukenandGitHub 084d7e8355 Merge pull request #3583 from Quezler/patch-69 
automatic reconnect
 2020-11-25 11:14:04 -05:00
Patrick 'Quezler' MounierGitHubAnuken
 		f26b3358ef Update core/src/mindustry/ui/dialogs/JoinDialog.java 
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-11-25 17:08:03 +01:00
Patrick 'Quezler' MounierandGitHub 3d6390a76a Set the ping to null when canceling manually as well 2020-11-25 16:51:57 +01:00
Patrick 'Quezler' MounierandGitHub ff20928bec Anukify reconnect logic 2020-11-25 16:49:36 +01:00
Anuken 8418770bbf Merge remote-tracking branch 'origin/master' 2020-11-25 10:15:22 -05:00
Anuken eaa7b04c3d Fixed CI / Fixed exponentially increasing broken blocks 2020-11-25 10:15:14 -05:00
Patrick 'Quezler' MounierandGitHub f5e06cca54 Update NetClient.java 2020-11-25 10:41:41 +01:00
Patrick 'Quezler' MounierandGitHub 642b877ab0 Update JoinDialog.java 2020-11-25 10:40:42 +01:00
Patrick 'Quezler' MounierandGitHub 8ee3f2b2e6 Remove stray newline 2020-11-25 09:38:04 +01:00
Patrick 'Quezler' MounierandGitHub 40bf0741f0 Remove unused import 2020-11-25 09:36:12 +01:00
Anuken 5fd66d38bb Fixed #3573 2020-11-24 18:15:40 -05:00
Anuken 15f33b45c7 Salt Flats should probably require additive reconstructors 2020-11-24 18:12:45 -05:00
Anuken 17e66f1008 Final campaign tweaks 2020-11-24 17:17:55 -05:00
Anuken bcaf5e4c3d Campaign balance / Smarter power node placement 2020-11-24 16:33:36 -05:00
Anuken 6fd36d97f0 Balancing 2020-11-24 12:53:55 -05:00
Anuken 61bec243dc Campaign balance 2020-11-24 12:35:04 -05:00
Anuken 7d43856735 Bugfixes 2020-11-24 10:23:28 -05:00
Anuken 058b2ddfce Fixed #3565 2020-11-24 09:00:34 -05:00
Anuken 2282cb89b1 Fixed sector damage calculations / Campaign balance 2020-11-23 18:09:20 -05:00
Anuken 06929ee8f3 Fixed boss hint not disappearing 2020-11-23 15:47:15 -05:00
Anuken ec19381c4e Fixed campaign bases having ridiculous wall tiers 2020-11-23 15:41:10 -05:00
Anuken 4a52392ce9 Added hint about guards & armor 2020-11-23 13:09:42 -05:00
Anuken dcbe06229c Campaign fixes & balance 2020-11-23 10:36:41 -05:00
Anuken 075be1a862 Fixed #3540 / Fixed #3544 / Fixed #3542 2020-11-23 09:12:36 -05:00
Anuken 8d91a9b014 Fixed sectors not auto-unlocking 2020-11-22 22:03:23 -05:00
Anuken ecea8eab01 Various tweaks and bugfixes 2020-11-22 21:20:33 -05:00
Anuken ad71007a0a Campaign balance 2020-11-22 17:20:20 -05:00
Anuken ea377c6f16 Bugfixes 2020-11-22 16:53:50 -05:00
Anuken b42e5c3b66 Merge remote-tracking branch 'origin/master' 2020-11-22 14:45:47 -05:00
Anuken 455e3188c4 More concentrated enemy bases 2020-11-22 14:45:43 -05:00
AnukenandGitHub 704b53a02e Merge pull request #3532 from Quezler/patch-66 
unitBuildSpeedMultiplier | UnitSpawnAbility.java
 2020-11-22 14:24:50 -05:00
Anuken 909dff7608 Bugfixes 2020-11-22 11:59:53 -05:00
Patrick 'Quezler' MounierandGitHub ebf7cf859e Update UnitSpawnAbility.java 2020-11-22 17:37:53 +01:00
Patrick 'Quezler' MounierandGitHub 3ef2c585a5 Update UnitSpawnAbility.java 2020-11-22 17:33:50 +01:00
Anuken e4266d22f5 Added more hints 2020-11-21 17:17:03 -05:00
Anuken b09dc47aad Bugfixes / Tutorial cleanup 2020-11-21 15:50:44 -05:00
AnukenandGitHub ac4a96eefb Merge pull request #3513 from Quezler/patch-64 
Sync construction blocks
 2020-11-21 15:22:25 -05:00
Anuken 3b991952b1 Merge remote-tracking branch 'origin/master' 2020-11-21 14:06:06 -05:00
Anuken 6fba84959c New hint tutorial system (unfinished!) 2020-11-21 14:05:58 -05:00
Patrick 'Quezler' MounierandGitHub c6657109b1 Sync construction blocks 2020-11-21 16:59:09 +01:00
SkatandGitHub 2b22170318 [Typo] communitycommunity servers 2020-11-21 10:31:10 +03:00
Anuken 522a7f4728 Fixed #3493 but for point defense turrets 2020-11-20 12:53:51 -05:00
Anuken 06921b53be Fixed #3493 2020-11-20 12:53:09 -05:00
Anuken 1372fc4079 Fixed sector gameover ghost bug 2020-11-20 12:38:16 -05:00
Anuken 814065bf8e Removed Rules#tutorial 2020-11-20 11:23:30 -05:00
Anuken abdccbb1bd Fixed #3487 / Fixed #3484 2020-11-20 09:13:36 -05:00
Anuken a0f1f52a8b CI cleanup 2020-11-19 19:44:49 -05:00
Anuken a7aad1a1f9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.github/workflows/gradle.yml
 2020-11-19 18:53:15 -05:00