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

10144 Commits

Author SHA1 Message Date
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
Anuken
f49e05a915 Fixed #8161 / Fixed #8162 2023-01-12 14:30:57 -05:00
Anuken
53e8eaae75 Further scathe uncover range nerf 2023-01-12 11:36:13 -05:00
Anuken
85077fbb9c Force canGameOver in campaign 2023-01-12 11:32:57 -05:00
Anuken
3287479ee3 Damage object pooling 2023-01-12 08:50:19 -05:00
Anuken
b734fb948d Fixed #8159 2023-01-12 08:36:47 -05:00
Anuken
9c63165ef5 Fixed #8156 2023-01-11 19:59:58 -05:00
Anuken
5e084be6f5 Merge remote-tracking branch 'origin/master' 2023-01-11 09:23:29 -05:00
Anuken
5a2c987ea6 Fixed #8153 2023-01-11 09:23:22 -05:00
MEEPofFaith
6eeb49bb37 Fix armor piercing not working against buildings (#8150) 2023-01-11 09:06:44 -05:00
MEEPofFaith
87949679f1 Make crash damage a multiplier instead of a toggle (#8151) 
* Switch unitCrashDamage to a multiplier

* Add to rules dialog
 2023-01-11 08:56:29 -05:00
Anuken
a9175d3ffe + 2023-01-10 21:26:57 -05:00
Anuken
79ea2480cb unitCrashDamage rule 2023-01-10 21:25:23 -05:00
MEEPofFaith
7455fb21a4 Proper trails for point lasers (#8038) 
* Proper trails for point lasers

* Take current size into account

* fh9weqfjpoepiofjwpiqoefjpoiwjieqpofpjioji

* Web editing moment

* Point laser bullets shouldn't have aa shoot effect

* h
 2023-01-10 12:11:37 -05:00
Anuken
ea9ba60d66 Minor unit balance changes 2023-01-10 11:59:31 -05:00
Anuken
1417e94bcd Merge remote-tracking branch 'origin/master' 2023-01-09 22:17:27 -05:00
Anuken
3ec2ae797e Ship beryllium cost increase / Scathe discover range nerf 2023-01-09 22:17:20 -05:00
MEEPofFaith
2a6fcb7983 Region part growing (#7861) 
E x p a n d
 2023-01-09 22:08:40 -05:00
Anuken
cba1e81f3d More consistent status flash 2023-01-08 14:40:47 -05:00
Anuken
dcc6e9827d Status flash tweaks 2023-01-08 12:29:29 -05:00
Anuken
e27f7c8332 Fixed #8131 2023-01-08 10:24:55 -05:00
Anuken
dcf9aa9793 Fixed #8132 2023-01-08 10:19:47 -05:00
Anuken
62e33effd1 CargoAI target clearing 2023-01-07 19:34:36 -05:00
Anuken
be8fec55e1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-01-07 16:22:06 -05:00
Anuken
76430c1e68 a 2023-01-07 16:21:03 -05:00
Garen7
832b5e62bf Fixes typo on Payload Mass Drivers (#8090) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 16:14:04 -05:00
Anuken
4c09f6dd40 Fixed #8025 2023-01-07 15:07:54 -05:00
Anuken
f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken
963b96a1fb Merge remote-tracking branch 'origin/master' 2023-01-07 14:47:14 -05:00
Anuken
87786441ff Fixed #8117 2023-01-07 14:47:10 -05:00
Anuken
05dec4df6a Fixed #8117 2023-01-07 14:46:31 -05:00
MEEPofFaith
a3270debac Fix collideLine (#8037) 2023-01-07 14:46:19 -05:00
Prosta4okua
574a10e5f8 🍉🍉🍉 Watermelons have deployed. Prepare yourself for new Ukrainian translation for v7 release (#7885) 
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* будівль -> будівель
 2023-01-07 14:42:27 -05:00
Anuken
eb410af371 sandbox is now actually sandbox again 2023-01-07 14:41:12 -05:00
Anuken
542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
Anuken
723b10af57 Fixed #7944 2023-01-07 14:18:07 -05:00
Anuken
1394c49e48 Fixed #8008 2023-01-07 14:10:41 -05:00
Anuken
2a71f4620e Fixed #7962 2023-01-07 14:01:28 -05:00