mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,688 Commits 4 Branches 160 Tags 2.3 GiB
e4bc6e21a4
Commit Graph

14076 Commits

Author SHA1 Message Date
Anuken
f01df70d3f mesh fix 2 2023-06-27 18:38:45 -04:00
Anuken
c15b3421b2 mesh fix 2023-06-27 16:27:50 -04:00
Anuken
b4d5d05217 Merge remote-tracking branch 'origin/master' 2023-06-27 16:13:00 -04:00
Anuken
9b1a8edafc Closes Anuken/Mindustry-Suggestions/issues/4499 2023-06-27 16:12:55 -04:00
Sunky.MP3G
fbcc53e2c0
New Ru translations (#8755) 
* Update bundle_ru.properties

* Mistake
 2023-06-27 16:03:13 -04:00
Anuken
e630bcf41e Fixed #8764 2023-06-27 14:45:11 -04:00
Anuken
eb44a7ec84 Fixed #8762 2023-06-27 10:29:42 -04:00
Anuken
023ec9f66b Fixed #8760 2023-06-26 18:48:57 -04:00
Anuken
1bc3ac8761 Fixed #8759 2023-06-26 07:11:58 -04:00
Anuken
4b3feb2f0e Merge remote-tracking branch 'origin/master' 2023-06-25 20:04:16 -04:00
Anuken
ac5526e785 Fixed #8757 2023-06-25 20:04:02 -04:00
Anuken
95a7a181e0
Update contributors 2023-06-25 13:36:03 -04:00
Lime712
0a869fd690
Update bundle_de.properties (#8754) 
English description in German bundle
 2023-06-25 09:20:44 -04:00
Lime712
ec9c19101f
Update bundle_de.properties (#8753) 
Large plasma bores are boosted by nitrogen, not hydrogen.
 2023-06-24 22:17:38 -04:00
Anuken
31b01ac39e Decreased canvas silicon cost 2023-06-24 13:43:10 -04:00
Anuken
f74293b878 Merge remote-tracking branch 'origin/master' 2023-06-23 22:51:58 -04:00
Anuken
0e31103b21 Cleanup output stream 2023-06-23 22:51:53 -04:00
router
591c31fd29
Add priority servers, update servers_v7.json (#8720) 
* Update servers_v7.json

* Add priority server outlining and bumping

* a

* chore: A little bit of cleanup :)

* json

* fixed no-server issue

* removed cursed duplication

---------

Co-authored-by: phinner <62483793+Phinner@users.noreply.github.com>
 2023-06-23 14:00:00 -04:00
Somka000
a20ca67527
Update contributors (#8748) 
I did several Polish translations (I also helped translators since 2018), reported many bugs, had my own server, encouraged many people to play mindustry etc.
 2023-06-22 17:15:07 -04:00
Anuken
c66abc3f0f Fixed #8742 2023-06-22 12:10:52 -04:00
Anuken
6163738ad8 Merge remote-tracking branch 'origin/master' 2023-06-21 23:55:05 -04:00
Anuken
443d31e4a5 Less pierce damage for shocked status 2023-06-21 23:54:39 -04:00
Даркнесс#3729
2d827f83b4
add getEmoji() method (#8739) 2023-06-21 16:28:25 -04:00
Даркнесс#3729
fbc6740668
fix (#8736) 2023-06-21 09:05:39 -04:00
Anuken
06cd71e13c Merge remote-tracking branch 'origin/master' 2023-06-20 17:32:43 -04:00
Anuken
f65edb3468 Fixed #8735 2023-06-20 17:32:38 -04:00
夜狐
aefcb7746a
Turn Issue Templates into Issue Forms for better structure (#8734) 
* Turned Issue Template into an Issue Form

* Bug Fix in Form

* Added Yoru Kitsune to credits

(I did some translations and bug fixes)
 2023-06-20 13:22:08 -04:00
Anuken
a2dd2c88a2 Fixed #8733 2023-06-20 13:09:50 -04:00
Anuken
2008cf6387 Fixed non-even assembler modules not working 2023-06-19 19:42:54 -04:00
Anuken
6ba1cd3ef6 Fixed #8732 2023-06-19 18:44:16 -04:00
Anuken
c7181999b2 Pathfinding improvements 2023-06-19 17:21:21 -04:00
Anuken
974d19fb75 Fixed #8729 2023-06-19 13:50:33 -04:00
Anuken
f4dcd37be3 Conduit padCorners fix 2023-06-19 10:56:30 -04:00
Anuken
014750fa97 Merge remote-tracking branch 'origin/master' 2023-06-19 10:28:59 -04:00
Anuken
5c178c20a1 Conduit padCorners 2023-06-19 10:28:54 -04:00
Даркнесс#3729
3762ee6313
Fix invalid heal targeting for non-sharded teams (#8728) 2023-06-19 09:10:33 -04:00
RTOmega
4289450a4d
Fixed Grammar Error on TR Bundle (#8727) 2023-06-18 16:46:01 -04:00
Anuken
509a6a28b5 . 2023-06-18 09:08:09 -04:00
Anuken
54d7f3e17c Fixed #8718 2023-06-18 09:06:52 -04:00
Anuken
7e23272668 Do not crash when reading null planets 2023-06-17 20:39:52 -04:00
Anuken
70516752fc Fixed reconstructor commanding in multiplayer 2023-06-17 17:54:29 -04:00
Anuken
6ed336ad95 Misc fixes 2023-06-17 17:40:29 -04:00
Anuken
0adfee97cc Merge remote-tracking branch 'origin/master' 2023-06-17 15:33:13 -04:00
Anuken
dc921ff4a8 Quieter build sound / Display player name on hovered unit 2023-06-17 15:33:08 -04:00
Github Actions
c39ad8ce6e Automatic bundle update 2023-06-17 03:53:36 +00:00
Phinner
a582fe0d1c
Update french translations (#8715) 
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀

* chore: Translate missing strings + Small changes

* chore: Apply suggested changes (author: Kalpas)

* chore: Sync bundle files

* chore: Translate missing lines

* chore: Add trailing line back

* chore: Minor visual changes
 2023-06-16 23:52:41 -04:00
Github Actions
6cbdc86169 Automatic bundle update 2023-06-17 00:13:54 +00:00
red
a650018b6e
Update bundle_pt_BR.properties (#8687) 
* Update bundle_pt_BR.properties

i translated the rest of the stuff to brazilian portuguese :D

* Update contributors

* Update bundle_pt_BR.properties

* Fixed color translation

* i fixed the miss conjugated verbs and translated one more line

---------

Co-authored-by: red <80164245+Redgabriel13-red13@users.noreply.github.com>
 2023-06-16 20:12:59 -04:00
Anuken
743f61a92c lockRotation 2023-06-16 17:04:43 -04:00
Anuken
9eefea3c6f Merge remote-tracking branch 'origin/master' 2023-06-16 17:03:46 -04:00
Anuken
b4a32f506e Misc fixes 2023-06-16 17:03:42 -04:00
MEEPofFaith
26c0c7467b
Lock rotation of blocks with rotate = false to 0 (#8531) 
* Lock rotation of blocks that don't rotate

* Fix input visuals

* Default to false

Quick, stop forcing changes to mods before sk yells at me.

* lock GenericCrafter rotation if rotate = false

* Convert from a setter a to block method

* Simplify

* Revert "lock GenericCrafter rotation if rotate = false"

This reverts commit 26ac41baf5.

* Remove `lockRotation` boolean.

Pointless. If you want something to rotate, just do `rotate = true; drawArrow = false;`
 2023-06-16 15:57:54 -04:00
BalaM314
d14cdfd59c
Allow ulocate to output enemy buildings (#6704) 
* Allow ulocate to output enemy buildings
Previously you would have to use ucontrol getblock to get the actual Building
that's weird and just confuses newbs
like me

* whoops, turns out ulocate doesn't have a range

* c o d e s t y l e

* Always return building object if on same team
 2023-06-16 14:27:05 -04:00
Anuken
017aa71da8 Merge remote-tracking branch 'origin/master' 2023-06-16 13:19:57 -04:00
Anuken
58cd1852f1 Conduit junction replacement fix 2023-06-16 13:19:52 -04:00
Github Actions
500f22b1d0 Automatic bundle update 2023-06-16 15:57:43 +00:00
JniTrRny
ed6619d2df
Update bundle_th.properties (#8714) 2023-06-16 11:56:55 -04:00
Tornado3708
be7a360bf5
Update bundle_be.properties (#8697) 
Foreshadow, tar fields and particular interface text translation.
 2023-06-15 23:31:37 -04:00
MEEPofFaith
2ff7ccfc19
Laser pierce fixes. (#8526) 
* Flip pierce check order

Allow pierce cap + laser to function together

* Apply to continuous bullets

+ Make visually accurately show length.

* laser parameter for findPierceLength

consistency with collideLine
 2023-06-15 19:33:01 -04:00
WayZer
bf1484b17c
Update CoreBlock.java (#8583) 2023-06-15 15:44:02 -04:00
MEEPofFaith
40c5510205
Better handling of missiles splitting to other missiles (#8603) 
- Pass a shooter separate to owner into `BulletType#create`. `killShooter` kills the owner while the shooter is passed into the missile ai
- `killShooter` no longer kills already dead units
- `MissileAI` no longer aims at shooter's aim pos if the shooter is dead
 2023-06-15 13:57:27 -04:00
Github Actions
913722202e Automatic bundle update 2023-06-14 13:11:46 +00:00
Даркнесс#3729
4e5475f0ed
Team improvements (#8704) 
* Update Team.java

* Update ServerControl.java

* better

* kill me please

* kill me please

* kill me please

* Update bundle_ca.properties

* kill me please

* Update bundle_da.properties

* kill me please

* kill me please

* Update bundle_et.properties

* Update bundle_eu.properties

* Update bundle_fi.properties

* Update bundle_fil.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_id_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_lt.properties

* Update bundle_nl.properties

* Update bundle_nl_BE.properties

* Update bundle_pl.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_PT.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_sr.properties

* Update bundle_sv.properties

* Update bundle_th.properties

* Update bundle_tr.properties

* Update bundle_tk.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update World.java

* Update CustomRulesDialog.java

* skill issue

* skill issue x2

* skill issue x3
 2023-06-13 18:54:10 -04:00
Anuken
d4e7f4a2ee Merge remote-tracking branch 'origin/master' 2023-06-13 16:02:29 -04:00
Anuken
1928c6db83 Fixed #8710 2023-06-13 16:02:24 -04:00
BalaM314
c49075ff0d
Correctly display ∞ unit cap in reconstructors (#8709) 
* Correctly display ∞ in reconstructors

UnitFactory.java uses getStringCap, but Reconstructor uses getCap
this was probably missed in 8cabae1

* might as well fix formatting

same format as UnitFactory.java
 2023-06-13 10:37:17 -04:00
Anuken
1d358a3c84 Show locked item names 2023-06-13 09:29:21 -04:00
Anuken
4721086a8e Fixed logic blocks making clicking noises when not accessible 2023-06-12 10:50:32 -04:00
Anuken
a07db8a08e Merge remote-tracking branch 'origin/master' 2023-06-12 10:35:36 -04:00
Anuken
a00b3a4670 Fixed objective flags not syncing 2023-06-12 10:35:31 -04:00
Github Actions
637bd4fc8f Automatic bundle update 2023-06-12 04:04:41 +00:00
Anuken
0006291631 e 2023-06-12 00:03:41 -04:00
Anuken
8cb6f080f1 Merge remote-tracking branch 'origin/master' 2023-06-11 23:22:59 -04:00
Anuken
7389a5de7f Cleanup 2023-06-11 23:22:54 -04:00
Github Actions
5459322080 Automatic bundle update 2023-06-12 03:19:14 +00:00
Anuken
4b0824a20c Admin player team switch + more trace info 2023-06-11 23:18:04 -04:00
NullReferenceExc
f05d1ebc78
Update Team.java (#8700) 2023-06-10 16:59:11 -04:00
Anuken
2dbbd62163 Merge remote-tracking branch 'origin/master' 2023-06-10 12:27:40 -04:00
Anuken
49168bb8f9 Fixed #8698 2023-06-10 12:27:36 -04:00
qwertystar
a8de7c17bd
Update bundle_zh_CN.properties (#8692) 
refer the Chinese translation of hint.rebuildSelect to provide that of hint.rebuildSelect.mobile
 2023-06-09 09:26:21 -04:00
夜狐
603efd7653
Update bundle_de.properties (#8688) 2023-06-07 23:15:24 -04:00
Valera
a43d39597a
fix a small mistake made by inattention (#8686) 2023-06-07 17:36:19 -04:00
Даркнесс#3729
376e5c0b29
💀 (#8685) 2023-06-07 14:13:41 -04:00
Anuken
f2cd506eb4 Merge remote-tracking branch 'origin/master' 2023-06-07 09:52:55 -04:00
Anuken
af76e889cf Closes Anuken/Mindustry-Suggestions/issues/4452 2023-06-07 09:52:50 -04:00
Даркнесс#3729
ef0efc84cb
Map improvements (#8682) 
* Update Map.java

* Update MapListDialog.java

* Update ServerControl.java
 2023-06-07 09:35:57 -04:00
Anuken
4d301ebdbf Merge remote-tracking branch 'origin/master' 2023-06-06 10:05:16 -04:00
Anuken
84817c0c24 Fixed #8680 2023-06-06 10:05:11 -04:00
Github Actions
d7a87f36b7 Automatic bundle update 2023-06-05 18:30:55 +00:00
Ninjdai
379875f591
Update bundle_fr.properties (#8678) 
Translated new votekick strings
 2023-06-05 14:30:07 -04:00
MEEPofFaith
38b2540677
Side-based liquid tile padding (#8676) 2023-06-05 10:37:26 -04:00
Github Actions
9ff10e9d16 Automatic bundle update 2023-06-05 00:51:34 +00:00
Даркнесс#3729
ebe965ef40
Better votekick reason input (#8673) 
* Update bundle.properties

* Update PlayerListFragment.java

* Update bundle.properties

* Update bundle.properties
 2023-06-04 20:50:48 -04:00
Alex Gusev
32c146cdf1
Adapt interface to display notch of mac laptops (#8666) 
* Adapt interface to display notch of mac laptops

* `macNotchHeight` as a separate variable, and description for mac notch setting
 2023-06-04 12:43:07 -04:00
frieda666
70bb7aff54
Improvement on votekick (#8664) 
* Add test case for achievement

* Allow admins to cancel votekick & allow players to change vote

* Require reason to start votekick

* Require reason to start votekick

* Update message sent by votekick button
 2023-06-03 23:45:55 -04:00
Anuken
fc673de556 augh 2023-06-03 12:43:39 -04:00
Anuken
925d19d867 Merge remote-tracking branch 'origin/master' 2023-06-03 12:38:22 -04:00
Anuken
cda82e572f ServerConnectFilter 2023-06-03 12:38:18 -04:00
Github Actions
21f4efaddc Automatic bundle update 2023-06-03 15:48:18 +00:00
Anuken
5515cd3187 Merge remote-tracking branch 'origin/master' 2023-06-03 11:47:24 -04:00