Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,921 Commits 4 Branches 180 Tags
2dbd9e5ea951fd013622dd0fa6f7287bddcbc1ff
Commit Graph

11174 Commits

Author SHA1 Message Date
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
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
a00b3a4670 Fixed objective flags not syncing 2023-06-12 10:35:31 -04:00
Anuken
7389a5de7f Cleanup 2023-06-11 23:22:54 -04: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
49168bb8f9 Fixed #8698 2023-06-10 12:27:36 -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
MEEPofFaith
38b2540677 Side-based liquid tile padding (#8676) 2023-06-05 10:37:26 -04: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
cda82e572f ServerConnectFilter 2023-06-03 12:38:18 -04:00
Anuken
038994a95f Fixed #8667 2023-06-03 11:47:19 -04:00
Anuken
37daf0a871 Ignore processing players kicked in event 2023-06-03 00:58:22 -04:00
Anuken
88c201559f Fixed #8658 2023-06-03 00:30:29 -04:00
Anuken
174f0f2ffe Fixed #8659 2023-06-02 19:11:49 -04:00
Anuken
dde7b77de6 Closes Anuken/Mindustry-Suggestions/issues/4457 2023-06-02 12:06:06 -04:00
Anuken
afee374a66 Merge remote-tracking branch 'origin/master' 2023-06-02 11:56:13 -04:00