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

10181 Commits

Author SHA1 Message Date
Anuken
f093360565 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-15 10:34:57 -05:00
Anuken
d457901d2e Minor Conquer buff 2023-02-15 10:34:52 -05:00
Anuken
460dbff7d1 Fixed shield break effect 2023-02-15 10:33:36 -05:00
Anuken
e564602fd1 Hide isHidden content in mod info 2023-02-15 09:59:32 -05:00
WayZer
e4f929a851 Fix turret when cheating (#8291) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`

* Why `shouldConsume` cause `potentialEfficiency=0`
 2023-02-15 09:02:32 -05:00
MEEPofFaith
8726cde05d Return salvo and swarmer to how they were before shoot changes (#8278) 2023-02-15 09:01:03 -05:00
Bill Arndt
a189ac8613 Update Team.java to increase dynamic range of team colors (#8279) 
I'm having a lot of trouble finding enough visually distinct team colors; In the worst case I need about 25 colors. I am manually excluded colliding team numbers I know about, but, I can only find about 14 easily distinguishable colors before everything is another bright magenta, or yellow, or cyan, or pale green.
 2023-02-15 09:00:34 -05:00
MEEPofFaith
cc3ae2c66c Use setBars instead of overriding displayBars (#8296) 2023-02-15 08:59:57 -05:00
Anuken
40ec7fd6fc Less Core.app.post for build events 2023-02-15 08:57:06 -05:00
Anuken
d17f0ebc51 Fixed #8297 2023-02-15 08:35:53 -05:00
Anuken
0b7c790777 turret status fix 2023-02-14 15:08:24 -05:00
Anuken
b08136e3ea Quell no longer targets flying units 2023-02-13 14:12:53 -05:00
Anuken
ec8262418f Basic unit boost command support 2023-02-11 17:40:57 -05:00
Anuken
946e36c66e Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-09 17:50:46 -05:00
Anuken
00f3518349 Fixed #8277 2023-02-09 17:50:43 -05:00
WayZer
53f410fee0 Fix Turret bug when cheat (#8273) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`
 2023-02-09 09:20:06 -05:00
Даркнесс#3729
9c1f17fbdd Add pvpAutoPause rule (#8249) 
* Update Rules.java

* Update NetServer.java
 2023-02-08 22:44:07 -05:00
MEEPofFaith
ce3643f0b3 Make type not required if the template already provides one (#8257) 
Such as with missile units
 2023-02-08 22:35:13 -05:00
MEEPofFaith
f1fb7d8098 Fix modded payload conveyor icons (#8266) 2023-02-08 22:28:44 -05:00
Anuken
3d01eeaf1c Fixed #8251 2023-02-08 22:25:10 -05:00
Phinner
0d2dfadba7 Mod dependency resolution improvements (#7972) 
* soft dependencies + better mod resolution algorithm

* update ModMeta#toString

* var

* add #7962 bugfix

* Use existing code to resolve

* add state text for mod dialog

* bugfix

* fix error text

* remove external resolver class

It's simpler like that :)
 2023-02-01 15:21:42 -05:00
Anuken
2dcab97b6d Merge remote-tracking branch 'origin/master' 2023-02-01 15:20:38 -05:00
Anuken
31cb169002 Random server order 2023-02-01 15:20:34 -05:00
MEEPofFaith
12f747ae1d Strip colors from mod name as well (#8224) 2023-02-01 14:45:56 -05:00
Даркнесс#3729
c945243795 It doesn't work (#8237) 2023-02-01 14:45:00 -05:00
Anuken
c2262cc9cf Fixed #8235 / Fixed #8221 2023-02-01 14:42:50 -05:00
Anuken
411399e96f Fixed #8211 2023-02-01 14:18:29 -05:00
Anuken
f833b9e0ce Fixed #8236 2023-02-01 14:09:16 -05:00
Anuken
d2792a4e9d Fixed #8202 2023-01-22 08:59:32 -05:00
Anuken
6ef8d64d46 Efficiency fix 2023-01-20 09:37:28 -05:00
Anuken
85b8868d2b Fixed #8194 2023-01-18 10:41:39 -05:00
Anuken
478baf2532 Fixed #8192 2023-01-17 18:50:44 -05:00
Anuken
b4359c0489 Merge remote-tracking branch 'origin/master' 2023-01-16 15:28:45 -05:00
Anuken
977192bc54 Fixed #8187 2023-01-16 15:28:40 -05:00
南门阳德
d54b557a9f Revert #8176 (#8186) 
Liquid turrets are used to give buff like wet but not do the damage. The ammo change is not appropriate.
 2023-01-16 11:07:00 -05:00
Anuken
f6c97f4ff6 Fixed #8185 2023-01-16 11:06:34 -05:00
Anuken
66f4118896 Fixed #8184 2023-01-15 15:19:13 -05:00
Anuken
4a8f8c4ecf Merge remote-tracking branch 'origin/master' 2023-01-15 08:51:57 -05:00
Anuken
6d7c207b95 Fixed drawing of assembler payloads 2023-01-15 08:51:51 -05:00
MEEPofFaith
5e324e71d4 Hitscan fix 2 (#8175) 
* Revert "Reverting #8037"

Re-implement #8037

* Properly count collisions

Fix #8170
 2023-01-14 10:05:30 -05:00
Anuken
3159ce6707 Merge remote-tracking branch 'origin/master' 2023-01-13 19:34:52 -05:00
Anuken
9b033532c8 Fixed #8177 2023-01-13 19:34:48 -05:00
Даркнесс#3729
0678592d59 Fix cheaty item and liquid turrets (#8176) 
* Update Turret.java

* Update TractorBeamTurret.java

* Update TractorBeamTurret.java

* Update ItemTurret.java

* Update LiquidTurret.java
 2023-01-13 16:51:36 -05:00
Anuken
598049265a Complete revert of #8019 2023-01-13 09:59:01 -05:00
Anuken
b2b4602c91 Reverting #8037 2023-01-13 09:42:28 -05:00
Anuken
edcf3c4223 Fixed #8170 2023-01-13 09:31:10 -05:00
Anuken
7277892e33 Merge remote-tracking branch 'origin/master' 2023-01-12 17:01:52 -05:00
Anuken
54962a158d Fixed #8168 2023-01-12 17:01:47 -05:00
Даркнесс#3729
30dcbe1af3 Administration improvements (#8167) 
* Administration improvements

Reduced the interval for preventing sending the same message because 50 seconds is too much and kinda confusing
Added saving and loading kicked IPs so they are saved even when the server crashes
Fixed smth in Config

* skill issue
 2023-01-12 16:24:51 -05:00
Anuken
411367f294 Revert JSON rules change 2023-01-12 14:38:11 -05:00