Commit Graph

11243 Commits

Author SHA1 Message Date
Anuken
2d4d38990d Merge remote-tracking branch 'origin/master' 2024-06-13 21:59:35 -04:00
Anuken
a39b05ffc2 Scanner -> BufferedReader 2024-06-13 21:59:28 -04:00
Mythril382
b1e683a963 JSON Stuff (#9933)
* why is everything-

* don't shrink

* they're different????????

* varabel

* i cannot ignore it

* check

* a

* missing ops
2024-06-12 17:32:53 -04:00
Anuken
d8e5818a45 Merge remote-tracking branch 'origin/master' 2024-06-08 12:55:11 -04:00
Anuken
f0bee7f19f Pathfinder bugfixes 2024-06-08 12:55:04 -04:00
Anuken
197fbbf46e multi-chooser fix 2024-06-02 16:26:36 -04:00
Anuken
1fc83e6b0f Merge branch 'master' of https://github.com/Anuken/Mindustry 2024-06-02 16:11:33 -04:00
Anuken
a7aa600ed6 Native multi file chooser 2024-06-02 16:11:29 -04:00
Mythril382
0397d3bf89 Merge branch 'master' into do-you-hear-the-voices-too 2024-06-03 02:15:36 +08:00
Mythril382
84774a0a80 driving in masses (#9915) 2024-06-02 13:20:17 -04:00
Anuken
8944b08fbf Fixed map load dialog 2024-05-27 21:45:23 -04:00
Anuken
05c2d47d51 Invert 2024-05-27 18:25:39 -04:00
Anuken
4d2163d248 Less frequent Erekir turret retargeting when valid target is present 2024-05-27 18:12:21 -04:00
Anuken
a260710ee6 MacOS file chooser fix 2024-05-27 17:57:34 -04:00
Anuken
6e7613dee3 Fixes 2024-05-27 17:34:34 -04:00
Anuken
9ac8d9a821 Fixes 2024-05-27 17:29:04 -04:00
Anuken
e7d7890891 Fixes 2024-05-27 17:27:40 -04:00
Mythril382
41e2183793 Merge branch 'master' into do-you-hear-the-voices-too 2024-05-28 00:40:31 +08:00
Mythril382
0067af0e2c changes 2024-05-28 00:31:00 +08:00
Anuken
f51c6e458d Fixed unit shields breaking on spawn 2024-05-27 11:25:34 -04:00
Mythril382
ff35e6a7d8 mythril that's a seq, NOT an objectmap 2024-05-27 23:13:43 +08:00
Mythril382
dbb62bd87c nullcheck 2024-05-27 23:10:07 +08:00
Anuken
6243ef6d4a Fixed #9892 2024-05-27 09:40:52 -04:00
Mythril382
580d35cf1e the arc pr 2024-05-27 12:54:27 +08:00
Mythril382
d24f031cb4 it's 4:14, i should sleep
anuke was right, this is a mess
2024-05-27 04:13:35 +08:00
Mythril382
7f80a1879e sound id 2024-05-27 03:35:37 +08:00
Mythril382
bc2be5de25 Delete core/src/mindustry/logic/LogicSound.java 2024-05-27 02:10:12 +08:00
Anuken
f1f17965bc Fixed #9888 2024-05-26 09:31:40 -04:00
Anuken
f30b24f4ac Closes Anuken/Mindustry-Suggestions/issues/5012 2024-05-25 22:40:37 -04:00
Anuken
a0569a63bc Possible entity collision variable overwrite fix 2024-05-25 21:50:12 -04:00
Anuken
37dc449471 Processor list bugfixes 2024-05-24 22:02:37 -04:00
Anuken
b4b6b9fa44 World processor list in editor 2024-05-24 21:46:15 -04:00
Anuken
19b6b60ac5 Merge remote-tracking branch 'origin/master' 2024-05-23 11:54:33 -04:00
Anuken
779a8f75bc Fixed #9876 2024-05-23 11:54:26 -04:00
WayZer
a14daab7e9 Update BeamDrill.java (#9857) 2024-05-18 14:25:41 -04:00
Anuken
515431de02 Fixed #9847 2024-05-13 10:24:26 -04:00
Anuken
328ba21ceb Fixed trail not shortening 2024-05-11 13:35:26 -04:00
Anuken
6cf371b949 Unloader optimizations from buthed 2024-05-08 10:24:38 -04:00
Anuken
db314c1134 Possible pathfinder error fix 2024-05-07 16:33:08 -04:00
Anuken
a8b08dadea Pathfinder crash "fix" 2024-05-07 15:26:32 -04:00
Anuken
251e5cc3e7 Pathfinder error fix 2024-05-07 13:31:39 -04:00
Anuken
abf3111bdc Fixed #9821 2024-05-07 11:39:11 -04:00
Anuken
6d90202949 Merge remote-tracking branch 'origin/master' 2024-05-06 17:11:07 -04:00
Anuken
fd81bf13dd Closes Anuken/Mindustry-Suggestions/issues/4993 2024-05-06 17:11:00 -04:00
Elixias
b12fac3aef i fix bug heheheheheheheeeeh (#9808) 2024-05-04 09:18:59 -04:00
Anuken
d934fff02e Merge remote-tracking branch 'origin/master' 2024-05-03 15:57:32 -04:00
Anuken
179adabd56 Fixed #9804 2024-05-03 15:57:22 -04:00
Andrey Andreyevich Bienkowski
08429b5492 Add turret ammo capacity to the in-game help (#9777)
* Add turret ammo capacity to the in-game help

* Rename max shots to ammo capacity

* Rename ammo multipier to ammo per item
2024-05-03 14:11:23 -04:00
Leo
143db64710 Updated the core landing sound and added a launch sound (#9802)
* Added core launch sound and remade the land sound,

* Updated the land.ogg to use Synth Pad 3

* Added saw

* Updated
2024-05-02 15:56:09 -04:00
Uenhe
d9ea8beae2 Call onRemoved() in StatusEffect.java when an effect is removed (#9801)
* Call onRemoved() in StatusEffect.java when an effect is removed

* Call onRemoved() in StatusEffect.java when an effect is removed

* cleanup

* cleanup
2024-05-02 09:41:59 -04:00