diff --git a/Mine-imator Violet.yyp b/Mine-imator Violet.yyp index 6d9967ee09967fed84486bfef6b4952ce244c4bc..84da404e8f6b56f816efd54392f74c86e5443a3b 100644 --- a/Mine-imator Violet.yyp +++ b/Mine-imator Violet.yyp @@ -3486,6 +3486,14 @@ "resourceType": "GMScript" } }, + { + "Key": "36dd1084-bffb-4f9f-9755-af556db7d18e", + "Value": { + "id": "14f3640b-3af7-4f52-9f60-45ff8407dc05", + "resourcePath": "extensions\\libdlgmod\\libdlgmod.yy", + "resourceType": "GMExtension" + } + }, { "Key": "37655674-bcd2-49ce-8c10-00c43dae0a0e", "Value": { @@ -11070,6 +11078,14 @@ "resourceType": "GMScript" } }, + { + "Key": "a6fb785f-6f75-4b0b-85dd-8eac07feaf63", + "Value": { + "id": "12326ad7-a08b-4287-b2f0-60da8639c257", + "resourcePath": "scripts\\file_dialog_open_assets\\file_dialog_open_assets.yy", + "resourceType": "GMScript" + } + }, { "Key": "a70f35f5-3e0b-4119-b5a8-0973c3e3cceb", "Value": { @@ -17723,6 +17739,7 @@ "f0c0faae-6e1b-4c47-9685-24903b137b6d", "a3811016-d59f-4dca-919a-d8bddb4ca1b0", "f8c9d7ce-9330-4410-997c-981e62c84c89", + "a6fb785f-6f75-4b0b-85dd-8eac07feaf63", "75b9ea24-9820-4ade-b053-c8db36f3e179", "7071c736-d787-496b-977d-a371db6cf88a", "b33dc21d-1c3c-47ed-8673-c87118f2af89", diff --git a/datafiles/Data/Languages/english.milanguage b/datafiles/Data/Languages/english.milanguage index 405b1922c912245ded5de2f61192f48eec652be8..4bbacb75a046e7f04c58935193fb3e26254dd371 100644 --- a/datafiles/Data/Languages/english.milanguage +++ b/datafiles/Data/Languages/english.milanguage @@ -3181,7 +3181,7 @@ "inbounce": "Ease in (bounce)", "outbounce": "Ease out (bounce)", "inoutbounce": "Ease in and out (bounce)", - "easebezier": "Ease in and out (bezier)" + "bezier": "Ease in and out (bezier)" } }, "settings/": { diff --git a/extensions/libdlgmod/libdlgmod.dll b/extensions/libdlgmod/libdlgmod.dll new file mode 100644 index 0000000000000000000000000000000000000000..08b534b92991d3cf31591b93dfb5db1590533064 Binary files /dev/null and b/extensions/libdlgmod/libdlgmod.dll differ diff --git a/extensions/libdlgmod/libdlgmod.yy b/extensions/libdlgmod/libdlgmod.yy new file mode 100644 index 0000000000000000000000000000000000000000..717052c29f20e180ab98f19ae84f9a74ff1fd3d2 --- /dev/null +++ b/extensions/libdlgmod/libdlgmod.yy @@ -0,0 +1,114 @@ +{ + "id": "36dd1084-bffb-4f9f-9755-af556db7d18e", + "modelName": "GMExtension", + "mvc": "1.0", + "name": "libdlgmod", + "IncludedResources": [ + + ], + "androidPermissions": [ + + ], + "androidProps": false, + "androidactivityinject": "", + "androidclassname": "", + "androidinject": "", + "androidmanifestinject": "", + "androidsourcedir": "", + "author": "", + "classname": "", + "copyToTargets": -1, + "date": "2021-37-24 09:10:16", + "description": "", + "extensionName": "", + "files": [ + { + "id": "b03c7da5-ccba-428b-8ff9-0f81a81e791e", + "modelName": "GMExtensionFile", + "mvc": "1.0", + "ProxyFiles": [ + + ], + "constants": [ + + ], + "copyToTargets": -1, + "filename": "libdlgmod.dll", + "final": "", + "functions": [ + { + "id": "4d893d1b-c2db-4078-bb42-233ab7931fa8", + "modelName": "GMExtensionFunction", + "mvc": "1.0", + "argCount": 0, + "args": [ + 1, + 1 + ], + "externalName": "get_open_filenames", + "help": "get_open_filenames(filter,fname)", + "hidden": false, + "kind": 1, + "name": "get_open_filenames", + "returnType": 1 + }, + { + "id": "038cd3ab-0286-4275-937a-983ad1ee3c30", + "modelName": "GMExtensionFunction", + "mvc": "1.0", + "argCount": 0, + "args": [ + 1, + 1, + 1, + 1 + ], + "externalName": "get_open_filenames_ext", + "help": "get_open_filenames_ext(filter,fname,dir,title)", + "hidden": false, + "kind": 1, + "name": "get_open_filenames_ext", + "returnType": 1 + } + ], + "init": "", + "kind": 1, + "order": [ + "4d893d1b-c2db-4078-bb42-233ab7931fa8", + "038cd3ab-0286-4275-937a-983ad1ee3c30" + ], + "origname": "", + "uncompress": false + } + ], + "gradleinject": "", + "helpfile": "", + "installdir": "", + "iosProps": false, + "iosSystemFrameworkEntries": [ + + ], + "iosThirdPartyFrameworkEntries": [ + + ], + "iosplistinject": "", + "license": "", + "maccompilerflags": "", + "maclinkerflags": "", + "macsourcedir": "", + "packageID": "", + "productID": "", + "sourcedir": "", + "tvosProps": false, + "tvosSystemFrameworkEntries": [ + + ], + "tvosThirdPartyFrameworkEntries": [ + + ], + "tvosclassname": "", + "tvosmaccompilerflags": "", + "tvosmaclinkerflags": "", + "tvosplistinject": "", + "version": "0.0.1" +} \ No newline at end of file diff --git a/scripts/action_toolbar_import_asset/action_toolbar_import_asset.gml b/scripts/action_toolbar_import_asset/action_toolbar_import_asset.gml index 4d0e26506cf183461869e8a8580bd0b000dc1d5b..67f0dafe6dd1036852056ee9875f01e81fded648 100644 --- a/scripts/action_toolbar_import_asset/action_toolbar_import_asset.gml +++ b/scripts/action_toolbar_import_asset/action_toolbar_import_asset.gml @@ -1,3 +1,16 @@ /// action_toolbar_import_asset() +/// Multiple selected files added +var fn = file_dialog_open_assets(); +var path_array = string_split(fn, "\n"); +var path_array_count = array_length_1d(path_array); +if (path_array_count==0){ + return ; +} + +for(var i = 0; i 0) fn = argument[0] else - fn = file_dialog_open_asset() + fn = file_dialog_open_asset(); } if (fn = "" || !file_exists_lib(fn)) @@ -107,6 +107,8 @@ switch (ext) case ".jpeg": log("Opening image", fn) popup_importimage.filename = fn + popup_importimage.filenameArray[popup_importimage.filenameArray_index] = fn; + popup_importimage.filenameArray_index++; popup_show(popup_importimage) return true } diff --git a/scripts/ease_bezier/ease_bezier.gml b/scripts/ease_bezier/ease_bezier.gml index 0b71ed02507d07f2cfbf24c5256c0811f561ad61..804adcc1dd3233d1a11498b71e98609daa79ef08 100644 --- a/scripts/ease_bezier/ease_bezier.gml +++ b/scripts/ease_bezier/ease_bezier.gml @@ -1,4 +1,4 @@ -/// ease(function, x, bezierconfig) +/// ease_bezier(function, x, bezierconfig) /// @arg function /// @arg x /// @desc http://www.easings.net diff --git a/scripts/file_dialog_open_assets/file_dialog_open_assets.gml b/scripts/file_dialog_open_assets/file_dialog_open_assets.gml new file mode 100644 index 0000000000000000000000000000000000000000..da036dcec6318e60ae0abf30e2317249d2d4a387 --- /dev/null +++ b/scripts/file_dialog_open_assets/file_dialog_open_assets.gml @@ -0,0 +1,8 @@ +/// file_dialog_open_assets() + +var formats = "*miobject;*.miframes;*.zip;*.schematic;*.miproject;*.miparticles;*.mimodel;"; +formats += "*.png;*.jpg;*.json;*.ttf;" +formats += "*.mp3;*.wav;*.ogg;*.flac;*.wma;*.m4a;" +formats += "*.object;*.keyframes;*.particles;*.mproj;*.mani;*.blocks"; + +return get_open_filenames_ext(text_get("filedialogopenasset") + "|" + formats, "", "", text_get("filedialogopenassetcaption")) diff --git a/scripts/file_dialog_open_assets/file_dialog_open_assets.yy b/scripts/file_dialog_open_assets/file_dialog_open_assets.yy new file mode 100644 index 0000000000000000000000000000000000000000..e89b5da4c560b63557dfd58f582fa6a59c2c9932 --- /dev/null +++ b/scripts/file_dialog_open_assets/file_dialog_open_assets.yy @@ -0,0 +1,8 @@ +{ + "id": "a6fb785f-6f75-4b0b-85dd-8eac07feaf63", + "modelName": "GMScript", + "mvc": "1.0", + "name": "file_dialog_open_assets", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/scripts/popup_importimage_draw/popup_importimage_draw.gml b/scripts/popup_importimage_draw/popup_importimage_draw.gml index 6f33cbbfab87d202b19442da154e948a0ec8f5d6..3833935c89a07d6296539544179c9c2c4b4a424b 100644 --- a/scripts/popup_importimage_draw/popup_importimage_draw.gml +++ b/scripts/popup_importimage_draw/popup_importimage_draw.gml @@ -27,7 +27,14 @@ if (draw_button_normal("importimageok", dx, dy, dw, 32)) popup_importitemsheet_show(popup.filename, null) else { - action_res_image_load(popup.filename, popup.type) + if(popup_importimage.filenameArray_index>1){ + for (var i = 0; i < popup_importimage.filenameArray_index;i+=1){ + action_res_image_load(popup_importimage.filenameArray[i], popup.type) + } + }else{ + action_res_image_load(popup.filename, popup.type); + } + popup_importimage.filenameArray_index = 0; popup_close() } } diff --git a/views/78e25a8e-5279-4962-b264-43e3e8009d20.yy b/views/78e25a8e-5279-4962-b264-43e3e8009d20.yy index 89eeabb64be3710d7513d28043cb4f04106252b6..603f24f8e41c8da9b6b4ab29ce07cc9a17a24498 100644 --- a/views/78e25a8e-5279-4962-b264-43e3e8009d20.yy +++ b/views/78e25a8e-5279-4962-b264-43e3e8009d20.yy @@ -4,7 +4,7 @@ "mvc": "1.1", "name": "78e25a8e-5279-4962-b264-43e3e8009d20", "children": [ - + "36dd1084-bffb-4f9f-9755-af556db7d18e" ], "filterType": "GMExtension", "folderName": "extensions", diff --git a/views/a48e2b3d-83db-45b9-bb71-5f1978a64de0.yy b/views/a48e2b3d-83db-45b9-bb71-5f1978a64de0.yy index 6ca38e5ce5c345e93ac4c20c0458a44b11e3fecd..8c47496ff26f208ca4ee1dc9e7dc39fe2d9aa00a 100644 --- a/views/a48e2b3d-83db-45b9-bb71-5f1978a64de0.yy +++ b/views/a48e2b3d-83db-45b9-bb71-5f1978a64de0.yy @@ -6,6 +6,7 @@ "children": [ "a3811016-d59f-4dca-919a-d8bddb4ca1b0", "f8c9d7ce-9330-4410-997c-981e62c84c89", + "a6fb785f-6f75-4b0b-85dd-8eac07feaf63", "75b9ea24-9820-4ade-b053-c8db36f3e179", "7071c736-d787-496b-977d-a371db6cf88a", "b33dc21d-1c3c-47ed-8673-c87118f2af89",