Merge branch 'master' into 3d-view-upgrade

This commit is contained in:
Efruz Yıldırır 2023-08-05 12:56:13 +03:00 committed by GitHub
commit 3804c6522c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 274 additions and 43 deletions

View file

@ -30,6 +30,16 @@
/>
<meta name="twitter:image" content="images/preview.png" />
<script async src="https://www.googletagmanager.com/gtag/js?id=G-VJL3J26W7R"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag("js", new Date());
gtag("config", "G-VJL3J26W7R");
</script>
<link rel="icon" type="image/png" href="images/icons/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="images/icons/favicon-16x16.png" sizes="16x16" />
<link rel="apple-touch-icon" href="images/icons/maskable_icon_x192.png" />
@ -128,7 +138,7 @@
}
</style>
<link rel="preload" href="index.css?v=1.89.21" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="index.css?v=1.89.38" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="icons.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="libs/jquery-ui.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
</head>
@ -5499,6 +5509,14 @@
<div id="markersBottom">
<button id="markersOverviewRefresh" data-tip="Refresh the Overview screen" class="icon-cw"></button>
<input type="hidden" id="addedMarkerType" name="addedMarkerType" value="" />
<span id="markerTypeSelectorWrapper">
<button
id="markerTypeSelector"
data-tip="Select marker type for newly added markers."
>❓</button>
<div id="markerTypeSelectMenu"></div>
</span>
<button
id="markersAddFromOverview"
data-tip="Add a new marker. Hold Shift to add multiple"
@ -7894,9 +7912,9 @@
<script src="modules/lakes.js"></script>
<script src="modules/names-generator.js?v=1.87.14"></script>
<script src="modules/cultures-generator.js?v=1.89.10"></script>
<script src="modules/burgs-and-states.js?v=1.89.07"></script>
<script src="modules/burgs-and-states.js?v=1.89.37"></script>
<script src="modules/routes-generator.js"></script>
<script src="modules/religions-generator.js?v=1.89.28"></script>
<script src="modules/religions-generator.js?v=1.89.36"></script>
<script src="modules/military-generator.js"></script>
<script src="modules/markers-generator.js?v=1.89.34"></script>
<script src="modules/coa-generator.js"></script>
@ -7915,8 +7933,8 @@
<script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js"></script>
<script defer src="modules/ui/editors.js?v=1.89.12"></script>
<script defer src="modules/ui/tools.js?v=1.89.27"></script>
<script defer src="modules/ui/editors.js?v=1.89.35"></script>
<script defer src="modules/ui/tools.js?v=1.89.38"></script>
<script defer src="modules/ui/world-configurator.js"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.89.06"></script>
<script defer src="modules/ui/provinces-editor.js?v=1.89.00"></script>
@ -7941,7 +7959,7 @@
<script defer src="modules/ui/rivers-overview.js"></script>
<script defer src="modules/ui/military-overview.js"></script>
<script defer src="modules/ui/regiments-overview.js?v=1.89.20"></script>
<script defer src="modules/ui/markers-overview.js?v=1.89.20"></script>
<script defer src="modules/ui/markers-overview.js?v=1.89.38"></script>
<script defer src="modules/ui/regiment-editor.js"></script>
<script defer src="modules/ui/battle-screen.js"></script>
<script defer src="modules/ui/emblems-editor.js?v=1.89.21"></script>