Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,439 Commits 4 Branches 180 Tags
8fe08268924be759343c0855b11c785372f58fb1
Commit Graph
14559 Commits
Author SHA1 Message Date
KnochiandGitHub 98157f2852 Never use „tun“ in German language (#8179) 2023-01-14 14:41:14 -05:00
MEEPofFaithandGitHub 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
Даркнесс#3729andGitHub 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 00d6b0d483 Merge remote-tracking branch 'origin/master' 2023-01-13 09:59:05 -05:00
Anuken 598049265a Complete revert of #8019 2023-01-13 09:59:01 -05:00
NuntingandGitHub c3209f2cdd Update bundle_ko.properties (#8171) 2023-01-13 09:44:08 -05:00
Anuken b2b4602c91 Reverting #8037 2023-01-13 09:42:28 -05:00
Anuken b1e1fe4922 Merge remote-tracking branch 'origin/master' 2023-01-13 09:31:14 -05:00
Anuken edcf3c4223 Fixed #8170 2023-01-13 09:31:10 -05:00
Github Actions 58315acfa3 Automatic bundle update 2023-01-13 03:53:33 +00:00
Anuken ec9eadd660 encoding test 2023-01-12 22:52:32 -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
Даркнесс#3729andGitHub 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
Даркнесс#3729andGitHub 80afe5ad86 Fixed russian translate (#8045) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2023-01-12 08:51:28 -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
MEEPofFaithandGitHub 6eeb49bb37 Fix armor piercing not working against buildings (#8150) 2023-01-11 09:06:44 -05:00
Github Actions b2bb6136de Automatic bundle update 2023-01-11 13:57:16 +00:00
MEEPofFaithandGitHub 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
MEEPofFaithandGitHub 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
MEEPofFaithandGitHub 2a6fcb7983 Region part growing (#7861) 
E x p a n d
 2023-01-09 22:08:40 -05:00
Github Actions 8212c54446 Automatic bundle update 2023-01-09 17:48:55 +00:00
Prosta4okuaandGitHub c1b0b22e4c Ukr translation v7 (#8134) 
* 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

* виправлення

* Update bundle_uk_UA.properties
 2023-01-08 22:55:07 -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 40aebf0e77 Merge remote-tracking branch 'origin/master' 2023-01-08 10:19:52 -05:00
Anuken dcf9aa9793 Fixed #8132 2023-01-08 10:19:47 -05:00
Github Actions 45591fab83 Automatic bundle update 2023-01-08 06:24:54 +00:00
Anuken 658ebf4bc5 Merged #8053 2023-01-08 01:23:54 -05:00
Joan JosepandGitHub 59c2a11824 Update bundle_ca.properties (#7947) 2023-01-08 01:22:32 -05:00
Github Actions 33a57b11f6 Automatic bundle update 2023-01-08 05:18:51 +00:00
Anuken d082963167 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_es.properties
 2023-01-08 00:17:52 -05:00
Anuken e2fa834079 Merge of #7987 2023-01-08 00:16:58 -05:00
KhanxandGitHub e6bfc1cee8 Updated spanish translation (#7928) 2023-01-08 00:15:55 -05:00