mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-22 12:01:23 +01:00
dropbox - import changes from alpha
This commit is contained in:
parent
eecdff1968
commit
68fade20c3
7 changed files with 4547 additions and 0 deletions
|
|
@ -702,7 +702,11 @@ function showSavePane() {
|
|||
$("#saveMapData").dialog({
|
||||
title: "Save map",
|
||||
resizable: false,
|
||||
<<<<<<< HEAD
|
||||
width: "25em",
|
||||
=======
|
||||
width: "27em",
|
||||
>>>>>>> f557701e (dropbox - import changes from alpha)
|
||||
position: {my: "center", at: "center", of: "svg"},
|
||||
buttons: {
|
||||
Close: function () {
|
||||
|
|
@ -743,7 +747,11 @@ async function showLoadPane() {
|
|||
$("#loadMapData").dialog({
|
||||
title: "Load map",
|
||||
resizable: false,
|
||||
<<<<<<< HEAD
|
||||
width: "24em",
|
||||
=======
|
||||
width: "22em",
|
||||
>>>>>>> f557701e (dropbox - import changes from alpha)
|
||||
position: {my: "center", at: "center", of: "svg"},
|
||||
buttons: {
|
||||
Close: function () {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue