From d75b96baaa38d0e09513f2ac1cb2667e285c5f00 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Mon, 3 Mar 2025 09:30:28 +0700 Subject: [PATCH] [GlobalVar] Fix crash on animate. --- PixelComposer.resource_order | 19 ++-- PixelComposer.yyp | 26 +++-- datafiles/data/Collections.zip | Bin 465502 -> 476597 bytes objects/o_dialog_add_node/Create_0.gml | 10 +- .../Create_0.gml | 93 +++++++++++++---- scripts/__node/__node.gml | 1 + .../directory_functions.gml | 27 ++++- scripts/globals/globals.gml | 4 +- .../node_action_object/node_action_object.gml | 30 +++--- scripts/node_data/node_data.gml | 1 - scripts/node_registry/node_registry.gml | 1 - .../panel_action_create.gml | 94 ++++++++++-------- scripts/scrollBox/scrollBox.gml | 16 +-- sprites/s_bone_constrain/s_bone_constrain.yy | 4 +- .../s_inspector_wavetable.yy | 4 +- sprites/s_junc_aseprite/s_junc_aseprite.yy | 2 +- .../s_node_2d_light_shape.yy | 4 +- .../s_node_3d_affector_shape.yy | 4 +- .../f1335e25-2155-4fed-af9c-b7292e170940.png | Bin 0 -> 1722 bytes .../be5ae4eb-183a-429f-9954-55735933c188.png | Bin 0 -> 1722 bytes .../s_node_action_default.yy | 90 +++++++++++++++++ sprites/s_node_alignment/s_node_alignment.yy | 4 +- .../s_node_armature_mesh.yy | 4 +- sprites/s_node_axis_type/s_node_axis_type.yy | 4 +- sprites/s_node_bend_type/s_node_bend_type.yy | 4 +- .../s_node_camera_repeat.yy | 4 +- .../s_node_color_data_label.yy | 4 +- .../s_node_condition_type.yy | 4 +- .../s_node_curve_type/s_node_curve_type.yy | 4 +- .../s_node_flip_render_type.yy | 4 +- .../s_node_gradient_type.yy | 4 +- sprites/s_node_line_cap/s_node_line_cap.yy | 4 +- .../s_node_liquefy_type.yy | 4 +- .../s_node_logic_type/s_node_logic_type.yy | 4 +- .../s_node_math_operators.yy | 4 +- sprites/s_node_mesh_type/s_node_mesh_type.yy | 4 +- .../s_node_mk_grid_flip.yy | 4 +- .../s_node_mk_rain_type.yy | 4 +- .../s_node_normal_light_type.yy | 4 +- .../s_node_path_3d_shape.yy | 4 +- .../s_node_plot_linear_type.yy | 4 +- .../s_node_repeat_axis/s_node_repeat_axis.yy | 4 +- .../s_node_repeat_selection_types.yy | 4 +- .../s_node_shadow_type/s_node_shadow_type.yy | 4 +- sprites/s_node_shape_3d/s_node_shape_3d.yy | 4 +- .../s_node_shape_circle.yy | 4 +- .../s_node_shape_leaf/s_node_shape_leaf.yy | 4 +- .../s_node_shape_misc/s_node_shape_misc.yy | 4 +- .../s_node_shape_poly_type.yy | 4 +- .../s_node_shape_rectangle.yy | 4 +- .../s_node_shape_type/s_node_shape_type.yy | 4 +- .../s_node_trigger_cond.yy | 4 +- sprites/s_shape_curve/s_shape_curve.yy | 4 +- 53 files changed, 370 insertions(+), 188 deletions(-) create mode 100644 sprites/s_node_action_default/f1335e25-2155-4fed-af9c-b7292e170940.png create mode 100644 sprites/s_node_action_default/layers/f1335e25-2155-4fed-af9c-b7292e170940/be5ae4eb-183a-429f-9954-55735933c188.png create mode 100644 sprites/s_node_action_default/s_node_action_default.yy diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index f5d63708a..a0124a1a1 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -156,6 +156,7 @@ {"name":"Tile","order":12,"path":"folders/nodes/data/MKFX/Tile.yy",}, {"name":"PB","order":12,"path":"folders/nodes/data/PB.yy",}, {"name":"draw","order":2,"path":"folders/nodes/data/PB/draw.yy",}, + {"name":"shaders","order":2,"path":"folders/nodes/data/PB/main/shaders.yy",}, {"name":"modify","order":3,"path":"folders/nodes/data/PB/modify.yy",}, {"name":"pbbox","order":1,"path":"folders/nodes/data/PB/pbbox.yy",}, {"name":"PCX","order":11,"path":"folders/nodes/data/PCX.yy",}, @@ -256,11 +257,13 @@ {"name":"node","order":5,"path":"folders/shader/UI/node.yy",}, {"name":"palette mixer","order":2,"path":"folders/shader/UI/palette mixer.yy",}, {"name":"sprites","order":8,"path":"folders/sprites.yy",}, - {"name":"bs","order":3,"path":"folders/sprites/bs.yy",}, - {"name":"gameframe","order":4,"path":"folders/sprites/gameframe.yy",}, - {"name":"meta","order":2,"path":"folders/sprites/meta.yy",}, - {"name":"misc","order":5,"path":"folders/sprites/misc.yy",}, - {"name":"nodes","order":6,"path":"folders/sprites/nodes.yy",}, + {"name":"bs","order":2,"path":"folders/sprites/bs.yy",}, + {"name":"enum icons","order":6,"path":"folders/sprites/enum icons.yy",}, + {"name":"gameframe","order":3,"path":"folders/sprites/gameframe.yy",}, + {"name":"node","order":9,"path":"folders/sprites/node.yy",}, + {"name":"junctions","order":5,"path":"folders/sprites/junctions.yy",}, + {"name":"meta","order":1,"path":"folders/sprites/meta.yy",}, + {"name":"misc","order":4,"path":"folders/sprites/misc.yy",}, {"name":"profiler","order":8,"path":"folders/sprites/profiler.yy",}, {"name":"texture","order":7,"path":"folders/sprites/texture.yy",}, {"name":"widgets","order":6,"path":"folders/widgets.yy",}, @@ -268,7 +271,6 @@ {"name":"rotator","order":1,"path":"folders/widgets/rotator.yy",}, {"name":"sliders","order":2,"path":"folders/widgets/sliders.yy",}, {"name":"text","order":3,"path":"folders/widgets/text.yy",}, - {"name":"shaders","order":2,"path":"folders/nodes/data/PB/main/shaders.yy",}, ], "ResourceOrderSettings":[ {"name":"ac_disappear","order":2,"path":"animcurves/ac_disappear/ac_disappear.yy",}, @@ -349,7 +351,6 @@ {"name":"o_dialog_textbox_autocomplete","order":7,"path":"objects/o_dialog_textbox_autocomplete/o_dialog_textbox_autocomplete.yy",}, {"name":"o_dialog_textbox_function_guide","order":8,"path":"objects/o_dialog_textbox_function_guide/o_dialog_textbox_function_guide.yy",}, {"name":"o_dialog_value_editor","order":9,"path":"objects/o_dialog_value_editor/o_dialog_value_editor.yy",}, - {"name":"sh_corner_apply","order":1,"path":"shaders/sh_corner_apply/sh_corner_apply.yy",}, {"name":"o_dialog_warning","order":6,"path":"objects/o_dialog_warning/o_dialog_warning.yy",}, {"name":"o_pie_menu","order":14,"path":"objects/o_pie_menu/o_pie_menu.yy",}, {"name":"Obj_Debug_FallText_Firestore","order":6,"path":"objects/Obj_Debug_FallText_Firestore/Obj_Debug_FallText_Firestore.yy",}, @@ -1464,7 +1465,6 @@ {"name":"type_conversion","order":7,"path":"scripts/type_conversion/type_conversion.yy",}, {"name":"value_snap","order":9,"path":"scripts/value_snap/value_snap.yy",}, {"name":"var_comparison","order":1,"path":"scripts/var_comparison/var_comparison.yy",}, - {"name":"sh_corner_coord","order":4,"path":"shaders/sh_corner_coord/sh_corner_coord.yy",}, {"name":"vct_knob","order":2,"path":"scripts/vct_knob/vct_knob.yy",}, {"name":"vct_slider","order":1,"path":"scripts/vct_slider/vct_slider.yy",}, {"name":"vct_toggle","order":3,"path":"scripts/vct_toggle/vct_toggle.yy",}, @@ -1586,6 +1586,8 @@ {"name":"sh_content_sampler","order":17,"path":"shaders/sh_content_sampler/sh_content_sampler.yy",}, {"name":"sh_convolution","order":9,"path":"shaders/sh_convolution/sh_convolution.yy",}, {"name":"sh_coord","order":14,"path":"shaders/sh_coord/sh_coord.yy",}, + {"name":"sh_corner_apply","order":1,"path":"shaders/sh_corner_apply/sh_corner_apply.yy",}, + {"name":"sh_corner_coord","order":4,"path":"shaders/sh_corner_coord/sh_corner_coord.yy",}, {"name":"sh_corner_erode","order":2,"path":"shaders/sh_corner_erode/sh_corner_erode.yy",}, {"name":"sh_corner_iterate","order":3,"path":"shaders/sh_corner_iterate/sh_corner_iterate.yy",}, {"name":"sh_cross_section","order":17,"path":"shaders/sh_cross_section/sh_cross_section.yy",}, @@ -1688,7 +1690,6 @@ {"name":"sh_kuwahara_ani_pass3","order":3,"path":"shaders/sh_kuwahara_ani_pass3/sh_kuwahara_ani_pass3.yy",}, {"name":"sh_kuwahara_ani_pass4","order":4,"path":"shaders/sh_kuwahara_ani_pass4/sh_kuwahara_ani_pass4.yy",}, {"name":"sh_kuwahara_gen","order":5,"path":"shaders/sh_kuwahara_gen/sh_kuwahara_gen.yy",}, - {"name":"sh_pb_main_draw","order":0,"path":"shaders/sh_pb_main_draw/sh_pb_main_draw.yy",}, {"name":"sh_level_selector","order":23,"path":"shaders/sh_level_selector/sh_level_selector.yy",}, {"name":"sh_level","order":21,"path":"shaders/sh_level/sh_level.yy",}, {"name":"sh_liquefy_bloat","order":3,"path":"shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index ccc466183..a3074db37 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -218,6 +218,7 @@ {"$GMFolder":"","%Name":"PB","folderPath":"folders/nodes/data/PB.yy","name":"PB","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"draw","folderPath":"folders/nodes/data/PB/draw.yy","name":"draw","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"main","folderPath":"folders/nodes/data/PB/main.yy","name":"main","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"shaders","folderPath":"folders/nodes/data/PB/main/shaders.yy","name":"shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"modify","folderPath":"folders/nodes/data/PB/modify.yy","name":"modify","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"pbbox","folderPath":"folders/nodes/data/PB/pbbox.yy","name":"pbbox","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"PCX","folderPath":"folders/nodes/data/PCX.yy","name":"PCX","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -335,11 +336,12 @@ {"$GMFolder":"","%Name":"palette mixer","folderPath":"folders/shader/UI/palette mixer.yy","name":"palette mixer","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"sprites","folderPath":"folders/sprites.yy","name":"sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"bs","folderPath":"folders/sprites/bs.yy","name":"bs","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"enum icons","folderPath":"folders/sprites/enum icons.yy","name":"enum icons","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"gameframe","folderPath":"folders/sprites/gameframe.yy","name":"gameframe","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"node","folderPath":"folders/sprites/node.yy","name":"node","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"junctions","folderPath":"folders/sprites/junctions.yy","name":"junctions","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"meta","folderPath":"folders/sprites/meta.yy","name":"meta","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"misc","folderPath":"folders/sprites/misc.yy","name":"misc","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"nodes","folderPath":"folders/sprites/nodes.yy","name":"nodes","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"junctions","folderPath":"folders/sprites/nodes/junctions.yy","name":"junctions","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"profiler","folderPath":"folders/sprites/profiler.yy","name":"profiler","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"texture","folderPath":"folders/sprites/texture.yy","name":"texture","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"widgets","folderPath":"folders/widgets.yy","name":"widgets","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -348,7 +350,6 @@ {"$GMFolder":"","%Name":"rotator","folderPath":"folders/widgets/rotator.yy","name":"rotator","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"sliders","folderPath":"folders/widgets/sliders.yy","name":"sliders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"text","folderPath":"folders/widgets/text.yy","name":"text","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"shaders","folderPath":"folders/nodes/data/PB/main/shaders.yy","name":"shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "IncludedFiles":[ {"$GMIncludedFile":"","%Name":"Addons.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Addons.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1314,7 +1315,11 @@ {"$GMIncludedFile":"","%Name":"Canvas.png","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Templates","name":"Canvas.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Canvas.pxc","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Templates","name":"Canvas.pxc","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Welcome files.zip","CopyToMask":-1,"filePath":"datafiles/data/Welcome files","name":"Welcome files.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":0,"filePath":"datafiles","name":"dllcredits.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{ + "Itch":{ + "CopyToMask":"0", + }, + },"CopyToMask":0,"filePath":"datafiles","name":"dllcredits.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dlltest1.dll","CopyToMask":-1,"filePath":"datafiles","name":"dlltest1.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"ffmpeg.exe","CopyToMask":-1,"filePath":"datafiles/ffmpeg/bin","name":"ffmpeg.exe","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"LICENSE","CopyToMask":-1,"filePath":"datafiles/ffmpeg","name":"LICENSE","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1333,7 +1338,11 @@ {"$GMIncludedFile":"","%Name":"mf.dll","CopyToMask":-1,"filePath":"datafiles","name":"mf.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"mfcore.dll","CopyToMask":-1,"filePath":"datafiles","name":"mfcore.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"mfplat.dll","CopyToMask":-1,"filePath":"datafiles","name":"mfplat.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"PixelComposer_profile-2.provisionprofile","ConfigValues":{"Itch":{"CopyToMask":"2",},},"CopyToMask":-1,"filePath":"datafiles","name":"PixelComposer_profile-2.provisionprofile","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"PixelComposer_profile-2.provisionprofile","ConfigValues":{ + "Itch":{ + "CopyToMask":"2", + }, + },"CopyToMask":-1,"filePath":"datafiles","name":"PixelComposer_profile-2.provisionprofile","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"data.win","CopyToMask":-1,"filePath":"datafiles/report","name":"data.win","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"execute_shell_simple_ext_x64.dll","CopyToMask":-1,"filePath":"datafiles/report","name":"execute_shell_simple_ext_x64.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"options.ini","CopyToMask":-1,"filePath":"datafiles/report","name":"options.ini","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1757,7 +1766,6 @@ {"id":{"name":"dynaSurf_3d","path":"scripts/dynaSurf_3d/dynaSurf_3d.yy",},}, {"id":{"name":"dynaSurf_iso","path":"scripts/dynaSurf_iso/dynaSurf_iso.yy",},}, {"id":{"name":"dynaSurf","path":"scripts/dynaSurf/dynaSurf.yy",},}, - {"id":{"name":"sh_pb_main_draw","path":"shaders/sh_pb_main_draw/sh_pb_main_draw.yy",},}, {"id":{"name":"event_recorder","path":"scripts/event_recorder/event_recorder.yy",},}, {"id":{"name":"export_portable","path":"scripts/export_portable/export_portable.yy",},}, {"id":{"name":"fft_functions","path":"scripts/fft_functions/fft_functions.yy",},}, @@ -1978,7 +1986,6 @@ {"id":{"name":"node_color_adjust","path":"scripts/node_color_adjust/node_color_adjust.yy",},}, {"id":{"name":"node_color_data","path":"scripts/node_color_data/node_color_data.yy",},}, {"id":{"name":"node_color_hsv","path":"scripts/node_color_hsv/node_color_hsv.yy",},}, - {"id":{"name":"sh_corner_coord","path":"shaders/sh_corner_coord/sh_corner_coord.yy",},}, {"id":{"name":"node_color_mix","path":"scripts/node_color_mix/node_color_mix.yy",},}, {"id":{"name":"node_color_oklch","path":"scripts/node_color_oklch/node_color_oklch.yy",},}, {"id":{"name":"node_color_remove","path":"scripts/node_color_remove/node_color_remove.yy",},}, @@ -2855,6 +2862,8 @@ {"id":{"name":"sh_content_sampler","path":"shaders/sh_content_sampler/sh_content_sampler.yy",},}, {"id":{"name":"sh_convolution","path":"shaders/sh_convolution/sh_convolution.yy",},}, {"id":{"name":"sh_coord","path":"shaders/sh_coord/sh_coord.yy",},}, + {"id":{"name":"sh_corner_apply","path":"shaders/sh_corner_apply/sh_corner_apply.yy",},}, + {"id":{"name":"sh_corner_coord","path":"shaders/sh_corner_coord/sh_corner_coord.yy",},}, {"id":{"name":"sh_corner_erode","path":"shaders/sh_corner_erode/sh_corner_erode.yy",},}, {"id":{"name":"sh_corner_iterate","path":"shaders/sh_corner_iterate/sh_corner_iterate.yy",},}, {"id":{"name":"sh_corner","path":"shaders/sh_corner/sh_corner.yy",},}, @@ -3053,6 +3062,7 @@ {"id":{"name":"sh_path_sdf","path":"shaders/sh_path_sdf/sh_path_sdf.yy",},}, {"id":{"name":"sh_pb_diamond","path":"shaders/sh_pb_diamond/sh_pb_diamond.yy",},}, {"id":{"name":"sh_pb_draw","path":"shaders/sh_pb_draw/sh_pb_draw.yy",},}, + {"id":{"name":"sh_pb_main_draw","path":"shaders/sh_pb_main_draw/sh_pb_main_draw.yy",},}, {"id":{"name":"sh_perlin_extra","path":"shaders/sh_perlin_extra/sh_perlin_extra.yy",},}, {"id":{"name":"sh_perlin_smear","path":"shaders/sh_perlin_smear/sh_perlin_smear.yy",},}, {"id":{"name":"sh_perlin_tiled","path":"shaders/sh_perlin_tiled/sh_perlin_tiled.yy",},}, @@ -3197,7 +3207,6 @@ {"id":{"name":"s_filter_node_inspector","path":"sprites/s_filter_node_inspector/s_filter_node_inspector.yy",},}, {"id":{"name":"s_filter_node","path":"sprites/s_filter_node/s_filter_node.yy",},}, {"id":{"name":"s_filter","path":"sprites/s_filter/s_filter.yy",},}, - {"id":{"name":"sh_corner_apply","path":"shaders/sh_corner_apply/sh_corner_apply.yy",},}, {"id":{"name":"s_flare_type","path":"sprites/s_flare_type/s_flare_type.yy",},}, {"id":{"name":"s_fx_pixel","path":"sprites/s_fx_pixel/s_fx_pixel.yy",},}, {"id":{"name":"s_gamemaker","path":"sprites/s_gamemaker/s_gamemaker.yy",},}, @@ -3262,6 +3271,7 @@ {"id":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},}, {"id":{"name":"s_node_3d_uv_remap","path":"sprites/s_node_3d_uv_remap/s_node_3d_uv_remap.yy",},}, {"id":{"name":"s_node_9slice","path":"sprites/s_node_9slice/s_node_9slice.yy",},}, + {"id":{"name":"s_node_action_default","path":"sprites/s_node_action_default/s_node_action_default.yy",},}, {"id":{"name":"s_node_active_canvas","path":"sprites/s_node_active_canvas/s_node_active_canvas.yy",},}, {"id":{"name":"s_node_alignment","path":"sprites/s_node_alignment/s_node_alignment.yy",},}, {"id":{"name":"s_node_alpha_cutoff","path":"sprites/s_node_alpha_cutoff/s_node_alpha_cutoff.yy",},}, diff --git a/datafiles/data/Collections.zip b/datafiles/data/Collections.zip index d6fee95c425e7d470120bac3adcbe94312206b1c..6caccf50050654707da3ddc3106fbbb18e7e4792 100644 GIT binary patch delta 27855 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

0_fz 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 diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 241ba657a..238a25078 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -254,8 +254,10 @@ event_inherited(); } else if(is(_node, NodeAction)) { // NOT IMPLEMENTED var _dat = _node.build(node_target_x, node_target_y,, _param); - var _node_in = _dat.inputNode; - var _node_out = _dat.outputNode; + if(_dat == noone) return; + + var _node_in = _dat[$ "inputNode"] ?? noone; + var _node_out = _dat[$ "outputNode"] ?? noone; if(_node_in != noone) for( var i = 0, n = array_length(_node_in.inputs); i < n; i++ ) @@ -532,6 +534,8 @@ event_inherited(); if(is_global && !_node.show_in_global) continue; } + if(is(_node, NodeAction_create) && array_empty(PANEL_GRAPH.nodes_selecting)) continue; + if(is_string(_node)) { if(PREFERENCES.dialog_add_node_grouping == 0) continue; if(PREFERENCES.dialog_add_node_grouping == 1 && string_starts_with(_node, "/")) continue; @@ -716,6 +720,8 @@ event_inherited(); if(is_global && !_node.show_in_global) continue; } + if(is(_node, NodeAction_create) && array_empty(PANEL_GRAPH.nodes_selecting)) continue; + if(is_string(_node)) { if(PREFERENCES.dialog_add_node_grouping == 0) continue; if(PREFERENCES.dialog_add_node_grouping == 1 && string_starts_with(_node, "/")) continue; diff --git a/objects/o_dialog_scrollbox_horizontal/Create_0.gml b/objects/o_dialog_scrollbox_horizontal/Create_0.gml index 2d45c3b15..09c71d25d 100644 --- a/objects/o_dialog_scrollbox_horizontal/Create_0.gml +++ b/objects/o_dialog_scrollbox_horizontal/Create_0.gml @@ -2,7 +2,8 @@ event_inherited(); #region - max_h = 640; + max_w = WIN_W * .8; + max_h = ui(640); horizon = true; font = f_p0 @@ -11,6 +12,9 @@ event_inherited(); item_pad = ui(8); minWidth = 0; widths = []; + heights = []; + + minHeight = 0; draggable = false; destroy_on_click_out = true; @@ -72,22 +76,27 @@ event_inherited(); var lh = item_pad; var _emp = true; - widths = []; + widths = []; + heights = []; draw_set_text(font, fa_left, fa_top); for( var i = 0, n = array_length(data); i < n; i++ ) { var _val = data[i]; - var txt = is_instanceof(_val, scrollItem)? _val.name : _val; - var _spr = is_instanceof(_val, scrollItem) && _val.spr; + var txt = is(_val, scrollItem)? _val.name : _val; + var _spr = is(_val, scrollItem) && _val.spr; if(_hori) { if(_val == -1) { if(_emp) { - array_push(widths, 0); + array_push(widths, 0); + array_push(heights, 0); + } else { - lw = max(minWidth, lw); - array_push(widths, lw); + lw = max(minWidth, lw); + array_push(widths, lw); + array_push(heights, lh); + ww += lw; hh = max(hh, lh); } @@ -103,13 +112,15 @@ event_inherited(); _emp = false; - tw = string_width(txt) + _spr * (hght + _tpad * 2); - lw = max(lw, tw + _tpad * 2); - lh += hght; + tw = string_width(txt) + _spr * (hght + _tpad * 2) + _tpad * 2; + lw = max(lw, tw); + lh += hght; } lw = max(minWidth, lw); - array_push(widths, _emp? 0 : lw); + + array_push(widths, _emp? 0 : lw); + array_push(heights, _emp? 0 : lh); ww += lw; hh = max(hh, lh); @@ -122,6 +133,31 @@ event_inherited(); dialog_h = min(max_h, sh + lh); } + if(_hori && dialog_w >= max_w) { + var wwMin = 0; + minHeight = sh + hh; + + var lwMin = 0; + var lhMin = item_pad; + + for( var i = 0, n = array_length(heights); i < n; i++ ) { + var _w = widths[i]; + var _h = heights[i]; + + if(lhMin + _h > minHeight) { + wwMin += lwMin; + lwMin = 0; + lhMin = item_pad; + } + + lwMin = max(lwMin, _w); + lhMin += _h; + } + + wwMin += lwMin; + dialog_w = wwMin + _tpad * 2; + } + sc_content.resize(dialog_w - _tpad * 2, dialog_h - ui(40)); resetPosition(); @@ -141,20 +177,31 @@ event_inherited(); var _hori = horizon && search_string == ""; var _tpad = _hori? text_pad : ui(8); + var _ww = sc_content.surface_w; + var _hh = sc_content.surface_h; + var _dw = 0; + + if(MOUSE_MOVED) selecting = noone; + for( var i = 0, n = array_length(data); i < n; i++ ) { - var _dw = _hori? widths[_col] : sc_content.surface_w; var _val = data[i]; + _dw = max(_dw, _hori? widths[_col] : _ww); if(_hori) { if(_val == -1) { - _lx += _dw; - _ly = _y; _col++; + var _ch = heights[_col]; - _h = max(_h, _lh); - _lh = 0; - _lw = 0; - + if(_lh + _ch > minHeight) { + _lx += _dw; + _ly = _y; + + _h = max(_h, _lh); + _dw = 0; + _lh = 0; + _lw = 0; + + } continue; } @@ -213,8 +260,12 @@ event_inherited(); var _xc = _spr != noone? hght + (_dw - hght) / 2 : _dw / 2; draw_text_add(_lx + _xc, _ly + hght / 2, _txt); - } else if(align == fa_left) - draw_text_add(_tpad + _lx + (_spr != noone) * (_tpad * 2 + hght), _ly + hght / 2, _txt); + } else if(align == fa_left) { + var _tx = _tpad + _lx; + if(_spr != noone) _tx += _tpad * 2 + hght; + + draw_text_add(_tx, _ly + hght / 2, _txt); + } if(_spr) draw_sprite_ui(_val.spr, _val.spr_ind, _lx + ui(8) + hght / 2, _ly + hght / 2, 1, 1, 0, _val.spr_blend); @@ -244,7 +295,7 @@ event_inherited(); instance_destroy(); } - return _h; + return _h + ui(8); }); sc_content.scroll_resize = false; diff --git a/scripts/__node/__node.gml b/scripts/__node/__node.gml index a468e8ba4..7e7eb0f6c 100644 --- a/scripts/__node/__node.gml +++ b/scripts/__node/__node.gml @@ -9,6 +9,7 @@ function __Node_Base(x, y) constructor { outputs = []; input_value_map = {}; + is_selecting = false; active_index = -1; preview_index = 0; anim_priority = -999; diff --git a/scripts/directory_functions/directory_functions.gml b/scripts/directory_functions/directory_functions.gml index a12e0d976..b06293b57 100644 --- a/scripts/directory_functions/directory_functions.gml +++ b/scripts/directory_functions/directory_functions.gml @@ -1,6 +1,16 @@ function directory_verify(path) { - if(directory_exists(path)) return; - directory_create(path); + var _d = path; + var _v = ds_stack_create(); + + while(!directory_exists(_d)) { + ds_stack_push(_v, _d); + _d = filename_dir(_d); + } + + repeat(ds_stack_size(_v)) + directory_create(ds_stack_pop(_v)); + + ds_stack_destroy(_v); } function directory_clear(path) { @@ -12,4 +22,17 @@ function directory_clear(path) { function directory_size_mb(dir) { if(!directory_exists(dir)) return 0; return directory_size(dir) / (1024*1024); +} + +function directory_get_files_ext(dir, ext) { + var a = []; + + var f = file_find_first(dir + "/*", 0), _f; + while (f != "") { + if(filename_ext(f) == ext) array_push(a, f); + f = file_find_next(); + } + file_find_close(); + + return a; } \ No newline at end of file diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index f35e7e296..043f795fb 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -43,8 +43,8 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_09_0; SAVE_VERSION = 1_18_09_1; - VERSION_STRING = MAC? "1.18.003m" : "1.18.10.004"; - BUILD_NUMBER = 118101.004; + VERSION_STRING = MAC? "1.18.003m" : "1.18.10.005"; + BUILD_NUMBER = 118101.005; PREF_VERSION = 1_17_1; var _vsp = string_split(VERSION_STRING, "."); diff --git a/scripts/node_action_object/node_action_object.gml b/scripts/node_action_object/node_action_object.gml index 864a8e57f..5c68da59a 100644 --- a/scripts/node_action_object/node_action_object.gml +++ b/scripts/node_action_object/node_action_object.gml @@ -2,7 +2,7 @@ global.ACTIONS = []; function NodeAction() constructor { name = ""; - spr = noone; + spr = s_node_action_default; node = noone; tags = []; @@ -124,37 +124,31 @@ function NodeAction_create() : NodeAction() constructor { spr = s_action_add; hide_bg = true; - static build = function() { PANEL_GRAPH.createAction(); } + static build = function() { PANEL_GRAPH.createAction(); return noone; } } -function __initNodeActions() { - var root = $"{DIRECTORY}Nodes"; - directory_verify(root); +function __initNodeActions(_update = false) { + if(_update) { + array_resize(NODE_ACTION_LIST, 0); + array_push(NODE_ACTION_LIST, new NodeAction_create()); + + } else NODE_ACTION_LIST = [ new NodeAction_create() ]; var root = $"{DIRECTORY}Nodes/Actions"; directory_verify(root); - NODE_ACTION_LIST = [ new NodeAction_create() ]; + var _acts = directory_get_files_ext(root, ".json"); - var f = file_find_first(root + "/*", 0), _f; - - while (f != "") { - _f = f; - f = file_find_next(); - - if(filename_ext(_f) != ".json") continue; - + for( var i = 0, n = array_length(_acts); i < n; i++ ) { + var _f = _acts[i]; var _c = new NodeAction().deserialize($"{root}/{_f}"); array_push(NODE_ACTION_LIST, _c); if(_c.location == noone) continue; - var _cat = array_safe_get(_c.location, 0, ""); var _grp = array_safe_get(_c.location, 1, ""); - - } - file_find_close(); + } function __initAction() { diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 28f7c46cd..b4771946b 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -125,7 +125,6 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { badgePreview = 0; badgeInspect = 0; - is_selecting = false; active_drawing = false; active_draw_index = -1; active_draw_anchor = false; diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 9d1e7e7ae..476ed1f04 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -503,7 +503,6 @@ function __read_node_display(_list) { } else { var _txt = $"Missing node data [{_n}]: Check if node folder exists in {DIRECTORY}Nodes\Internal"; - // print(_txt); noti_warning(_txt); } } diff --git a/scripts/panel_action_create/panel_action_create.gml b/scripts/panel_action_create/panel_action_create.gml index 0e79cbc2b..104f2450d 100644 --- a/scripts/panel_action_create/panel_action_create.gml +++ b/scripts/panel_action_create/panel_action_create.gml @@ -2,7 +2,7 @@ function Panel_Action_Create() : PanelContent() constructor { #region data title = __txt("Create Action"); showHeader = true; - padding = ui(12); + padding = ui(8); w = min(WIN_W, ui(720)); h = ui(400); @@ -19,12 +19,12 @@ function Panel_Action_Create() : PanelContent() constructor { nodes = []; connections = []; - cat_index = 0; node_categories = [ "None" ]; + cat_index = 0; cat_value = [ noone ]; - for(var i = 0; i < ds_list_size(NODE_CATEGORY); i++) { - var _name = NODE_CATEGORY[| i].name; + for(var i = 0; i < array_length(NODE_CATEGORY); i++) { + var _name = NODE_CATEGORY[i].name; switch(_name) { case "Action" : case "Custom" : @@ -35,11 +35,12 @@ function Panel_Action_Create() : PanelContent() constructor { array_push(node_categories, _name); array_push(cat_value, [ _name, "" ]); - var _list = NODE_CATEGORY[| i].list; - for(var j = 0, m = ds_list_size(_list); j < m; j++ ) { - if(is_string(_list[| j])) { - array_push(node_categories, $"> {_list[| j]}"); - array_push(cat_value, [ _name, _list[| j] ]); + var _list = NODE_CATEGORY[i].list; + + for(var j = 0, m = array_length(_list); j < m; j++ ) { + if(is_string(_list[j])) { + array_push(node_categories, $"> {_list[j]}"); + array_push(cat_value, [ _name, _list[j] ]); } } @@ -47,18 +48,18 @@ function Panel_Action_Create() : PanelContent() constructor { array_push(cat_value, noone); } - tb_name = new textBox( TEXTBOX_INPUT.text, function(str) /*=>*/ { name = str; }).setAutoUpdate(); - tb_tooltip = new textArea(TEXTBOX_INPUT.text, function(str) /*=>*/ { tooltip = str; }).setAutoUpdate(); - tb_alias = new textArea(TEXTBOX_INPUT.text, function(str) /*=>*/ { tags = str; }).setAutoUpdate(); - tb_location = new scrollBox(node_categories, function(val) /*=>*/ { cat_index = val; }); - tb_location.align = fa_left; - tb_location.horizontal = true; - tb_location.padding = ui(16); - tb_location.item_pad = ui(4); - tb_location.font = f_p2; + tb_name = new textBox( TEXTBOX_INPUT.text, function(s) /*=>*/ { name = s; }).setAutoUpdate().setFont(f_p2); + tb_tooltip = new textArea(TEXTBOX_INPUT.text, function(s) /*=>*/ { tooltip = s; }).setAutoUpdate().setFont(f_p2); + tb_alias = new textArea(TEXTBOX_INPUT.text, function(s) /*=>*/ { tags = s; }).setAutoUpdate().setFont(f_p2); + tb_location = new scrollBox(node_categories, function(v) /*=>*/ { cat_index = v; }) + .setAlign(fa_left) + .setHorizontal(true) + .setFont(f_p2) + .setPadding(ui(16)) + .setPaddingItem(ui(4)); b_create = button(function() /*=>*/ { - var _path = $"{DIRECTORY}Actions/Nodes/{name}.json"; + var _path = $"{DIRECTORY}Nodes/Actions/{name}.json"; var _map = { name, sprPath : $"./{name}.png", @@ -71,10 +72,10 @@ function Panel_Action_Create() : PanelContent() constructor { json_save_struct(_path, _map); - if(spr) surface_save(spr, $"{DIRECTORY}Actions/Nodes/{name}.png"); + if(spr) surface_save(spr, $"{DIRECTORY}Nodes/Actions/{name}.png"); close(); - __initNodeActions(); + __initNodeActions(true); }); b_create.text = __txtx("new_action_create", "Create"); @@ -93,8 +94,8 @@ function Panel_Action_Create() : PanelContent() constructor { var _lh = line_get_height(f_p2); for (var i = 0, n = array_length(rawNodes); i < n; i++) { - var _r = rawNodes[i]; - var _n = _r.node; + var _r = rawNodes[i]; + var _n = _r.node; var _name = _n.getFullName(); var _nd = nodes[i]; @@ -125,7 +126,7 @@ function Panel_Action_Create() : PanelContent() constructor { var _bx = ui(8 + 12); var _by = yy + _lh / 2; var _tg = struct_has(_vali, "value"); _ttg |= _tg; - var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, 6); + var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, ui(8)); if(_hv) { TOOLTIP = "Save value"; sc_node_content.hover_content = true; @@ -140,7 +141,7 @@ function Panel_Action_Create() : PanelContent() constructor { if(_in.expUse) { var _tg = struct_has(_vali, "expression"); _ttg |= _tg; - var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, 6); + var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, ui(8)); if(_hv) { TOOLTIP = "Save expression"; sc_node_content.hover_content = true; @@ -156,7 +157,7 @@ function Panel_Action_Create() : PanelContent() constructor { if(_in.unit.reference != noone) { var _tg = struct_has(_vali, "unit"); _ttg |= _tg; - var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, 6); + var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, ui(8)); if(_hv) { TOOLTIP = "Save unit"; sc_node_content.hover_content = true; @@ -249,13 +250,14 @@ function Panel_Action_Create() : PanelContent() constructor { function drawContent(panel) { draw_clear_alpha(COLORS.panel_bg_clear, 0); - var _pd = padding; + var _pd = padding; + var _conw = ui(320); // Nodes var ndx = _pd; var ndy = _pd; - var ndw = w - _pd * 2 - ui(320); + var ndw = w - _pd * 2 - _conw; var ndh = h - _pd * 2; draw_sprite_stretched(THEME.ui_panel_bg, 1, ndx, ndy, ndw, ndh); @@ -265,11 +267,11 @@ function Panel_Action_Create() : PanelContent() constructor { // Metadata - var _tx = w - ui(320); + var _tx = w - _conw; var _nm = ui(128); var _wx = _tx + _nm; var _wy = ui(8); - var _ww = ui(320) - _pd - _nm; + var _ww = _conw - _pd - _nm; var _wh = TEXTBOX_HEIGHT; var _th = _wy; @@ -278,24 +280,28 @@ function Panel_Action_Create() : PanelContent() constructor { tb_alias.setFocusHover(pFOCUS, pHOVER); tb_alias.register(); tb_location.setFocusHover(pFOCUS, pHOVER); tb_location.register(); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Name")); - var _hh = tb_name.draw(_wx, _wy, _ww, _wh, name, [ mx, my ]); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Name")); + var _hh = tb_name.draw(_wx, _wy, _ww, _wh, name, [ mx, my ]); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Alias")); - var _hh = tb_alias.draw(_wx, _wy, _ww, _wh, tags, [ mx, my ]); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Alias")); + var _hh = tb_alias.draw(_wx, _wy, _ww, _wh, tags, [ mx, my ]); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Tooltip")); - var _hh = tb_tooltip.draw(_wx, _wy, _ww, _wh * 2, tooltip, [ mx, my ]); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Tooltip")); + var _hh = tb_tooltip.draw(_wx, _wy, _ww, _wh * 2, tooltip, [ mx, my ]); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Category")); - var _hh = tb_location.draw(_wx, _wy, _ww, _wh, cat_index, [ mx, my ], x, y); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Category")); + var _hh = tb_location.draw(_wx, _wy, _ww, _wh, cat_index, [ mx, my ], x, y); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Icon")); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Icon")); var spx = _wx; var spy = _wy; diff --git a/scripts/scrollBox/scrollBox.gml b/scripts/scrollBox/scrollBox.gml index ad7406bb6..f8a957a32 100644 --- a/scripts/scrollBox/scrollBox.gml +++ b/scripts/scrollBox/scrollBox.gml @@ -13,8 +13,8 @@ function scrollItem(name, spr = noone, spr_ind = 0, spr_blend = COLORS._main_ico static setTooltip = function(_tt) { tooltip = _tt; return self; } } -function scrollBox(_data, _onModify, update_hover = true) : widget() constructor { - self.update_hover = update_hover; +function scrollBox(_data, _onModify, _update_hover = true) : widget() constructor { + update_hover = _update_hover; onModify = _onModify; data_list = _data; @@ -40,11 +40,13 @@ function scrollBox(_data, _onModify, update_hover = true) : widget() constructor type = 0; hide = 0; - static setHorizontal = function(_l) /*=>*/ { horizontal = _l; return self; } - static setAlign = function(_l) /*=>*/ { align = _l; return self; } - static setTextColor = function(_l) /*=>*/ { text_color = _l; return self; } - static setUpdateHover = function(_l) /*=>*/ { update_hover = _l; return self; } - static setMinWidth = function(_l) /*=>*/ { minWidth = _l; return self; } + static setHorizontal = function(_l) /*=>*/ { horizontal = _l; return self; } + static setAlign = function(_l) /*=>*/ { align = _l; return self; } + static setTextColor = function(_l) /*=>*/ { text_color = _l; return self; } + static setUpdateHover = function(_l) /*=>*/ { update_hover = _l; return self; } + static setMinWidth = function(_l) /*=>*/ { minWidth = _l; return self; } + static setPadding = function(_l) /*=>*/ { padding = _l; return self; } + static setPaddingItem = function(_l) /*=>*/ { item_pad = _l; return self; } static setPaddingScroll = function(_l) /*=>*/ { padding_scroll = _l; return self; } static trigger = function() { diff --git a/sprites/s_bone_constrain/s_bone_constrain.yy b/sprites/s_bone_constrain/s_bone_constrain.yy index f8aa6602f..06230a959 100644 --- a/sprites/s_bone_constrain/s_bone_constrain.yy +++ b/sprites/s_bone_constrain/s_bone_constrain.yy @@ -31,8 +31,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_inspector_wavetable/s_inspector_wavetable.yy b/sprites/s_inspector_wavetable/s_inspector_wavetable.yy index 68b400046..52e0d7867 100644 --- a/sprites/s_inspector_wavetable/s_inspector_wavetable.yy +++ b/sprites/s_inspector_wavetable/s_inspector_wavetable.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_junc_aseprite/s_junc_aseprite.yy b/sprites/s_junc_aseprite/s_junc_aseprite.yy index 4e8bbf8d0..ef645aac4 100644 --- a/sprites/s_junc_aseprite/s_junc_aseprite.yy +++ b/sprites/s_junc_aseprite/s_junc_aseprite.yy @@ -26,7 +26,7 @@ "origin":4, "parent":{ "name":"junctions", - "path":"folders/sprites/nodes/junctions.yy", + "path":"folders/sprites/junctions.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy b/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy index 2db9111f9..1de76039e 100644 --- a/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy +++ b/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy @@ -31,8 +31,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy b/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy index b97861124..9006719dd 100644 --- a/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy +++ b/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_action_default/f1335e25-2155-4fed-af9c-b7292e170940.png b/sprites/s_node_action_default/f1335e25-2155-4fed-af9c-b7292e170940.png new file mode 100644 index 0000000000000000000000000000000000000000..0d57b554f1dc0ab94ebcd0f21a8d27d2fd5f553a GIT binary patch literal 1722 zcmah}dsNa_9KSzN2^49H*-$~sm_00Jt`x;EF~E^IvT}NAxKy+<4N)6Y_siUzwdJ#v zIgk=pY4+H(e38G|sWcxcWtlxhEsDxlL!(@|pZ&3OwzJO8eSE+7e(vYqbHA^gkYFwW zPsRfP2z(w#h)Q^N%&|o0OMa2(KEvjhCBRN8ja>enqm=)-KGT|$DycTOzY2*{GW5qmn!0HbA)fF#s_T)fBrTpHfiSfCY>X`<|CO(^#&7-sXTo?t5CU@t5&-NN_;p zb+(P`6DZ>aN$^0oR>z`_I2mXsTit=%19Q8ynuA7;}wo?A{05#+%$yW7!_<@D7(()AQqiVzr%# z(L1a4mhdJrE*;ed1goJ?G3j#Ecl`9ZftVAwTt(-N->)OHCu8`;SQHxzH$XqWi^|@+ z%UP;?%Mgvd7DGmF=r?bovyPz~3TMPx+(I+Z&~rP|@b`uUrq5-qIi7G=goR)a{dqA( zvV_bQyIYJV)Bkj5sn^uLeORU1ru$f&i9&QT`_m+#$HaDK=yr=+V&2*Rrwa#%JjSr7t}R6LX%;_J-TfU)P<^;_ zUxWfTtw0k2d2ikpErjJ@_ z@Fcg06rs zltb-~`y3~A#UIs+;dOrfk%-rUXVYcy{jMx2Hub0)6QU@-w+5;V|DT%ouVPp~1GPWm z=xv$b-9k(GB57clG%8XW&D<`DMg{O-czoi{Sc&#fh6mGQ74wtTOBoC%gONNm7W@xF wd_q)Q%vbLxm^W{EffC&QenA=+ADtwPj8A+&XJciGJIVq4z+lelwW7?w04+r2UjP6A literal 0 HcmV?d00001 diff --git a/sprites/s_node_action_default/layers/f1335e25-2155-4fed-af9c-b7292e170940/be5ae4eb-183a-429f-9954-55735933c188.png b/sprites/s_node_action_default/layers/f1335e25-2155-4fed-af9c-b7292e170940/be5ae4eb-183a-429f-9954-55735933c188.png new file mode 100644 index 0000000000000000000000000000000000000000..0d57b554f1dc0ab94ebcd0f21a8d27d2fd5f553a GIT binary patch literal 1722 zcmah}dsNa_9KSzN2^49H*-$~sm_00Jt`x;EF~E^IvT}NAxKy+<4N)6Y_siUzwdJ#v zIgk=pY4+H(e38G|sWcxcWtlxhEsDxlL!(@|pZ&3OwzJO8eSE+7e(vYqbHA^gkYFwW zPsRfP2z(w#h)Q^N%&|o0OMa2(KEvjhCBRN8ja>enqm=)-KGT|$DycTOzY2*{GW5qmn!0HbA)fF#s_T)fBrTpHfiSfCY>X`<|CO(^#&7-sXTo?t5CU@t5&-NN_;p zb+(P`6DZ>aN$^0oR>z`_I2mXsTit=%19Q8ynuA7;}wo?A{05#+%$yW7!_<@D7(()AQqiVzr%# z(L1a4mhdJrE*;ed1goJ?G3j#Ecl`9ZftVAwTt(-N->)OHCu8`;SQHxzH$XqWi^|@+ z%UP;?%Mgvd7DGmF=r?bovyPz~3TMPx+(I+Z&~rP|@b`uUrq5-qIi7G=goR)a{dqA( zvV_bQyIYJV)Bkj5sn^uLeORU1ru$f&i9&QT`_m+#$HaDK=yr=+V&2*Rrwa#%JjSr7t}R6LX%;_J-TfU)P<^;_ zUxWfTtw0k2d2ikpErjJ@_ z@Fcg06rs zltb-~`y3~A#UIs+;dOrfk%-rUXVYcy{jMx2Hub0)6QU@-w+5;V|DT%ouVPp~1GPWm z=xv$b-9k(GB57clG%8XW&D<`DMg{O-czoi{Sc&#fh6mGQ74wtTOBoC%gONNm7W@xF wd_q)Q%vbLxm^W{EffC&QenA=+ADtwPj8A+&XJciGJIVq4z+lelwW7?w04+r2UjP6A literal 0 HcmV?d00001 diff --git a/sprites/s_node_action_default/s_node_action_default.yy b/sprites/s_node_action_default/s_node_action_default.yy new file mode 100644 index 000000000..f4ec41176 --- /dev/null +++ b/sprites/s_node_action_default/s_node_action_default.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_action_default", + "bboxMode":0, + "bbox_bottom":110, + "bbox_left":35, + "bbox_right":92, + "bbox_top":17, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f1335e25-2155-4fed-af9c-b7292e170940","name":"f1335e25-2155-4fed-af9c-b7292e170940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":128, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"be5ae4eb-183a-429f-9954-55735933c188","blendMode":0,"displayName":"default","isLocked":false,"name":"be5ae4eb-183a-429f-9954-55735933c188","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_action_default", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"node", + "path":"folders/sprites/node.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_action_default", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_action_default", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1335e25-2155-4fed-af9c-b7292e170940","path":"sprites/s_node_action_default/s_node_action_default.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3ecce393-9c16-4452-9b46-9cc69f4fd423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":64, + "yorigin":64, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":128, +} \ No newline at end of file diff --git a/sprites/s_node_alignment/s_node_alignment.yy b/sprites/s_node_alignment/s_node_alignment.yy index 3c4a97f9b..2d31085c3 100644 --- a/sprites/s_node_alignment/s_node_alignment.yy +++ b/sprites/s_node_alignment/s_node_alignment.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_armature_mesh/s_node_armature_mesh.yy b/sprites/s_node_armature_mesh/s_node_armature_mesh.yy index 92a10f754..b2ec7c9c0 100644 --- a/sprites/s_node_armature_mesh/s_node_armature_mesh.yy +++ b/sprites/s_node_armature_mesh/s_node_armature_mesh.yy @@ -25,8 +25,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_axis_type/s_node_axis_type.yy b/sprites/s_node_axis_type/s_node_axis_type.yy index 8625d0c91..48ef61c4c 100644 --- a/sprites/s_node_axis_type/s_node_axis_type.yy +++ b/sprites/s_node_axis_type/s_node_axis_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_bend_type/s_node_bend_type.yy b/sprites/s_node_bend_type/s_node_bend_type.yy index 8e03dfd64..e90c0a315 100644 --- a/sprites/s_node_bend_type/s_node_bend_type.yy +++ b/sprites/s_node_bend_type/s_node_bend_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_camera_repeat/s_node_camera_repeat.yy b/sprites/s_node_camera_repeat/s_node_camera_repeat.yy index d49304d55..370b92e6b 100644 --- a/sprites/s_node_camera_repeat/s_node_camera_repeat.yy +++ b/sprites/s_node_camera_repeat/s_node_camera_repeat.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_color_data_label/s_node_color_data_label.yy b/sprites/s_node_color_data_label/s_node_color_data_label.yy index d75401772..d488375be 100644 --- a/sprites/s_node_color_data_label/s_node_color_data_label.yy +++ b/sprites/s_node_color_data_label/s_node_color_data_label.yy @@ -51,8 +51,8 @@ }, "origin":5, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_condition_type/s_node_condition_type.yy b/sprites/s_node_condition_type/s_node_condition_type.yy index b50d4fae8..3d52e38c9 100644 --- a/sprites/s_node_condition_type/s_node_condition_type.yy +++ b/sprites/s_node_condition_type/s_node_condition_type.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_curve_type/s_node_curve_type.yy b/sprites/s_node_curve_type/s_node_curve_type.yy index 36b2d7eee..78863ec0c 100644 --- a/sprites/s_node_curve_type/s_node_curve_type.yy +++ b/sprites/s_node_curve_type/s_node_curve_type.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_flip_render_type/s_node_flip_render_type.yy b/sprites/s_node_flip_render_type/s_node_flip_render_type.yy index 7aebca631..d20f50625 100644 --- a/sprites/s_node_flip_render_type/s_node_flip_render_type.yy +++ b/sprites/s_node_flip_render_type/s_node_flip_render_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_gradient_type/s_node_gradient_type.yy b/sprites/s_node_gradient_type/s_node_gradient_type.yy index 5f531bf83..ed3b2beb3 100644 --- a/sprites/s_node_gradient_type/s_node_gradient_type.yy +++ b/sprites/s_node_gradient_type/s_node_gradient_type.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_line_cap/s_node_line_cap.yy b/sprites/s_node_line_cap/s_node_line_cap.yy index e30a4fd43..4bc8cd1e8 100644 --- a/sprites/s_node_line_cap/s_node_line_cap.yy +++ b/sprites/s_node_line_cap/s_node_line_cap.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_liquefy_type/s_node_liquefy_type.yy b/sprites/s_node_liquefy_type/s_node_liquefy_type.yy index 544063b24..35905ee12 100644 --- a/sprites/s_node_liquefy_type/s_node_liquefy_type.yy +++ b/sprites/s_node_liquefy_type/s_node_liquefy_type.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_logic_type/s_node_logic_type.yy b/sprites/s_node_logic_type/s_node_logic_type.yy index 1810794bb..2d544efd7 100644 --- a/sprites/s_node_logic_type/s_node_logic_type.yy +++ b/sprites/s_node_logic_type/s_node_logic_type.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_math_operators/s_node_math_operators.yy b/sprites/s_node_math_operators/s_node_math_operators.yy index 19c9c6e54..586dc7d8c 100644 --- a/sprites/s_node_math_operators/s_node_math_operators.yy +++ b/sprites/s_node_math_operators/s_node_math_operators.yy @@ -43,8 +43,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_mesh_type/s_node_mesh_type.yy b/sprites/s_node_mesh_type/s_node_mesh_type.yy index 939b09b9e..0d171a4f8 100644 --- a/sprites/s_node_mesh_type/s_node_mesh_type.yy +++ b/sprites/s_node_mesh_type/s_node_mesh_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy b/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy index b0b108eda..e0e5b3a78 100644 --- a/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy +++ b/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy b/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy index c95e5e1ba..fae575f46 100644 --- a/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy +++ b/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_normal_light_type/s_node_normal_light_type.yy b/sprites/s_node_normal_light_type/s_node_normal_light_type.yy index 1e37f43a2..9eda5ebbd 100644 --- a/sprites/s_node_normal_light_type/s_node_normal_light_type.yy +++ b/sprites/s_node_normal_light_type/s_node_normal_light_type.yy @@ -33,8 +33,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy b/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy index 2b9fcccf7..b5b7db370 100644 --- a/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy +++ b/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy @@ -32,8 +32,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy b/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy index 08ab4c266..af82f3bd2 100644 --- a/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy +++ b/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_repeat_axis/s_node_repeat_axis.yy b/sprites/s_node_repeat_axis/s_node_repeat_axis.yy index bd30695f9..c4b5adf5f 100644 --- a/sprites/s_node_repeat_axis/s_node_repeat_axis.yy +++ b/sprites/s_node_repeat_axis/s_node_repeat_axis.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy b/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy index 2a1678fde..698b02848 100644 --- a/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy +++ b/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shadow_type/s_node_shadow_type.yy b/sprites/s_node_shadow_type/s_node_shadow_type.yy index 747f2fd3c..8b8497b11 100644 --- a/sprites/s_node_shadow_type/s_node_shadow_type.yy +++ b/sprites/s_node_shadow_type/s_node_shadow_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_3d/s_node_shape_3d.yy b/sprites/s_node_shape_3d/s_node_shape_3d.yy index 946bb7641..63b313674 100644 --- a/sprites/s_node_shape_3d/s_node_shape_3d.yy +++ b/sprites/s_node_shape_3d/s_node_shape_3d.yy @@ -44,8 +44,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_circle/s_node_shape_circle.yy b/sprites/s_node_shape_circle/s_node_shape_circle.yy index dd86b8501..a41e41b17 100644 --- a/sprites/s_node_shape_circle/s_node_shape_circle.yy +++ b/sprites/s_node_shape_circle/s_node_shape_circle.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_leaf/s_node_shape_leaf.yy b/sprites/s_node_shape_leaf/s_node_shape_leaf.yy index c9f357d9c..167c908f9 100644 --- a/sprites/s_node_shape_leaf/s_node_shape_leaf.yy +++ b/sprites/s_node_shape_leaf/s_node_shape_leaf.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_misc/s_node_shape_misc.yy b/sprites/s_node_shape_misc/s_node_shape_misc.yy index 76a73e1b0..c24251be9 100644 --- a/sprites/s_node_shape_misc/s_node_shape_misc.yy +++ b/sprites/s_node_shape_misc/s_node_shape_misc.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy b/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy index fb1ff771c..d41c1b68c 100644 --- a/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy +++ b/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy @@ -44,8 +44,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy b/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy index 55aad358e..18c4e653b 100644 --- a/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy +++ b/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_type/s_node_shape_type.yy b/sprites/s_node_shape_type/s_node_shape_type.yy index 13d454e02..3a9ed236e 100644 --- a/sprites/s_node_shape_type/s_node_shape_type.yy +++ b/sprites/s_node_shape_type/s_node_shape_type.yy @@ -46,8 +46,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_trigger_cond/s_node_trigger_cond.yy b/sprites/s_node_trigger_cond/s_node_trigger_cond.yy index 29b6c6716..34efabc71 100644 --- a/sprites/s_node_trigger_cond/s_node_trigger_cond.yy +++ b/sprites/s_node_trigger_cond/s_node_trigger_cond.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_shape_curve/s_shape_curve.yy b/sprites/s_shape_curve/s_shape_curve.yy index 1790db05b..283725550 100644 --- a/sprites/s_shape_curve/s_shape_curve.yy +++ b/sprites/s_shape_curve/s_shape_curve.yy @@ -25,8 +25,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite",