Commit Graph
18 Commits
Author SHA1 Message Date
ApsZoldat 8ab37c5ce4 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-15 19:39:30 +03:00
ApsZoldat df8f90a02b Small MapObjectives refactor (removal of duplicating overrided methods) 2023-12-15 19:33:03 +03:00
ApsZoldat 317a533b5c millimicronanopico setmarker texture fix (object print consistency) 2023-12-13 18:24:08 +03:00
ApsZoldat 5830259e41 Markers draw code refactor, minor text marker control changes 2023-12-12 22:40:33 +03:00
ApsZoldat 4802076bf8 WIP marker changes, fix server name not appearing for saved hosts in join dialog 2023-12-10 22:44:30 +03:00
ApsZoldat 2b0a6a6f97 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-07 18:26:55 +03:00
ApsZoldat c20684025e Small git shenanigans to actually (i really hope) revert all the bad stuff 2023-12-07 18:24:51 +03:00
ApsZoldat adada50f1c Minor map locales dialog fixes 2023-12-04 23:33:23 +03:00
ApsZoldat cf131696bd Merge remote-tracking branch 'upstream/master' 2023-12-04 22:43:59 +03:00
ApsZoldat cf02b0f36d Make setmarker ignor null values, remove redundant marker control operations 2023-12-04 22:39:32 +03:00
ApsZoldat 90e40af8c1 Minor setmarker ui statement fix (farming tiny commits?) 2023-11-28 22:24:48 +03:00
ApsZoldat 20b2be5de8 "i forgor" fix 2023-11-28 22:19:08 +03:00
ApsZoldat 557f2d4447 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-11-28 22:08:33 +03:00
ApsZoldat 02a53daa58 Marker autoscale now works outside of minimap mode, another yet lmarkercontrol instructions cleanup, fix renderer's draw color breaking after drawing markers 2023-11-28 22:00:08 +03:00
ApsZoldat 6ea2188bee Add minimap mode to other objective markers 2023-11-27 22:56:26 +03:00
ApsZoldat aa018b314d World processor markers: remove toggleVisibility, swap makemarker's type and id arguments for instruction consistency 2023-11-22 22:33:05 +03:00
ApsZoldat c434e18f8f Add drawing layers to markers 2023-11-13 23:25:44 +03:00
ApsZoldat 6dff68e7d9 Texture marker implementation 2023-11-07 22:42:42 +03:00