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

10501 Commits

Author SHA1 Message Date
Anuken
129c3f446a Fixed #8782 2023-06-30 22:26:43 -04:00
Anuken
c64b6092d7 Merge remote-tracking branch 'origin/master' 2023-06-29 09:48:31 -04:00
Anuken
f17719f08e Fixed #8777 2023-06-29 09:48:26 -04:00
Даркнесс#3729
cc41b99c75 Update UnitType.java (#8778) 2023-06-29 09:43:41 -04:00
Uenhe
8c7523b3b3 Update RegenProjector.java (#8768) 2023-06-28 10:58:28 -04:00
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
9b1a8edafc Closes Anuken/Mindustry-Suggestions/issues/4499 2023-06-27 16:12:55 -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
ac5526e785 Fixed #8757 2023-06-25 20:04:02 -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
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
f65edb3468 Fixed #8735 2023-06-20 17:32:38 -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
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
dc921ff4a8 Quieter build sound / Display player name on hovered unit 2023-06-17 15:33:08 -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
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
Даркнесс#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