Commit Graph
8118 Commits
Author SHA1 Message Date
Anuken 20425fde14 Merge remote-tracking branch 'origin/master' 2025-04-17 14:38:52 -04:00
Anuken c4a54ec103 Crash fix, minor duct bridge cost reduction 2025-04-17 14:38:39 -04:00
The4codeblocksandGitHub 222e3436b3 fix clipSize for overhanging displays (#10673)
* fix clipSize for overhanging displays

* Update contributors
2025-04-17 12:22:34 -04:00
Anuken defa3a5887 Merge remote-tracking branch 'origin/master' 2025-04-16 18:48:50 -04:00
Anuken 1bf2e8d818 Minor tiled display cost reduction 2025-04-16 18:48:43 -04:00
EggleEggandGitHub 9e84fc3167 Disperse ammo rebalance (#10670)
* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Almost missed the interaction
2025-04-16 17:21:26 -04:00
Anuken bf0142d8c4 Merge remote-tracking branch 'origin/master' 2025-04-16 16:51:03 -04:00
Anuken 1838a8ee12 Merge branch 'tiled-logic-displays' of https://github.com/Anuken/Mindustry 2025-04-16 16:50:52 -04:00
buthed010203andGitHub 7d707a431f Fix contains checking wrong variable (#10668) 2025-04-16 15:07:33 -04:00
Anuken 9cadf06c92 Minor optimization 2025-04-16 13:06:15 -04:00
Anuken 3249d042d1 Merge remote-tracking branch 'origin/master' 2025-04-16 00:19:09 -04:00
Anuken f994d2929f Fungal pass added to T2 unit requirements 2025-04-16 00:18:46 -04:00
EggleEggandGitHub 3892416993 Scathe ammo rebalance (#10660)
* Update Blocks.java

* Update Blocks.java
2025-04-16 00:08:35 -04:00
Anuken b45afe1f4c comment 2025-04-15 15:39:28 -04:00
Anuken 841ea4f78e Retain display contents when merging 2025-04-15 12:16:09 -04:00
Anuken e2ae2e4f71 Tiled background for tiled logic display 2025-04-14 23:20:29 -04:00
Anuken 1a00264902 Merge branch 'master' of https://github.com/Anuken/Mindustry into tileable-logic-displays
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/logicids.dat
2025-04-14 22:50:47 -04:00
Anuken 666c68edb1 Fixed #10656 2025-04-14 20:36:07 -04:00
Anuken bfeb8ccc38 Fixed command mode button not showing up after toggling editor blocks on mobile 2025-04-14 20:02:01 -04:00
Anuken 4d35c8a128 Reverted bridge cost increase 2025-04-14 15:13:30 -04:00
Anuken f2d97503d0 Fixed #10651 2025-04-14 11:35:12 -04:00
Anuken c59daa5bbb Possible crash fix 2025-04-13 22:46:43 -04:00
Anuken 061caaa092 Crash fixes 2025-04-13 22:36:12 -04:00
Anuken 62585a32b3 Fixed #10647 2025-04-13 22:26:00 -04:00
Anuken a906ce0cd9 Merge remote-tracking branch 'origin/master' 2025-04-13 22:23:42 -04:00
Anuken 017fbeb4e9 Misc UI fixes 2025-04-13 22:23:32 -04:00
BalaM314andGitHub 8b235a9915 Fix #10645 (#10646) 2025-04-13 10:47:20 -04:00
Anuken 1b6c0c7717 Minor bugfixes + ClassMap update 2025-04-13 10:05:57 -04:00
Anuken 1fb0946b86 Fixed #10645 2025-04-13 09:29:33 -04:00
Anuken f70a59c604 Fixed #10639 2025-04-12 23:39:20 -04:00
Anuken da2821f220 Difficulty info tooltips 2025-04-12 11:36:49 -04:00
Anuken f50f935232 Fixed #10632 2025-04-12 10:27:18 -04:00
Anuken 27eca86547 Hide mobile command mode only when editor blocks are shown 2025-04-12 09:34:16 -04:00
Anuken c54b1dcb6a Clamp refund multiplier rule in UI 2025-04-12 09:32:19 -04:00
Anuken da729c3ffd Re-added option for RTS AI on Serpulo (likely buggy) 2025-04-12 00:34:49 -04:00
Anuken c096c5858e Possible research dialog deselect fix 2025-04-11 20:57:30 -04:00
Anuken 0b9564abd5 GL error checker 2025-04-11 10:18:05 -04:00
Anuken 753262d436 Fixed #10615 2025-04-10 20:47:02 -04:00
Anuken 92517a470a Don't create unit spawns on campaign enemy core death when a spawn already exists 2025-04-10 20:26:24 -04:00
Anuken 2c37560710 Internal crash fix in wiki generator 2025-04-10 19:31:54 -04:00
Anuken e608a0fea4 Buildable beam link block 2025-04-10 11:40:47 -04:00
Anuken 80fbf59188 Sector icons rescaled / Anti-air turrets no longer trigger place range check 2025-04-09 21:16:19 -04:00
ba21959c15 Read Length of Strings (#10611)
* added ability to sense length of charsequences

* documentation

* Update core/assets/bundles/bundle.properties

Co-authored-by: Jason <131086642+JasonP01@users.noreply.github.com>

---------

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Jason <131086642+JasonP01@users.noreply.github.com>
2025-04-08 11:48:11 -04:00
Anuken 3096397fd3 WIP sector icons 2025-04-08 01:23:58 -04:00
Anuken 7bab72df04 Fixed map area disable logic 2025-04-07 09:53:07 -04:00
Anuken 6bb031b47f Possible wave AI pathfinding fix 2025-04-07 00:26:47 -04:00
Anuken fb3a6b526a Fixed #10608 2025-04-06 20:13:58 -04:00
Anuken 26111b4878 Overgrowth T3 requirement 2025-04-06 16:16:13 -04:00
Anuken c07be82a7c Fungal pass requirement fix 2025-04-06 16:01:24 -04:00
Anuken cb49d13d75 Made built-in variables viewable in editor 2025-04-06 15:15:40 -04:00