Commit Graph
1155 Commits
Author SHA1 Message Date
Anuken c6873a72f6 a 2021-08-28 20:46:54 -04:00
Anuken 26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/UnitTypes.java
2021-08-25 09:22:23 -04:00
Anuken 0d27e3afdc Fixed #5856 2021-08-24 19:14:40 -04:00
Anuken 8143cb7be0 Unit balancing 2021-08-24 12:10:44 -04:00
Anuken 8949fd279e Build error fix / Anuken/Mindustry-Suggestions/issues/2897 2021-08-24 09:28:51 -04:00
Anuken 80ef3cee34 Suppress gen deprecatio warning / Anuken/Mindustry-Suggestions/issues/2888 2021-08-23 15:33:28 -04:00
Anuken dd8279bab3 Crawl progress 2021-08-22 20:25:46 -04:00
Anuken 6388e8da56 More drown tweaks 2021-08-22 16:01:49 -04:00
Anuken 502816d210 New mech drowning algorithm 2021-08-22 15:41:03 -04:00
Anuken 4e12289eaa progress 2021-08-22 11:40:38 -04:00
Anuken 4af101bf7d Drownable legged units 2021-08-22 11:06:25 -04:00
Anuken 1d46fb5425 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-22 09:52:19 -04:00
JrTRinnyandGitHub 7773a3b17b let payload source/void replace each other (#5835) 2021-08-22 09:45:05 -04:00
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 ec61598a52 Minke ability moved to Oxynoe 2021-08-20 23:04:43 -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 465afc3128 Sound fixes 2021-08-20 08:54:02 -04:00
Anuken cd7103e3f4 Cryo vapor 2021-08-20 00:15:47 -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 efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken 9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken 90826b7064 Boiling point implementation 2021-08-19 20:39:49 -04:00
Anuken a39f2bd3a9 wip 2021-08-19 17:46:10 -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 1d32680ab2 sprite tweaks 2021-08-18 20:09:59 -04:00
Anuken 130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -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 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 b3ef412368 Extra debug logging for mod pack 2021-08-15 21:59:57 -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 4fc18d35ce #5742 2021-08-11 16:42:25 -04:00
Anuken c2720bbc33 Increased PPT range 2021-08-11 11:36:20 -04:00
Anuken ec89db7cb1 Things 2021-08-11 09:54:30 -04:00
Anuken 5e5df8848d Ammo rebalancing / Possible crash fix 2021-08-11 09:27:06 -04:00
Anuken 9c626a17f0 Database dialog search bar 2021-08-10 17:11:22 -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 be38bba0e4 #5729 2021-08-10 10:16:15 -04:00
Anuken 00a2c1aad0 Refactored fireball into FireBulletType 2021-08-08 13:37:55 -04:00
Anuken 644d00b268 Misc ammo balancing 2021-08-07 17:37:55 -04:00
Anuken 71c4f27d60 Removed pointless 'device' switcher / Anuken/Mindustry-Suggestions/issues/2811 (but only partially) 2021-08-07 12:34:11 -04:00
Anuken 6cb2c0e8a7 Anuken/Mindustry-Suggestions/issues/2810 2021-08-07 12:22:34 -04:00