Commit Graph

55 Commits

Author SHA1 Message Date
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
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Anuken
8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
Anuken
47e639be28 Fixed more objective bugs 2022-07-15 17:26:43 -04:00
Anuken
926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
GlennFolker
695c19d0b0 Tree-like objective node structure (#7152)
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
2022-07-15 10:41:18 -04:00
Anuken
3f6ab92fcb Map objective editor fixes 2022-06-26 14:07:58 -04:00
Anuken
b25ca6ff33 WIP objective marker editing + Mobile factory output tap 2022-06-26 12:09:58 -04:00
Anuken
cc26a0eeb3 WIP objective editor progress 2022-06-24 21:18:04 -04:00
Anuken
e3c1b7ba30 Better objective indicators for 3rd map 2022-04-29 10:08:50 -04:00
Anuken
6c42dff884 Bugfixes 2022-04-28 18:25:39 -04:00
Anuken
293311087d Fixed destroyblocks objective 2022-04-28 14:52:51 -04:00
Anuken
3d12b66f3c DestroyBlocksObjective 2022-04-27 16:37:38 -04:00
Anuken
14dcd71819 Faction color changes again 2022-04-24 12:50:33 -04:00
Anuken
fa8b94722e Second map polish 2022-04-23 14:57:52 -04:00
Anuken
520d80a96b Minimap marker support 2022-04-22 15:45:27 -04:00
Anuken
5a6d1787c5 Better timer objective formatting 2022-04-22 15:05:23 -04:00
Anuken
5b4e424cda New insectoid almost done + DestroyBlockObjective 2022-04-18 21:34:21 -04:00
Anuken
5d8fb01710 Removed something pointless 2022-04-18 00:02:22 -04:00
Anuken
dded736c8f Flag set instruction fix 2022-04-17 21:05:50 -04:00
Anuken
9ea891bf64 Timer objective text 2022-04-17 20:31:49 -04:00
Anuken
854dbacd14 Timer objective 2022-04-17 20:22:45 -04:00
Anuken
8364a6ac78 Destroy units objective, WIP 2022-04-17 19:13:29 -04:00
Anuken
9def4b8d88 FlagObjective 2022-04-15 14:25:24 -04:00
Anuken
35f2aad595 Tech tree fix / Objective text fix 2022-04-14 21:17:43 -04:00
Anuken
037d028465 Label localization support 2022-04-14 17:01:06 -04:00
Anuken
0f3fc92746 Objective flag system 2022-04-14 16:23:39 -04:00
Anuken
c01348af29 Objective details 2022-04-13 16:51:11 -04:00
Anuken
693482df83 Added most necessary objectives 2022-04-13 15:32:33 -04:00
Anuken
2a8c4b51d4 Objectives 2022-04-13 15:09:49 -04:00