mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-22 12:01:23 +01:00
Fonts refactoring and Add Font dialog (#660)
* fonts rework - start * fonts rework - continue * fonts rework - fetch google font * fonts rework - issue fixes * fonts rework - add fonts to downloaded image * fonts rework - add methods dialog * fonts rework - add methods description * fonts update - move version to 1.661 * fonts - remove unused file
This commit is contained in:
parent
a5f4939875
commit
efb545c6c5
4 changed files with 32 additions and 44 deletions
10
main.js
10
main.js
|
|
@ -300,7 +300,6 @@ async function checkLoadParameters() {
|
|||
});
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
if (onloadMap.value === "saved") {
|
||||
try {
|
||||
await loadLastMap();
|
||||
|
|
@ -318,15 +317,6 @@ async function checkLoadParameters() {
|
|||
async function generateMapOnLoad() {
|
||||
await applyStyleOnLoad(); // apply previously selected default or custom style
|
||||
await generate(); // generate map
|
||||
=======
|
||||
WARN && console.warn('Generate random map');
|
||||
generateMapOnLoad();
|
||||
})();
|
||||
|
||||
function generateMapOnLoad() {
|
||||
applyStyleOnLoad(); // apply default of previously selected style
|
||||
generate(); // generate map
|
||||
>>>>>>> f557701e (dropbox - import changes from alpha)
|
||||
focusOn(); // based on searchParams focus on point, cell or burg from MFCG
|
||||
applyPreset(); // apply saved layers preset
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue