Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,670 Commits 4 Branches 180 Tags
a4e482f55aac3b474fc4bbc67ba635fe25915810
Commit Graph

5612 Commits

Author SHA1 Message Date
Anuken
a4e482f55a Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-04 20:23:08 -04:00
Anuken
5ce61b863b New WIP turret 2022-07-04 20:23:05 -04:00
MEEPofFaith
4e8736de6c alwaysContinuous weapons have no reload (#7124) 2022-07-04 17:28:23 -04:00
Anuken
5b1d1a2ce4 Misc minor fixes 2022-07-04 16:52:18 -04:00
Anuken
02dd74b113 Merge remote-tracking branch 'origin/master' 2022-07-03 18:38:07 -04:00
Anuken
ae842ac9e1 Partial rollback for #7117 2022-07-03 18:38:00 -04:00
JniTrRny
51a42ae4f5 I kid you not (#7119) 2022-07-03 16:15:36 -04:00
Anuken
443a60dc76 Merge remote-tracking branch 'origin/master' 2022-07-03 14:32:26 -04:00
Anuken
3e4b754a60 Weapon support for "always-continuous" bullets 2022-07-03 14:32:21 -04:00
JniTrRny
0201e08ac9 generation UI fix + other miniscule ui fix (#7117) 2022-07-03 13:54:30 -04:00
Phinner
685e3cac83 Add support for SRV records (#6982) 
* SRV record support

* respect the formatting II

* avoid blocking call

* Add android support

* switch to stripped down version of dnsjava

* move srv lookup from `Net` to `NetProvider`

* random optimizations

* bump arc and restart the thing

* reimplement using ArcDns

* Update core/src/mindustry/net/ArcNetProvider.java

Co-authored-by: buthed010203 <naguiar010203@gmail.com>

* Update ArcNetProvider.java

Co-authored-by: buthed010203 <naguiar010203@gmail.com>
 2022-07-03 10:37:58 -04:00
Anuken
4d5f16e75d Merge remote-tracking branch 'origin/master' 2022-07-03 09:43:22 -04:00
Anuken
3b1930777f Fixed #7115 2022-07-03 09:43:15 -04:00
Mythril382
0d8a46943b i made a mistake aaaaaaaaaaa (#7114) 2022-07-03 09:26:44 -04:00
Anuken
4c9a3def1d Merge remote-tracking branch 'origin/master' 2022-07-03 09:18:40 -04:00
Anuken
7d67585f9a JSON ClassMap update 2022-07-03 09:18:35 -04:00
Mythril382
e34637a02f Display Bullet Status Duration (#7109) 
* whad

i have no idea if this works

and have no idea if the formatting is right

💀

* int

int

* i am an idiot

yes i am

an idiot
 2022-07-02 17:36:41 -04:00
Lucky Clover
fb3b69a401 fix added assembler module doesnt reset progress (#7108) 2022-07-02 10:17:43 -04:00
Anuken
a9c0beee61 Missile stat value display 2022-07-01 12:36:54 -04:00
Anuken
2e98ecf09a Scathe turret homing 2022-07-01 10:58:17 -04:00
Anuken
2dee4a380f Pathfinder fix / Version logging 2022-06-30 20:05:53 -04:00
Anuken
5c1b874f38 Fixed #7100 2022-06-30 10:45:17 -04:00
Anuken
efc7194fbe Bundle update 2022-06-29 18:50:09 -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
487b630d62 Fixed #7087 2022-06-28 16:09:21 -04:00
Anuken
b4d46ca137 Limit mod browser to mods for 136 and above 2022-06-27 12:07:30 -04:00
Anuken
3ef0f0f56e Mod release browser cleanup 2022-06-27 10:06:58 -04: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
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
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
0ee53817d8 Fixed JSON controller crash 2022-06-25 09:45:12 -04:00
Anuken
6db23c4d07 JSON unitType class -> template 2022-06-25 08:57:30 -04:00
Anuken
cc26a0eeb3 WIP objective editor progress 2022-06-24 21:18:04 -04: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