1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-06 21:07:25 +03:00
Commit Graph

14720 Commits

Author SHA1 Message Date
Anuken
f7b4890ef7 arc 2022-06-29 17:50:19 -04:00
Anuken
28e777e1e4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-06-29 17:38:10 -04:00
Anuken
36aa56f251 New WIP missile turret 2022-06-29 17:37:32 -04:00
smol
1c1b1295d1
changes (#7089)
* a

* i guess so

* despawnUnitCount, which i forgot to include

* changes + despawnUnitRadius field

* enter?

* no

* can

you not
2022-06-29 12:39:10 -04:00
JniTrRny
a5cb7b09eb
Deconstructable Core in Editor Mode (#7090)
* Deconstructable Core in Editor Mode

* I hate it when
2022-06-29 11:33:04 -04:00
Lucky Clover
8d6807a79d
Fix Rules-initialWaveSpacing comment (#7093)
(In fact I'm not sure if this should be edited to "<=0" to correspond with the actual codes.
2022-06-29 11:32:48 -04:00
smol
366f4f490c
BulletType despawnUnit field (#7088)
* a

* i guess so

* despawnUnitCount, which i forgot to include
2022-06-28 23:27:51 -04:00
Anuken
4e3f7eccae Merge remote-tracking branch 'origin/master' 2022-06-28 19:58:04 -04:00
Anuken
87bbb1ac27 Mod dialog fixes 2022-06-28 19:58:00 -04:00
MEEPofFaith
49b6f417d2
Unhardcode reactor explosion sound (#7085)
Also fix NuclearReactors playing the explode sound even if it doesn't explode.
2022-06-28 16:09:58 -04:00
Anuken
7402577902 Merge remote-tracking branch 'origin/master' 2022-06-28 16:09:26 -04:00
Anuken
487b630d62 Fixed #7087 2022-06-28 16:09:21 -04:00
BeDanGames
c584eb92fc
Update servers_v7.json (#7084) 2022-06-27 14:08:28 -04:00
Github Actions
4f0e634b42 Automatic bundle update 2022-06-27 16:54:13 +00:00
xem8k5
82ffa91b49
Update bundle_zh_CN.properties aaaaaagain (#7072)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2022-06-27 12:53:01 -04:00
Anuken
b4d46ca137 Limit mod browser to mods for 136 and above 2022-06-27 12:07:30 -04:00
Anuken
d857ef6290 Merge remote-tracking branch 'origin/master' 2022-06-27 10:07:04 -04:00
Anuken
3ef0f0f56e Mod release browser cleanup 2022-06-27 10:06:58 -04:00
Github Actions
8f0b8c1277 Automatic bundle update 2022-06-27 13:57:57 +00:00
KayAyeAre
b72702957b
Selectable mod releases (#7079)
* filterable power node connections

* selectable mod releases

* Update contributors

* selectable mod releases

* Update contributors

* Revert "Merge branch 'master' of https://github.com/KayyAyeAre/Mindustry"

This reverts commit 1f210a898a, reversing
changes made to 8ba6d4b2aa.

* move the release selection to a new button
2022-06-27 09:56:45 -04:00
Anuken
3927841f43 Fixed #7080 2022-06-26 17:31:31 -04:00
Anuken
2c20bf28c1 arc 2022-06-26 14:32:33 -04:00
Anuken
3f6ab92fcb Map objective editor fixes 2022-06-26 14:07:58 -04:00
Anuken
02e46a9909 Merge remote-tracking branch 'origin/master' 2022-06-26 12:10:02 -04:00
Anuken
b25ca6ff33 WIP objective marker editing + Mobile factory output tap 2022-06-26 12:09:58 -04:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
JniTrRny
a2513493df
better generation UI (#7078) 2022-06-26 11:51:17 -04:00
Anuken
5b48faf13b ...and faster music loading 2022-06-26 09:33:26 -04:00
Anuken
d84b981d24 Faster sound loading 2022-06-26 08:35:08 -04:00
Anuken
4ae157d50f Merge remote-tracking branch 'origin/master' 2022-06-25 09:45:17 -04:00
Anuken
0ee53817d8 Fixed JSON controller crash 2022-06-25 09:45:12 -04:00
nowords123
5b25919e38
new server (#7070)
added Echo#3305 servers since he asked in #help
2022-06-25 09:11:53 -04:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
xem8k5
2ac0c79b4f
Update bundle.properties (#7073) 2022-06-25 09:07:09 -04:00
Anuken
6db23c4d07 JSON unitType class -> template 2022-06-25 08:57:30 -04:00
Anuken
b47a8be8cf Merge remote-tracking branch 'origin/master' 2022-06-24 21:18:10 -04:00
Anuken
cc26a0eeb3 WIP objective editor progress 2022-06-24 21:18:04 -04:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Anuken
be61b45d08 WIP point laser turret 2022-06-23 20:57:22 -04:00
Anuken
ac47d22ea1 Map resize dialog shift options 2022-06-23 17:10:44 -04:00
Anuken
d4a33c6d51 Homing bullet targeting fix 2022-06-23 17:00:24 -04:00
Anuken
e682a0f1d3 WIP/unfinished map 2022-06-23 16:55:16 -04:00
Anuken
a39fe2cb37 WIP map info dialog changes 2022-06-23 16:32:37 -04:00
Anuken
342a7abf9b Misc tweaks 2022-06-23 14:55:08 -04:00
Anuken
4ba5be8d31 Misc improvements / Latum death unit spawning 2022-06-23 13:16:25 -04:00
Anuken
226d0a9f32 Merge remote-tracking branch 'origin/master' 2022-06-22 18:31:04 -04:00
Anuken
1a98a66f23 Batched building health update packet 2022-06-22 18:30:59 -04:00
RTOmega
e74be686f1
OmegaHub ip change (#7060)
* OmegaHub ip change

* Update servers_v7.json

* Update servers_be.json
2022-06-22 14:21:04 -04:00
Github Actions
54c4859e92 Automatic bundle update 2022-06-22 18:20:29 +00:00
xem8k5
53f4bf7b78
Update bundle_zh_CN.properties by lastcommanded and so on (#7036)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2022-06-22 14:19:07 -04:00