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

This commit is contained in:
Efruz Yıldırır 2023-07-22 18:49:13 +03:00
commit a2ba10be78
3 changed files with 7 additions and 7 deletions

View file

@ -365,7 +365,7 @@
<div id="loading-typography">
<div id="titleName">Azgaar's</div>
<div id="title">Fantasy Map Generator</div>
<div id="versionText">v<span id="version"></span></div>
<div id="versionText"></div>
<p id="loading-text">LOADING<span>.</span><span>.</span><span>.</span></p>
</div>
</div>
@ -4646,7 +4646,7 @@
<span>Doubled: </span>
<input
id="namesbaseDouble"
data-tip="Populate with letters that can used twice in a row (geminates)"
data-tip="Populate with letters that can be used twice in a row (geminates)"
autocorrect="off"
spellcheck="false"
style="width: 10em"
@ -7901,7 +7901,7 @@
<script src="modules/routes-generator.js"></script>
<script src="modules/religions-generator.js?v=1.89.28"></script>
<script src="modules/military-generator.js"></script>
<script src="modules/markers-generator.js?v=1.89.23"></script>
<script src="modules/markers-generator.js?v=1.89.34"></script>
<script src="modules/coa-generator.js"></script>
<script src="modules/submap.js?v=1.88.05"></script>
<script src="libs/polylabel.min.js"></script>

View file

@ -1,7 +1,7 @@
"use strict";
window.Markers = (function () {
let config = [];
let config = getDefaultConfig();
let occupied = [];
function getDefaultConfig() {

View file

@ -1,12 +1,12 @@
"use strict";
// version and caching control
const version = "1.89.33"; // generator version, update each time
const version = "1.89.34"; // generator version, update each time
{
document.title += " v" + version;
const loadingScreenVersion = document.getElementById("version");
if (loadingScreenVersion) loadingScreenVersion.innerHTML = version;
const loadingScreenVersion = document.getElementById("versionText");
if (loadingScreenVersion) loadingScreenVersion.innerText = `v${version}`;
const versionNumber = parseFloat(version);
const storedVersion = localStorage.getItem("version") ? parseFloat(localStorage.getItem("version")) : 0;