Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,649 Commits 4 Branches 180 Tags
10b8a6e4a5542ff1deee70fdbd8c67a6bb633b51
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
 2021-10-01 09:41:33 -04:00
Anuken b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
Anuken ee26f51d7a Cleanup 2021-09-30 18:32:31 -04:00
Anuken 0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Anuken 9939d6065a Merge remote-tracking branch 'origin/master' 2021-09-30 17:33:23 -04:00
Anuken c226127648 Display jump statement destination 2021-09-30 17:33:17 -04:00
Anuken 6f6590d5bb chargeShootEffect / Effect startDelay 2021-09-29 22:39:33 -04:00
Anuken 603c871e6e apparently the --illegal-access flag is still needed 2021-09-28 18:52:48 -04:00
Anuken 5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
Anuken 71543f2ab2 Improved Serpulo water edge generation 2021-09-28 17:20:20 -04:00
Anuken 7f415588f4 Cleaned up duplicate SettingsMenuDialog code 2021-09-28 14:41:35 -04:00
Anuken c6c374f672 Merge remote-tracking branch 'origin/master' 2021-09-28 11:28:58 -04:00
Anuken d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
Anuken 8f53822a6e Merge remote-tracking branch 'origin/master' 2021-09-27 21:11:25 -04:00
Anuken c814ef0012 Slightly increased item charge damage 2021-09-27 21:11:21 -04:00
Anuken f5a0528c73 Merge remote-tracking branch 'origin/master' 2021-09-27 19:02:10 -04:00
Anuken f5a2ed900d Make hint.presetLaunch more likely to show up 2021-09-27 19:02:06 -04:00
Anuken 13b92519f1 Added missing revision 2021-09-27 15:07:34 -04:00
Anuken 61a28aca91 Cryofluid floor tweaks 2021-09-27 15:07:10 -04:00
Anuken 7c00b54191 hgdf 2021-09-27 14:51:50 -04:00
Anuken a21942e401 Map dialog margin cleanup 2021-09-27 11:36:03 -04:00
Anuken 2d2052e39f "ok" 2021-09-27 11:00:33 -04:00
Anuken 7bf85d9f84 Merge remote-tracking branch 'origin/master' 2021-09-27 09:18:53 -04:00
Anuken ed1557b5ac Implemented Anuken/Mindustry-Suggestions/issues/3026 2021-09-27 09:18:46 -04:00
Anuken 8a3d46b4a7 a 2021-09-27 08:58:22 -04:00
Anuken d13c7a959f Added LiquidExplodeAbility 2021-09-25 09:31:03 -04:00
Anuken 096826a36f Ability death listener 2021-09-24 21:27:21 -04:00
Anuken dac17aa2b7 Merge remote-tracking branch 'origin/master' 2021-09-23 19:44:46 -04:00
Anuken 29242249bd Fixed #6039 2021-09-23 19:44:42 -04:00
Anuken de7dfc75f9 Neoplasm regen ability 2021-09-23 17:34:19 -04:00
Anuken c8ab2bd1ba Inline SchematicsDialog#focusSearchField 2021-09-22 20:25:01 -04:00
Anuken 9e718b633e Increase dependency timeout for jitpack 2021-09-22 20:21:26 -04:00
Anuken 90d1770b3e Attempt to synchronized logic random seed 2021-09-22 20:12:45 -04:00
Anuken 3f6d5b9dfe Sync/save @tick/@time; make @time be based off of @tick 
Closes Anuken/Mindustry-Suggestions/issues/2976
 2021-09-22 19:35:15 -04:00
Anuken 6d41b894ab Slight difficulty increase of Desolate Rift 2021-09-22 19:21:58 -04:00
Anuken 0c4592fbc8 ok jitpack 2021-09-22 18:43:13 -04:00
Anuken dc2ff1e933 Switch to 'slightly faster' Jabel version 2021-09-22 18:40:00 -04:00
Anuken 6f8ae1b5a3 h 2021-09-22 18:32:14 -04:00
Anuken 76e5c51a12 ???? 2021-09-22 18:26:04 -04:00
Anuken 45f6fde689 ??? 2021-09-22 18:22:28 -04:00
Anuken 83dc70b054 Run tests with --stacktrace 2021-09-22 18:17:54 -04:00
Anuken ec886456c8 really? 2021-09-22 18:15:27 -04:00
Anuken 4377eacfd5 Updated Jabel for JDK 17 compatibility 2021-09-22 18:11:51 -04:00
Anuken 01f06cd0f7 NeoplasmUnitType 2021-09-22 18:04:21 -04:00
AnukenandGitHub c92433c5f9 Attempting JDK 17 again 2021-09-22 18:01:04 -04:00
Anuken 00cb441704 Fixed #6032 2021-09-21 13:50:20 -04:00
Anuken 173ac324a4 Merge remote-tracking branch 'origin/master' 2021-09-21 09:42:24 -04:00
Anuken 3a8ba568b5 Fixed main -> mainClass deprecation warning 2021-09-21 09:42:19 -04:00
Anuken 9289fe01fd Fixed main -> mainClass deprecation warning 2021-09-21 09:41:52 -04:00
Anuken 6f27fd1ea2 Merge remote-tracking branch 'origin/master' 2021-09-20 12:38:34 -04:00
Anuken 8a6f3db20e Fixed #6028 2021-09-20 12:38:29 -04:00
Anuken e57087e891 Better payload construct/deconstruct effects 2021-09-20 10:09:00 -04:00
Anuken bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Anuken 7e0f68b24d Made replaced preset sector saves auto-delete 2021-09-19 12:50:45 -04:00
Anuken cc0cdeb6c0 Use Unit icon() for minimap icons 2021-09-19 09:29:32 -04:00
Anuken 01a76d1c9e Merge remote-tracking branch 'origin/master' 2021-09-19 08:53:04 -04:00
Anuken 5c0827b208 Fixed requestItem not respecting amount 2021-09-19 08:52:59 -04:00
Anuken 9dfb5888ec Fixed shields not capping properly 2021-09-18 20:39:43 -04:00
Anuken 66f56d9e98 Merge remote-tracking branch 'origin/master' 2021-09-18 14:33:03 -04:00
Anuken 3f996cf294 Better bullet range calc 2021-09-18 14:32:57 -04:00
Anuken 61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
 2021-09-17 21:33:01 -04:00
Anuken 5d5d1f8953 0 scroll support 2021-09-17 21:32:43 -04:00
Anuken cdb12a381d Custom background renderer support for mods 2021-09-17 21:20:16 -04:00
Anuken 01771c5288 Merge remote-tracking branch 'origin/master' 2021-09-17 11:46:58 -04:00
Anuken 58a21c3cc7 Arc compatibility 2021-09-17 11:46:52 -04:00
Anuken 263850624a Cleanup 2021-09-17 11:36:57 -04:00
Anuken e08e51b939 Planet background system 2021-09-17 11:23:32 -04:00
Anuken 84935e1bb0 Fixed #6008 2021-09-16 21:25:31 -04:00
Anuken 32baf06c97 Experimental alternate Serpulo generation / Spawn margin decrease 2021-09-16 18:10:38 -04:00
Anuken 76b0ca53c5 Fixed wall assignment 2021-09-16 15:48:08 -04:00
Anuken 18d34c5854 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 14:18:24 -04:00
Anuken ed911d87a3 Planet rendering refactoring 2021-09-16 14:18:17 -04:00
Anuken 0756da0dd1 Fixed shader warnings 2021-09-16 12:41:45 -04:00
Anuken c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken ad425f322c Proper asteroid albedo 2021-09-16 10:33:15 -04:00
Anuken a8fd047cd6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 10:23:31 -04:00
Anuken 845b64945e "Realistic" specular planet lighting 2021-09-16 10:20:32 -04:00
Anuken 7b623e964c gitignore fixes 2021-09-15 22:34:15 -04:00
Anuken e3cceea1af Re-trying JITPack 2021-09-15 22:30:53 -04:00
Anuken e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Anuken c4fe53955b Moved Scripts loaders to Vars.tree.loadSound/Music 2021-09-15 11:24:39 -04:00
Anuken 0068952ba6 Content parser listener 2021-09-15 10:49:22 -04:00
Anuken a3b3745d01 Merge remote-tracking branch 'origin/master' 2021-09-14 21:28:39 -04:00
Anuken 95c3476144 Fixed #6001 2021-09-14 21:28:34 -04:00
Anuken 72841afd96 too soon, apparently 2021-09-14 12:29:29 -04:00
Anuken eb9c3c8033 Use JDK 17 for tests 2021-09-14 12:25:09 -04:00
Anuken e23837a4ba Updated RoboVM / Switched to hard-coded SDK platform jar 2021-09-14 12:21:07 -04:00
Anuken 625f2640d8 Merge remote-tracking branch 'origin/master' 2021-09-14 09:55:40 -04:00
Anuken 01c67b77cb Fixed #5995 2021-09-14 09:55:35 -04:00
Anuken ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Anuken e1ba9f16f6 Merge remote-tracking branch 'origin/master' 2021-09-13 09:04:01 -04:00
Anuken 826ddf4aad strip message newlines 2021-09-13 09:03:56 -04:00
Anuken edbe795aa5 Merge remote-tracking branch 'origin/master' 2021-09-12 20:21:59 -04:00
Anuken 087cd2c55a Cleanup 2021-09-12 20:21:55 -04:00
Anuken 35ffbef557 #5932 2021-09-12 11:07:18 -04:00
Anuken 24db94a55b No server category colors 2021-09-12 11:05:05 -04:00
Anuken 46bda97362 Merge remote-tracking branch 'origin/master' 2021-09-12 09:05:23 -04:00
Anuken a1b9f7d1b3 Fixed #5979 2021-09-12 09:05:18 -04:00
Anuken 2f7c5994a7 Fixed #5978 2021-09-11 15:43:24 -04:00
Anuken 2664bb84be Fixed #5974 2021-09-11 13:30:10 -04:00