Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,838 Commits 4 Branches 180 Tags
5e2ad38e88c8aaef1037d5ac94ed870548f8621a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 5e2ad38e88 PayloadDeconstructor progress 2021-06-30 22:16:46 -04:00
Anuken 50d50b11ad Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-06-29 09:37:14 -04:00
Anuken 3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-28 18:57:27 -04:00
Anuken f6f1ddb826 Fixed non-existent fire being targeted 2021-06-28 13:30:54 -04:00
Anuken fcdbd4b117 Fixed liquid turrets not targeting closest fire 2021-06-28 11:35:46 -04:00
Anuken a5c44e7998 #5055 2021-06-28 10:50:04 -04:00
Anuken 8afea88023 Fixed #5500 2021-06-28 10:15:54 -04:00
Anuken 75443e4dfc Clear commanding units on sync 2021-06-28 09:56:49 -04:00
Anuken fbfb491dca Merge remote-tracking branch 'origin/master' 2021-06-28 09:25:48 -04:00
Anuken 082c17da85 Fixed #5498 2021-06-28 09:25:38 -04:00
Anuken 0bd1b4eedc Skip loading team regions for teams without palettes 2021-06-27 12:28:40 -04:00
Anuken d401d7838c Gradle 7.1 2021-06-27 11:10:07 -04:00
Anuken 8b2e273d41 Merge remote-tracking branch 'origin/master' 2021-06-27 09:34:59 -04:00
Anuken bdff6f9560 Repair turret nerf 2021-06-27 09:34:54 -04:00
Anuken 36b49b6d8b Fixed #5488 / Fixed #5489 2021-06-27 09:12:35 -04:00
Anuken e8edfb1170 Merge remote-tracking branch 'origin/master' 2021-06-26 20:55:59 -04:00
Anuken bc6fcbc86d Fixed more flaky tests 2021-06-26 20:55:52 -04:00
Anuken 604e6f8c47 Catch NoClassDefFoundErrors on ClientLoad 2021-06-26 11:11:27 -04:00
Anuken 4ac4f10ea0 Log mismatch errors for net buffers 2021-06-26 11:08:45 -04:00
Anuken 4c07733857 Fixed #5481 2021-06-26 11:04:03 -04:00
Anuken 7dc0f4dbc5 Merge remote-tracking branch 'origin/master' 2021-06-26 10:12:04 -04:00
Anuken 22f64fa2a5 Revert naval balance changes for now 2021-06-26 10:11:59 -04:00
Anuken c6e0292d03 Fixed clientside physics jitter 2021-06-26 09:52:03 -04:00
Anuken 17eee61a93 Fixed #5478 2021-06-26 09:34:25 -04:00
Anuken 3817b159cf Reduced jittery interpolation 2021-06-26 00:19:23 -04:00
Anuken 331cf2e269 arc 2021-06-25 22:58:30 -04:00
Anuken 96622848d9 Hide outdated lobbies on Steam 2021-06-25 19:49:53 -04:00
Anuken bcdc8867e6 Merge remote-tracking branch 'origin/master' 2021-06-25 19:36:07 -04:00
Anuken eaeb67b91f Fixed #5474 2021-06-25 19:35:34 -04:00
Anuken 47443d5ae7 Merge remote-tracking branch 'origin/master' 2021-06-25 14:37:36 -04:00
Anuken cd2c605036 Suppress certain mod errors on client load 2021-06-25 14:37:32 -04:00
Anuken 3d6cfcafd0 Don't assign players to derelict 2021-06-25 14:11:36 -04:00
AnukenandGitHub d86d2dbdb9 Delete servers.json 2021-06-25 13:35:15 -04:00
AnukenandGitHub 91f50883b1 Update deployment.yml 2021-06-25 12:42:02 -04:00
Anuken 756c717a9b Possible flaky test fix 2021-06-25 12:39:46 -04:00
Anuken 2cea277320 RoboVM debugging 2021-06-25 12:29:49 -04:00
Anuken dd36b71c7f Updated RoboVM plugin 2021-06-25 12:18:28 -04:00
Anuken 5e3e07f002 Updated RoboVM 2021-06-25 11:56:28 -04:00
Anuken 0ffe2ed51a Skip launch pad destination text for clients 2021-06-25 10:27:10 -04:00
Anuken 02e6257a66 Fixed #5462 2021-06-25 09:18:11 -04:00
Anuken 57fd72f476 arc 2021-06-24 19:34:21 -04:00
Anuken d2d7596ef1 Fixed Android deployment script 2021-06-24 18:30:01 -04:00
Anuken 149c48a03e Merge remote-tracking branch 'origin/master' 2021-06-24 17:58:30 -04:00
Anuken bdeba22561 Switched to v7 server list 2021-06-24 17:58:26 -04:00
AnukenandGitHub 640c7851cf Update servers_be.json 2021-06-24 17:57:38 -04:00
AnukenandGitHub c0991a9baa Create servers_v7.json 2021-06-24 17:57:27 -04:00
Anuken 5af6e8c5de Preparations for 127 pre-alpha release 2021-06-24 17:25:08 -04:00
Anuken 2d4677aa27 Reduced unit item glow 2021-06-24 17:00:33 -04:00
Anuken 984b646103 Merge remote-tracking branch 'origin/master' 2021-06-24 15:38:26 -04:00
Anuken 0949852758 Logic wait & content look up instructions 2021-06-24 15:38:20 -04:00
Anuken d54b7dc396 WIP payload deconstructor 2021-06-24 12:35:44 -04:00
Anuken 38a9ad9ec1 Fixed #5455 2021-06-23 16:22:00 -04:00
Anuken e7ec2da063 Asteroid variants 2021-06-23 16:21:12 -04:00
Anuken c70be45a25 Merge remote-tracking branch 'origin/master' 2021-06-23 14:02:10 -04:00
Anuken 186e8f707e Fixed #5453 2021-06-23 14:02:06 -04:00
AnukenandGitHub e3351e0c23 Typo fix 2021-06-23 11:59:02 -04:00
Anuken b08f198629 Merge remote-tracking branch 'origin/master' 2021-06-23 11:57:55 -04:00
Anuken 1b3e99fbb0 Remove linear filtering on iOS 2021-06-23 11:57:51 -04:00
Anuken 2613ff6796 Fixed #5448 2021-06-23 08:46:50 -04:00
Anuken c404e7e1c6 Fixed #5447 2021-06-22 16:54:32 -04:00
Anuken d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken d468a4f328 Removed unnecessary TODOs 2021-06-22 16:07:19 -04:00
Anuken 4417a83424 Merge remote-tracking branch 'origin/master' 2021-06-22 14:22:58 -04:00
Anuken 45dc72faf6 Removed unnecessary themes 2021-06-22 14:22:54 -04:00
Anuken 1630e1a7fb Asteroid gen progress 2021-06-22 14:22:31 -04:00
Anuken b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken ff3940865e A. 2021-06-21 19:35:00 -04:00
Anuken 4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken 448d1e2c77 Cleanup 2021-06-20 09:50:25 -04:00
Anuken d6566830ac Ignore Discord RPC exceptions 2021-06-20 08:48:05 -04:00
Anuken 5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken b7b9d48d1e Cleanup 2021-06-19 21:31:37 -04:00
Anuken 3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken ca60309fde Asteroid generator progress 2021-06-19 11:17:52 -04:00
Anuken 8f6365015a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-18 18:40:02 -04:00
Anuken 12dfd71345 Minor load markup fix 2021-06-18 15:44:35 -04:00
Anuken 60b6e93f7c arc 2021-06-18 15:25:40 -04:00
Anuken 128174faa4 NOTHING 2021-06-18 15:19:28 -04:00
Anuken 7ab0c86978 Stencil buffer fallback 2021-06-18 15:14:08 -04:00
Anuken 5f0ec79b0f Fixed crash logs sometimes not saving 2021-06-18 09:33:12 -04:00
Anuken 5d8f6d7c97 More environmental support 2021-06-18 09:31:28 -04:00
Anuken b77b89abfb More environmental support 2021-06-17 14:34:57 -04:00
Anuken 23ced8d006 aa 2021-06-17 11:10:39 -04:00
Anuken 016e5ab97e Env rules for many various blocks 2021-06-17 11:08:01 -04:00
Anuken afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
 2021-06-17 10:44:51 -04:00
Anuken 15affaad9b Cleaner impact reactor explosion 2021-06-16 16:53:09 -04:00
Anuken 9088d9eb39 Polygonal protection bugfixes 2021-06-16 15:07:14 -04:00
Anuken f11f390c1f Polygonal protection for built-in PvP maps 2021-06-16 14:51:37 -04:00
Anuken 865ee952c9 WIP polygonal core protection 2021-06-16 13:26:18 -04:00
Anuken efcae883fb Experimental core-capture PvP map / Editor filter fixes 2021-06-16 11:09:18 -04:00
Anuken c623e66694 hhhh 2021-06-15 19:32:06 -04:00
Anuken 97729fd659 Stateless simplex (2) 2021-06-15 19:31:51 -04:00
Anuken eed91eaaa0 # Conflicts: 
#	core/src/mindustry/mod/ClassMap.java
 2021-06-15 19:29:12 -04:00
Anuken fe9ff212b2 Stateless simplex 2021-06-15 19:28:54 -04:00
Anuken 210fb349de Less editor filter state 2021-06-15 12:26:00 -04:00
Anuken 69d8af7874 Editor filter seed saving & cleanup 2021-06-15 11:58:26 -04:00
Anuken 183c922b6b Do not save MirrorFilter temporary vectors 2021-06-15 11:32:49 -04:00
Anuken 964104db65 Merge remote-tracking branch 'origin/master' 2021-06-15 09:39:27 -04:00
Anuken 2d8f7cb680 Fixed #5425 2021-06-15 09:39:23 -04:00