backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 12:01:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into gui/lock-everything

Browse source 
# Conflicts:
#	index.html
#	versioning.js
This commit is contained in:
Guillaume St-Pierre 2022-12-10 16:29:58 -05:00
commit ae9ba6c077
9 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
index.html
View file

@ -4055,9 +4055,10 @@
onclick="wiki('Heightmap-template-editor')"
></button>
<label
data-tip="Set seed if you want template to generate the same heightmap each time. Leave blank to use random seed"
data-tip="Lock seed (click on lock icon) if you want template to generate the same heightmap each time"
>
Seed: <input id="templateSeed" value="" type="number" min="1" max="999999999" step="1" style="width: 7em" />
Seed: <input id="templateSeed" value="" type="number" min="1" max="999999999" step="1" style="width: 8em" />
<i data-locked="0" id="lock_templateSeed" class="icon-lock-open"></i>
</label>
</div>
</div>
@ -7824,7 +7825,7 @@
<script src="utils/commonUtils.js"></script>
<script src="utils/arrayUtils.js"></script>
<script src="utils/colorUtils.js"></script>
<script src="utils/graphUtils.js"></script>
<script src="utils/graphUtils.js?v=1.88.02"></script>
<script src="utils/nodeUtils.js"></script>
<script src="utils/numberUtils.js"></script>
<script src="utils/polyfills.js"></script>
@ -7857,16 +7858,16 @@
<script src="modules/ui/measurers.js?v=1.87.02"></script>
<script src="modules/ui/stylePresets.js"></script>
<script src="modules/ui/general.js?v=1.87.00"></script>
<script src="modules/ui/options.js?v=1.87.15"></script>
<script src="main.js?v=1.87.15"></script>
<script src="modules/ui/general.js?v=1.87.03"></script>
<script src="modules/ui/options.js?v=1.88.02"></script>
<script src="main.js?v=1.88.02"></script>
<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.87.07"></script>
<script defer src="modules/ui/tools.js?v=1.89.00"></script>
<script defer src="modules/ui/world-configurator.js"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.88.00"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.88.03"></script>
<script defer src="modules/ui/provinces-editor.js?v=1.89.00"></script>
<script defer src="modules/ui/biomes-editor.js"></script>
<script defer src="modules/ui/namesbase-editor.js?v=1.87.10"></script>