Commit Graph

1025 Commits

Author SHA1 Message Date
Anuken
e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Anuken
95c3476144 Fixed #6001 2021-09-14 21:28:34 -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
JrTRinny
d33a4f9f87 More Target varieties for energy field ability (#5828)
* more targets for energy field ability

* group booleans
2021-09-12 14:55:26 -04:00
Anuken
a1b9f7d1b3 Fixed #5979 2021-09-12 09:05:18 -04:00
Anuken
08d7390775 Merge remote-tracking branch 'origin/master' 2021-09-09 17:05:00 -04:00
Anuken
cbe188abab Map editor bugfixes / Re-added build noise 2021-09-09 17:04:55 -04:00
Matthew Peng
abbc25798d Pull trail updating out into its own method (#5964) 2021-09-09 15:47:08 -04:00
Anuken
c98eb2edd7 Fixed #5958 2021-09-08 08:42:23 -04:00
Anuken
dd7062f0f7 ParticleEffect#sizeInterp / Log usable RAM 2021-09-07 22:32:27 -04:00
Anuken
227fb388b8 Update building consume module before main update 2021-09-05 11:18:31 -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
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
Matthew Peng
f8c7ff0159 Damage.damage doesn't properly convert cores (#5882)
* `Damage.damage` doesn't properly convert cores

* Well that was a complete failure
2021-08-28 08:46:08 -04:00
Anuken
6ca2855365 Fixed RailBulletType effect length 2021-08-27 22:33:56 -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
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
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
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
4e12289eaa progress 2021-08-22 11:40:38 -04:00
Anuken
4af101bf7d Drownable legged units 2021-08-22 11:06:25 -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
55270996ff Cleanup 2021-08-22 00:36:25 -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
caeabe3ee8 Cleanup 2021-08-20 12:28:05 -04:00
Anuken
8f389665a1 Space 'puddles' 2021-08-20 11:42:27 -04:00
Anuken
f0a8c6e281 Oyxgen env 2021-08-20 10:06:16 -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
90826b7064 Boiling point implementation 2021-08-19 20:39:49 -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
a8b423836e Added unit decal system for mods/future units 2021-08-19 14:20:18 -04:00
Anuken
a67b7a6e77 Liquid puddle draw override 2021-08-19 09:21:25 -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
buthed010203
179f44cd37 // (#5798) 2021-08-18 12:52:12 -04:00
Anuken
356c2cfa80 Fixed #5797 2021-08-18 11:41:38 -04:00