Commit Graph
100 Commits
Author SHA1 Message Date
Anuken 178cd16010 Optimizations that don't even belong in this branch 2026-06-08 23:47:46 -04:00
Anuken 7357cef274 Asset type reordering 2026-06-08 19:04:44 -04:00
Anuken 033e489904 Proper sound icon for settings 2026-06-08 13:26:00 -04:00
Anuken 6de284f6eb Updated font with new icons 2026-06-08 12:52:36 -04:00
Anuken 776c5bcb82 WIP asset view 2026-06-06 16:35:55 -04:00
Anuken 8779326e78 Unit tests 2026-06-04 13:36:44 -04:00
Anuken 4dfa4a2348 Merge remote-tracking branch 'origin/data-patch-assets' into data-patch-assets 2026-06-03 18:26:06 -04:00
Anuken 39cc6cfd6d Misc minor fixes 2026-06-03 18:25:58 -04:00
Anuken ab69f947ef Merge remote-tracking branch 'origin/data-patch-assets' into data-patch-assets 2026-06-03 11:54:04 -04:00
Anuken a9bc173016 Incremental asset downloading 2026-06-03 11:53:56 -04:00
Anuken acc8eda33f Merge remote-tracking branch 'origin/data-patch-assets' into data-patch-assets 2026-06-02 21:23:18 -04:00
Anuken a5ea0ee39e Faster asset transfer & asset transfer loading bar 2026-06-02 21:23:11 -04:00
Anuken c9106ef256 Merge remote-tracking branch 'origin/data-patch-assets' into data-patch-assets 2026-06-02 14:37:25 -04:00
Anuken d44b9ae317 Various fixes related to content assets 2026-06-02 14:37:01 -04:00
Anuken 1ed80c59fd Embed assets when exporting save 2026-06-01 12:14:53 -04:00
Anuken 17d8aa5dc2 Server embedded asset fix 2026-06-01 02:52:23 -04:00
Anuken dc490696ac WIP: External asset cache 2026-06-01 02:41:25 -04:00
Anuken 8764208045 Merge remote-tracking branch 'origin/data-patch-assets' into data-patch-assets 2026-05-31 15:44:26 -04:00
Anuken 536e460fce Misc data patching fixes 2026-05-31 15:44:19 -04:00
Anuken fdef57d38f Server rule file, planet data patch support, logic script class 2026-05-30 16:21:57 -04:00
Anuken e11ada7ef2 Rule/planet/server/logic music playing support 2026-05-30 12:46:28 -04:00
Anuken 62ee68679d Better validation for content 2026-05-30 01:16:59 -04:00
Anuken 01d1d3adf0 Actually functional asset addition system 2026-05-29 20:45:06 -04:00
Anuken 67c9b2d276 WIP data patch asset system 2026-05-29 17:07:52 -04:00
Anuken f42b6d58ec Merge remote-tracking branch 'origin/master' 2026-05-29 11:39:57 -04:00
Anuken bce8c14efb Fixed #12131 2026-05-29 11:39:51 -04:00
Anuken 8e21f0a113 Fixed #12140 2026-05-29 11:10:41 -04:00
Anuken 03dc7b0ac5 Merge remote-tracking branch 'origin/master' 2026-05-29 10:53:04 -04:00
Anuken 5afb043fb2 Fixed #12127 2026-05-29 10:52:58 -04:00
Anuken ac10d2b082 Objective text for unit factories activating 2026-05-28 23:17:36 -04:00
Anuken 47c398f744 Triggering CI 2026-05-28 13:39:16 -04:00
Anuken b192b13250 Fixed assets jar + added CI scripts for it 2026-05-28 13:36:15 -04:00
Anuken ae0c0966d3 arc 2026-05-28 11:51:45 -04:00
Anuken a1330c444c arc 2026-05-28 11:13:31 -04:00
Anuken f4f7f3cc1d Target java 17 for annotations subproject 2026-05-28 11:04:35 -04:00
Anuken 8927383d7b Merge remote-tracking branch 'origin/master' 2026-05-27 16:50:06 -04:00
Anuken 506647e70b Server jline support 2026-05-27 16:50:00 -04:00
Anuken 07ded59fb8 Merge remote-tracking branch 'origin/master' 2026-05-27 16:28:01 -04:00
Anuken c2e1e97862 Show message when no files are imported 2026-05-27 16:27:35 -04:00
Anuken 66257c15af RoboVM compilation fix 2026-05-27 16:15:42 -04:00
Anuken d6ecbcdf11 Triggering build CI 2026-05-27 15:37:39 -04:00
Anuken 52da06729b Upgrading to Java 17 target without jabel (seeing if CI fails) 2026-05-27 15:30:19 -04:00
Anuken c04a67bc85 Use STB-based image reading for pixmaps in patch images 2026-05-27 15:17:19 -04:00
Anuken 47a477dedd Merge remote-tracking branch 'origin/master' 2026-05-27 14:53:34 -04:00
Anuken 45ae083eea Removed unused sprite 2026-05-27 14:53:04 -04:00
Anuken 4040d1995a Merge branch 'data-patch-images' of https://github.com/Anuken/Mindustry
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
2026-05-27 14:52:19 -04:00
Anuken a620647376 Data patch save format changes 2026-05-27 14:50:59 -04:00
Anuken 3d970138ca Merge remote-tracking branch 'origin/data-patch-images' into data-patch-images 2026-05-27 10:08:15 -04:00
Anuken 385c147975 Minor structural refactoring 2026-05-27 10:08:04 -04:00
Anuken 0eb8dd5170 Data patch image dialog 2026-05-26 16:45:40 -04:00
Anuken 3b85f6a499 Fixed previews 2026-05-26 13:25:52 -04:00
Anuken b907b839bf Full data patch image support 2026-05-26 11:57:51 -04:00
Anuken 16fb1154ef WIP data patch image support 2026-05-25 23:20:14 -04:00
Anuken 017b6e86f7 Fixed #12124 2026-05-25 19:45:28 -04:00
Anuken 05b2ecd4eb Fixed #12112 2026-05-24 20:09:08 -04:00
Anuken 430a4ce59e Fixed #12113 2026-05-24 20:03:57 -04:00
Anuken 4fff0f9af7 Better status effect display 2026-05-24 19:49:17 -04:00
Anuken e830e65247 Merge remote-tracking branch 'origin/master' 2026-05-24 16:07:27 -04:00
Anuken 990fe2bdf8 Display shields stacked on health for payload units 2026-05-24 16:07:17 -04:00
Anuken 0358038b71 Revert "Added shield health bar when commanding a shielded unit. (#12043)"
This reverts commit 7b541c72c9.
2026-05-24 15:54:36 -04:00
Anuken ed54566a14 Merge remote-tracking branch 'origin/master' 2026-05-23 18:29:39 -04:00
Anuken 13b549d4b1 Fixed circling check for CommandAI 2026-05-23 18:29:34 -04:00
Anuken 9fde5f1a64 Closes Anuken/Mindustry-Suggestions/issues/6319 2026-05-23 13:25:47 -04:00
Anuken 4058485677 Fixed #12107 2026-05-23 13:08:46 -04:00
Anuken 8a6ee5b440 Merge remote-tracking branch 'origin/master' 2026-05-23 01:39:45 -04:00
Anuken 06f557409f Fixed #12106 2026-05-23 01:39:38 -04:00
Anuken 51b22124bb Fixed #12099 2026-05-23 01:21:59 -04:00
Anuken 469a392936 Fixed #12097 2026-05-23 01:15:37 -04:00
Anuken 9053f1ea9e Typo 2026-05-23 01:05:19 -04:00
Anuken 8b045667a6 Merge remote-tracking branch 'origin/master' 2026-05-23 01:00:58 -04:00
Anuken 6d1caaf4d8 Fixed #12103 2026-05-23 01:00:51 -04:00
Anuken d4cbf1252b Redundant check removed 2026-05-20 02:24:27 -04:00
Anuken c55ac244b7 Fixed #12094 2026-05-20 02:22:57 -04:00
Anuken 5911a7a0f5 WIP data patcher IO changes 2026-05-18 21:06:28 -04:00
Anuken d2dbc5e7d5 Fixed #12091 2026-05-18 15:17:31 -04:00
Anuken a052b8bd30 Merge remote-tracking branch 'origin/master' 2026-05-18 11:27:07 -04:00
Anuken 050848932f Fixed #12092 2026-05-18 11:27:01 -04:00
Anuken 9d48c430e5 Merge remote-tracking branch 'origin/master' 2026-05-18 10:37:46 -04:00
Anuken 986e99a4c5 Fixed #12081 2026-05-18 10:37:37 -04:00
Anuken 5def371c61 Merge remote-tracking branch 'origin/master' 2026-05-17 16:08:54 -04:00
Anuken ed0906e39d Updated PLT submission 2026-05-17 16:08:48 -04:00
Anuken f52b2fc78d Fixed #12085 2026-05-17 15:41:45 -04:00
Anuken fa8ed48a7c Merge remote-tracking branch 'origin/master' 2026-05-17 15:39:34 -04:00
Anuken 1095b26251 Fixed #12080 2026-05-17 15:39:28 -04:00
Anuken 2b8788935d Merge remote-tracking branch 'origin/master' 2026-05-14 09:34:07 +09:00
Anuken 667368f00d Updated littoralShipyard.msav 2026-05-14 09:33:53 +09:00
Anuken 48ca2c29fd Merge remote-tracking branch 'origin/master' 2026-05-14 09:00:24 +09:00
Anuken a278d4db32 Fixed #12064 2026-05-14 09:00:09 +09:00
Anuken de2202eb1c Fixed #12042 2026-05-14 08:44:55 +09:00
Anuken 1678613135 Merge remote-tracking branch 'origin/master' 2026-05-14 08:30:07 +09:00
Anuken 622c449a55 Fixed #12054 2026-05-14 08:29:37 +09:00
Anuken aa7d4270a7 Fixed #12041 2026-05-14 08:07:46 +09:00
Anuken 0d129b2b9b Fixed #12031 2026-05-14 08:06:09 +09:00
Anuken d13afc1439 Optimized processor link changes 2026-05-12 07:35:28 +09:00
Anuken 54443b9517 Fixed save corruption caused by big build queues 2026-05-11 08:20:54 +09:00
Anuken 51b1a4c97f World label flag for only being visible to the parent 2026-05-07 08:11:19 +09:00
Anuken f3ad7b8570 Fixed unit assembler crash with incorrect unit type 2026-05-05 23:48:20 +09:00
Anuken 15c9ea4cc9 Fixed BuildTurret unitType being assignable 2026-05-05 10:15:09 +09:00
Anuken a0153214dd Increased max map size to 800 2026-05-04 09:10:09 +09:00
Anuken 68f32020f6 Fixed #12021 2026-05-01 13:06:50 -04:00