Commit Graph

19142 Commits

Author SHA1 Message Date
Anuken
90603561ac Merge remote-tracking branch 'origin/master' 2025-06-18 19:14:18 -04:00
Anuken
8569eed795 Closes Anuken/Mindustry-Suggestions/issues/5674 2025-06-18 19:14:10 -04:00
Redstonneur1256
b73c85ff75 Quad marker tweaks (#10787)
* Don't clamp UV on repeat textures

* Cleanup
2025-06-18 19:05:08 -04:00
The4codeblocks
0185b08ca7 canvas read/write + multiplayer overwrite bug fix (#10899)
* stuff

* Update CanvasBlock.java

* canvas read/write

* updated flag

* dispose on every possible closing condition (back/cancel/ok)

* arraycopy

* hide listener

* partial colons

* fix updated and dedupe closing

* typo?
2025-06-17 12:36:42 -04:00
Anuken
7a33de8fe3 Fixed #10942 2025-06-17 12:23:49 -04:00
Anuken
1e3b6b7524 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gradle.properties
2025-06-17 11:20:35 -04:00
Anuken
536f4db5fe Sublimate collision fix 2025-06-17 11:20:21 -04:00
grely
2d14cd2232 Update servers_v7.json | Okay, this looks like crap. (#10941) 2025-06-16 13:27:12 -04:00
grely
7a1279fc30 Update servers_v7.json | replaced ip's (#10935)
* Update servers_v7.json | replaced ip's

* Update servers_v7.json

* Update servers_v7.json
2025-06-16 12:48:12 -04:00
Волшебник
067e24318c Update servers_v7.json (#10937)
For new servers
2025-06-15 20:23:23 -04:00
Redstonneur1256
c27eac9bed Marker outline control (#10931)
* Marker `outline` control

* Text/ShapeText marker outline
2025-06-15 15:28:20 -04:00
Anuken
1465916bed Merge remote-tracking branch 'origin/master' 2025-06-15 12:40:17 -04:00
Anuken
3cffbec92c Don't fill core with hidden items 2025-06-15 12:40:09 -04:00
Jason
d79802836c fix typo (#10934)
Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
2025-06-14 13:27:59 -04:00
Jason
fbf41641d3 Update servers_v7.json (#10929)
Re-added CN events server
2025-06-14 11:44:03 -04:00
Github Actions
77c4f27046 Automatic bundle update 2025-06-14 15:22:35 +00:00
Cardillan
981e954c61 Sense number of graphics operations (#10898)
* Sense number of graphics operations

* int to long
2025-06-14 11:21:18 -04:00
Anuken
96b0544261 Fixed #10927 2025-06-14 10:29:51 -04:00
Anuken
a8700ef441 Merge remote-tracking branch 'origin/master' 2025-06-13 19:02:46 -04:00
Anuken
f4e8325238 Fixed player stuck shooting in certain situations 2025-06-13 19:02:40 -04:00
Alpha
807517e828 Update servers_v7.json (#10903)
Changed domains from:
mindustry.kalpe.games
to
mv7-survival.kalpe.games
2025-06-13 18:18:50 -04:00
abcxyzDustry
339f6fcc9c Update servers_v7.json (#10924)
we negotiated with the mindustry tool programmer, and he agreed to let us merge into one until v8 is actually released, and before leading to the above agreement we used to have a separate group for our server, why did you delete it, hope you agree to approve for us
2025-06-13 18:07:44 -04:00
grely
ac1f49aeb5 Update servers_v7.json (#10893) 2025-06-13 18:07:35 -04:00
Iniquit
ef5fae289c Allow block info hotkey to also work on units (#10894)
* Allow the block info key to also work on units

* Follow code formatting guidelines
2025-06-13 18:06:14 -04:00
SomeonesShade
19d3e20328 Temporarily Invincible Missiles Quell (#10674)
* quell changes version 1 (draft)

* Quell Homing Workaround and Stat Display Working

* Quell, 16 close range instead of 19

* final color adjustment

* quell description attempt 1

* quell desc attempt 2

* e

* oop

* Added Homing to Quell Plasma Shielding

---------

Co-authored-by: EggleEgg <125359838+EggleEgg@users.noreply.github.com>
2025-06-13 18:04:09 -04:00
Anuken
a186b622f6 Merge remote-tracking branch 'origin/master' 2025-06-13 17:55:04 -04:00
Anuken
0b1399b3b1 Closes #10921 2025-06-13 17:54:55 -04:00
WhiteSpike
39ad275cb4 Included self check when disabling the redirect prompt from Landing Pad (#10925)
- If a sector had both a launch and landing pad of the same resource, when clicking "Redirect Launch Pads" to make other sectors' launch pads to send theirs to that sector, the prompt would remain enabled due to the disable check not considering self sending that same resource, making it seem it did nothing.

Implementation details:
- Refactored some variable names and code blocks for easier reading.
- Created ``canRedirectExports`` method which determines if the provided sector's launch pads can be redirected to the player's current sector. This method is used in both the button's disabled attribute and during execution of redirecting sectors.

Testing details:
- Utilized Windows instructions for compilation and running the application;
- Used save file from Steam's "v8-beta" branch;
- Selected a sector which contained both a launch and landing pad of the same resource. Before the changes, the button would remain enabled after pressing it. After the changes, the button now remains disabled (as all other sectors were already exporting to that sector).
2025-06-13 17:52:20 -04:00
Anuken
432adbd1d4 Closes Anuken/Mindustry-Suggestions/issues/5670 2025-06-13 11:55:55 -04:00
Anuken
7da5f0a6d9 Fixed #10915 2025-06-13 00:03:31 -04:00
Anuken
e5c745ee16 Generate autotiles at gradle pack time 2025-06-10 20:21:20 -04:00
Anuken
70ad6eb7d1 Autotile support for floors (untested) 2025-06-09 17:08:18 -04:00
Anuken
46099ca492 Merge remote-tracking branch 'origin/master' 2025-06-09 15:56:18 -04:00
Anuken
4469bfc4bc Bounds clamp fixes 2025-06-09 15:56:08 -04:00
KochiyaUenehaaa
f21429f3f1 display StatusDuration to one decimal place (#10908) 2025-06-08 10:26:28 -04:00
Lett
a18c5d148d Improve server control and logging of the DOS blacklist (#10904)
* Log kicks related to DOS bans

* unBlacklistDos method

Added a method to remove an IP that was blacklisted for being a potential DOS attack.

* Added a command to add/remove/list DOS bans

* Switched from spaces to a tab in the subnet-ban command

Switched from spaces to a tab in the subnet-ban command's listing function. This is better for accessibility and customizability.

* Use info(String, Object...) instead of String.format

* Fixed formatting to fit style guidelines
2025-06-07 00:13:15 -04:00
Anuken
47c19487fc Fixed #10901 2025-06-05 13:12:08 -04:00
Anuken
945f916d2c Fixed #10895 2025-06-04 13:34:39 -04:00
Anuken
c05eab2bcf Fixed #10887 2025-06-03 16:04:23 -04:00
Anuken
bcbe0890fe Fixed #10886 2025-06-03 15:40:03 -04:00
Anuken
1c3aa19fc4 Merge remote-tracking branch 'origin/master' 2025-06-03 15:37:27 -04:00
Anuken
a22e532034 Fixed #10891 2025-06-03 15:37:19 -04:00
Wxp
7076d1bf97 Fix Android loadJar (#10867)
* Fix Android loadJar

* Using another way

* Code formating

* Fix mod update
2025-06-02 14:32:24 -04:00
Anuken
18d852b5c1 Merge remote-tracking branch 'origin/master' 2025-06-02 14:30:26 -04:00
Anuken
fbc2794fde Fixed #10876 2025-06-02 14:30:19 -04:00
Github Actions
ee06e8b19f Automatic bundle update 2025-06-02 18:09:30 +00:00
Redstonneur1256
ea333a0a63 True modulo and unsigned right shift. (#10885) 2025-06-02 14:05:45 -04:00
Anuken
f924d0b533 Merge remote-tracking branch 'origin/master' 2025-06-01 23:10:15 -04:00
Anuken
2e64f7663a Fixed some issues with sector positions not migrating correctly 2025-06-01 23:10:05 -04:00
KochiyaUenehaaa
ab73305df9 building dumps faster when overdriven (#10871)
* Update Binding.java

* Update UnitCommand.java

* building dumps faster when overdriven
2025-06-01 11:58:42 -04:00