Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,446 Commits 4 Branches 180 Tags
393d3a19a391414fc0d5af56bdcf57d33e20e5b7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken efe5668c5a Merge remote-tracking branch 'origin/master' 2021-09-04 20:37:31 -04:00
Anuken 0331d8c6c4 Fixed #5937 2021-09-04 20:37:26 -04:00
Anuken b4b9a44126 Merge remote-tracking branch 'origin/master' 2021-09-04 18:07:15 -04:00
Anuken 063d2ce6c0 Implemented #5905 properly 2021-09-04 18:07:08 -04:00
Anuken 23d0dfe6bf Deprecated DoubleOverlayFloor 2021-09-04 16:29:14 -04:00
Anuken 0a5b1d1380 Merge remote-tracking branch 'origin/master' 2021-09-04 15:23:53 -04:00
Anuken 24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken ed1d4414a0 Payload conveyors are magnetic 2021-09-04 12:27:15 -04:00
Anuken dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
Anuken 3f49807348 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-09-04 11:27:29 -04:00
Anuken 13ddca750a arc 2021-09-04 11:27:26 -04:00
Anuken ee8683c734 Do not display overdrive visual for router/conduit 2021-09-04 10:07:13 -04:00
Anuken 8224cc3fce Fixed #5922 2021-09-04 10:03:40 -04:00
Anuken 94a340d3ee Merge remote-tracking branch 'origin/master' 2021-09-04 09:59:32 -04:00
Anuken f8048be429 Fixed #5918 2021-09-04 09:59:28 -04:00
Anuken 6984be2172 Merge remote-tracking branch 'origin/master' 2021-09-04 09:55:28 -04:00
Anuken 48f359ca9b Fixed #5907 2021-09-04 09:55:23 -04:00
Anuken 80acea4708 #5897 with proper formatting 2021-08-29 16:25:26 -04:00
Anuken cc689fd114 Fixed #5895 2021-08-29 10:26:39 -04:00
Anuken be5d9154a7 Merge remote-tracking branch 'origin/master' 2021-08-29 09:12:08 -04:00
Anuken bb9d7fedf7 Fixed #5894 2021-08-29 09:12:03 -04:00
Anuken e30d7e998d Allow unit icons for sectors 2021-08-28 20:49:39 -04:00
Anuken c6873a72f6 a 2021-08-28 20:46:54 -04:00
Anuken 259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken a3270dd908 this turned out to be pretty difficult 2021-08-28 16:29:58 -04:00
Anuken 48d568978b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/entities/Damage.java
 2021-08-28 14:17:29 -04:00
Anuken 9a7324ce54 Fixed #5887 2021-08-28 14:17:01 -04:00
Anuken 4d62b0321f Fixed #5885 2021-08-28 08:44:42 -04:00
Anuken 6ca2855365 Fixed RailBulletType effect length 2021-08-27 22:33:56 -04:00
Anuken ced97888e4 why 2021-08-27 21:51:37 -04:00
Anuken 8c32acbc30 Fixed #5878 2021-08-27 09:58:08 -04:00
Anuken bfc9b07651 Redundant cast cleanup 2021-08-27 09:31:18 -04:00
Anuken e53b578043 Merge remote-tracking branch 'origin/master' 2021-08-27 09:17:31 -04:00
Anuken b2ed066faa Fixed BE server not updating 2021-08-27 09:17:26 -04:00
Anuken 9b22777dfb AGP 7.0.1 2021-08-26 15:15:29 -04:00
Anuken 3bd08bb047 Merge remote-tracking branch 'origin/master' 2021-08-26 15:07:13 -04:00
Anuken 139d6cd5cc Proper #5872 2021-08-26 15:07:08 -04:00
Anuken c25e6b586b Allow empty maps in FileMapGenerator 2021-08-25 21:57:18 -04:00
Anuken f46b22e4a7 Merge remote-tracking branch 'origin/master' 2021-08-25 13:22:23 -04:00
Anuken 2b6856634c Fixed #5864 2021-08-25 13:22:19 -04:00
Anuken 9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken 55269846f1 Unit drown color fixes 2021-08-25 09:35:07 -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 c573fd34a1 Bullet raycast clamp 2021-08-25 09:10:59 -04:00
Anuken da7873cbd8 #5855 2021-08-25 08:49:41 -04:00
Anuken a15f8131fa Merge remote-tracking branch 'origin/master' 2021-08-24 19:14:44 -04:00
Anuken 0d27e3afdc Fixed #5856 2021-08-24 19:14:40 -04:00
Anuken bc4783e9cd Implemented #5851 properly 2021-08-24 12:45:28 -04:00
Anuken 8143cb7be0 Unit balancing 2021-08-24 12:10:44 -04:00
Anuken 8e90527609 Chat prefix empty message fix / Call.sound volume limit increase 2021-08-24 10:19:46 -04:00
Anuken 8949fd279e Build error fix / Anuken/Mindustry-Suggestions/issues/2897 2021-08-24 09:28:51 -04:00
Anuken 901d594768 Prevent server sound ear destruction / Particle effect rand param 2021-08-23 20:27:01 -04:00
Anuken 3964c8e826 Merge remote-tracking branch 'origin/master' 2021-08-23 17:41:02 -04:00
Anuken 044a124bc7 Fixed #5847 2021-08-23 17:40:58 -04:00
Anuken 80ef3cee34 Suppress gen deprecatio warning / Anuken/Mindustry-Suggestions/issues/2888 2021-08-23 15:33:28 -04:00
Anuken 254284760f Hid details of locked content 2021-08-23 15:20:56 -04:00
Anuken 71ee7558ab Merge remote-tracking branch 'origin/master' 2021-08-23 14:47:16 -04:00
Anuken 5f4a3e341f #5785 2021-08-23 14:47:11 -04:00
Anuken b52d645459 #5837 2021-08-23 12:04:54 -04:00
Anuken 006c796da7 Added database button in menu 2021-08-23 10:03:26 -04:00
Anuken 160fdee596 Consistent tile attribute display 2021-08-23 09:12:36 -04:00
Anuken 542412bbe0 ech 2021-08-23 09:11:58 -04:00
Anuken dd8279bab3 Crawl progress 2021-08-22 20:25:46 -04:00
Anuken 5e737510a3 Leg collision bugfixes 2021-08-22 18:48:12 -04:00
Anuken 6388e8da56 More drown tweaks 2021-08-22 16:01:49 -04:00
Anuken 2ef9cfdad6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/entities/comp/FlyingComp.java
 2021-08-22 15:53:33 -04:00
Anuken 5cc50b0ff3 Fixed floorSpeedMultiplier being squared 2021-08-22 15:53:07 -04:00
Anuken 502816d210 New mech drowning algorithm 2021-08-22 15:41:03 -04:00
Anuken 3ba2498815 Removed atrax from archipelago waves 2021-08-22 13:44:55 -04:00
Anuken 0a0ec12e6c Allow logic itemDrop to @air 2021-08-22 11:43:14 -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 9c826a5fdd Merge remote-tracking branch 'origin/master' 2021-08-22 10:21:24 -04:00
Anuken 50d01ef6f8 FlyingComp cleanup 2021-08-22 10:21:20 -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
Anuken c605418e33 public Setting constructor 2021-08-22 09:40:55 -04:00
Anuken 55270996ff Cleanup 2021-08-22 00:36:25 -04:00
Anuken 789fcac439 Merge remote-tracking branch 'origin/master' 2021-08-22 00:35:55 -04:00
Anuken 466118319f Fixed naval units with canBoost = true 2021-08-22 00:35:40 -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 f85c078de8 PR cleanup 2021-08-21 11:34:05 -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