Commit graph

84 commits

Author SHA1 Message Date
Anuken
67d3a9feb0 Added field for running logic code upon objective completion 2026-02-06 22:46:17 -05:00
Anuken
4f9ea8b70d JSON Unit type requirements cache fix / Better FlyingAI flag targeting 2026-01-16 17:31:18 -05:00
Anuken
90d32abd6b Fixed #11508 2025-12-29 10:38:11 -05:00
Anuken
011713cd25 Minor fixes for markers and empty floor edges 2025-12-28 20:46:17 -05:00
Redstonneur1256
59c3b18a6f
Allow markers to use content/displays as textures (#11142)
* Allow markers to use content/displays as textures

* Don't process empty commands

* Allow canvases to be used as marker textures

* Proper Json serialization

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-12-27 21:37:03 -05:00
Anuken
9edd31fad3 Map objective curve & unnecessary rebuild fix 2025-10-13 22:53:16 +09:00
Anuken
0ca37719bb Server crash fix 2025-08-07 21:12:56 +02:00
Redstonneur1256
835c8b4a6c
Text align (#10804)
* Text/ShapeText marker text alignment

* Allow `draw print` to use a dynamic align

* Highlight currently selected value when possible

* Fix alignment with newlines

* Add `lineAlign`

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-07-02 14:04:43 -04:00
Redstonneur1256
b73c85ff75
Quad marker tweaks (#10787)
* Don't clamp UV on repeat textures

* Cleanup
2025-06-18 19:05:08 -04:00
Redstonneur1256
c27eac9bed
Marker outline control (#10931)
* Marker `outline` control

* Text/ShapeText marker outline
2025-06-15 15:28:20 -04:00
Anuken
bcbe0890fe Fixed #10886 2025-06-03 15:40:03 -04:00
Anuken
2e46633bcd Fixed #10845 2025-05-24 23:20:54 -04:00
Anuken
e1e5bd5b3f Fixed #10806 / Fixed crash 2025-05-14 12:06:35 -04:00
Anuken
b7dbe54d76 Merging changes from private branch 2025-04-04 11:47:35 -04:00
Anuken
7a6222aa18
Revert "Allow markers to be used as light sources (#9733)" (#10490)
This reverts commit 8626082068.
2025-02-10 14:24:46 -05:00
Redstonneur1256
8626082068
Allow markers to be used as light sources (#9733)
* Allow markers to be used as light sources

* Better light source markers

* Move PointMarker drawLight to LightMarker

* Add a rule for unit lights

* Optimize marker rendering

* Update core/assets/bundles/bundle.properties

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-09 12:10:45 -05:00
MEEPofFaith
e8a4ecc61e
Formatting Icons (#10359)
* formatIcons

* Smarter end check

I think it's smarter?

* unecessary

* oop

* Update UI.java

* Just don't check for adjacent colons.

The hasUnicodeStr already checks for validity

* Copy from I18NBundle

* Revert "Copy from I18NBundle"

This reverts commit ac660fcd9f.

* If get and format refer to parent, then just set the existing bundle as parent

* Test with Ground Zero objectives

* Update MBundle.java

* That didn't work

* Slip the method into reasonable places like objectives and chat

* Check for Icons as well

* More testing with objective text

* Apply to hints

* Optimized formatIcons

No longer scans through every character

* TIME UPDATE THE BUNDLES YIPPEEEEEEEEEEE

* residual

* Apply to message blocks

* IntelliJ lied

* Suggestions

* Format before sending
2025-02-09 00:05:43 -05:00
Anuken
13c0e95e6b Menu to copy/load objectives from clipboard 2024-10-01 15:05:05 -04:00
Anuken
c36e638826 Polar aerodrome fixes / Objective timer multiplier for difficulty 2024-09-20 11:17:12 -04:00
Anuken
63e246cc9d Headless crash fix 2024-09-18 09:02:05 -04:00
Anuken
4e19a3c4d0 Atolls map fixes / Extraction outpost edits / Option to hide objectives 2024-09-16 16:05:03 -04:00
Redstonneur1256
e8e8189a92
Add ShapeMarker starting and ending angles (#9729) 2024-04-08 19:51:50 -04:00
Anuken
9e503efd2f Fixed sync issues with large objective trees 2024-03-03 17:09:23 -05:00
Redstonneur1256
f0d37281d4
Marker fixes (#9514) 2024-02-03 12:17:17 -05:00
Redstonneur1256
6a429184aa
update markers (#9506)
* update markers

* update markers & minimap rendering
2024-01-30 19:35:39 -05:00
Anuken
a6f2aa6c43 Marker control cleanup 2024-01-29 15:17:49 -05:00
Redstonneur1256
7440f195ba
Allow markers to use any texture (#9455) 2024-01-14 21:55:37 -05:00
Anuken
14854ae0a2 Removed unused methods 2024-01-14 12:47:56 -05:00
Anuken
1d894bdacd Objective marker cleanup & optimization 2024-01-14 12:41:20 -05:00
ApsZoldat
df8f90a02b Small MapObjectives refactor (removal of duplicating overrided methods) 2023-12-15 19:33:03 +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
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
862d3153d9
Map-specific locale bundles system (#9199)
* Fix text setting in marker control

* Fix marker and bridge calculation game crashes, minor marker instruction code fixes

* Add privileged desynced client constant global variables

* Remove broken attempt to not initialize client vars on server

* Make @clientLocale variable non-constant, make @server and @client privileged

* WIP Implementation of map-specific locale bundles

* Progress on map locale bundles: add locale data to saves, make objectives use map locales if possible

* Add print formatting and map locale printing to world processors

* 🗿

* Minor map locales dialog ui changes

* Make map locale bundles load when joining multiplayer server

* Remove static declaration of current locale in MapLocales to fix tests failing

* Unify name of localeprint instruction, minor instruction description change, fix map locales incorrectly loading from clipboard

* Fix locale bundles not saving in game state, add  global var, make objective markers use map locale bundles and .mobile properties on mobile devices

* Even more map locales dialog improvements

* Fix english locale picking (when property isn't presented in current locale but english version has it) not working

* Add icon pasting to map locales dialog, minor ui changes

* Fix inconsistent game crash with null text in objectives, define player.locale on game loading (for clientLocale var)

* Change format instruction placeholders to backslash, fix map locales system incorrectly handling default locale

* understood
2023-12-01 21:14:10 -05:00
ApsZoldat
20b2be5de8 "i forgor" fix 2023-11-28 22:19:08 +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
ApsZoldat
93269692ab
Fix marker and bridge calculation game crashes, minor marker instruction fixes (#9112)
* Fix text setting in marker control

* Fix marker and bridge calculation game crashes, minor marker instruction code fixes
2023-09-29 10:10:50 -04:00
Anuken
8bbf5b1f52 Marker instruction rework 2023-09-28 01:04:03 -04:00
ApsZoldat
8c777e79fa
Add marker instruction to world processors (#9087)
* Basic implementation of world processor marker control

* Add line marker, some marker control fixes

* Add remote for setting markers, add marker writer/reader to TypeIO

* Add sides cap to ShapeTextMarker's draw() method

* Marker instruction code refactor, revert accident auto-formatting, fix marker control bugs

* Cleanup LMarkerControl.java

* Remove deleted marker controls from MapObjectives

* Marker control method refactor, fix minimap marker rendering

* Refactor, proper double comparsion in MapObjectives

* Fix line marker's color not changing through world processors
2023-09-27 17:17:59 -04:00
Anuken
a00b3a4670 Fixed objective flags not syncing 2023-06-12 10:35:31 -04:00
Anuken
b734fb948d Fixed #8159 2023-01-12 08:36:47 -05:00
Anuken
215633587d Fixed #7728 2022-10-16 08:44:08 -04:00
Anuken
8104173b31 Ground zero tutorial from #7532 2022-10-10 19:05:23 -04:00
Anuken
48ce73b517 Fixed #7651 2022-10-03 07:24:03 -04:00
MEEPofFaith
b7e8c211f7
Countdowns on other objectives. (#7528)
* Destroy units objective countdown

* Countdown on other objectives
2022-09-07 22:50:06 -04:00