Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,325 Commits 4 Branches 180 Tags
b98395c8baf2efd794841c40968ee34316d769d9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken b98395c8ba progress 2021-08-22 00:30:15 -04:00
Anuken b2aaca45d5 progress 2021-08-21 18:35:27 -04:00
Anuken 7afc6d3631 CrawlComp progress 2021-08-21 15:32:25 -04:00
Anuken a6c8b3a2bd Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-21 10:15:44 -04:00
Anuken 92d3d3cd9c Fixed #5824 2021-08-21 09:54:05 -04:00
Anuken 8d23e335ae Merge remote-tracking branch 'origin/master' 2021-08-20 23:04:47 -04:00
Anuken ec61598a52 Minke ability moved to Oxynoe 2021-08-20 23:04:43 -04:00
Anuken 8b4112f705 Check for repo & display name in mod browser search 2021-08-20 13:35:41 -04:00
Anuken caeabe3ee8 Cleanup 2021-08-20 12:28:05 -04:00
Anuken 8f389665a1 Space 'puddles' 2021-08-20 11:42:27 -04:00
Anuken e5c77ef69a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-20 11:10:55 -04:00
Anuken f0a8c6e281 Oyxgen env 2021-08-20 10:06:16 -04:00
Anuken 465afc3128 Sound fixes 2021-08-20 08:54:02 -04:00
Anuken 6730954a2e Fixed particle effect icon offset 2021-08-20 00:16:03 -04:00
Anuken cd7103e3f4 Cryo vapor 2021-08-20 00:15:47 -04:00
Anuken d03049799e Gradle 7.2 2021-08-20 00:06:37 -04:00
Anuken 5ddb22ab61 Various minor tweaks 2021-08-20 00:05:08 -04:00
Anuken 946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken 3a3622bb58 Boss status color fix 2021-08-19 23:42:27 -04:00
Anuken 38ec05807a Disallow logic-building invalid blocks 2021-08-19 23:32:21 -04:00
Anuken 5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken 148c95e1f2 Crash fix 2021-08-19 22:03:19 -04:00
Anuken 9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken 0ab5f5bb14 hide hidden units in menu 2021-08-19 21:29:50 -04:00
Anuken f1207fd3f1 Disposable containers for unloaders 2021-08-19 20:45:48 -04:00
Anuken 90826b7064 Boiling point implementation 2021-08-19 20:39:49 -04:00
Anuken 4b14008080 Fixed #5812 2021-08-19 17:50:31 -04:00
Anuken a39f2bd3a9 wip 2021-08-19 17:46:10 -04:00
Anuken e23054d606 Better support for disabling omniMovement 2021-08-19 16:29:49 -04:00
Anuken dc5ca76df0 Merge remote-tracking branch 'origin/master' 2021-08-19 14:20:22 -04:00
Anuken a8b423836e Added unit decal system for mods/future units 2021-08-19 14:20:18 -04:00
Anuken 558ee579e1 BlockIndexer null team fix 2021-08-19 09:37:12 -04:00
Anuken a67b7a6e77 Liquid puddle draw override 2021-08-19 09:21:25 -04:00
Anuken 53eba2fb6a Asteroid clip size fix 2021-08-18 21:39:51 -04:00
Anuken 41829b8660 Fixed #5803 2021-08-18 20:10:14 -04:00
Anuken 1d32680ab2 sprite tweaks 2021-08-18 20:09:59 -04:00
Anuken b8eaabe0de Fixed #5802 2021-08-18 18:55:36 -04:00
Anuken a94735c5a5 Remote unlock tweaks 2021-08-18 17:52:59 -04:00
Anuken 130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -04:00
Anuken ba48373bbc Game stats cleanup 2021-08-18 16:39:20 -04:00
Anuken f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Anuken 512b65a592 Merge remote-tracking branch 'origin/master' 2021-08-18 13:50:05 -04:00
Anuken 103ee371bd Fixed #5800 2021-08-18 13:49:59 -04:00
Anuken 1bf173b1ee Merge remote-tracking branch 'origin/master' 2021-08-18 11:41:44 -04:00
Anuken 356c2cfa80 Fixed #5797 2021-08-18 11:41:38 -04:00
Anuken 63795d9df8 public AI fields 2021-08-17 22:06:29 -04:00
Anuken 8e179552ec pointless casts begone 2021-08-17 21:45:13 -04:00
Anuken e4742133ca Made various fields/methods public 2021-08-17 17:23:02 -04:00
Anuken ada6ef229c Merge remote-tracking branch 'origin/master' 2021-08-17 11:39:03 -04:00
Anuken f0c0900770 Lambda memory allocation optimizations 2021-08-17 11:38:57 -04:00
Anuken 7b4d488b11 UI cleanup 2021-08-16 20:06:50 -04:00
Anuken 0c5f781702 Sector wave spawning fixes 2021-08-16 13:15:14 -04:00
Anuken ff5c48a2a0 Merge remote-tracking branch 'origin/master' 2021-08-16 10:34:53 -04:00
Anuken 1a55f19ab2 Fixed #5774 2021-08-16 10:34:48 -04:00
Anuken d83f48891a Fixed #5774 2021-08-15 22:23:31 -04:00
Anuken 747c6186d4 DesktopLauncher -debug argument 2021-08-15 22:17:17 -04:00
Anuken b3ef412368 Extra debug logging for mod pack 2021-08-15 21:59:57 -04:00
Anuken c35dde5569 Fixed #5772 2021-08-15 21:17:16 -04:00
Anuken 79d757856e Merge remote-tracking branch 'origin/master' 2021-08-15 09:34:28 -04:00
Anuken cd0c48985d Unconditional unit draw state reset 2021-08-15 09:34:23 -04:00
Anuken d9ecaa701b Merge remote-tracking branch 'origin/master' 2021-08-14 23:19:34 -04:00
Anuken 9355496915 Correct SolidPump bar 2021-08-14 23:19:29 -04:00
Anuken 334b62b0a2 Misc scripting visibility changes 2021-08-14 09:49:25 -04:00
Anuken 16fb70b0ef Fixed #5762 / Fixed #5763 2021-08-14 09:21:02 -04:00
Anuken c2fcffb0d8 Planet frustum culling 2021-08-13 23:49:47 -04:00
Anuken 681fc6de3d Misc bugfixes 2021-08-13 19:41:14 -04:00
Anuken 9640acfb74 Merge remote-tracking branch 'origin/master' 2021-08-13 19:07:19 -04:00
Anuken 94b12704dc Mobile text input fixes 2021-08-13 19:07:14 -04:00
Anuken 031b1abe0a Allow animations without top regions 2021-08-13 14:14:58 -04:00
Anuken 0e6d9ea933 Fixed #5760 / Fixed #5761 2021-08-13 13:58:25 -04:00
Anuken 6e5ad304e4 Fixed #5759 2021-08-13 12:17:32 -04:00
Anuken a689c2cb4d Merge remote-tracking branch 'origin/master' 2021-08-13 11:29:27 -04:00
Anuken cd53cf0991 Fixed planet zoom 2021-08-13 11:29:22 -04:00
Anuken 2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken 033dadae2c Removed unnecessary 'chat' font 2021-08-13 09:20:46 -04:00
Anuken 1b0de739f9 Sector info list / Minor hint fixes 2021-08-12 22:16:13 -04:00
Anuken 351f1a80c7 Merge remote-tracking branch 'origin/master' 2021-08-12 10:07:34 -04:00
Anuken def1094357 Added world data progress bar 2021-08-12 10:07:30 -04:00
Anuken a5fe8970c6 Per-team AI settings / Errors for missing player cores 2021-08-12 09:24:20 -04:00
Anuken 1cf2bd4892 Team-specific rules / Player+Enemy team rules 2021-08-11 23:36:06 -04:00
Anuken 9111860fce Merge remote-tracking branch 'origin/master' 2021-08-11 21:18:52 -04:00
Anuken 0cac972061 Support for team-specific multipliers (no UI) 2021-08-11 21:18:48 -04:00
Anuken 4fc18d35ce #5742 2021-08-11 16:42:25 -04:00
Anuken c2720bbc33 Increased PPT range 2021-08-11 11:36:20 -04:00
Anuken 5d86390e28 Turret heat cleanup 2021-08-11 10:31:36 -04:00
Anuken ec89db7cb1 Things 2021-08-11 09:54:30 -04:00
Anuken d15968d291 Merge remote-tracking branch 'origin/master' 2021-08-11 09:27:11 -04:00
Anuken 5e5df8848d Ammo rebalancing / Possible crash fix 2021-08-11 09:27:06 -04:00
Anuken d3a15fba96 Filter locked items from stat values 2021-08-10 21:47:28 -04:00
Anuken 14dc293a09 Fixed #5734 / New derelict icon 2021-08-10 19:56:31 -04:00
Anuken a97690d219 Merge remote-tracking branch 'origin/master' 2021-08-10 17:11:29 -04:00
Anuken 9c626a17f0 Database dialog search bar 2021-08-10 17:11:22 -04:00
Anuken 90a58388d6 merge 2021-08-10 16:34:57 -04:00
Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Anuken e7e64379dd () 2021-08-10 15:12:58 -04:00
Anuken 78dc94b0ed Merge remote-tracking branch 'origin/master' 2021-08-10 10:16:20 -04:00
Anuken be38bba0e4 #5729 2021-08-10 10:16:15 -04:00
Anuken 9c1063c7cc Misc minor bugfixes 2021-08-09 16:53:49 -04:00
Anuken ed71777a17 . 2021-08-09 14:27:42 -04:00