Commit graph

708 commits

Author SHA1 Message Date
dranorter
d0d8015c96
Merge branch 'master' into master 2021-10-11 05:19:24 -04:00
Dranorter
37882b7c65 Change default 2021-10-11 05:14:46 -04:00
Azgaar
2dc0959c23 limit units - complete 2021-10-10 18:41:45 +03:00
Azgaar
bdc0c9f8ee minmax util function 2021-10-10 17:59:27 +03:00
Azgaar
b202a58db9 limit units - continue 2021-10-10 17:36:17 +03:00
Azgaar
01904f21af limit units - start 2021-10-10 00:59:51 +03:00
Azgaar
167e2f2c66 fix: restore rescaleLabels on load 2021-10-09 19:25:59 +03:00
M. Aleksandrov
827d488904
Add new marker lore descriptions (#681)
* Add new marker lore descriptions

* Fix errors, expand lore generation
2021-10-09 18:12:05 +03:00
Azgaar
eb76ec8e48 remove default texture base64 2021-10-09 15:48:03 +03:00
dranorter
9116d03e76
Placed labels use most recent label group (#673) 2021-10-09 13:44:12 +03:00
Azgaar
965bfc7246 fix: hotkeys to use universal codes 2021-10-09 13:26:30 +03:00
Azgaar
50d440059f fix: marker qty bigger that elements count 2021-10-09 12:48:48 +03:00
Azgaar
b57b39c683 fix: draw markers on regeneration if layer is on 2021-10-09 12:27:23 +03:00
Azgaar
eed79ca96c marker - fix auto-update for complex cases 2021-10-08 11:11:42 +03:00
Azgaar
33bf699c0d supporters update 2021-10-08 00:39:05 +03:00
Azgaar
5e8c54c8d5 supporters update 2021-10-08 00:34:25 +03:00
Azgaar
bc46238f07 umami - reduce track calls 2021-10-08 00:32:49 +03:00
Azgaar
01caf798a6 draw markers - set init size fix 2021-10-08 00:12:19 +03:00
Azgaar
28f3828622 3d labels - don't create svg element 2021-10-07 23:59:38 +03:00
Azgaar
470e814a0e religion gen fix 2021-10-07 23:12:08 +03:00
Azgaar
e2ffb446dd notes editor - clear on open 2021-10-07 13:34:08 +03:00
Azgaar
648c0ac0c9 markers - add locked to already occupied 2021-10-07 13:00:29 +03:00
Azgaar
7f33c26729 markers - generate campaigns if missing 2021-10-07 12:39:09 +03:00
Dranorter
8a32adba1f Getting the equation right 2021-10-06 17:42:48 -04:00
Dranorter
8538bb3e44 whoops 2021-10-06 17:38:56 -04:00
Dranorter
477cbbfc71 Trying to put the formula in the right place
Again, sorry for the mess
2021-10-06 17:37:12 -04:00
Dranorter
a96a42098f Watabou cities integration change, new Urban Density setting
New setting does not yet save/load - I don't want to change the .map file format.
2021-10-06 17:27:27 -04:00
Dranorter
d1c0f25bb8 Merge remote-tracking branch 'upstream/master' 2021-10-06 17:25:34 -04:00
Dranorter
61005a3895 markers - generate tool + lock tooltip 2021-10-06 17:20:28 -04:00
Dranorter
a68db0f171 burg editor - MFCG preview 2021-10-06 17:10:06 -04:00
Azgaar
d02c7804ec markers overview - focus on marker 2021-10-06 17:04:39 -04:00
Azgaar
19d8b7b5cf markers - auto-update on load 2021-10-06 17:04:21 -04:00
Azgaar
90928012d3 markers overview - export data to csv 2021-10-06 17:04:08 -04:00
Azgaar
bc3aabb488 markers - export as geoJSON 2021-10-06 17:03:53 -04:00
Azgaar
cadfcf2ca4 markers overview 2021-10-06 17:03:41 -04:00
Azgaar
fe26cc6707 config generate markers dialog fixes 2021-10-06 17:03:32 -04:00
Azgaar
91f0c3e860 config generate markers dialog 2021-10-06 17:03:17 -04:00
Dranorter
e12e37a24d markers - generate from config file 2021-10-06 17:02:46 -04:00
Azgaar
85839f1d47 saveTiles clean up listeners on close 2021-10-06 17:00:31 -04:00
Azgaar
f9d31a1984 markers - add on click 2021-10-06 17:00:20 -04:00
Azgaar
af2d911c3b collect statistics for a short period 2021-10-06 16:59:48 -04:00
Azgaar
756d020d9a editable theme color 2021-10-06 16:58:43 -04:00
Azgaar
e86adc8d04 markers rework - editor functions 2021-10-06 16:58:15 -04:00
Azgaar
6364a2935a markers rework - editor start, dragging 2021-10-06 16:57:48 -04:00
Azgaar
0b14bc864a markers rework - optional pin shapes 2021-10-06 16:57:39 -04:00
Azgaar
104641d52c markers data rework - master data object 2021-10-06 16:57:03 -04:00
Azgaar
5e82c23299 markers - palm grove fix 2021-10-06 16:56:31 -04:00
Azgaar
1fa012b483 markers - magic portals fix 2021-10-06 16:56:21 -04:00
Azgaar
8c0c2646b4 markers - magic portals 2021-10-06 16:56:08 -04:00
Azgaar
4482be13f6 markers - statues 2021-10-06 16:56:00 -04:00