diff --git a/Pixels Composer.yyp b/Pixels Composer.yyp index 60c72dd38..d79bb70c8 100644 --- a/Pixels Composer.yyp +++ b/Pixels Composer.yyp @@ -122,6 +122,7 @@ {"id":{"name":"s_color_picker_sample","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"order":4,}, {"id":{"name":"rotatorRange","path":"scripts/rotatorRange/rotatorRange.yy",},"order":12,}, {"id":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"order":74,}, + {"id":{"name":"font_loader","path":"scripts/font_loader/font_loader.yy",},"order":8,}, {"id":{"name":"point_rotate","path":"scripts/point_rotate/point_rotate.yy",},"order":1,}, {"id":{"name":"node_displacement","path":"scripts/node_displacement/node_displacement.yy",},"order":8,}, {"id":{"name":"s_workspace_0","path":"sprites/s_workspace_0/s_workspace_0.yy",},"order":0,}, @@ -178,7 +179,7 @@ {"id":{"name":"node_blur","path":"scripts/node_blur/node_blur.yy",},"order":16,}, {"id":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"order":25,}, {"id":{"name":"node_zigzag","path":"scripts/node_zigzag/node_zigzag.yy",},"order":16,}, - {"id":{"name":"f_h5","path":"fonts/f_h5/f_h5.yy",},"order":2,}, + {"id":{"name":"_f_h5","path":"fonts/_f_h5/_f_h5.yy",},"order":2,}, {"id":{"name":"node_color","path":"scripts/node_color/node_color.yy",},"order":0,}, {"id":{"name":"node_surface_data","path":"scripts/node_surface_data/node_surface_data.yy",},"order":10,}, {"id":{"name":"load_palette","path":"scripts/load_palette/load_palette.yy",},"order":3,}, @@ -193,12 +194,13 @@ {"id":{"name":"node_corner","path":"scripts/node_corner/node_corner.yy",},"order":35,}, {"id":{"name":"vertex_function","path":"scripts/vertex_function/vertex_function.yy",},"order":0,}, {"id":{"name":"o_dialog_palette","path":"objects/o_dialog_palette/o_dialog_palette.yy",},"order":2,}, - {"id":{"name":"f_p0","path":"fonts/f_p0/f_p0.yy",},"order":0,}, + {"id":{"name":"_f_p0","path":"fonts/_f_p0/_f_p0.yy",},"order":0,}, {"id":{"name":"node_condition","path":"scripts/node_condition/node_condition.yy",},"order":0,}, {"id":{"name":"sh_draw_normal","path":"shaders/sh_draw_normal/sh_draw_normal.yy",},"order":12,}, {"id":{"name":"sh_seperate_shape_index","path":"shaders/sh_seperate_shape_index/sh_seperate_shape_index.yy",},"order":0,}, {"id":{"name":"node_registry","path":"scripts/node_registry/node_registry.yy",},"order":5,}, {"id":{"name":"sh_checkerboard","path":"shaders/sh_checkerboard/sh_checkerboard.yy",},"order":12,}, + {"id":{"name":"s_preview_crosshair","path":"sprites/s_preview_crosshair/s_preview_crosshair.yy",},"order":10,}, {"id":{"name":"node_character","path":"scripts/node_character/node_character.yy",},"order":9,}, {"id":{"name":"s_folder_content_24","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"order":38,}, {"id":{"name":"draw_set_text","path":"scripts/draw_set_text/draw_set_text.yy",},"order":1,}, @@ -330,6 +332,7 @@ {"id":{"name":"sh_outline","path":"shaders/sh_outline/sh_outline.yy",},"order":21,}, {"id":{"name":"node_checkerboard","path":"scripts/node_checkerboard/node_checkerboard.yy",},"order":17,}, {"id":{"name":"node_gradient_output","path":"scripts/node_gradient_output/node_gradient_output.yy",},"order":3,}, + {"id":{"name":"display_refresh","path":"scripts/display_refresh/display_refresh.yy",},"order":18,}, {"id":{"name":"o_dialog_color_selector","path":"objects/o_dialog_color_selector/o_dialog_color_selector.yy",},"order":0,}, {"id":{"name":"s_color_picker_dropper","path":"sprites/s_color_picker_dropper/s_color_picker_dropper.yy",},"order":6,}, {"id":{"name":"sh_bloom_pass1","path":"shaders/sh_bloom_pass1/sh_bloom_pass1.yy",},"order":0,}, @@ -385,7 +388,7 @@ {"id":{"name":"s_timeline_ease","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"order":5,}, {"id":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"order":79,}, {"id":{"name":"o_dialog_animation","path":"objects/o_dialog_animation/o_dialog_animation.yy",},"order":9,}, - {"id":{"name":"f_p0b","path":"fonts/f_p0b/f_p0b.yy",},"order":5,}, + {"id":{"name":"_f_p0b","path":"fonts/_f_p0b/_f_p0b.yy",},"order":5,}, {"id":{"name":"o_dialog_keyframe_curve","path":"objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy",},"order":22,}, {"id":{"name":"s_button_middle","path":"sprites/s_button_middle/s_button_middle.yy",},"order":7,}, {"id":{"name":"s_node_pin_bg_s","path":"sprites/s_node_pin_bg_s/s_node_pin_bg_s.yy",},"order":3,}, @@ -432,7 +435,7 @@ {"id":{"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"order":91,}, {"id":{"name":"gif_reader","path":"scripts/gif_reader/gif_reader.yy",},"order":4,}, {"id":{"name":"s_circle_16","path":"sprites/s_circle_16/s_circle_16.yy",},"order":43,}, - {"id":{"name":"f_p3","path":"fonts/f_p3/f_p3.yy",},"order":7,}, + {"id":{"name":"_f_p3","path":"fonts/_f_p3/_f_p3.yy",},"order":7,}, {"id":{"name":"s_loading","path":"sprites/s_loading/s_loading.yy",},"order":37,}, {"id":{"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"order":37,}, {"id":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"order":44,}, @@ -513,7 +516,7 @@ {"id":{"name":"s_circle_12","path":"sprites/s_circle_12/s_circle_12.yy",},"order":44,}, {"id":{"name":"s_workspace_1","path":"sprites/s_workspace_1/s_workspace_1.yy",},"order":1,}, {"id":{"name":"string_decimal","path":"scripts/string_decimal/string_decimal.yy",},"order":0,}, - {"id":{"name":"f_h3","path":"fonts/f_h3/f_h3.yy",},"order":3,}, + {"id":{"name":"_f_h3","path":"fonts/_f_h3/_f_h3.yy",},"order":3,}, {"id":{"name":"node_iteration_index","path":"scripts/node_iteration_index/node_iteration_index.yy",},"order":4,}, {"id":{"name":"node_greyscale","path":"scripts/node_greyscale/node_greyscale.yy",},"order":19,}, {"id":{"name":"node_color_adjustment","path":"scripts/node_color_adjustment/node_color_adjustment.yy",},"order":5,}, @@ -534,6 +537,7 @@ {"id":{"name":"path_parser","path":"scripts/path_parser/path_parser.yy",},"order":3,}, {"id":{"name":"s_icon_minimap","path":"sprites/s_icon_minimap/s_icon_minimap.yy",},"order":0,}, {"id":{"name":"node_area","path":"scripts/node_area/node_area.yy",},"order":11,}, + {"id":{"name":"s_icon_spalsh_show_on_start","path":"sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy",},"order":12,}, {"id":{"name":"path_function","path":"scripts/path_function/path_function.yy",},"order":4,}, {"id":{"name":"node_grey_to_alpha","path":"scripts/node_grey_to_alpha/node_grey_to_alpha.yy",},"order":23,}, {"id":{"name":"sh_blend_add","path":"shaders/sh_blend_add/sh_blend_add.yy",},"order":7,}, @@ -553,12 +557,12 @@ {"id":{"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"order":16,}, {"id":{"name":"node_group_output","path":"scripts/node_group_output/node_group_output.yy",},"order":2,}, {"id":{"name":"s_node_junctions_array","path":"sprites/s_node_junctions_array/s_node_junctions_array.yy",},"order":1,}, - {"id":{"name":"f_p2","path":"fonts/f_p2/f_p2.yy",},"order":4,}, + {"id":{"name":"_f_p2","path":"fonts/_f_p2/_f_p2.yy",},"order":4,}, {"id":{"name":"s_button_path_not_found_icon","path":"sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy",},"order":41,}, {"id":{"name":"button","path":"scripts/button/button.yy",},"order":2,}, {"id":{"name":"sh_blur_gaussian","path":"shaders/sh_blur_gaussian/sh_blur_gaussian.yy",},"order":1,}, {"id":{"name":"paddingBox","path":"scripts/paddingBox/paddingBox.yy",},"order":9,}, - {"id":{"name":"f_p1","path":"fonts/f_p1/f_p1.yy",},"order":1,}, + {"id":{"name":"_f_p1","path":"fonts/_f_p1/_f_p1.yy",},"order":1,}, {"id":{"name":"s_button_left","path":"sprites/s_button_left/s_button_left.yy",},"order":5,}, {"id":{"name":"curve_bezier_function","path":"scripts/curve_bezier_function/curve_bezier_function.yy",},"order":0,}, {"id":{"name":"draw_line_dashed","path":"scripts/draw_line_dashed/draw_line_dashed.yy",},"order":7,}, @@ -727,7 +731,7 @@ {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, ], "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","isScaled":true,"compressFormat":"bz2","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,}, + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","isScaled":true,"compressFormat":"bz2","loadType":"default","directory":"","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,}, ], "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tile_0044.png","CopyToMask":-1,"filePath":"datafiles/Sample Projects",}, @@ -791,8 +795,33 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"4 Looping operation.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Assets.zip","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Collections.zip","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tile_0126.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"card_back.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"card_clubs_02.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"card_clubs_03.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"card_clubs_04.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"card_clubs_05.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"dice_1.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"dice_2.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"dice_3.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"dice_4.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"dice_5.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"arrowRight.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"dice_6.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tile_0044.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tile_0067.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Black.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Bold.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-ExtraBold.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-ExtraLight.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Italic.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Light.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Medium.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Regular.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-SemiBold.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Thin.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, ], "MetaData": { - "IDEVersion": "2022.8.1.37", + "IDEVersion": "2022.9.0.49", }, } \ No newline at end of file diff --git a/datafiles/Getting started/5 Particle and effectors.pxc b/datafiles/Getting started/5 Particle and effectors.pxc index 0885185c6..38e1ae5a6 100644 --- a/datafiles/Getting started/5 Particle and effectors.pxc +++ b/datafiles/Getting started/5 Particle and effectors.pxc @@ -1 +1 @@ -{ "nodes": [ { "group": -1.0, "x": -416.0, "id": 899910864.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Press to start a simulation.", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -96.0, "name": "Display text" }, { "group": -1.0, "x": -288.0, "id": 406135373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "There are a lot of properties that control particle spawning, movement, etc.", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 160.0, "name": "Display text" }, { "group": -1.0, "x": -288.0, "id": 254863834.0, "inputs": [ { "from node": 930439119.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 4.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 32.0, 32.0, 32.0, 32.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 20.0, 30.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 45.0, 135.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0, 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ 0.0 ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0, 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 2.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 291.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Particle", "y": -32.0, "name": "Particle" }, { "group": -1.0, "x": -416.0, "id": 660826364.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Particle is one of a node in Pixel Composer which allow you to simulate particle effect.", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -128.0, "name": "Display text" }, { "group": -1.0, "x": 160.0, "id": 216943566.0, "inputs": [ { "from node": 254863834.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, -1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": 1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 30.956521739130437254061689600348, 17.217391304347827940546267200261, 32.869565217391304656757711200044, 15.217391304347826164189427800011, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 4.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ -2.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Particle_Effector", "y": -32.0, "name": "Effector" }, { "group": -1.0, "x": -416.0, "id": 676613630.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Getting started 5: Particle and effectors", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -192.0, "name": "Display text" }, { "group": -1.0, "x": 288.0, "id": 569002150.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "You can apply multiple effects by chaining particle data to multiple effectors.", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 300.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 64.0, "name": "Display text" }, { "group": -1.0, "x": -480.0, "id": 930439119.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 8.0, 8.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 4.0, 4.0, 4.0, 4.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 3.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Shape", "y": -32.0, "name": "Shape" }, { "group": -1.0, "x": 160.0, "id": 611339757.0, "inputs": [ { "from node": 216943566.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, -1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 39.130434782608695343242288799956, 38.260869565217390686484577599913, 23.304347826086956985136566800065, 23.21739130434782438783258839976, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 4.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ -1.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Particle_Effector", "y": 64.0, "name": "Effector" }, { "group": -1.0, "x": -416.0, "id": 593948373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Welcome to Pixel Composer", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -224.0, "name": "Display text" }, { "group": -1.0, "x": 288.0, "id": 887629234.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Particle effector node use the particle data from particle node and apply different force upon it.", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 400.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -32.0, "name": "Display text" } ], "version": 82.0, "animator": { "framerate": 15.0, "frames_total": 12.0 } } \ No newline at end of file +{ "nodes": [ { "group": -1.0, "x": -416.0, "id": 899910864.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Press to start a simulation.", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -96.0, "name": "Display text" }, { "group": -1.0, "x": -288.0, "id": 406135373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "There are a lot of properties that control particle spawning, movement, etc.", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 160.0, "name": "Display text" }, { "group": -1.0, "x": -288.0, "id": 254863834.0, "inputs": [ { "from node": 930439119.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 4.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 32.0, 32.0, 32.0, 32.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 20.0, 30.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 45.0, 135.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ -416240001210060.0, -288240001210060.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0, 1.0, 1.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ 0.0 ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0, 1.0, 1.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 2.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 217.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 291.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Particle", "y": -32.0, "name": "Particle" }, { "group": -1.0, "x": -416.0, "id": 660826364.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Particle is one of a node in Pixel Composer which allow you to simulate particle effect.", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -128.0, "name": "Display text" }, { "group": -1.0, "x": 160.0, "id": 216943566.0, "inputs": [ { "from node": 254863834.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, -1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": 1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 30.96000000000000085265128291212, 17.21999999999999886313162278384, 32.869999999999997442046151263639, 15.22000000000000063948846218409, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 1.0, 1.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 4.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ -2.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 180.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 0.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Particle_Effector", "y": -32.0, "name": "Effector" }, { "group": -1.0, "x": -416.0, "id": 676613630.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Getting started 5: Particle and effectors", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -192.0, "name": "Display text" }, { "group": -1.0, "x": 288.0, "id": 569002150.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "You can apply multiple effects by chaining particle data to multiple effectors.", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 300.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 64.0, "name": "Display text" }, { "group": -1.0, "x": -480.0, "id": 930439119.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 8.0, 8.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 4.0, 4.0, 4.0, 4.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 3.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Shape", "y": -32.0, "name": "Shape" }, { "group": -1.0, "x": 160.0, "id": 611339757.0, "inputs": [ { "from node": 216943566.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, -1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 39.130000000000002557953848736361, 38.259999999999998010480339871719, 23.3000000000000007105427357601, 23.21999999999999886313162278384, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 1.0, 1.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 4.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ -1.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 180.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 0.0, 0.0 ], 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Particle_Effector", "y": 64.0, "name": "Effector" }, { "group": -1.0, "x": -416.0, "id": 593948373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Welcome to Pixel Composer", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1000000.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -224.0, "name": "Display text" }, { "group": -1.0, "x": 288.0, "id": 887629234.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Particle effector node use the particle data from particle node and apply different force upon it.", 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 400.0, 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -32.0, "name": "Display text" } ], "version": 90.0, "animator": { "framerate": 15.0, "frames_total": 12.0 } } \ No newline at end of file diff --git a/datafiles/Getting started/arrowRight.png b/datafiles/Getting started/arrowRight.png new file mode 100644 index 000000000..a836920f1 Binary files /dev/null and b/datafiles/Getting started/arrowRight.png differ diff --git a/datafiles/Getting started/card_back.png b/datafiles/Getting started/card_back.png new file mode 100644 index 000000000..0a4c98397 Binary files /dev/null and b/datafiles/Getting started/card_back.png differ diff --git a/datafiles/Getting started/card_clubs_02.png b/datafiles/Getting started/card_clubs_02.png new file mode 100644 index 000000000..f65bab033 Binary files /dev/null and b/datafiles/Getting started/card_clubs_02.png differ diff --git a/datafiles/Getting started/card_clubs_03.png b/datafiles/Getting started/card_clubs_03.png new file mode 100644 index 000000000..29a87ebfc Binary files /dev/null and b/datafiles/Getting started/card_clubs_03.png differ diff --git a/datafiles/Getting started/card_clubs_04.png b/datafiles/Getting started/card_clubs_04.png new file mode 100644 index 000000000..d10a215f0 Binary files /dev/null and b/datafiles/Getting started/card_clubs_04.png differ diff --git a/datafiles/Getting started/card_clubs_05.png b/datafiles/Getting started/card_clubs_05.png new file mode 100644 index 000000000..f3ba22a9c Binary files /dev/null and b/datafiles/Getting started/card_clubs_05.png differ diff --git a/datafiles/Getting started/dice_1.png b/datafiles/Getting started/dice_1.png new file mode 100644 index 000000000..3b79c1e81 Binary files /dev/null and b/datafiles/Getting started/dice_1.png differ diff --git a/datafiles/Getting started/dice_2.png b/datafiles/Getting started/dice_2.png new file mode 100644 index 000000000..9a8a6c85c Binary files /dev/null and b/datafiles/Getting started/dice_2.png differ diff --git a/datafiles/Getting started/dice_3.png b/datafiles/Getting started/dice_3.png new file mode 100644 index 000000000..c84c8471c Binary files /dev/null and b/datafiles/Getting started/dice_3.png differ diff --git a/datafiles/Getting started/dice_4.png b/datafiles/Getting started/dice_4.png new file mode 100644 index 000000000..57e21720b Binary files /dev/null and b/datafiles/Getting started/dice_4.png differ diff --git a/datafiles/Getting started/dice_5.png b/datafiles/Getting started/dice_5.png new file mode 100644 index 000000000..d771a680b Binary files /dev/null and b/datafiles/Getting started/dice_5.png differ diff --git a/datafiles/Getting started/dice_6.png b/datafiles/Getting started/dice_6.png new file mode 100644 index 000000000..e34d41740 Binary files /dev/null and b/datafiles/Getting started/dice_6.png differ diff --git a/datafiles/Getting started/tile_0044.png b/datafiles/Getting started/tile_0044.png new file mode 100644 index 000000000..2d87d4ddf Binary files /dev/null and b/datafiles/Getting started/tile_0044.png differ diff --git a/datafiles/Getting started/tile_0067.png b/datafiles/Getting started/tile_0067.png new file mode 100644 index 000000000..791cb4674 Binary files /dev/null and b/datafiles/Getting started/tile_0067.png differ diff --git a/datafiles/Getting started/tile_0126.png b/datafiles/Getting started/tile_0126.png new file mode 100644 index 000000000..074bd034d Binary files /dev/null and b/datafiles/Getting started/tile_0126.png differ diff --git a/datafiles/data/fonts/NotoSans-Black.ttf b/datafiles/data/fonts/NotoSans-Black.ttf new file mode 100644 index 000000000..298c24022 Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Black.ttf differ diff --git a/datafiles/data/fonts/NotoSans-Bold.ttf b/datafiles/data/fonts/NotoSans-Bold.ttf new file mode 100644 index 000000000..3e68bc241 Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Bold.ttf differ diff --git a/datafiles/data/fonts/NotoSans-ExtraBold.ttf b/datafiles/data/fonts/NotoSans-ExtraBold.ttf new file mode 100644 index 000000000..ce254440e Binary files /dev/null and b/datafiles/data/fonts/NotoSans-ExtraBold.ttf differ diff --git a/datafiles/data/fonts/NotoSans-ExtraLight.ttf b/datafiles/data/fonts/NotoSans-ExtraLight.ttf new file mode 100644 index 000000000..ebddc5669 Binary files /dev/null and b/datafiles/data/fonts/NotoSans-ExtraLight.ttf differ diff --git a/datafiles/data/fonts/NotoSans-Italic.ttf b/datafiles/data/fonts/NotoSans-Italic.ttf new file mode 100644 index 000000000..eedc5e459 Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Italic.ttf differ diff --git a/datafiles/data/fonts/NotoSans-Light.ttf b/datafiles/data/fonts/NotoSans-Light.ttf new file mode 100644 index 000000000..9f9453e8b Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Light.ttf differ diff --git a/datafiles/data/fonts/NotoSans-Medium.ttf b/datafiles/data/fonts/NotoSans-Medium.ttf new file mode 100644 index 000000000..02dad4e2b Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Medium.ttf differ diff --git a/datafiles/data/fonts/NotoSans-Regular.ttf b/datafiles/data/fonts/NotoSans-Regular.ttf new file mode 100644 index 000000000..973bc2ed3 Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Regular.ttf differ diff --git a/datafiles/data/fonts/NotoSans-SemiBold.ttf b/datafiles/data/fonts/NotoSans-SemiBold.ttf new file mode 100644 index 000000000..182ac5d92 Binary files /dev/null and b/datafiles/data/fonts/NotoSans-SemiBold.ttf differ diff --git a/datafiles/data/fonts/NotoSans-Thin.ttf b/datafiles/data/fonts/NotoSans-Thin.ttf new file mode 100644 index 000000000..6d5ce81fb Binary files /dev/null and b/datafiles/data/fonts/NotoSans-Thin.ttf differ diff --git a/fonts/f_h3/f_h3.png b/fonts/_f_h3/_f_h3.png similarity index 100% rename from fonts/f_h3/f_h3.png rename to fonts/_f_h3/_f_h3.png diff --git a/fonts/f_h3/f_h3.yy b/fonts/_f_h3/_f_h3.yy similarity index 99% rename from fonts/f_h3/f_h3.yy rename to fonts/_f_h3/_f_h3.yy index 790bbb1ef..1e02d94f6 100644 --- a/fonts/f_h3/f_h3.yy +++ b/fonts/_f_h3/_f_h3.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_h3", "hinting": 0, "glyphOperations": 0, "interpreter": 0, @@ -21,6 +24,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, + "ascender": 0, "glyphs": { "32": {"x":2,"y":2,"w":7,"h":35,"character":32,"shift":7,"offset":0,}, "33": {"x":47,"y":76,"w":5,"h":35,"character":33,"shift":9,"offset":2,}, @@ -1207,8 +1211,4 @@ "name": "font", "path": "folders/font.yy", }, - "resourceVersion": "1.0", - "name": "f_h3", - "tags": [], - "resourceType": "GMFont", } \ No newline at end of file diff --git a/fonts/f_h3/f_h3.old.png b/fonts/_f_h3/f_h3.old.png similarity index 100% rename from fonts/f_h3/f_h3.old.png rename to fonts/_f_h3/f_h3.old.png diff --git a/fonts/f_h3/f_h3.old.yy b/fonts/_f_h3/f_h3.old.yy similarity index 100% rename from fonts/f_h3/f_h3.old.yy rename to fonts/_f_h3/f_h3.old.yy diff --git a/fonts/f_h3/f_h5.old.png b/fonts/_f_h3/f_h5.old.png similarity index 100% rename from fonts/f_h3/f_h5.old.png rename to fonts/_f_h3/f_h5.old.png diff --git a/fonts/f_h3/f_h5.old.yy b/fonts/_f_h3/f_h5.old.yy similarity index 100% rename from fonts/f_h3/f_h5.old.yy rename to fonts/_f_h3/f_h5.old.yy diff --git a/fonts/f_h3/f_h5.png b/fonts/_f_h3/f_h5.png similarity index 100% rename from fonts/f_h3/f_h5.png rename to fonts/_f_h3/f_h5.png diff --git a/fonts/f_h3/f_h5.yy b/fonts/_f_h3/f_h5.yy similarity index 100% rename from fonts/f_h3/f_h5.yy rename to fonts/_f_h3/f_h5.yy diff --git a/fonts/f_h3/f_p.old.png b/fonts/_f_h3/f_p.old.png similarity index 100% rename from fonts/f_h3/f_p.old.png rename to fonts/_f_h3/f_p.old.png diff --git a/fonts/f_h3/f_p.old.yy b/fonts/_f_h3/f_p.old.yy similarity index 100% rename from fonts/f_h3/f_p.old.yy rename to fonts/_f_h3/f_p.old.yy diff --git a/fonts/f_h3/f_p0.old.png b/fonts/_f_h3/f_p0.old.png similarity index 100% rename from fonts/f_h3/f_p0.old.png rename to fonts/_f_h3/f_p0.old.png diff --git a/fonts/f_h3/f_p0.old.yy b/fonts/_f_h3/f_p0.old.yy similarity index 100% rename from fonts/f_h3/f_p0.old.yy rename to fonts/_f_h3/f_p0.old.yy diff --git a/fonts/f_h3/f_p0.png b/fonts/_f_h3/f_p0.png similarity index 100% rename from fonts/f_h3/f_p0.png rename to fonts/_f_h3/f_p0.png diff --git a/fonts/f_h3/f_p0.yy b/fonts/_f_h3/f_p0.yy similarity index 100% rename from fonts/f_h3/f_p0.yy rename to fonts/_f_h3/f_p0.yy diff --git a/fonts/f_h5/f_h5.png b/fonts/_f_h5/_f_h5.png similarity index 100% rename from fonts/f_h5/f_h5.png rename to fonts/_f_h5/_f_h5.png diff --git a/fonts/f_h5/f_h5.yy b/fonts/_f_h5/_f_h5.yy similarity index 99% rename from fonts/f_h5/f_h5.yy rename to fonts/_f_h5/_f_h5.yy index cac491699..f9ac678da 100644 --- a/fonts/f_h5/f_h5.yy +++ b/fonts/_f_h5/_f_h5.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_h5", "hinting": 0, "glyphOperations": 0, "interpreter": 0, @@ -21,6 +24,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, + "ascender": 0, "glyphs": { "32": {"x":2,"y":2,"w":6,"h":28,"character":32,"shift":6,"offset":0,}, "33": {"x":117,"y":92,"w":5,"h":28,"character":33,"shift":7,"offset":1,}, @@ -886,8 +890,4 @@ "name": "font", "path": "folders/font.yy", }, - "resourceVersion": "1.0", - "name": "f_h5", - "tags": [], - "resourceType": "GMFont", } \ No newline at end of file diff --git a/fonts/f_h5/f_h5.old.png b/fonts/_f_h5/f_h5.old.png similarity index 100% rename from fonts/f_h5/f_h5.old.png rename to fonts/_f_h5/f_h5.old.png diff --git a/fonts/f_h5/f_h5.old.yy b/fonts/_f_h5/f_h5.old.yy similarity index 100% rename from fonts/f_h5/f_h5.old.yy rename to fonts/_f_h5/f_h5.old.yy diff --git a/fonts/f_h5/f_p.old.png b/fonts/_f_h5/f_p.old.png similarity index 100% rename from fonts/f_h5/f_p.old.png rename to fonts/_f_h5/f_p.old.png diff --git a/fonts/f_h5/f_p.old.yy b/fonts/_f_h5/f_p.old.yy similarity index 100% rename from fonts/f_h5/f_p.old.yy rename to fonts/_f_h5/f_p.old.yy diff --git a/fonts/f_h5/f_p0.old.png b/fonts/_f_h5/f_p0.old.png similarity index 100% rename from fonts/f_h5/f_p0.old.png rename to fonts/_f_h5/f_p0.old.png diff --git a/fonts/f_h5/f_p0.old.yy b/fonts/_f_h5/f_p0.old.yy similarity index 100% rename from fonts/f_h5/f_p0.old.yy rename to fonts/_f_h5/f_p0.old.yy diff --git a/fonts/f_h5/f_p0.png b/fonts/_f_h5/f_p0.png similarity index 100% rename from fonts/f_h5/f_p0.png rename to fonts/_f_h5/f_p0.png diff --git a/fonts/f_h5/f_p0.yy b/fonts/_f_h5/f_p0.yy similarity index 100% rename from fonts/f_h5/f_p0.yy rename to fonts/_f_h5/f_p0.yy diff --git a/fonts/f_p0/f_p0.png b/fonts/_f_p0/_f_p0.png similarity index 100% rename from fonts/f_p0/f_p0.png rename to fonts/_f_p0/_f_p0.png diff --git a/fonts/f_p0/f_p0.yy b/fonts/_f_p0/_f_p0.yy similarity index 99% rename from fonts/f_p0/f_p0.yy rename to fonts/_f_p0/_f_p0.yy index 2fe95ad3c..c2bd48661 100644 --- a/fonts/f_p0/f_p0.yy +++ b/fonts/_f_p0/_f_p0.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_p0", "hinting": 0, "glyphOperations": 0, "interpreter": 0, @@ -21,6 +24,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, + "ascender": 0, "glyphs": { "32": {"x":2,"y":2,"w":4,"h":21,"character":32,"shift":4,"offset":0,}, "33": {"x":163,"y":48,"w":3,"h":21,"character":33,"shift":5,"offset":1,}, @@ -575,8 +579,4 @@ "name": "font", "path": "folders/font.yy", }, - "resourceVersion": "1.0", - "name": "f_p0", - "tags": [], - "resourceType": "GMFont", } \ No newline at end of file diff --git a/fonts/f_p0/f_p.old.png b/fonts/_f_p0/f_p.old.png similarity index 100% rename from fonts/f_p0/f_p.old.png rename to fonts/_f_p0/f_p.old.png diff --git a/fonts/f_p0/f_p.old.yy b/fonts/_f_p0/f_p.old.yy similarity index 100% rename from fonts/f_p0/f_p.old.yy rename to fonts/_f_p0/f_p.old.yy diff --git a/fonts/f_p0/f_p0.old.png b/fonts/_f_p0/f_p0.old.png similarity index 100% rename from fonts/f_p0/f_p0.old.png rename to fonts/_f_p0/f_p0.old.png diff --git a/fonts/f_p0/f_p0.old.yy b/fonts/_f_p0/f_p0.old.yy similarity index 100% rename from fonts/f_p0/f_p0.old.yy rename to fonts/_f_p0/f_p0.old.yy diff --git a/fonts/f_p0b/f_p0b.png b/fonts/_f_p0b/_f_p0b.png similarity index 100% rename from fonts/f_p0b/f_p0b.png rename to fonts/_f_p0b/_f_p0b.png diff --git a/fonts/f_p0b/f_p0b.yy b/fonts/_f_p0b/_f_p0b.yy similarity index 99% rename from fonts/f_p0b/f_p0b.yy rename to fonts/_f_p0b/_f_p0b.yy index 56e4c21ec..5a060efee 100644 --- a/fonts/f_p0b/f_p0b.yy +++ b/fonts/_f_p0b/_f_p0b.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_p0b", "hinting": 0, "glyphOperations": 0, "interpreter": 0, @@ -21,6 +24,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, + "ascender": 0, "glyphs": { "32": {"x":2,"y":2,"w":4,"h":21,"character":32,"shift":4,"offset":0,}, "33": {"x":200,"y":48,"w":4,"h":21,"character":33,"shift":5,"offset":1,}, @@ -549,8 +553,4 @@ "name": "font", "path": "folders/font.yy", }, - "resourceVersion": "1.0", - "name": "f_p0b", - "tags": [], - "resourceType": "GMFont", } \ No newline at end of file diff --git a/fonts/f_p0b/f_p.old.png b/fonts/_f_p0b/f_p.old.png similarity index 100% rename from fonts/f_p0b/f_p.old.png rename to fonts/_f_p0b/f_p.old.png diff --git a/fonts/f_p0b/f_p.old.yy b/fonts/_f_p0b/f_p.old.yy similarity index 100% rename from fonts/f_p0b/f_p.old.yy rename to fonts/_f_p0b/f_p.old.yy diff --git a/fonts/f_p0b/f_p0.old.png b/fonts/_f_p0b/f_p0.old.png similarity index 100% rename from fonts/f_p0b/f_p0.old.png rename to fonts/_f_p0b/f_p0.old.png diff --git a/fonts/f_p0b/f_p0.old.yy b/fonts/_f_p0b/f_p0.old.yy similarity index 100% rename from fonts/f_p0b/f_p0.old.yy rename to fonts/_f_p0b/f_p0.old.yy diff --git a/fonts/f_p0b/f_p0.png b/fonts/_f_p0b/f_p0.png similarity index 100% rename from fonts/f_p0b/f_p0.png rename to fonts/_f_p0b/f_p0.png diff --git a/fonts/f_p0b/f_p0.yy b/fonts/_f_p0b/f_p0.yy similarity index 100% rename from fonts/f_p0b/f_p0.yy rename to fonts/_f_p0b/f_p0.yy diff --git a/fonts/f_p0b/f_p0b.old.png b/fonts/_f_p0b/f_p0b.old.png similarity index 100% rename from fonts/f_p0b/f_p0b.old.png rename to fonts/_f_p0b/f_p0b.old.png diff --git a/fonts/f_p0b/f_p0b.old.yy b/fonts/_f_p0b/f_p0b.old.yy similarity index 100% rename from fonts/f_p0b/f_p0b.old.yy rename to fonts/_f_p0b/f_p0b.old.yy diff --git a/fonts/f_p1/f_p1.png b/fonts/_f_p1/_f_p1.png similarity index 100% rename from fonts/f_p1/f_p1.png rename to fonts/_f_p1/_f_p1.png diff --git a/fonts/f_p1/f_p1.yy b/fonts/_f_p1/_f_p1.yy similarity index 99% rename from fonts/f_p1/f_p1.yy rename to fonts/_f_p1/_f_p1.yy index c419bd694..dda88c030 100644 --- a/fonts/f_p1/f_p1.yy +++ b/fonts/_f_p1/_f_p1.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_p1", "hinting": 0, "glyphOperations": 0, "interpreter": 0, @@ -21,6 +24,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, + "ascender": 0, "glyphs": { "32": {"x":2,"y":2,"w":4,"h":20,"character":32,"shift":4,"offset":0,}, "33": {"x":128,"y":46,"w":3,"h":20,"character":33,"shift":5,"offset":1,}, @@ -473,8 +477,4 @@ "name": "font", "path": "folders/font.yy", }, - "resourceVersion": "1.0", - "name": "f_p1", - "tags": [], - "resourceType": "GMFont", } \ No newline at end of file diff --git a/fonts/f_p1/f_p.old.png b/fonts/_f_p1/f_p.old.png similarity index 100% rename from fonts/f_p1/f_p.old.png rename to fonts/_f_p1/f_p.old.png diff --git a/fonts/f_p1/f_p.old.yy b/fonts/_f_p1/f_p.old.yy similarity index 100% rename from fonts/f_p1/f_p.old.yy rename to fonts/_f_p1/f_p.old.yy diff --git a/fonts/f_p1/f_p.png b/fonts/_f_p1/f_p.png similarity index 100% rename from fonts/f_p1/f_p.png rename to fonts/_f_p1/f_p.png diff --git a/fonts/f_p1/f_p.yy b/fonts/_f_p1/f_p.yy similarity index 100% rename from fonts/f_p1/f_p.yy rename to fonts/_f_p1/f_p.yy diff --git a/fonts/f_p1/f_p1.old.png b/fonts/_f_p1/f_p1.old.png similarity index 100% rename from fonts/f_p1/f_p1.old.png rename to fonts/_f_p1/f_p1.old.png diff --git a/fonts/f_p1/f_p1.old.yy b/fonts/_f_p1/f_p1.old.yy similarity index 100% rename from fonts/f_p1/f_p1.old.yy rename to fonts/_f_p1/f_p1.old.yy diff --git a/fonts/f_p2/f_p2.png b/fonts/_f_p2/_f_p2.png similarity index 100% rename from fonts/f_p2/f_p2.png rename to fonts/_f_p2/_f_p2.png diff --git a/fonts/f_p2/f_p2.yy b/fonts/_f_p2/_f_p2.yy similarity index 99% rename from fonts/f_p2/f_p2.yy rename to fonts/_f_p2/_f_p2.yy index 5e54d7361..bcac9e46a 100644 --- a/fonts/f_p2/f_p2.yy +++ b/fonts/_f_p2/_f_p2.yy @@ -1,7 +1,7 @@ { "resourceType": "GMFont", "resourceVersion": "1.0", - "name": "f_p2", + "name": "_f_p2", "hinting": 0, "glyphOperations": 0, "interpreter": 0, diff --git a/fonts/f_p2/f_p.old.png b/fonts/_f_p2/f_p.old.png similarity index 100% rename from fonts/f_p2/f_p.old.png rename to fonts/_f_p2/f_p.old.png diff --git a/fonts/f_p2/f_p.old.yy b/fonts/_f_p2/f_p.old.yy similarity index 100% rename from fonts/f_p2/f_p.old.yy rename to fonts/_f_p2/f_p.old.yy diff --git a/fonts/f_p2/f_p.png b/fonts/_f_p2/f_p.png similarity index 100% rename from fonts/f_p2/f_p.png rename to fonts/_f_p2/f_p.png diff --git a/fonts/f_p2/f_p.yy b/fonts/_f_p2/f_p.yy similarity index 100% rename from fonts/f_p2/f_p.yy rename to fonts/_f_p2/f_p.yy diff --git a/fonts/f_p2/f_p1.old.png b/fonts/_f_p2/f_p1.old.png similarity index 100% rename from fonts/f_p2/f_p1.old.png rename to fonts/_f_p2/f_p1.old.png diff --git a/fonts/f_p2/f_p1.old.yy b/fonts/_f_p2/f_p1.old.yy similarity index 100% rename from fonts/f_p2/f_p1.old.yy rename to fonts/_f_p2/f_p1.old.yy diff --git a/fonts/f_p2/f_p1.png b/fonts/_f_p2/f_p1.png similarity index 100% rename from fonts/f_p2/f_p1.png rename to fonts/_f_p2/f_p1.png diff --git a/fonts/f_p2/f_p1.yy b/fonts/_f_p2/f_p1.yy similarity index 100% rename from fonts/f_p2/f_p1.yy rename to fonts/_f_p2/f_p1.yy diff --git a/fonts/f_p2/f_p2.old.png b/fonts/_f_p2/f_p2.old.png similarity index 100% rename from fonts/f_p2/f_p2.old.png rename to fonts/_f_p2/f_p2.old.png diff --git a/fonts/f_p2/f_p2.old.yy b/fonts/_f_p2/f_p2.old.yy similarity index 100% rename from fonts/f_p2/f_p2.old.yy rename to fonts/_f_p2/f_p2.old.yy diff --git a/fonts/f_p3/f_p3.png b/fonts/_f_p3/_f_p3.png similarity index 100% rename from fonts/f_p3/f_p3.png rename to fonts/_f_p3/_f_p3.png diff --git a/fonts/f_p3/f_p3.yy b/fonts/_f_p3/_f_p3.yy similarity index 99% rename from fonts/f_p3/f_p3.yy rename to fonts/_f_p3/_f_p3.yy index 9b30a24a4..9edc6c8a6 100644 --- a/fonts/f_p3/f_p3.yy +++ b/fonts/_f_p3/_f_p3.yy @@ -1,7 +1,7 @@ { "resourceType": "GMFont", "resourceVersion": "1.0", - "name": "f_p3", + "name": "_f_p3", "hinting": 0, "glyphOperations": 0, "interpreter": 0, diff --git a/fonts/f_p3/f_p.old.png b/fonts/_f_p3/f_p.old.png similarity index 100% rename from fonts/f_p3/f_p.old.png rename to fonts/_f_p3/f_p.old.png diff --git a/fonts/f_p3/f_p.old.yy b/fonts/_f_p3/f_p.old.yy similarity index 100% rename from fonts/f_p3/f_p.old.yy rename to fonts/_f_p3/f_p.old.yy diff --git a/fonts/f_p3/f_p.png b/fonts/_f_p3/f_p.png similarity index 100% rename from fonts/f_p3/f_p.png rename to fonts/_f_p3/f_p.png diff --git a/fonts/f_p3/f_p.yy b/fonts/_f_p3/f_p.yy similarity index 100% rename from fonts/f_p3/f_p.yy rename to fonts/_f_p3/f_p.yy diff --git a/fonts/f_p3/f_p1.old.png b/fonts/_f_p3/f_p1.old.png similarity index 100% rename from fonts/f_p3/f_p1.old.png rename to fonts/_f_p3/f_p1.old.png diff --git a/fonts/f_p3/f_p1.old.yy b/fonts/_f_p3/f_p1.old.yy similarity index 100% rename from fonts/f_p3/f_p1.old.yy rename to fonts/_f_p3/f_p1.old.yy diff --git a/fonts/f_p3/f_p1.png b/fonts/_f_p3/f_p1.png similarity index 100% rename from fonts/f_p3/f_p1.png rename to fonts/_f_p3/f_p1.png diff --git a/fonts/f_p3/f_p1.yy b/fonts/_f_p3/f_p1.yy similarity index 100% rename from fonts/f_p3/f_p1.yy rename to fonts/_f_p3/f_p1.yy diff --git a/fonts/f_p3/f_p2.old.png b/fonts/_f_p3/f_p2.old.png similarity index 100% rename from fonts/f_p3/f_p2.old.png rename to fonts/_f_p3/f_p2.old.png diff --git a/fonts/f_p3/f_p2.old.yy b/fonts/_f_p3/f_p2.old.yy similarity index 100% rename from fonts/f_p3/f_p2.old.yy rename to fonts/_f_p3/f_p2.old.yy diff --git a/fonts/f_p3/f_p2.png b/fonts/_f_p3/f_p2.png similarity index 100% rename from fonts/f_p3/f_p2.png rename to fonts/_f_p3/f_p2.png diff --git a/fonts/f_p3/f_p3.old.png b/fonts/_f_p3/f_p3.old.png similarity index 100% rename from fonts/f_p3/f_p3.old.png rename to fonts/_f_p3/f_p3.old.png diff --git a/fonts/f_p3/f_p3.old.yy b/fonts/_f_p3/f_p3.old.yy similarity index 100% rename from fonts/f_p3/f_p3.old.yy rename to fonts/_f_p3/f_p3.old.yy diff --git a/objects/_p_dialog/Alarm_0.gml b/objects/_p_dialog/Alarm_0.gml index f2d1c0634..9b61d6194 100644 --- a/objects/_p_dialog/Alarm_0.gml +++ b/objects/_p_dialog/Alarm_0.gml @@ -1,16 +1,3 @@ /// @description init -#region anchor - if(anchor == ANCHOR.none) { - dialog_x = x - dialog_w / 2; - dialog_y = y - dialog_h / 2; - } else { - if(anchor & ANCHOR.left) dialog_x = min(x, WIN_W - dialog_w); - if(anchor & ANCHOR.right) dialog_x = max(x - dialog_w, 0); - if(anchor & ANCHOR.top) dialog_y = min(y, WIN_H - dialog_h); - if(anchor & ANCHOR.bottom) dialog_y = max(y - dialog_h, 0); - } -#endregion - -dialog_x = round(dialog_x); -dialog_y = round(dialog_y); +resetPosition(); ready = true; \ No newline at end of file diff --git a/objects/_p_dialog/Create_0.gml b/objects/_p_dialog/Create_0.gml index 0d522b446..cdc5926cb 100644 --- a/objects/_p_dialog/Create_0.gml +++ b/objects/_p_dialog/Create_0.gml @@ -88,4 +88,19 @@ } } } -#endregion \ No newline at end of file + + function resetPosition() { + if(anchor == ANCHOR.none) { + dialog_x = xstart - dialog_w / 2; + dialog_y = ystart - dialog_h / 2; + } else { + if(anchor & ANCHOR.left) dialog_x = min(xstart, WIN_SW - dialog_w); + if(anchor & ANCHOR.right) dialog_x = max(xstart - dialog_w, 0); + if(anchor & ANCHOR.top) dialog_y = min(ystart, WIN_SH - dialog_h); + if(anchor & ANCHOR.bottom) dialog_y = max(ystart - dialog_h, 0); + } + dialog_x = round(dialog_x); + dialog_y = round(dialog_y); + } +#endregion + diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 1c09d65d4..2b66d57c6 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -233,8 +233,8 @@ event_inherited(); dialog_resizable = true; dialog_w_min = 200; dialog_h_min = 120; - dialog_w_max = 640; - dialog_h_max = 480; + dialog_w_max = 800; + dialog_h_max = 640; onResize = function() { catagory_pane.resize(132, dialog_h - 66); diff --git a/objects/o_dialog_inspector_grid/Create_0.gml b/objects/o_dialog_inspector_grid/Create_0.gml index 0f66e0b6c..0b9af9986 100644 --- a/objects/o_dialog_inspector_grid/Create_0.gml +++ b/objects/o_dialog_inspector_grid/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 280; - dialog_h = 144; + dialog_w = 320; + dialog_h = 180; destroy_on_click_out = true; #endregion @@ -16,4 +16,8 @@ event_inherited(); tb_size = new textBox(TEXTBOX_INPUT.number, function(str) { PANEL_GRAPH.graph_line_s = max(1, real(str)); }) + + sl_opacity = new slider(0, 1, .05, function(str) { + PANEL_GRAPH.grid_opacity = clamp(real(str), 0, 1); + }) #endregion \ No newline at end of file diff --git a/objects/o_dialog_inspector_grid/Draw_64.gml b/objects/o_dialog_inspector_grid/Draw_64.gml index a365b7eb9..553a14744 100644 --- a/objects/o_dialog_inspector_grid/Draw_64.gml +++ b/objects/o_dialog_inspector_grid/Draw_64.gml @@ -12,17 +12,25 @@ if !ready exit; #region draw var yy = dialog_y + 44; + var ww = 128; cb_enable.active = FOCUS == self; cb_enable.hover = HOVER == self; draw_set_text(f_p1, fa_left, fa_center, c_white); draw_text(dialog_x + 32, yy + 17, "Snap to grid"); - cb_enable.draw(dialog_x + dialog_w - 24 - 48 - 14, yy, PANEL_GRAPH.node_drag_snap, [mouse_mx, mouse_my]); + cb_enable.draw(dialog_x + dialog_w - 24 - ww / 2 - 14, yy, PANEL_GRAPH.node_drag_snap, [mouse_mx, mouse_my]); - yy += 44; + yy += 40; tb_size.active = FOCUS == self; tb_size.hover = HOVER == self; draw_set_text(f_p1, fa_left, fa_center, c_white); draw_text(dialog_x + 32, yy + 17, "Grid size"); - tb_size.draw(dialog_x + dialog_w - 24 - 96, yy, 96, 34, PANEL_GRAPH.graph_line_s, [mouse_mx, mouse_my]); + tb_size.draw(dialog_x + dialog_w - 24 - ww, yy, ww, 34, PANEL_GRAPH.graph_line_s, [mouse_mx, mouse_my]); + + yy += 40; + sl_opacity.active = FOCUS == self; + sl_opacity.hover = HOVER == self; + draw_set_text(f_p1, fa_left, fa_center, c_white); + draw_text(dialog_x + 32, yy + 17, "Grid opacity"); + sl_opacity.draw(dialog_x + dialog_w - 24 - ww, yy, ww, 34, PANEL_GRAPH.grid_opacity, [mouse_mx, mouse_my], 52); #endregion \ No newline at end of file diff --git a/objects/o_dialog_menubox/Create_0.gml b/objects/o_dialog_menubox/Create_0.gml index 27882bd37..53533d2b3 100644 --- a/objects/o_dialog_menubox/Create_0.gml +++ b/objects/o_dialog_menubox/Create_0.gml @@ -3,10 +3,12 @@ event_inherited(); #region data draggable = false; - destroy_on_click_out = true; + destroy_on_click_out = false; alarm[0] = -1; menu = 1; hght = 36; + children = ds_list_create(); + ds_list_add(children, self); function setMenu(_menu) { menu = _menu; @@ -16,6 +18,12 @@ event_inherited(); dialog_w = 0; dialog_h = 0; + while(ds_list_size(children) > 1) { + var ch = children[| 1]; + instance_destroy(children[| 1]); + ds_list_delete(children, 1); + } + draw_set_text(f_p0, fa_center, fa_center, c_white); for(var i = 0; i < array_length(menu); i++) { if(!is_array(menu[i])) { @@ -26,11 +34,15 @@ event_inherited(); var ww = string_width(menu[i][0]) + 64; if(array_length(menu[i]) > 2) { - var _key = find_hotkey(menu[i][2][0], menu[i][2][1]); - if(_key) { - draw_set_font(f_p1); - var ss = key_get_name(_key.key, _key.modi); - ww += string_width(ss) + 16; + if(menu[i][2] == ">") { + + } else if(is_array(menu[i][2])) { + var _key = find_hotkey(menu[i][2][0], menu[i][2][1]); + if(_key) { + draw_set_font(f_p1); + var ss = key_get_name(_key.key, _key.modi); + ww += string_width(ss) + 16; + } } } dialog_w = max(dialog_w, ww); diff --git a/objects/o_dialog_menubox/Destroy_0.gml b/objects/o_dialog_menubox/Destroy_0.gml new file mode 100644 index 000000000..dfb1a82aa --- /dev/null +++ b/objects/o_dialog_menubox/Destroy_0.gml @@ -0,0 +1,4 @@ +/// @description +event_inherited(); + +ds_list_destroy(children); \ No newline at end of file diff --git a/objects/o_dialog_menubox/Draw_64.gml b/objects/o_dialog_menubox/Draw_64.gml index 443a4e352..1322b725a 100644 --- a/objects/o_dialog_menubox/Draw_64.gml +++ b/objects/o_dialog_menubox/Draw_64.gml @@ -21,8 +21,11 @@ if(FOCUS == self && mouse_check_button_released(mb_left)) { if(!is_array(menu[i][1])) { - menu[i][1](); - instance_destroy(); + var res = menu[i][1](dialog_x + dialog_w, yy, depth, menu[i][0]); + if(array_safe_get(menu[i], 2, 0) == ">") + ds_list_add(children, res); + else + instance_destroy(o_dialog_menubox); } } } @@ -54,7 +57,7 @@ if(FOCUS == self && mouse_check_button_pressed(mb_left)) { menu[i][1][j][1](); - instance_destroy(); + instance_destroy(o_dialog_menubox); } } @@ -66,10 +69,14 @@ } if(array_length(menu[i]) > 2) { - var _key = find_hotkey(menu[i][2][0], menu[i][2][1]); - if(_key) { - draw_set_text(f_p1, fa_right, fa_center, c_ui_blue_grey); - draw_text(dialog_x + dialog_w - 16, yy + hght / 2, key_get_name(_key.key, _key.modi)); + if(menu[i][2] == ">") { + draw_sprite_ext(s_arrow_16, 0, dialog_x + dialog_w - 20, yy + hght / 2, 1, 1, 0, c_ui_blue_dkgrey, 1); + } else if(is_array(menu[i][2])) { + var _key = find_hotkey(menu[i][2][0], menu[i][2][1]); + if(_key) { + draw_set_text(f_p1, fa_right, fa_center, c_ui_blue_grey); + draw_text(dialog_x + dialog_w - 16, yy + hght / 2, key_get_name(_key.key, _key.modi)); + } } } diff --git a/objects/o_dialog_menubox/Step_1.gml b/objects/o_dialog_menubox/Step_1.gml new file mode 100644 index 000000000..9f77e9b2f --- /dev/null +++ b/objects/o_dialog_menubox/Step_1.gml @@ -0,0 +1,19 @@ +/// @description +if !ready exit; + +#region destroy + var hovering = false; + + for( var i = 0; i < ds_list_size(children); i++ ) { + var ch = children[| i]; + if(!instance_exists(ch)) continue; + var x0 = ch.dialog_x; + var x1 = ch.dialog_x + ch.dialog_w; + var y0 = ch.dialog_y; + var y1 = ch.dialog_y + ch.dialog_h; + hovering |= point_in_rectangle(mouse_mx, mouse_my, x0, y0, x1, y1); + } + + if(!hovering && mouse_check_button_pressed(mb_left)) + instance_destroy(self); +#endregion \ No newline at end of file diff --git a/objects/o_dialog_menubox/o_dialog_menubox.yy b/objects/o_dialog_menubox/o_dialog_menubox.yy index 4191ef868..2f37e5474 100644 --- a/objects/o_dialog_menubox/o_dialog_menubox.yy +++ b/objects/o_dialog_menubox/o_dialog_menubox.yy @@ -27,6 +27,8 @@ "eventList": [ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/o_dialog_preference/Create_0.gml b/objects/o_dialog_preference/Create_0.gml index 220789d10..3268eb643 100644 --- a/objects/o_dialog_preference/Create_0.gml +++ b/objects/o_dialog_preference/Create_0.gml @@ -17,8 +17,8 @@ event_inherited(); dialog_h_max = 800; onResize = function() { - sp_pref.resize(dialog_w - 160 - 32, dialog_h - 56 - 28); - sp_hotkey.resize(dialog_w - 160 - 32, dialog_h - 56 - 28); + sp_pref.resize(dialog_w - 160 - 32, dialog_h - 56 - 24); + sp_hotkey.resize(dialog_w - 160 - 32, dialog_h - 56 - 24); } #endregion @@ -41,11 +41,14 @@ event_inherited(); ]); ds_list_add(pref_global, [ - "Curve connection line", - "curve_connection_line", - new checkBox(function() { - PREF_MAP[? "curve_connection_line"] = !PREF_MAP[? "curve_connection_line"]; + "GUI scaling", + "display_scaling", + new slider(0.5, 2, 0.01, function(val) { + PREF_MAP[? "display_scaling"] = val; PREF_SAVE(); + }, function() { + setPanel(); + loadFonts(); }) ]); @@ -148,7 +151,7 @@ event_inherited(); current_list = pref_global; - sp_pref = new scrollPane(dialog_w - 160 - 32, dialog_h - 64 - 28, function(_y, _m) { + sp_pref = new scrollPane(dialog_w - 160 - 32, dialog_h - 64 - 24, function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); var hh = 0; var th = 34; @@ -164,6 +167,7 @@ event_inherited(); draw_set_text(f_p0b, fa_left, fa_top, c_ui_blue_grey); draw_text(8, yy, _pref); yy += string_height(_pref) + 8; + hh += string_height(_pref) + 8; ind = 0; continue; } @@ -187,7 +191,7 @@ event_inherited(); _pref[2].draw(x1 - 36, yy + 2, PREF_MAP[? _pref[1]], _m); break; case "slider" : - _pref[2].draw(x1 - 4 - 160, yy + 2, 160, 34, PREF_MAP[? _pref[1]], _m); + _pref[2].draw(x1 - 4 - 200, yy + 2, 200, 34, PREF_MAP[? _pref[1]], _m); break; } @@ -217,7 +221,7 @@ event_inherited(); ]; hk_editing = noone; - sp_hotkey = new scrollPane(dialog_w - 160 - 32, dialog_h - 64 - 28, function(_y, _m) { + sp_hotkey = new scrollPane(dialog_w - 160 - 32, dialog_h - 64 - 24, function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); var padd = 8; var hh = 0; diff --git a/objects/o_dialog_preference/Draw_64.gml b/objects/o_dialog_preference/Draw_64.gml index d8d964c1e..3306aa4bb 100644 --- a/objects/o_dialog_preference/Draw_64.gml +++ b/objects/o_dialog_preference/Draw_64.gml @@ -31,7 +31,7 @@ if !ready exit; #endregion #region draw - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 160, yy - 8, dialog_w - 160 - 16, dialog_h - 56 - 8); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 160, yy - 8, dialog_w - 160 - 16, dialog_h - 56 - 16); tb_search.auto_update = true; tb_search.no_empty = false; diff --git a/objects/o_dialog_splash/Create_0.gml b/objects/o_dialog_splash/Create_0.gml index f37ab9836..4720d7db4 100644 --- a/objects/o_dialog_splash/Create_0.gml +++ b/objects/o_dialog_splash/Create_0.gml @@ -23,6 +23,7 @@ event_inherited(); for(var i = 0; i < ds_list_size(RECENT_FILES); i++) { var _rec = RECENT_FILES[| i]; + if(!file_exists(_rec)) continue; draw_sprite_stretched(s_ui_panel_bg, 1, 0, _y, sp_recent.surface_w, hg); if(HOVER == self && point_in_rectangle(_m[0], _m[1], 0, _y, sp_recent.surface_w, _y + hg)) { @@ -85,7 +86,7 @@ event_inherited(); draw_sprite(_node.spr, 0, _boxx + grid_width / 2, yy + grid_heigh / 2); var tx = _boxx + grid_width / 2; - var ty = yy + grid_heigh + 6; + var ty = yy + grid_heigh + 4; draw_set_text(f_p2, fa_center, fa_top, c_ui_blue_dkgrey); var _tw = string_width(_node.tag); var _th = string_height(_node.tag); diff --git a/objects/o_dialog_splash/Draw_64.gml b/objects/o_dialog_splash/Draw_64.gml index 344acd15d..587014297 100644 --- a/objects/o_dialog_splash/Draw_64.gml +++ b/objects/o_dialog_splash/Draw_64.gml @@ -12,7 +12,7 @@ if !ready exit; draw_set_text(f_h5, fa_left, fa_bottom, c_ui_orange); draw_text(dialog_x + 56 + 40, dialog_y + 70, "Pixel Composer"); - var bx = dialog_x + 256; + var bx = dialog_x + 266; var by = dialog_y + 40; var txt = "v. " + VERSION_STRING; draw_set_text(f_p0, fa_center, fa_center, c_ui_blue_grey); @@ -24,10 +24,16 @@ if !ready exit; var bx = dialog_x + dialog_w - 16 - 36; var by = dialog_y + 16; - if(buttonInstant(s_button_hide, bx, by, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_gear_24) == 2) { + if(buttonInstant(s_button_hide, bx, by, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Prefernece", s_gear_24) == 2) { dialogCall(o_dialog_preference, WIN_W / 2, WIN_H / 2); } + bx -= 40; + if(buttonInstant(s_button_hide, bx, by, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Show on startup", s_icon_spalsh_show_on_start, PREF_MAP[? "show_splash"]) == 2) { + PREF_MAP[? "show_splash"] = !PREF_MAP[? "show_splash"]; + PREF_SAVE(); + } + var x0 = dialog_x + 16; var x1 = x0 + 288; var y0 = dialog_y + 128; diff --git a/objects/o_dialog_splash/o_dialog_splash.yy b/objects/o_dialog_splash/o_dialog_splash.yy index 01e318ce7..a430249b5 100644 --- a/objects/o_dialog_splash/o_dialog_splash.yy +++ b/objects/o_dialog_splash/o_dialog_splash.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_splash", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -30,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_splash", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_main/Alarm_1.gml b/objects/o_main/Alarm_1.gml index 1179e6750..9b14366dc 100644 --- a/objects/o_main/Alarm_1.gml +++ b/objects/o_main/Alarm_1.gml @@ -5,7 +5,6 @@ LOAD_SAMPLE(); INIT_FOLDERS(); - if(!file_exists(file_open_parameter) && PREF_MAP[? "show_splash"]) { - dialogCall(o_dialog_splash, WIN_W / 2, WIN_H / 2); - } + if(!file_exists(file_open_parameter) && PREF_MAP[? "show_splash"]) + dialogCall(o_dialog_splash); #endregion \ No newline at end of file diff --git a/objects/o_main/Other_4.gml b/objects/o_main/Other_4.gml index 104db9f29..ee602a40d 100644 --- a/objects/o_main/Other_4.gml +++ b/objects/o_main/Other_4.gml @@ -1,2 +1,2 @@ /// @description init -alarm[1] = 2; \ No newline at end of file +MODIFIED = false; \ No newline at end of file diff --git a/objects/o_main/Step_0.gml b/objects/o_main/Step_0.gml index dd7fc8dde..13b3a4595 100644 --- a/objects/o_main/Step_0.gml +++ b/objects/o_main/Step_0.gml @@ -114,7 +114,7 @@ } if (window_command_check(window_command_close)) { - if(MODIFIED) { + if(MODIFIED && !READONLY) { dialogCall(o_dialog_exit); } else { PREF_SAVE(); diff --git a/objects/o_main/Step_1.gml b/objects/o_main/Step_1.gml index 038946b45..69f44fba0 100644 --- a/objects/o_main/Step_1.gml +++ b/objects/o_main/Step_1.gml @@ -9,25 +9,7 @@ CURSOR = cr_default; if((win_wp != WIN_W || win_hp != WIN_H) && (WIN_W > 1 && WIN_H > 1)) { - win_wp = WIN_W; - win_hp = WIN_H; - - room_width = WIN_W; - room_height = WIN_H; - - display_set_gui_size(win_wp, win_hp); - - clearPanel(); - setPanel(); - - PANEL_GRAPH.fullView(); - PANEL_PREVIEW.fullView(); - - alarm[0] = 10; - - PREF_MAP[? "window_width"] = WIN_W; - PREF_MAP[? "window_height"] = WIN_H; - PREF_SAVE(); + display_refresh(); renderAll(); } diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index e23f52618..7fe8ffd04 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -2,9 +2,9 @@ "resourceType": "GMWindowsOptions", "resourceVersion": "1.1", "name": "Windows", - "option_windows_display_name": "Pixel Composer 0.10.0", - "option_windows_executable_name": "${project_name} 0.10.0.exe", - "option_windows_version": "0.10.0.0", + "option_windows_display_name": "Pixel Composer 0.10.1", + "option_windows_executable_name": "${project_name} 0.10.1.exe", + "option_windows_version": "0.10.1.0", "option_windows_company_info": "MakhamDev", "option_windows_product_info": "Pixel Composer", "option_windows_copyright_info": "", diff --git a/scripts/checkbox/checkbox.gml b/scripts/checkbox/checkbox.gml index 15287c829..1e5f0840a 100644 --- a/scripts/checkbox/checkbox.gml +++ b/scripts/checkbox/checkbox.gml @@ -4,14 +4,14 @@ function checkBox(_onClick) constructor { onClick = _onClick; - static draw = function(_x, _y, _value, _m) { + static draw = function(_x, _y, _value, _m, _s = 28) { var cx = _x; var cy = _y; - draw_sprite_stretched(s_checkbox, _value * 2, cx, cy, 28, 28); + draw_sprite_stretched(s_checkbox, _value * 2, cx, cy, _s, _s); - if(hover && point_in_rectangle(_m[0], _m[1], cx, cy, cx + 28, cy + 28)) { - draw_sprite_stretched(s_checkbox, _value * 2 + 1, _x, _y, 28, 28); + if(hover && point_in_rectangle(_m[0], _m[1], cx, cy, cx + _s, cy + _s)) { + draw_sprite_stretched(s_checkbox, _value * 2 + 1, _x, _y, _s, _s); if(active && mouse_check_button_pressed(mb_left)) { if(onClick) onClick(); diff --git a/scripts/checkbox/checkbox.yy b/scripts/checkbox/checkbox.yy index b2a34fc25..9183b0557 100644 --- a/scripts/checkbox/checkbox.yy +++ b/scripts/checkbox/checkbox.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "checkbox", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "checkbox", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/controlPointBox/controlPointBox.gml b/scripts/controlPointBox/controlPointBox.gml index 15844cc81..45831a227 100644 --- a/scripts/controlPointBox/controlPointBox.gml +++ b/scripts/controlPointBox/controlPointBox.gml @@ -22,12 +22,12 @@ function controlPointBox(_onModify) constructor { active = false; hover = false; - tbCx = new textBox(TEXTBOX_INPUT.number, function(val) { onModify(PUPPET_CONTROL.cx, toNumber(val)); }); - tbCy = new textBox(TEXTBOX_INPUT.number, function(val) { onModify(PUPPET_CONTROL.cy, toNumber(val)); }); - tbFx = new textBox(TEXTBOX_INPUT.number, function(val) { onModify(PUPPET_CONTROL.fx, toNumber(val)); }); - tbFy = new textBox(TEXTBOX_INPUT.number, function(val) { onModify(PUPPET_CONTROL.fy, toNumber(val)); }); - tbW = new textBox(TEXTBOX_INPUT.number, function(val) { onModify(PUPPET_CONTROL.width, max(0, toNumber(val))); }); - tbH = new textBox(TEXTBOX_INPUT.number, function(val) { onModify(PUPPET_CONTROL.height, max(0, toNumber(val))); }); + tbCx = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(PUPPET_CONTROL.cx, toNumber(val)); }); + tbCy = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(PUPPET_CONTROL.cy, toNumber(val)); }); + tbFx = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(PUPPET_CONTROL.fx, toNumber(val)); }); + tbFy = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(PUPPET_CONTROL.fy, toNumber(val)); }); + tbW = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(PUPPET_CONTROL.width, max(0, toNumber(val))); }); + tbH = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(PUPPET_CONTROL.height, max(0, toNumber(val))); }); rot = new rotator(function(val) { onModify(PUPPET_CONTROL.fy, toNumber(val)); }); tbFx.slidable = true; tbFy.slidable = true; diff --git a/scripts/dialog_management/dialog_management.gml b/scripts/dialog_management/dialog_management.gml index d48f9a780..4c830e3cc 100644 --- a/scripts/dialog_management/dialog_management.gml +++ b/scripts/dialog_management/dialog_management.gml @@ -1,4 +1,7 @@ -function dialogCall(_dia, _x = WIN_W / 2, _y = WIN_H / 2, param = {}) { +function dialogCall(_dia, _x = noone, _y = noone, param = {}) { + if(_x == noone) _x = WIN_SW / 2; + if(_y == noone) _y = WIN_SH / 2; + var dia = instance_exists(_dia)? instance_find(_dia, 0) : instance_create_depth(_x, _y, 0, _dia); dia.x = _x; diff --git a/scripts/directory_object/directory_object.gml b/scripts/directory_object/directory_object.gml index d00a8c254..69b1adee0 100644 --- a/scripts/directory_object/directory_object.gml +++ b/scripts/directory_object/directory_object.gml @@ -8,9 +8,9 @@ function DirectoryObject(name, path) constructor { self.name = name; self.path = path; - subDir = ds_list_create(); + subDir = ds_list_create(); content = ds_list_create(); - open = false; + open = false; static destroy = function() { ds_list_destroy(subDir); @@ -57,7 +57,7 @@ function DirectoryObject(name, path) constructor { var hh = sprite_get_height(_temp); var amo = ww % hh == 0? ww / hh : 1; sprite_delete(_temp); - + f.spr = sprite_add(icon_path, amo, false, false, 0, 0); sprite_set_offset(f.spr, sprite_get_width(f.spr) / 2, sprite_get_height(f.spr) / 2); } diff --git a/scripts/display_refresh/display_refresh.gml b/scripts/display_refresh/display_refresh.gml new file mode 100644 index 000000000..a690dfb20 --- /dev/null +++ b/scripts/display_refresh/display_refresh.gml @@ -0,0 +1,20 @@ +function display_refresh() { + o_main.win_wp = WIN_W; + o_main.win_hp = WIN_H; + room_width = WIN_W; + room_height = WIN_H; + + display_set_gui_size(WIN_SW, WIN_SH); + + clearPanel(); + setPanel(); + + PANEL_GRAPH.fullView(); + PANEL_PREVIEW.fullView(); + + o_main.alarm[0] = 10; + + PREF_MAP[? "window_width"] = WIN_W; + PREF_MAP[? "window_height"] = WIN_H; + PREF_SAVE(); +} \ No newline at end of file diff --git a/scripts/display_refresh/display_refresh.yy b/scripts/display_refresh/display_refresh.yy new file mode 100644 index 000000000..afd816c29 --- /dev/null +++ b/scripts/display_refresh/display_refresh.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "display_refresh", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "functions", + "path": "folders/functions.yy", + }, +} \ No newline at end of file diff --git a/scripts/ds_map/ds_map.gml b/scripts/ds_map/ds_map.gml index 81f2df521..75ae6eaa1 100644 --- a/scripts/ds_map/ds_map.gml +++ b/scripts/ds_map/ds_map.gml @@ -24,7 +24,7 @@ function ds_map_override(original, newmap) { var k = ds_map_find_first(newmap); repeat(ds_map_size(newmap)) { - original[? k] = newmap[? k]; + original[? k] = newmap[? k] ?? 1; k = ds_map_find_next(newmap, k); } } diff --git a/scripts/font_loader/font_loader.gml b/scripts/font_loader/font_loader.gml new file mode 100644 index 000000000..f3a4c0b0d --- /dev/null +++ b/scripts/font_loader/font_loader.gml @@ -0,0 +1,14 @@ +globalvar f_h3, f_h5, f_p0, f_p0b, f_p1, f_p2, f_p3; + +function loadFonts() { + var font = "NotoSans"; + f_h3 = font_add("data/fonts/" + font + "-Bold.ttf", 20 * DISP_SCALE, false, false, 32, 127); + f_h5 = font_add("data/fonts/" + font + "-Bold.ttf", 16 * DISP_SCALE, false, false, 32, 127); + + f_p0 = font_add("data/fonts/" + font + "-Medium.ttf", 12 * DISP_SCALE, false, false, 32, 127); + f_p0b = font_add("data/fonts/" + font + "-Bold.ttf", 12 * DISP_SCALE, false, false, 32, 127); + + f_p1 = font_add("data/fonts/" + font + "-Medium.ttf", 11 * DISP_SCALE, false, false, 32, 127); + f_p2 = font_add("data/fonts/" + font + "-SemiBold.ttf", 10 * DISP_SCALE, false, false, 32, 127); + f_p3 = font_add("data/fonts/" + font + "-SemiBold.ttf", 9 * DISP_SCALE, false, false, 32, 127); +} \ No newline at end of file diff --git a/scripts/font_loader/font_loader.yy b/scripts/font_loader/font_loader.yy new file mode 100644 index 000000000..c6b2cc642 --- /dev/null +++ b/scripts/font_loader/font_loader.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "font_loader", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "font", + "path": "folders/font.yy", + }, +} \ No newline at end of file diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index f60b14e99..4146b291e 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -17,9 +17,9 @@ DEBUG = false; globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING; - VERSION = 100; + VERSION = 102; SAVEFILE_VERSION = 90; - VERSION_STRING = "0.10.0"; + VERSION_STRING = "0.10.2"; globalvar NODES, ANIMATOR, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT; @@ -35,6 +35,7 @@ loop, stop } + ANIMATOR = { frames_total : 30, current_frame : 0, @@ -71,8 +72,13 @@ #endregion #region macro - #macro WIN_W window_get_width() / PREF_MAP[? "display_scaling"] - #macro WIN_H window_get_height() / PREF_MAP[? "display_scaling"] + #macro WIN_W window_get_width() + #macro WIN_H window_get_height() + + #macro WIN_SW window_get_width() + #macro WIN_SH window_get_height() + + #macro DISP_SCALE PREF_MAP[? "display_scaling"] #macro mouse_mx device_mouse_x_to_gui(0) #macro mouse_my device_mouse_y_to_gui(0) @@ -86,7 +92,7 @@ #macro c_ui_blue_ltgrey $8f7e7e #macro c_ui_blue_white $e8d6d6 #macro c_ui_cyan $e9ff88 - + #macro c_ui_yellow $78e4ff #macro c_ui_orange $6691ff #macro c_ui_orange_light $92c2ff diff --git a/scripts/load_function/load_function.gml b/scripts/load_function/load_function.gml index b0520974a..ef9da64da 100644 --- a/scripts/load_function/load_function.gml +++ b/scripts/load_function/load_function.gml @@ -3,6 +3,11 @@ function LOAD() { if(path == "") return; if(filename_ext(path) != ".json" && filename_ext(path) != ".pxc") return; + nodeCleanUp(); + setPanel(); + room_restart(); + + gc_collect(); LOAD_PATH(path); } diff --git a/scripts/node_area/node_area.gml b/scripts/node_area/node_area.gml index 8c05e3e98..80d9d79c3 100644 --- a/scripts/node_area/node_area.gml +++ b/scripts/node_area/node_area.gml @@ -13,9 +13,11 @@ function Node_Area(_x, _y) : Node_Value_Processor(_x, _y) constructor { min_h = 0; inputs[| 0] = nodeValue(0, "Postion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + .setDisplay(VALUE_DISPLAY.vector) + .setVisible(true, true); inputs[| 1] = nodeValue(1, "Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ] ) - .setDisplay(VALUE_DISPLAY.vector); + .setDisplay(VALUE_DISPLAY.vector) + .setVisible(true, true); inputs[| 2] = nodeValue(2, "Shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, AREA_SHAPE.rectangle ) .setDisplay(VALUE_DISPLAY.enum_scroll, ["Rectangle", "Elipse"]); diff --git a/scripts/node_area/node_area.yy b/scripts/node_area/node_area.yy index acf5aa100..e51333d79 100644 --- a/scripts/node_area/node_area.yy +++ b/scripts/node_area/node_area.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_area", "isDnD": false, "isCompatibility": false, "parent": { "name": "number", "path": "folders/nodes/data/number.yy", }, - "resourceVersion": "1.0", - "name": "node_area", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index 076f8ed11..851fa5b76 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -504,12 +504,12 @@ function Node_Canvas(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); buffer_set_surface(surface_buffer, _outSurf, 0); } else { - if(surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1]))) { + if(surface_size_to(_outSurf, _dim[0], _dim[1])) { buffer_delete(surface_buffer); surface_buffer = -1; surface_buffer = buffer_create(surface_get_width(_outSurf) * surface_get_height(_outSurf) * 4, buffer_fixed, 2); @@ -518,10 +518,10 @@ function Node_Canvas(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 1].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 1].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); } doUpdate(); diff --git a/scripts/node_checkerboard/node_checkerboard.gml b/scripts/node_checkerboard/node_checkerboard.gml index 17fa25ea7..ab998c8b6 100644 --- a/scripts/node_checkerboard/node_checkerboard.gml +++ b/scripts/node_checkerboard/node_checkerboard.gml @@ -59,10 +59,10 @@ function Node_Checker(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); shader_set(shader); diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 317a26c0a..73148eae4 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -72,15 +72,17 @@ function Node(_x, _y) constructor { } static setHeight = function() { - var _hi = 32, _ho = 32; + var _hi = junction_shift_y; + var _ho = 32; for( var i = 0; i < ds_list_size(inputs); i++ ) { if(inputs[| i].isVisible()) _hi += 24; } + for( var i = 0; i < ds_list_size(outputs); i++ ) { if(outputs[| i].isVisible()) _ho += 24; } - h = max(_hi, _ho, min_h); + h = max(min_h, _hi, _ho); } static move = function(_x, _y) { @@ -191,20 +193,20 @@ function Node(_x, _y) constructor { rendered = result; } - static pointIn = function(_mx, _my) { - var xx = x; - var yy = y; + static pointIn = function(_x, _y, _mx, _my, _s) { + var xx = x * _s + _x; + var yy = y * _s + _y; - return point_in_rectangle(_mx, _my, xx, yy, xx + w, yy + h); + return point_in_rectangle(_mx, _my, xx, yy, xx + w * _s, yy + h * _s); } static preDraw = function(_x, _y, _s) { var xx = x * _s + _x; var yy = y * _s + _y; - var _in = yy + junction_shift_y * _s; var jun; var amo = input_display_list == -1? ds_list_size(inputs) : array_length(input_display_list); + var _in = yy + junction_shift_y * _s; for(var i = 0; i < amo; i++) { var idx = getInputJunctionIndex(i); @@ -392,14 +394,14 @@ function Node(_x, _y) constructor { //draw_set_color(c_ui_blue_grey); //draw_rectangle(px, py, px + pw * ps - 1, py + ph * ps - 1, true); - if(_s * w > 48) { + if(_s * w > 64) { draw_set_text(_s >= 1? f_p1 : f_p2, fa_center, fa_top, c_ui_blue_grey); var tx = xx + w * _s / 2; var ty = yy + (h + 4) * _s; draw_text(round(tx), round(ty), string(pw) + " x " + string(ph) + "px"); if(PREF_MAP[? "node_show_time"]) { - ty += string_height("l") + ty += string_height("l") * 0.8; var rt, unit; if(render_time < 1000) { rt = round(render_time / 10) * 10; diff --git a/scripts/node_frame/node_frame.gml b/scripts/node_frame/node_frame.gml index 5d5fab8e0..4776b1bf8 100644 --- a/scripts/node_frame/node_frame.gml +++ b/scripts/node_frame/node_frame.gml @@ -73,7 +73,7 @@ function Node_Frame(_x, _y) : Node(_x, _y) constructor { draw_sprite_ext(s_node_resize, 0, _re_x, _re_y, 1, 1, 0, c_white, 0.5); if(!name_hover && point_in_rectangle(_mx, _my, _re_x - 16 * _s, _re_y - 16 * _s, _re_x + 4 * _s, _re_y + 4 * _s)) { draw_sprite_ext(s_node_resize, 0, _re_x, _re_y, 1, 1, 0, c_white, 1); - PANEL_GRAPH.node_hovering = -1; + PANEL_GRAPH.drag_locking = true; if(mouse_check_button_pressed(mb_left)) { size_dragging = true; @@ -86,15 +86,15 @@ function Node_Frame(_x, _y) : Node(_x, _y) constructor { return noone; } - static pointIn = function(_mx, _my) { - var xx = x + w; - var yy = y + h; + static pointIn = function(_x, _y, _mx, _my, _s) { + var xx = x * _s + _x; + var yy = y * _s + _y; draw_set_font(f_h5); - var ww = (string_width(name) + 16) / draw_scale; - var hh = (string_height(name) + 16) / draw_scale; + var ww = (string_width(name) + 16) / _s; + var hh = (string_height(name) + 16) / _s; - var _x0 = max(x + 16, xx - ww); - var _y0 = max(y + 16, yy - hh); + var _x0 = max(xx + 16, xx - ww); + var _y0 = max(yy + 16, yy - hh); var hover = point_in_rectangle(_mx, _my, _x0, _y0, xx - 32, yy); name_hover = hover; diff --git a/scripts/node_frame/node_frame.yy b/scripts/node_frame/node_frame.yy index 77ceb09f0..d7d069ced 100644 --- a/scripts/node_frame/node_frame.yy +++ b/scripts/node_frame/node_frame.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_frame", "isDnD": false, "isCompatibility": false, "parent": { "name": "node", "path": "folders/nodes/data/node.yy", }, - "resourceVersion": "1.0", - "name": "node_frame", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_gradient/node_gradient.gml b/scripts/node_gradient/node_gradient.gml index 5e21e8e8c..d11c40969 100644 --- a/scripts/node_gradient/node_gradient.gml +++ b/scripts/node_gradient/node_gradient.gml @@ -61,10 +61,10 @@ function Node_Gradient(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); var _gra = inputs[| 1].getValue(); var _gra_data = inputs[| 1].getExtraData(); diff --git a/scripts/node_grid/node_grid.gml b/scripts/node_grid/node_grid.gml index 3a7b7ff9e..579c17b11 100644 --- a/scripts/node_grid/node_grid.gml +++ b/scripts/node_grid/node_grid.gml @@ -9,6 +9,7 @@ function Node_Grid(_x, _y) : Node(_x, _y) constructor { shader = sh_grid; uniform_pos = shader_get_uniform(shader, "position"); + uniform_dim = shader_get_uniform(shader, "dimension"); uniform_sca = shader_get_uniform(shader, "scale"); uniform_wid = shader_get_uniform(shader, "width"); uniform_ang = shader_get_uniform(shader, "angle"); @@ -72,15 +73,16 @@ function Node_Grid(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); draw_clear_alpha(0, 0); shader_set(shader); shader_set_uniform_f(uniform_pos, _pos[0] / _dim[0], _pos[1] / _dim[1]); + shader_set_uniform_f(uniform_dim, _dim[0], _dim[1]); shader_set_uniform_f_array(uniform_sca, _sca); shader_set_uniform_f(uniform_wid, _wid); shader_set_uniform_f(uniform_ang, degtorad(_ang)); diff --git a/scripts/node_keyframe/node_keyframe.gml b/scripts/node_keyframe/node_keyframe.gml index bb85b4763..03c917f31 100644 --- a/scripts/node_keyframe/node_keyframe.gml +++ b/scripts/node_keyframe/node_keyframe.gml @@ -38,7 +38,7 @@ function valueAnimator(_val, _prop) constructor { eo = rat; else { switch(from.ease_out_type) { - case CURVE_TYPE.bezier : + case CURVE_TYPE.bezier : eo = ease_cubic_in(rat); eo = lerp(rat, eo, from.ease_out); break; diff --git a/scripts/node_line/node_line.gml b/scripts/node_line/node_line.gml index 24430090b..32c7d879d 100644 --- a/scripts/node_line/node_line.gml +++ b/scripts/node_line/node_line.gml @@ -79,10 +79,10 @@ function Node_Line(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); if(_bg) draw_clear_alpha(0, 1); diff --git a/scripts/node_math/node_math.gml b/scripts/node_math/node_math.gml index 82565d460..49f32b841 100644 --- a/scripts/node_math/node_math.gml +++ b/scripts/node_math/node_math.gml @@ -114,6 +114,7 @@ function Node_Math(_x, _y) : Node(_x, _y) constructor { case MATH_OPERATOR.round : inputs[| 2].setVisible(false); break; + default: return; } var val = 0; @@ -152,6 +153,7 @@ function Node_Math(_x, _y) : Node(_x, _y) constructor { case MATH_OPERATOR.floor : str = "floor"; break; case MATH_OPERATOR.ceiling : str = "ceil"; break; case MATH_OPERATOR.round : str = "round"; break; + default: return; } var _ss = min((w - 16) * _s / string_width(str), (h - 18) * _s / string_height(str)); diff --git a/scripts/node_noise_ani/node_noise_ani.gml b/scripts/node_noise_ani/node_noise_ani.gml index 475c18d49..fde85ca49 100644 --- a/scripts/node_noise_ani/node_noise_ani.gml +++ b/scripts/node_noise_ani/node_noise_ani.gml @@ -42,10 +42,10 @@ function Node_Noise_Aniso(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); shader_set(shader); diff --git a/scripts/node_noise_cell/node_noise_cell.gml b/scripts/node_noise_cell/node_noise_cell.gml index 4b74a4800..dce28db14 100644 --- a/scripts/node_noise_cell/node_noise_cell.gml +++ b/scripts/node_noise_cell/node_noise_cell.gml @@ -65,10 +65,10 @@ function Node_Cellular(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); if(_type == 0) { shader = sh_cell_noise; diff --git a/scripts/node_noise_grid/node_noise_grid.gml b/scripts/node_noise_grid/node_noise_grid.gml index 870a7902c..969d66921 100644 --- a/scripts/node_noise_grid/node_noise_grid.gml +++ b/scripts/node_noise_grid/node_noise_grid.gml @@ -54,10 +54,10 @@ function Node_Grid_Noise(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); draw_clear_alpha(0, 0); diff --git a/scripts/node_particle/node_particle.gml b/scripts/node_particle/node_particle.gml index 8be04cb4f..4fa13a790 100644 --- a/scripts/node_particle/node_particle.gml +++ b/scripts/node_particle/node_particle.gml @@ -51,6 +51,7 @@ function __part() constructor { is_loop = false; + function create(_surf, _x, _y, _life) { active = true; surf = _surf; @@ -149,7 +150,7 @@ function __part() constructor { var _xx, _yy; var s_w = surface_get_width(ss) * scx; var s_h = surface_get_height(ss) * scy; - + if(boundary_data == -1) { var _pp = point_rotate(-s_w / 2, -s_h / 2, 0, 0, rot); _xx = x + _pp[0]; @@ -289,6 +290,7 @@ function Node_Particle(_x, _y) : Node(_x, _y) constructor { outputs[| 0] = nodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, PIXEL_SURFACE); + seed = irandom(9999999); def_surface = -1; parts = ds_list_create(); @@ -298,6 +300,7 @@ function Node_Particle(_x, _y) : Node(_x, _y) constructor { outputs[| 1] = nodeValue(1, "Particle data", self, JUNCTION_CONNECT.output, VALUE_TYPE.object, parts ); function spawn() { + randomize(); var _inSurf = inputs[| 0].getValue(); if(_inSurf == 0) { @@ -517,9 +520,9 @@ function Node_Particle(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(is_surface(_outSurf)) - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); else { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } diff --git a/scripts/node_particle_effector/node_particle_effector.gml b/scripts/node_particle_effector/node_particle_effector.gml index ac91e3332..0c2f3ee03 100644 --- a/scripts/node_particle_effector/node_particle_effector.gml +++ b/scripts/node_particle_effector/node_particle_effector.gml @@ -63,6 +63,87 @@ function Node_Particle_Effector(_x, _y) : Node(_x, _y) constructor { static drawOverlay = function(_active, _x, _y, _s, _mx, _my) { inputs[| 2].drawOverlay(_active, _x, _y, _s, _mx, _my); + + var parts = inputs[| 0].getValue(); + if(!parts) return; + + var _area = current_data[2]; + var _fall = current_data[3]; + var _fads = current_data[4]; + var _type = current_data[5]; + var _vect = current_data[6]; + + var _area_x = _area[0]; + var _area_y = _area[1]; + var _area_w = _area[2]; + var _area_h = _area[3]; + var _area_t = _area[4]; + + var _area_x0 = _area_x - _area_w; + var _area_x1 = _area_x + _area_w; + var _area_y0 = _area_y - _area_h; + var _area_y1 = _area_y + _area_h; + + for(var i = 0; i < ds_list_size(parts); i++) { + var part = parts[| i]; + var pv = part.getPivot(); + var px = _x + part.x * _s; + var py = _y + part.y * _s; + + var str = 0; + if(_area_t == AREA_SHAPE.rectangle) { + if(point_in_rectangle(pv[0], pv[1], _area_x0, _area_y0, _area_x1, _area_y1)) { + var _dst = min( distance_to_line(pv[0], pv[1], _area_x0, _area_y0, _area_x1, _area_y0), + distance_to_line(pv[0], pv[1], _area_x0, _area_y1, _area_x1, _area_y1), + distance_to_line(pv[0], pv[1], _area_x0, _area_y0, _area_x0, _area_y1), + distance_to_line(pv[0], pv[1], _area_x1, _area_y0, _area_x1, _area_y1)); + str = eval_curve_bezier_cubic(_fall, clamp(_dst / _fads, 0., 1.)); + } + } else if(_area_t == AREA_SHAPE.elipse) { + if(point_in_circle(pv[0], pv[1], _area_x, _area_y, min(_area_w, _area_h))) { + var _dst = point_distance(pv[0], pv[1], _area_x, _area_y); + str = eval_curve_bezier_cubic(_fall, clamp(_dst / _fads, 0., 1.)); + } + } + + var ss = 0.5 + 0.5 * str; + var cc = str < 0.5? merge_color(c_ui_red, c_ui_yellow, str * 2) : merge_color(c_ui_yellow, c_ui_lime, str * 2 - 1); + draw_set_color(cc); + var vx = 0, vy = 0; + var scale = 8; + + switch(_type) { + case FORCE_TYPE.Wind : + vx = _vect[0] * scale * str * _s; + vy = _vect[1] * scale * str * _s; + + draw_line(px, py, px + vx, py + vy); + break; + case FORCE_TYPE.Attract : + var dirr = point_direction(pv[0], pv[1], _area_x, _area_y); + vx = lengthdir_x(str * scale * _s, dirr); + vy = lengthdir_y(str * scale * _s, dirr); + + draw_line(px, py, px + vx, py + vy); + break; + case FORCE_TYPE.Repel : + var dirr = point_direction(_area_x, _area_y, pv[0], pv[1]); + vx = lengthdir_x(str * scale * _s, dirr); + vy = lengthdir_y(str * scale * _s, dirr); + + draw_line(px, py, px + vx, py + vy); + break; + case FORCE_TYPE.Vortex : + var dirr = point_direction(_area_x, _area_y, pv[0], pv[1]) + 90; + vx = lengthdir_x(str * scale * _s, dirr); + vy = lengthdir_y(str * scale * _s, dirr); + + draw_line(px, py, px + vx, py + vy); + break; + } + + draw_sprite_ext(s_preview_crosshair, 0, px, py, 1, 1, 0, cc, ss); + } } static step = function() { @@ -139,67 +220,67 @@ function Node_Particle_Effector(_x, _y) : Node(_x, _y) constructor { } } - if(str > 0) { - switch(_type) { - case FORCE_TYPE.Wind : - part.x = part.x + _vect[0] * _sten * str; - part.y = part.y + _vect[1] * _sten * str; + if(str == 0) return; + + switch(_type) { + case FORCE_TYPE.Wind : + part.x = part.x + _vect[0] * _sten * str; + part.y = part.y + _vect[1] * _sten * str; - part.rot += _rot * str; - break; - case FORCE_TYPE.Accelerate : - part.sx = part.sx + _vect[0] * _sten * str; - part.sy = part.sy + _vect[1] * _sten * str; + part.rot += _rot * str; + break; + case FORCE_TYPE.Accelerate : + part.sx = part.sx + _vect[0] * _sten * str; + part.sy = part.sy + _vect[1] * _sten * str; - part.rot += _rot * str; - break; - case FORCE_TYPE.Attract : - var dirr = point_direction(pv[0], pv[1], _area_x, _area_y); + part.rot += _rot * str; + break; + case FORCE_TYPE.Attract : + var dirr = point_direction(pv[0], pv[1], _area_x, _area_y); - part.x = part.x + lengthdir_x(_sten * str, dirr); - part.y = part.y + lengthdir_y(_sten * str, dirr); + part.x = part.x + lengthdir_x(_sten * str, dirr); + part.y = part.y + lengthdir_y(_sten * str, dirr); - part.rot += _rot * str; - break; - case FORCE_TYPE.Repel : - var dirr = point_direction(_area_x, _area_y, pv[0], pv[1]); + part.rot += _rot * str; + break; + case FORCE_TYPE.Repel : + var dirr = point_direction(_area_x, _area_y, pv[0], pv[1]); - part.x = part.x + lengthdir_x(_sten * str, dirr); - part.y = part.y + lengthdir_y(_sten * str, dirr); + part.x = part.x + lengthdir_x(_sten * str, dirr); + part.y = part.y + lengthdir_y(_sten * str, dirr); - part.rot += _rot * str; - break; - case FORCE_TYPE.Vortex : - var dirr = point_direction(_area_x, _area_y, pv[0], pv[1]) + 90; + part.rot += _rot * str; + break; + case FORCE_TYPE.Vortex : + var dirr = point_direction(_area_x, _area_y, pv[0], pv[1]) + 90; - part.x = part.x + lengthdir_x(_sten * str, dirr); - part.y = part.y + lengthdir_y(_sten * str, dirr); + part.x = part.x + lengthdir_x(_sten * str, dirr); + part.y = part.y + lengthdir_y(_sten * str, dirr); - part.rot += _rot * str; - break; - case FORCE_TYPE.Turbulence : - var t_scale = current_data[10]; - var per = (perlin_noise(pv[0] / t_scale, pv[1] / t_scale, 4, part.seed) - 0.5) * 2; - per *= str; + part.rot += _rot * str; + break; + case FORCE_TYPE.Turbulence : + var t_scale = current_data[10]; + var per = (perlin_noise(pv[0] / t_scale, pv[1] / t_scale, 4, part.seed) - 0.5) * 2; + per *= str; - part.x = part.x + _vect[0] * per; - part.y = part.y + _vect[1] * per; + part.x = part.x + _vect[0] * per; + part.y = part.y + _vect[1] * per; - part.rot += _rot * per; - break; - case FORCE_TYPE.Destroy : - if(random(1) < _sten) - part.kill(); - break; - } - - var scx_s = _sca[0] * str; - var scy_s = _sca[1] * str; - if(scx_s < 0) part.scx = lerp_linear(part.scx, 0, abs(scx_s)); - else part.scx += sign(part.scx) * scx_s; - if(scy_s < 0) part.scy = lerp_linear(part.scy, 0, abs(scy_s)); - else part.scy += sign(part.scy) * scy_s; + part.rot += _rot * per; + break; + case FORCE_TYPE.Destroy : + if(random(1) < _sten) + part.kill(); + break; } + + var scx_s = _sca[0] * str; + var scy_s = _sca[1] * str; + if(scx_s < 0) part.scx = lerp_linear(part.scx, 0, abs(scx_s)); + else part.scx += sign(part.scx) * scx_s; + if(scy_s < 0) part.scy = lerp_linear(part.scy, 0, abs(scy_s)); + else part.scy += sign(part.scy) * scy_s; } static update = function() { diff --git a/scripts/node_perlin/node_perlin.gml b/scripts/node_perlin/node_perlin.gml index 9a6bb2019..bc717cff6 100644 --- a/scripts/node_perlin/node_perlin.gml +++ b/scripts/node_perlin/node_perlin.gml @@ -39,10 +39,10 @@ function Node_Perlin(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); shader_set(shader); diff --git a/scripts/node_perlin_smear/node_perlin_smear.gml b/scripts/node_perlin_smear/node_perlin_smear.gml index 6e99f2ba8..7d5406273 100644 --- a/scripts/node_perlin_smear/node_perlin_smear.gml +++ b/scripts/node_perlin_smear/node_perlin_smear.gml @@ -39,10 +39,10 @@ function Node_Perlin_Smear(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); shader_set(shader); diff --git a/scripts/node_pin/node_pin.gml b/scripts/node_pin/node_pin.gml index 6ebe68bd2..202155c28 100644 --- a/scripts/node_pin/node_pin.gml +++ b/scripts/node_pin/node_pin.gml @@ -28,8 +28,11 @@ function Node_Pin(_x, _y) : Node(_x, _y) constructor { } doUpdate(); - static pointIn = function(_mx, _my) { - return point_in_circle(_mx, _my, x, y, 24); + static pointIn = function(_x, _y, _mx, _my, _s) { + var xx = x * _s + _x; + var yy = y * _s + _y; + + return point_in_circle(_mx, _my, xx, yy, 24); } static preDraw = function(_x, _y, _s) { diff --git a/scripts/node_pin/node_pin.yy b/scripts/node_pin/node_pin.yy index f1c614e2e..28f853feb 100644 --- a/scripts/node_pin/node_pin.yy +++ b/scripts/node_pin/node_pin.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_pin", "isDnD": false, "isCompatibility": false, "parent": { "name": "node", "path": "folders/nodes/data/node.yy", }, - "resourceVersion": "1.0", - "name": "node_pin", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_scatter/node_scatter.gml b/scripts/node_scatter/node_scatter.gml index 28c0699d4..eb26206dc 100644 --- a/scripts/node_scatter/node_scatter.gml +++ b/scripts/node_scatter/node_scatter.gml @@ -80,9 +80,9 @@ function Node_Scatter(_x, _y) : Node(_x, _y) constructor { var _in_w, _in_h; if(is_surface(_outSurf)) - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); else { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } diff --git a/scripts/node_simple_shape/node_simple_shape.gml b/scripts/node_simple_shape/node_simple_shape.gml index 9419af1f5..36fa92522 100644 --- a/scripts/node_simple_shape/node_simple_shape.gml +++ b/scripts/node_simple_shape/node_simple_shape.gml @@ -87,9 +87,9 @@ function Node_Shape(_x, _y) : Node_Processor(_x, _y) constructor { inputs[| 11].setVisible(_bg); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); if(_bg) draw_clear_alpha(0, 1); diff --git a/scripts/node_solid/node_solid.gml b/scripts/node_solid/node_solid.gml index 1f36a31e8..adfddaedc 100644 --- a/scripts/node_solid/node_solid.gml +++ b/scripts/node_solid/node_solid.gml @@ -29,10 +29,10 @@ function Node_Solid(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); draw_clear_alpha(0, 0); diff --git a/scripts/node_sprite_stack/node_sprite_stack.gml b/scripts/node_sprite_stack/node_sprite_stack.gml index 5b1043d21..aba111757 100644 --- a/scripts/node_sprite_stack/node_sprite_stack.gml +++ b/scripts/node_sprite_stack/node_sprite_stack.gml @@ -60,10 +60,10 @@ function Node_Sprite_Stack(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); if(_mov) { _pos[0] -= _shf[0] * _amo; diff --git a/scripts/node_stripe/node_stripe.gml b/scripts/node_stripe/node_stripe.gml index 23c456854..ca9058cf7 100644 --- a/scripts/node_stripe/node_stripe.gml +++ b/scripts/node_stripe/node_stripe.gml @@ -13,6 +13,7 @@ function Node_Stripe(_x, _y) : Node(_x, _y) constructor { uniform_grad_time = shader_get_uniform(sh_stripe, "gradient_time"); uniform_grad_key = shader_get_uniform(sh_stripe, "gradient_keys"); + uniform_dim = shader_get_uniform(sh_stripe, "dimension"); uniform_pos = shader_get_uniform(sh_stripe, "position"); uniform_angle = shader_get_uniform(sh_stripe, "angle"); uniform_amount = shader_get_uniform(sh_stripe, "amount"); @@ -78,13 +79,14 @@ function Node_Stripe(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); shader_set(sh_stripe); + shader_set_uniform_f(uniform_dim, _dim[0], _dim[1]); shader_set_uniform_f(uniform_pos, _pos[0] / _dim[0], _pos[1] / _dim[1]); shader_set_uniform_f(uniform_angle, degtorad(_ang)); shader_set_uniform_f(uniform_amount, _amo); diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index eb0cec427..b90e9dae5 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -393,14 +393,14 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T switch(display_type) { case VALUE_DISPLAY.path_load: var path = animator.getValue(); - if(!file_exists(path)) + if(try_get_path(path) == -1) value_validation = VALIDATION.error; break; case VALUE_DISPLAY.path_array: var paths = animator.getValue(); if(is_array(paths)) { for( var i = 0; i < array_length(paths); i++ ) { - if(!file_exists(paths[i])) + if(try_get_path(paths[i]) == -1) value_validation = VALIDATION.error; } } else diff --git a/scripts/node_zigzag/node_zigzag.gml b/scripts/node_zigzag/node_zigzag.gml index 24a7e7d77..38ff833ea 100644 --- a/scripts/node_zigzag/node_zigzag.gml +++ b/scripts/node_zigzag/node_zigzag.gml @@ -52,10 +52,10 @@ function Node_Zigzag(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(surface_valid(_dim[0]), surface_valid(_dim[1])); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else - surface_size_to(_outSurf, surface_valid(_dim[0]), surface_valid(_dim[1])); + surface_size_to(_outSurf, _dim[0], _dim[1]); surface_set_target(_outSurf); draw_clear_alpha(0, 0); diff --git a/scripts/panel_animation/panel_animation.gml b/scripts/panel_animation/panel_animation.gml index 742dfeab9..39166f564 100644 --- a/scripts/panel_animation/panel_animation.gml +++ b/scripts/panel_animation/panel_animation.gml @@ -825,7 +825,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { draw_sprite_ext(s_animate_node_go, 0, tx, key_y - 1, 1, 1, 0, c_ui_blue_grey, 1); draw_sprite_ext(s_arrow_16, prop.node.anim_show? 3 : 0, 10, key_y, 1, 1, 0, c_ui_blue_grey, 1); - draw_text(20, key_y, prop.node.name); + draw_text(20, key_y - 2, prop.node.name); key_y += 22; } @@ -926,7 +926,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { draw_sprite_ext(s_timeline_clock, 1, 22, key_y - 1, 1, 1, 0, c_ui_blue_grey, 1); draw_set_color(c_ui_blue_white); - draw_text(32, key_y, prop.name); + draw_text(32, key_y - 2, prop.name); if(prop.animator.show_graph) key_y += graph_h + 8; diff --git a/scripts/panel_collection/panel_collection.gml b/scripts/panel_collection/panel_collection.gml index 0ce72e84b..2a08a04f4 100644 --- a/scripts/panel_collection/panel_collection.gml +++ b/scripts/panel_collection/panel_collection.gml @@ -222,11 +222,11 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { folderPane.draw(0, content_y, mx, my - content_y); var _x = 16; - var _y = 28; + var _y = 24; for( var i = 0; i < array_length(roots); i++ ) { var r = roots[i]; - var b = buttonInstant(s_button_hide_fill, _x - 8, _y - 16, string_width(r[0]) + 20, string_height(r[0]) + 8, [mx, my], FOCUS == panel, HOVER == panel); + var b = buttonInstant(s_button_hide_fill, _x - 8, _y - 14, string_width(r[0]) + 20, string_height(r[0]) + 8, [mx, my], FOCUS == panel, HOVER == panel); if(b == 2) { mode = i; root = r[1]; diff --git a/scripts/panel_data/panel_data.gml b/scripts/panel_data/panel_data.gml index a015ce4a4..d4cbb37cf 100644 --- a/scripts/panel_data/panel_data.gml +++ b/scripts/panel_data/panel_data.gml @@ -26,8 +26,8 @@ function Panel(_parent, _x, _y, _w, _h) constructor { drag_sval = 0; drag_sm = 0; - content_surface = surface_create(w, h); - mask_surface = surface_create(w, h); + content_surface = surface_create_valid(w, h); + mask_surface = surface_create_valid(w, h); function resetMask() { surface_set_target(mask_surface); @@ -43,12 +43,12 @@ function Panel(_parent, _x, _y, _w, _h) constructor { if(is_surface(content_surface) && surface_exists(content_surface)) surface_size_to(content_surface, w, h); else - content_surface = surface_create(w, h); + content_surface = surface_create_valid(w, h); if(is_surface(mask_surface) && surface_exists(mask_surface)) surface_size_to(mask_surface, w, h); else - mask_surface = surface_create(w, h); + mask_surface = surface_create_valid(w, h); resetMask(); if(content != noone) @@ -113,7 +113,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { if(is_surface(mask_surface)) surface_size_to(mask_surface, w, h); else - mask_surface = surface_create(w, h); + mask_surface = surface_create_valid(w, h); resetMask(); } @@ -135,6 +135,8 @@ function Panel(_parent, _x, _y, _w, _h) constructor { } function split_h(_w) { + if(abs(_w) > w) return noone; + if(_w < 0) _w = w + _w; var _panelParent = new Panel(parent, x, y, w, h); _panelParent.anchor = anchor; @@ -165,6 +167,8 @@ function Panel(_parent, _x, _y, _w, _h) constructor { } function split_v(_h) { + if(abs(_h) > h) return noone; + if(_h < 0) _h = h + _h; var _panelParent = new Panel(parent, x, y, w, h); _panelParent.anchor = anchor; @@ -340,7 +344,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { draw_sprite_stretched(s_ui_panel_bg, 0, x + 2, y + 2, w - 4, h - 4); if(!is_surface(mask_surface)) { - mask_surface = surface_create(w, h); + mask_surface = surface_create_valid(w, h); resetMask(); } diff --git a/scripts/panel_data/panel_data.yy b/scripts/panel_data/panel_data.yy index f437c84c0..b89fd2a65 100644 --- a/scripts/panel_data/panel_data.yy +++ b/scripts/panel_data/panel_data.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "panel_data", "isDnD": false, "isCompatibility": false, "parent": { "name": "data", "path": "folders/panels/data.yy", }, - "resourceVersion": "1.0", - "name": "panel_data", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/panel_function/panel_function.gml b/scripts/panel_function/panel_function.gml index abd23e7ec..89b860ccf 100644 --- a/scripts/panel_function/panel_function.gml +++ b/scripts/panel_function/panel_function.gml @@ -33,41 +33,43 @@ } function setPanel() { - PANEL_MAIN = new Panel(noone, 0, 0, WIN_W, WIN_H); + PANEL_MAIN = new Panel(noone, 0, 0, WIN_SW, WIN_SH); - var split_menu = PANEL_MAIN.split_v(40); + var split_menu = PANEL_MAIN.split_v(40 * DISP_SCALE); PANEL_MENU = new Panel_Menu(split_menu[0]); - var split_ins = split_menu[1].split_h(-400); + var split_ins = split_menu[1].split_h(-400 * DISP_SCALE); PANEL_INSPECTOR = new Panel_Inspector(split_ins[1]); switch(PREF_MAP[? "panel_layout"]) { case 0 : - var split_anim = split_ins[0].split_v(-48); + var split_anim = split_ins[0].split_v(-48 * DISP_SCALE); PANEL_ANIMATION = new Panel_Animation(split_anim[1]); - - var split_prev = split_anim[0].split_v(-500); + + var split_prev = split_anim[0].split_v(-500 * DISP_SCALE); PANEL_PREVIEW = new Panel_Preview(split_prev[0]); PANEL_GRAPH = new Panel_Graph(split_prev[1]); if(PREF_MAP[? "panel_collection"]) { - var pane = PANEL_GRAPH.panel.split_h(460); + var pane = PANEL_GRAPH.panel.split_h(460 * DISP_SCALE); + if(pane == noone) break; pane[1].set(PANEL_GRAPH); PANEL_COLLECTION = new Panel_Collection(pane[0]); } break; case 1 : - var split_anim = split_ins[0].split_v(-300); + var split_anim = split_ins[0].split_v(-300 * DISP_SCALE); PANEL_ANIMATION = new Panel_Animation(split_anim[1]); - var split_prev = split_anim[0].split_h(400); + var split_prev = split_anim[0].split_h(400 * DISP_SCALE); PANEL_PREVIEW = new Panel_Preview(split_prev[0]); PANEL_GRAPH = new Panel_Graph(split_prev[1]); if(PREF_MAP[? "panel_collection"]) { - var pane = PANEL_ANIMATION.panel.split_h(500); + var pane = PANEL_ANIMATION.panel.split_h(500 * DISP_SCALE); + if(pane == noone) break; pane[1].set(PANEL_ANIMATION); PANEL_COLLECTION = new Panel_Collection(pane[0]); } diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 868a19d97..31c73e344 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -6,6 +6,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { graph_s = scale[graph_s_index]; graph_s_to = graph_s; graph_line_s = 32; + grid_opacity = 0.5; function toOrigin() { graph_x = round(w / 2 / graph_s); @@ -67,6 +68,8 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { minimap_drag_mx = 0; minimap_drag_my = 0; + drag_locking = false; + toolbar_height = 40; toolbars = [ [ @@ -114,7 +117,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { addHotkey("Graph", "Add vector3", "3", MOD_KEY.none, function() { nodeBuild("Vector3", mouse_grid_x, mouse_grid_y); }); addHotkey("Graph", "Add vector4", "4", MOD_KEY.none, function() { nodeBuild("Vector4", mouse_grid_x, mouse_grid_y); }); - addHotkey("Graph", "Transform node", "T", MOD_KEY.ctrl, function() { + static addNodeTransform = function() { if(ds_list_empty(nodes_select_list)) { if(node_focus != noone && !ds_list_empty(node_focus.outputs)) { var _o = node_focus.outputs[| 0]; @@ -123,8 +126,21 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { tr.inputs[| 0].setFrom(_o); } } + } else { + for( var i = 0; i < ds_list_size(nodes_select_list); i++ ) { + var node = nodes_select_list[| i]; + if(ds_list_empty(node.outputs)) continue; + + var _o = node.outputs[| 0]; + if(_o.type == VALUE_TYPE.surface) { + var tr = nodeBuild("Transform", node.x + node.w + 64, node.y); + tr.inputs[| 0].setFrom(_o); + } + } } - }); + } + addNodeTransform = method(self, addNodeTransform); + addHotkey("Graph", "Transform node", "T", MOD_KEY.ctrl, addNodeTransform); addHotkey("Graph", "Select all", "A", MOD_KEY.ctrl, function() { ds_list_clear(nodes_select_list); @@ -149,8 +165,8 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { addHotkey("Graph", "Frame", "F", MOD_KEY.ctrl, function() { doFrame(); }); - addHotkey("Graph", "Delete", vk_delete, MOD_KEY.shift, function() { doDelete(false); }); - addHotkey("Graph", "Delete merge", vk_delete, MOD_KEY.none, function() { doDelete(true); }); + addHotkey("Graph", "Delete (break)", vk_delete, MOD_KEY.shift, function() { doDelete(false); }); + addHotkey("Graph", "Delete (merge)", vk_delete, MOD_KEY.none, function() { doDelete(true); }); function stepBegin() { var gr_x = graph_x * graph_s; var gr_y = graph_y * graph_s; @@ -258,8 +274,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { draw_set_color(c_ui_blue_dkgrey); - draw_set_text(f_p0, fa_center, fa_top); - draw_set_alpha(graph_s >= 1? 1 : 0.5); + draw_set_alpha(grid_opacity * (graph_s >= 1? 1 : 0.5)); while(xx < w + gr_ls) { draw_line(xx + xs, 0, xx + xs, h); if(xx + xs - gr_x == 0) { @@ -267,10 +282,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { } xx += gr_ls; } - draw_set_alpha(1); - draw_set_text(f_p0, fa_left, fa_center); - draw_set_alpha(graph_s >= 1? 1 : 0.5); while(yy < h + gr_ls) { draw_line(0, yy + ys, w, yy + ys); if(yy + ys - gr_y == 0) { @@ -302,7 +314,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { node_hovering = noone; for(var i = 0; i < ds_list_size(nodes_list); i++) { var n = nodes_list[| i]; - if(n.pointIn(mouse_grid_x, mouse_grid_y)) + if(n.pointIn(gr_x, gr_y, mx, my, graph_s)) node_hovering = n; } #endregion @@ -369,19 +381,33 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { setCurrentExport(node_hover); }, ["Graph", "Export"] ]); array_push(menu, - [ "Copy to canvas", function() { - setCurrentCanvas(node_hover); - }, ["Graph", "Canvas"] ]); + [ "Delete and merge connection", function() { + doDelete(true); + }, ["Graph", "Delete (merge)"] ]); array_push(menu, - [ "Overlay canvas", function() { - setCurrentCanvasBlend(node_hover); - }, ["Graph", "Canvas blend"] ]); - array_push(menu, - [ "Delete", function() { - doDelete(); - }, ["Graph", "Delete"] ]); + [ "Delete and cut connection", function() { + doDelete(false); + }, ["Graph", "Delete (break)"] ]); + + array_push(menu, -1); + array_push(menu, [ "Add transform", addNodeTransform, ["Graph", "Transform node"] ]); + array_push(menu, [ "Canvas", + function(_x, _y, _depth) { + var dia = instance_create_depth(_x - 4, _y, _depth - 1, o_dialog_menubox); + dia.setMenu([ + [ "Copy to canvas", function() { + setCurrentCanvas(node_hover); + }, ["Graph", "Canvas"] ], + [ "Overlay canvas", function() { + setCurrentCanvasBlend(node_hover); + }, ["Graph", "Canvas blend"] ] + ]); + return dia; + }, ">" + ]); if(!ds_list_empty(nodes_select_list)) { + array_push(menu, -1); array_push(menu, [ "Blend nodes", function() { doBlend(); @@ -395,6 +421,11 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { [ "Group nodes", function() { doGroup(); }, ["Graph", "Group"] ]); + + array_push(menu, + [ "Frame nodes", function() { + doFrame(); + }, ["Graph", "Frame"] ]); } else if(variable_struct_exists(node_hover, "nodes")) { array_push(menu, [ "Ungroup", function() { @@ -452,7 +483,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { for(var i = 0; i < ds_list_size(nodes_list); i++) { var _node = nodes_list[| i]; - if(_node.pointIn(mouse_grid_x, mouse_grid_y) && variable_struct_exists(_node, "nodes")) { + if(_node.pointIn(gr_x, gr_y, mx, my, graph_s) && variable_struct_exists(_node, "nodes")) { var _recur = false; if(ds_list_size(nodes_select_list) == 0) { if(_node == node_dragging) _recur = true; @@ -588,11 +619,12 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { } if(mouse_on_graph && FOCUS == panel && mouse_check_button_pressed(mb_left) && !keyboard_check(vk_control)) { - if(!node_focus && !value_focus && node_hovering != -1) { + if(!node_focus && !value_focus && !drag_locking) { nodes_select_drag = true; nodes_select_mx = mx; nodes_select_my = my; } + drag_locking = false; } #endregion } @@ -948,7 +980,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { draw_sprite_ext(s_arrow_16, 0, xx + tw + 16, tbh, 1, 1, 0, c_ui_blue_grey, 1); } draw_set_alpha(i < ds_list_size(node_context) - 1? 0.5 : 1); - draw_text(xx, tbh, tt); + draw_text(xx, tbh - 2, tt); draw_set_alpha(1); xx += tw; xx += 32; diff --git a/scripts/panel_inspector/panel_inspector.gml b/scripts/panel_inspector/panel_inspector.gml index abbc2cd70..b7d1ebdc3 100644 --- a/scripts/panel_inspector/panel_inspector.gml +++ b/scripts/panel_inspector/panel_inspector.gml @@ -30,14 +30,13 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { contentPane = new scrollPane(content_w, content_h, function(_y, _m) { var con_w = contentPane.surface_w; - draw_clear_alpha(c_ui_blue_black, 0); if(FOCUS == panel) if(point_in_rectangle(_m[0], _m[1], 0, 0, con_w, content_h) && mouse_check_button_pressed(mb_left)) prop_selecting = noone; - if(!inspecting) + if(inspecting == noone) return 0; inspecting.inspecting = true; @@ -60,17 +59,17 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { if(HOVER == panel && point_in_rectangle(_m[0], _m[1], 0, yy, con_w, yy + 32)) { draw_sprite_stretched_ext(s_node_name, 0, 0, yy, con_w, 32, c_ui_blue_white, 1); - + if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { jun_disp[@ 1] = !coll; } } else draw_sprite_stretched_ext(s_node_name, 0, 0, yy, con_w, 32, c_ui_blue_ltgrey, 1); - + draw_sprite_ext(s_arrow_16, 0, 16, yy + 32 / 2, 1, 1, -90 + coll * 90, c_ui_blue_ltgrey, 1); draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_white); draw_text(32, yy + 32 / 2, txt); - + hh += 32 + 8 + 16 * !coll; if(coll) { diff --git a/scripts/panel_menu/panel_menu.gml b/scripts/panel_menu/panel_menu.gml index 64ba55295..b622538f0 100644 --- a/scripts/panel_menu/panel_menu.gml +++ b/scripts/panel_menu/panel_menu.gml @@ -15,8 +15,19 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { [ "Open...", function() { LOAD(); }, ["", "Open"] ], [ "Save", function() { SAVE(); }, ["", "Save"] ], [ "Save as...", function() { SAVE_AS(); }, ["", "Save as"] ], + [ "Recent files", function(_x, _y, _depth) { + var dia = instance_create_depth(_x - 4, _y, _depth - 1, o_dialog_menubox); + var arr = []; + for(var i = 0; i < min(10, ds_list_size(RECENT_FILES)); i++) { + var _rec = RECENT_FILES[| i]; + array_push(arr, [ _rec, function(_x, _y, _depth, _path) { LOAD_PATH(_path); } ]); + } + dia.setMenu(arr); + return dia; + }, ">" ], -1, - [ "Preferences...", function() { dialogCall(o_dialog_preference, WIN_W / 2, WIN_H / 2); } ], + [ "Preferences...", function() { dialogCall(o_dialog_preference); } ], + [ "Splash screen", function() { dialogCall(o_dialog_splash); } ], ]], ["Edit", [ [ "Undo", function() { UNDO(); }, ["", "Undo"] ], @@ -33,18 +44,18 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { -1, [ "Show Grid", function() { PANEL_PREVIEW.grid_show = !PANEL_PREVIEW.grid_show; }, ["Preview", "Toggle grid"] ], [ "Grid setting...", function() { - var dia = dialogCall(o_dialog_preview_grid, WIN_W / 2, WIN_H / 2); + var dia = dialogCall(o_dialog_preview_grid); dia.anchor = ANCHOR.none; } ], ]], ["Animation", [ [ "Animation setting...", function() { - var dia = dialogCall(o_dialog_animation, WIN_W / 2, WIN_H / 2); + var dia = dialogCall(o_dialog_animation); dia.anchor = ANCHOR.none; } ], -1, [ "Animation scaler...", function() { - dialogCall(o_dialog_anim_time_scaler, WIN_W / 2, WIN_H / 2); + dialogCall(o_dialog_anim_time_scaler); } ], ]], ["Rendering", [ @@ -89,7 +100,7 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { if(FOCUS == panel && point_in_rectangle(mx, my, 0, 0, 40, 32)) { if(mouse_check_button_pressed(mb_left)) { - dialogCall(o_dialog_about, WIN_W / 2, WIN_H / 2); + dialogCall(o_dialog_about); } } @@ -149,7 +160,7 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { draw_sprite_stretched(s_menu_button, 0, w - 16 - ww - 6, 6, ww + 12, h - 12); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { - dialogCall(o_dialog_release_note, WIN_W / 2, WIN_H / 2); + dialogCall(o_dialog_release_note); } } draw_text(w - 16, h / 2, txt); diff --git a/scripts/preferences/preferences.gml b/scripts/preferences/preferences.gml index b7f672cd2..23f8f1008 100644 --- a/scripts/preferences/preferences.gml +++ b/scripts/preferences/preferences.gml @@ -89,9 +89,9 @@ function key_get_name(_key, _mod) { var dk = ""; - if(_mod & MOD_KEY.ctrl) dk += "ctrl+"; - if(_mod & MOD_KEY.shift) dk += "shift+"; - if(_mod & MOD_KEY.alt) dk += "alt+"; + if(_mod & MOD_KEY.ctrl) dk += "Ctrl+"; + if(_mod & MOD_KEY.shift) dk += "Shift+"; + if(_mod & MOD_KEY.alt) dk += "Alt+"; switch(_key) { case vk_space : dk += "Space"; break; @@ -244,6 +244,8 @@ window_set_size(ww, hh); window_set_position(display_get_width() / 2 - ww / 2, display_get_height() / 2 - hh / 2); + + loadFonts(); } function find_hotkey(_context, _name) { diff --git a/scripts/rotatorRange/rotatorRange.gml b/scripts/rotatorRange/rotatorRange.gml index a7309886f..ce6e8dd02 100644 --- a/scripts/rotatorRange/rotatorRange.gml +++ b/scripts/rotatorRange/rotatorRange.gml @@ -24,12 +24,16 @@ function rotatorRange(_onModify) constructor { hover_arc = true; } else draw_set_color(c_ui_blue_grey); - var diff = _data[1] >= _data[0]? _data[1] - _data[0] : _data[1] + 360 - _data[0]; - - for(var i = 0; i < abs(diff); i += 4) { - var as = _data[0] + i * sign(diff); - var ae = _data[0] + (i + 4) * sign(diff); + var ans = _data[0] % 360; + var ane = _data[1] % 360; + + var diff = ane >= ans? ane - ans : ane + 360 - ans; + + for(var i = 0; i < abs(diff); i += 4) { + var as = ans + i * sign(diff); + var ae = ans + (i + 4) * sign(diff); + var sx = _x + lengthdir_x(36, as); var sy = knob_y + lengthdir_y(36, as); var ex = _x + lengthdir_x(36, ae); diff --git a/scripts/rotatorRange/rotatorRange.yy b/scripts/rotatorRange/rotatorRange.yy index 50fbf94e8..2848c0547 100644 --- a/scripts/rotatorRange/rotatorRange.yy +++ b/scripts/rotatorRange/rotatorRange.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "rotatorRange", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "rotatorRange", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/slider/slider.gml b/scripts/slider/slider.gml index 3681cb7e8..7837f7856 100644 --- a/scripts/slider/slider.gml +++ b/scripts/slider/slider.gml @@ -1,4 +1,4 @@ -function slider(_min, _max, _step, _onModify) constructor { +function slider(_min, _max, _step, _onModify = noone, _onRelease = noone) constructor { active = false; hover = false; @@ -7,15 +7,19 @@ function slider(_min, _max, _step, _onModify) constructor { step = _step; onModify = _onModify; + onRelease = _onRelease; + onApply = function(val) { + onModify(val); + onRelease(); + } dragging = false; drag_mx = 0; drag_sx = 0; - tb_value = new textBox(TEXTBOX_INPUT.float, onModify); + tb_value = new textBox(TEXTBOX_INPUT.float, onApply); - static draw = function(_x, _y, _w, _h, _data, _m) { - var tb_w = 64; + static draw = function(_x, _y, _w, _h, _data, _m, tb_w = 64) { var sw = _w - (tb_w + 16); tb_value.hover = hover; @@ -33,10 +37,14 @@ function slider(_min, _max, _step, _onModify) constructor { var val = (_m[0] - _x) / sw * (maxx - minn) + minn; val = round(val / step) * step; val = clamp(val, minn, maxx); - onModify(val); + if(onModify != noone) + onModify(val); - if(mouse_check_button_released(mb_left)) + if(mouse_check_button_released(mb_left)) { dragging = false; + if(onRelease != noone) + onRelease(val); + } } else { if(hover && (point_in_rectangle(_m[0], _m[1], _x, _y, _x + sw, _y + _h) || point_in_rectangle(_m[0], _m[1], _kx - 10, _y, _kx + 10, _y + _h))) { draw_sprite_stretched(s_slider, 2, _kx - 10, _y, 20, _h); diff --git a/scripts/slider/slider.yy b/scripts/slider/slider.yy index 8349d8e34..8415f8f93 100644 --- a/scripts/slider/slider.yy +++ b/scripts/slider/slider.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "slider", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "slider", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/string_cut/string_cut.gml b/scripts/string_cut/string_cut.gml index 8b5063005..b42dd2064 100644 --- a/scripts/string_cut/string_cut.gml +++ b/scripts/string_cut/string_cut.gml @@ -6,17 +6,19 @@ function string_cut(str, w, tail = "...") { var ww = 0; var ind = 1; var ss = ""; + var tw = string_width(tail); + if(string_width(str) <= w) return str; while(ind <= string_length(str)) { var ch = string_char_at(str, ind); var _w = string_width(ch); - if(ww + _w > w - 10) { + if(ww + _w + tw >= w) { ss += tail; - break; - } else { + break; + } else ss += ch; - } + ww += _w; ind++; diff --git a/scripts/string_cut/string_cut.yy b/scripts/string_cut/string_cut.yy index d655bc24d..de2149655 100644 --- a/scripts/string_cut/string_cut.yy +++ b/scripts/string_cut/string_cut.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "string_cut", "isDnD": false, "isCompatibility": false, "parent": { "name": "string", "path": "folders/functions/string.yy", }, - "resourceVersion": "1.0", - "name": "string_cut", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/surfaceBox/surfaceBox.gml b/scripts/surfaceBox/surfaceBox.gml index 8e474918f..24a55c2ee 100644 --- a/scripts/surfaceBox/surfaceBox.gml +++ b/scripts/surfaceBox/surfaceBox.gml @@ -44,8 +44,10 @@ function surfaceBox(_onModify, def_path = "") constructor { var sfw = surface_get_width(_surface); var sfh = surface_get_height(_surface); var ss = min(sw / sfw, sh / sfh); + var _sx = sx0 + sw / 2 - ss * sfw / 2; + var _sy = sy0 + sh / 2 - ss * sfh / 2; - draw_surface_ext(_surface, sx0, sy0, ss, ss, 0, c_white, 1); + draw_surface_ext(_surface, _sx, _sy, ss, ss, 0, c_white, 1); } draw_sprite_ext(s_scroll_box_arrow, 0, _x + _w - 20, _y + _h / 2, 1, 1, 0, c_ui_blue_grey, 1); diff --git a/scripts/surface_modify/surface_modify.gml b/scripts/surface_modify/surface_modify.gml index 28dfb2916..cc971720e 100644 --- a/scripts/surface_modify/surface_modify.gml +++ b/scripts/surface_modify/surface_modify.gml @@ -12,8 +12,8 @@ function draw_surface_part_ext_safe(surface, _l, _t, _w, _h, _x, _y, _xs, _ys, _ } function surface_size_to(surface, width, height) { - if(width <= 1 || height <= 1) return false; - if(is_infinity(width) || is_infinity(height)) return false; + width = surface_valid(width); + height = surface_valid(height); if(!surface_exists(surface)) return false; @@ -51,6 +51,10 @@ function surface_valid(s) { return max(1, s); } +function surface_create_valid(w, h) { + return surface_create(surface_valid(w), surface_valid(h)); +} + function is_surface(s) { if(is_array(s)) return false; if(!is_real(s)) return false; diff --git a/scripts/textBox/textBox.gml b/scripts/textBox/textBox.gml index 4f34b1444..b95b074e5 100644 --- a/scripts/textBox/textBox.gml +++ b/scripts/textBox/textBox.gml @@ -331,7 +331,7 @@ function textBox(_input, _onModify) constructor { #endregion #region draw - var ss = string_cut(_input_text, _w - 4); + var ss = string_cut(_input_text, _w - 16); draw_set_text(font, fa_left, fa_top, c_white); var ww = string_width(ss); @@ -374,7 +374,7 @@ function textBox(_input, _onModify) constructor { TEXTBOX_ACTIVE = noone; } } else { - var ss = string_cut(string(_text), _w - 4); + var ss = string_cut(string(_text), _w - 16); draw_set_text(font, fa_left, fa_center, c_white); var ww = string_width(ss); diff --git a/shaders/sh_grid/sh_grid.fsh b/shaders/sh_grid/sh_grid.fsh index 650036033..257b18354 100644 --- a/shaders/sh_grid/sh_grid.fsh +++ b/shaders/sh_grid/sh_grid.fsh @@ -5,6 +5,7 @@ varying vec2 v_vTexcoord; varying vec4 v_vColour; uniform vec2 position; +uniform vec2 dimension; uniform vec2 scale; uniform float angle; uniform float width; @@ -16,8 +17,9 @@ uniform int useSampler; void main() { vec2 pos = v_vTexcoord - position, _pos; - _pos.x = pos.x * cos(angle) - pos.y * sin(angle); - _pos.y = pos.x * sin(angle) + pos.y * cos(angle); + float ratio = dimension.x / dimension.y; + _pos.x = pos.x * ratio * cos(angle) - pos.y * sin(angle); + _pos.y = pos.x * ratio * sin(angle) + pos.y * cos(angle); if(shiftAxis == 0) { float cellY = floor(_pos.y * scale.y); diff --git a/shaders/sh_stripe/sh_stripe.fsh b/shaders/sh_stripe/sh_stripe.fsh index 853a35e00..16e79a96a 100644 --- a/shaders/sh_stripe/sh_stripe.fsh +++ b/shaders/sh_stripe/sh_stripe.fsh @@ -10,6 +10,7 @@ uniform vec4 gradient_color[16]; uniform float gradient_time[16]; uniform int gradient_keys; +uniform vec2 dimension; uniform vec2 position; uniform float angle; uniform float amount; @@ -49,7 +50,8 @@ vec4 gradientEval(in float prog) { void main() { vec2 pos = v_vTexcoord - position; - float prog = pos.x * cos(angle) - pos.y * sin(angle); + float ratio = dimension.x / dimension.y; + float prog = pos.x * ratio * cos(angle) - pos.y * sin(angle); float _a = 1. / amount; float slot = floor(prog / _a); diff --git a/sprites/icon_24/icon_24.yy b/sprites/icon_24/icon_24.yy index 978381c55..4469983aa 100644 --- a/sprites/icon_24/icon_24.yy +++ b/sprites/icon_24/icon_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/icon_32/icon_32.yy b/sprites/icon_32/icon_32.yy index 88efa83f7..b43f368a4 100644 --- a/sprites/icon_32/icon_32.yy +++ b/sprites/icon_32/icon_32.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/icon_64/icon_64.yy b/sprites/icon_64/icon_64.yy index d5e8cacf8..59eb46ab1 100644 --- a/sprites/icon_64/icon_64.yy +++ b/sprites/icon_64/icon_64.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 64, "height": 64, "textureGroupId": { diff --git a/sprites/s_add_24/s_add_24.yy b/sprites/s_add_24/s_add_24.yy index f2c41a43b..3bafa57f8 100644 --- a/sprites/s_add_24/s_add_24.yy +++ b/sprites/s_add_24/s_add_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_add_32/s_add_32.yy b/sprites/s_add_32/s_add_32.yy index fb8f251f0..afd47ad23 100644 --- a/sprites/s_add_32/s_add_32.yy +++ b/sprites/s_add_32/s_add_32.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_add_node_view/s_add_node_view.yy b/sprites/s_add_node_view/s_add_node_view.yy index 380d2c5ad..232b99888 100644 --- a/sprites/s_add_node_view/s_add_node_view.yy +++ b/sprites/s_add_node_view/s_add_node_view.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_anchor/s_anchor.yy b/sprites/s_anchor/s_anchor.yy index 97a2b8300..0eb9f9945 100644 --- a/sprites/s_anchor/s_anchor.yy +++ b/sprites/s_anchor/s_anchor.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_anchor_rotate/s_anchor_rotate.yy b/sprites/s_anchor_rotate/s_anchor_rotate.yy index 5dddfab4c..30a6ebf0b 100644 --- a/sprites/s_anchor_rotate/s_anchor_rotate.yy +++ b/sprites/s_anchor_rotate/s_anchor_rotate.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_anchor_scale/s_anchor_scale.yy b/sprites/s_anchor_scale/s_anchor_scale.yy index 16ce6429d..57c9a62cd 100644 --- a/sprites/s_anchor_scale/s_anchor_scale.yy +++ b/sprites/s_anchor_scale/s_anchor_scale.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy b/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy index 761ecd635..910516336 100644 --- a/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy +++ b/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 24, "textureGroupId": { diff --git a/sprites/s_anchor_selector/s_anchor_selector.yy b/sprites/s_anchor_selector/s_anchor_selector.yy index 3217d1807..2ad489e2b 100644 --- a/sprites/s_anchor_selector/s_anchor_selector.yy +++ b/sprites/s_anchor_selector/s_anchor_selector.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 18, "height": 18, "textureGroupId": { diff --git a/sprites/s_animate_clock/s_animate_clock.yy b/sprites/s_animate_clock/s_animate_clock.yy index 211662978..eea6ab003 100644 --- a/sprites/s_animate_clock/s_animate_clock.yy +++ b/sprites/s_animate_clock/s_animate_clock.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_animate_node_go/s_animate_node_go.yy b/sprites/s_animate_node_go/s_animate_node_go.yy index a1f818586..14c890c65 100644 --- a/sprites/s_animate_node_go/s_animate_node_go.yy +++ b/sprites/s_animate_node_go/s_animate_node_go.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 10, "height": 10, "textureGroupId": { diff --git a/sprites/s_animation_setting/s_animation_setting.yy b/sprites/s_animation_setting/s_animation_setting.yy index 26886ac17..7ad23869a 100644 --- a/sprites/s_animation_setting/s_animation_setting.yy +++ b/sprites/s_animation_setting/s_animation_setting.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_animation_timing/s_animation_timing.yy b/sprites/s_animation_timing/s_animation_timing.yy index 3ac0135d1..30b2ad5f8 100644 --- a/sprites/s_animation_timing/s_animation_timing.yy +++ b/sprites/s_animation_timing/s_animation_timing.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_arrow_16/s_arrow_16.yy b/sprites/s_arrow_16/s_arrow_16.yy index 91e0ce0a5..f4e6e98a0 100644 --- a/sprites/s_arrow_16/s_arrow_16.yy +++ b/sprites/s_arrow_16/s_arrow_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button/s_button.yy b/sprites/s_button/s_button.yy index 59ce8f1ab..9e848664d 100644 --- a/sprites/s_button/s_button.yy +++ b/sprites/s_button/s_button.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button_hide/s_button_hide.yy b/sprites/s_button_hide/s_button_hide.yy index 98812d933..1a3cabb75 100644 --- a/sprites/s_button_hide/s_button_hide.yy +++ b/sprites/s_button_hide/s_button_hide.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button_hide_fill/s_button_hide_fill.yy b/sprites/s_button_hide_fill/s_button_hide_fill.yy index d0dd0110b..627c15a78 100644 --- a/sprites/s_button_hide_fill/s_button_hide_fill.yy +++ b/sprites/s_button_hide_fill/s_button_hide_fill.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button_left/s_button_left.yy b/sprites/s_button_left/s_button_left.yy index abeb0ebd0..c8fdffd3b 100644 --- a/sprites/s_button_left/s_button_left.yy +++ b/sprites/s_button_left/s_button_left.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button_lime/s_button_lime.yy b/sprites/s_button_lime/s_button_lime.yy index 8a7fa22ee..f62c0d0fe 100644 --- a/sprites/s_button_lime/s_button_lime.yy +++ b/sprites/s_button_lime/s_button_lime.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button_middle/s_button_middle.yy b/sprites/s_button_middle/s_button_middle.yy index ebf9565c2..383744714 100644 --- a/sprites/s_button_middle/s_button_middle.yy +++ b/sprites/s_button_middle/s_button_middle.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_button_path_icon/s_button_path_icon.yy b/sprites/s_button_path_icon/s_button_path_icon.yy index c732983d1..becfeb45f 100644 --- a/sprites/s_button_path_icon/s_button_path_icon.yy +++ b/sprites/s_button_path_icon/s_button_path_icon.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy b/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy index 5fb37884b..c3583ff05 100644 --- a/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy +++ b/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_button_right/s_button_right.yy b/sprites/s_button_right/s_button_right.yy index 4a7e8457c..34d23872d 100644 --- a/sprites/s_button_right/s_button_right.yy +++ b/sprites/s_button_right/s_button_right.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_cache/s_cache.yy b/sprites/s_cache/s_cache.yy index 05c682911..536207cd9 100644 --- a/sprites/s_cache/s_cache.yy +++ b/sprites/s_cache/s_cache.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy b/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy index 6fdfcd613..be365f4a2 100644 --- a/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy +++ b/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy b/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy index 13b99348f..1989a866f 100644 --- a/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy +++ b/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy b/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy index f10eb78d1..6ec366826 100644 --- a/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy +++ b/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy b/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy index 225f6dae7..6002570f0 100644 --- a/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy +++ b/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy b/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy index 399646d01..05340c9da 100644 --- a/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy +++ b/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy b/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy index aa998c9f3..d53b7e30f 100644 --- a/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy +++ b/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy b/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy index cb8cfa36f..dbac1e621 100644 --- a/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy +++ b/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_checkbox/s_checkbox.yy b/sprites/s_checkbox/s_checkbox.yy index 513730a0d..1b6258baa 100644 --- a/sprites/s_checkbox/s_checkbox.yy +++ b/sprites/s_checkbox/s_checkbox.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_circle_12/s_circle_12.yy b/sprites/s_circle_12/s_circle_12.yy index 722accdd4..02dd7e49e 100644 --- a/sprites/s_circle_12/s_circle_12.yy +++ b/sprites/s_circle_12/s_circle_12.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_circle_16/s_circle_16.yy b/sprites/s_circle_16/s_circle_16.yy index df49b4c0e..926d0e5cc 100644 --- a/sprites/s_circle_16/s_circle_16.yy +++ b/sprites/s_circle_16/s_circle_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_color_picker_dropper/s_color_picker_dropper.yy b/sprites/s_color_picker_dropper/s_color_picker_dropper.yy index 36e71fd85..cf031d07d 100644 --- a/sprites/s_color_picker_dropper/s_color_picker_dropper.yy +++ b/sprites/s_color_picker_dropper/s_color_picker_dropper.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_color_picker_sample/s_color_picker_sample.yy b/sprites/s_color_picker_sample/s_color_picker_sample.yy index 616f6ec65..30d4fd48c 100644 --- a/sprites/s_color_picker_sample/s_color_picker_sample.yy +++ b/sprites/s_color_picker_sample/s_color_picker_sample.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_control_edit/s_control_edit.yy b/sprites/s_control_edit/s_control_edit.yy index 8f84d6b1e..bf51b42fa 100644 --- a/sprites/s_control_edit/s_control_edit.yy +++ b/sprites/s_control_edit/s_control_edit.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_control_pin/s_control_pin.yy b/sprites/s_control_pin/s_control_pin.yy index f1f806aaf..253ec396a 100644 --- a/sprites/s_control_pin/s_control_pin.yy +++ b/sprites/s_control_pin/s_control_pin.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_control_unpin/s_control_unpin.yy b/sprites/s_control_unpin/s_control_unpin.yy index e8651eb9b..dc5bdc638 100644 --- a/sprites/s_control_unpin/s_control_unpin.yy +++ b/sprites/s_control_unpin/s_control_unpin.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_cursor_path_add/s_cursor_path_add.yy b/sprites/s_cursor_path_add/s_cursor_path_add.yy index de9fffc42..f7ba670a0 100644 --- a/sprites/s_cursor_path_add/s_cursor_path_add.yy +++ b/sprites/s_cursor_path_add/s_cursor_path_add.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 29, "height": 29, "textureGroupId": { diff --git a/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy b/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy index f7fc5b63f..e439e4100 100644 --- a/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy +++ b/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 29, "height": 29, "textureGroupId": { diff --git a/sprites/s_cursor_path_move/s_cursor_path_move.yy b/sprites/s_cursor_path_move/s_cursor_path_move.yy index 60cd7f3fc..aeecfce26 100644 --- a/sprites/s_cursor_path_move/s_cursor_path_move.yy +++ b/sprites/s_cursor_path_move/s_cursor_path_move.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 29, "height": 29, "textureGroupId": { diff --git a/sprites/s_cursor_path_remove/s_cursor_path_remove.yy b/sprites/s_cursor_path_remove/s_cursor_path_remove.yy index d688c4b7f..ab93fbbc1 100644 --- a/sprites/s_cursor_path_remove/s_cursor_path_remove.yy +++ b/sprites/s_cursor_path_remove/s_cursor_path_remove.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 29, "height": 29, "textureGroupId": { diff --git a/sprites/s_delete_16/s_delete_16.yy b/sprites/s_delete_16/s_delete_16.yy index fd7d15013..8ae5ea022 100644 --- a/sprites/s_delete_16/s_delete_16.yy +++ b/sprites/s_delete_16/s_delete_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_dialog_active/s_dialog_active.yy b/sprites/s_dialog_active/s_dialog_active.yy index 278e4f3ec..b28775ccc 100644 --- a/sprites/s_dialog_active/s_dialog_active.yy +++ b/sprites/s_dialog_active/s_dialog_active.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 18, "height": 18, "textureGroupId": { diff --git a/sprites/s_dialog_bg/s_dialog_bg.yy b/sprites/s_dialog_bg/s_dialog_bg.yy index 20ff22206..676e279e1 100644 --- a/sprites/s_dialog_bg/s_dialog_bg.yy +++ b/sprites/s_dialog_bg/s_dialog_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 18, "height": 18, "textureGroupId": { diff --git a/sprites/s_file/s_file.yy b/sprites/s_file/s_file.yy index 0d523b685..0b276fa4a 100644 --- a/sprites/s_file/s_file.yy +++ b/sprites/s_file/s_file.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_fill_16/s_fill_16.yy b/sprites/s_fill_16/s_fill_16.yy index df115aa13..45af21d15 100644 --- a/sprites/s_fill_16/s_fill_16.yy +++ b/sprites/s_fill_16/s_fill_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_folder_24/s_folder_24.yy b/sprites/s_folder_24/s_folder_24.yy index 32ee630e7..27af20942 100644 --- a/sprites/s_folder_24/s_folder_24.yy +++ b/sprites/s_folder_24/s_folder_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_folder_add/s_folder_add.yy b/sprites/s_folder_add/s_folder_add.yy index 702a6be57..84ce360c0 100644 --- a/sprites/s_folder_add/s_folder_add.yy +++ b/sprites/s_folder_add/s_folder_add.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_folder_content_24/s_folder_content_24.yy b/sprites/s_folder_content_24/s_folder_content_24.yy index 70cfb9b9b..7e9534d44 100644 --- a/sprites/s_folder_content_24/s_folder_content_24.yy +++ b/sprites/s_folder_content_24/s_folder_content_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_fx_pixel/s_fx_pixel.yy b/sprites/s_fx_pixel/s_fx_pixel.yy index c34632ec6..97b17ec2c 100644 --- a/sprites/s_fx_pixel/s_fx_pixel.yy +++ b/sprites/s_fx_pixel/s_fx_pixel.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": true, + "DynamicTexturePage": false, "width": 1, "height": 1, "textureGroupId": { diff --git a/sprites/s_gear_24/s_gear_24.yy b/sprites/s_gear_24/s_gear_24.yy index 6d3442201..1158a9d34 100644 --- a/sprites/s_gear_24/s_gear_24.yy +++ b/sprites/s_gear_24/s_gear_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_grad_blend/s_grad_blend.yy b/sprites/s_grad_blend/s_grad_blend.yy index ac54ebf34..cd322d44d 100644 --- a/sprites/s_grad_blend/s_grad_blend.yy +++ b/sprites/s_grad_blend/s_grad_blend.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_graph/s_graph.yy b/sprites/s_graph/s_graph.yy index 19e2ec9bc..c620d8059 100644 --- a/sprites/s_graph/s_graph.yy +++ b/sprites/s_graph/s_graph.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_group_16/s_group_16.yy b/sprites/s_group_16/s_group_16.yy index bcf7b41a4..8075e4f7f 100644 --- a/sprites/s_group_16/s_group_16.yy +++ b/sprites/s_group_16/s_group_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_group_24/s_group_24.yy b/sprites/s_group_24/s_group_24.yy index 0503ddd70..b65d042a1 100644 --- a/sprites/s_group_24/s_group_24.yy +++ b/sprites/s_group_24/s_group_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_hamburger/s_hamburger.yy b/sprites/s_hamburger/s_hamburger.yy index 312df9f23..f160d536c 100644 --- a/sprites/s_hamburger/s_hamburger.yy +++ b/sprites/s_hamburger/s_hamburger.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_hamburger_16/s_hamburger_16.yy b/sprites/s_hamburger_16/s_hamburger_16.yy index 0af7c94ef..0a7a73d5c 100644 --- a/sprites/s_hamburger_16/s_hamburger_16.yy +++ b/sprites/s_hamburger_16/s_hamburger_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_icon_accept_24/s_icon_accept_24.yy b/sprites/s_icon_accept_24/s_icon_accept_24.yy index 7e716e8fa..8bf7ff6bb 100644 --- a/sprites/s_icon_accept_24/s_icon_accept_24.yy +++ b/sprites/s_icon_accept_24/s_icon_accept_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_accept_32/s_icon_accept_32.yy b/sprites/s_icon_accept_32/s_icon_accept_32.yy index 23ed657d5..1f6f4790d 100644 --- a/sprites/s_icon_accept_32/s_icon_accept_32.yy +++ b/sprites/s_icon_accept_32/s_icon_accept_32.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_icon_center_canvas/s_icon_center_canvas.yy b/sprites/s_icon_center_canvas/s_icon_center_canvas.yy index 8e36aaa8b..dc1429c05 100644 --- a/sprites/s_icon_center_canvas/s_icon_center_canvas.yy +++ b/sprites/s_icon_center_canvas/s_icon_center_canvas.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_curve_connection/s_icon_curve_connection.yy b/sprites/s_icon_curve_connection/s_icon_curve_connection.yy index 647927d03..90539988a 100644 --- a/sprites/s_icon_curve_connection/s_icon_curve_connection.yy +++ b/sprites/s_icon_curve_connection/s_icon_curve_connection.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_grid/s_icon_grid.yy b/sprites/s_icon_grid/s_icon_grid.yy index b98afed2b..53715fa62 100644 --- a/sprites/s_icon_grid/s_icon_grid.yy +++ b/sprites/s_icon_grid/s_icon_grid.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_grid_setting/s_icon_grid_setting.yy b/sprites/s_icon_grid_setting/s_icon_grid_setting.yy index 50012cd9a..a5a2f22d6 100644 --- a/sprites/s_icon_grid_setting/s_icon_grid_setting.yy +++ b/sprites/s_icon_grid_setting/s_icon_grid_setting.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_minimap/s_icon_minimap.yy b/sprites/s_icon_minimap/s_icon_minimap.yy index 6d6d0169a..040736a8e 100644 --- a/sprites/s_icon_minimap/s_icon_minimap.yy +++ b/sprites/s_icon_minimap/s_icon_minimap.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_preview_export/s_icon_preview_export.yy b/sprites/s_icon_preview_export/s_icon_preview_export.yy index 9804b3bec..727a87f25 100644 --- a/sprites/s_icon_preview_export/s_icon_preview_export.yy +++ b/sprites/s_icon_preview_export/s_icon_preview_export.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy b/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy index 1ea639b39..7ef41c738 100644 --- a/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy +++ b/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_icon_spalsh_show_on_start/943dad36-574c-4404-ab58-0b940258d501.png b/sprites/s_icon_spalsh_show_on_start/943dad36-574c-4404-ab58-0b940258d501.png new file mode 100644 index 000000000..91393999c Binary files /dev/null and b/sprites/s_icon_spalsh_show_on_start/943dad36-574c-4404-ab58-0b940258d501.png differ diff --git a/sprites/s_icon_spalsh_show_on_start/bcf948d2-a01b-486f-9ede-12bbcc458249.png b/sprites/s_icon_spalsh_show_on_start/bcf948d2-a01b-486f-9ede-12bbcc458249.png new file mode 100644 index 000000000..44085fd7e Binary files /dev/null and b/sprites/s_icon_spalsh_show_on_start/bcf948d2-a01b-486f-9ede-12bbcc458249.png differ diff --git a/sprites/s_icon_spalsh_show_on_start/layers/943dad36-574c-4404-ab58-0b940258d501/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png b/sprites/s_icon_spalsh_show_on_start/layers/943dad36-574c-4404-ab58-0b940258d501/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png new file mode 100644 index 000000000..91393999c Binary files /dev/null and b/sprites/s_icon_spalsh_show_on_start/layers/943dad36-574c-4404-ab58-0b940258d501/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png differ diff --git a/sprites/s_icon_spalsh_show_on_start/layers/bcf948d2-a01b-486f-9ede-12bbcc458249/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png b/sprites/s_icon_spalsh_show_on_start/layers/bcf948d2-a01b-486f-9ede-12bbcc458249/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png new file mode 100644 index 000000000..44085fd7e Binary files /dev/null and b/sprites/s_icon_spalsh_show_on_start/layers/bcf948d2-a01b-486f-9ede-12bbcc458249/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png differ diff --git a/sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy b/sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy new file mode 100644 index 000000000..3ce57e768 --- /dev/null +++ b/sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "s_icon_spalsh_show_on_start", + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 2, + "bbox_right": 23, + "bbox_top": 5, + "bbox_bottom": 22, + "HTile": false, + "VTile": false, + "For3D": false, + "DynamicTexturePage": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bcf948d2-a01b-486f-9ede-12bbcc458249",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"943dad36-574c-4404-ab58-0b940258d501",}, + ], + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "s_icon_spalsh_show_on_start", + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 2.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"423f4c40-7cc2-49be-aafe-b5eaca9c3e57","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bcf948d2-a01b-486f-9ede-12bbcc458249","path":"sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0f2a7da8-7a57-4ba8-bdfe-bde579beec8b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"943dad36-574c-4404-ab58-0b940258d501","path":"sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + ], + "visibleRange": {"x":0.0,"y":0.0,}, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + }, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e25cfe5b-d245-48ac-80c0-e1dc71267b9b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + ], + "nineSlice": null, + "parent": { + "name": "panels", + "path": "folders/sprites/panels.yy", + }, +} \ No newline at end of file diff --git a/sprites/s_icon_split_view/s_icon_split_view.yy b/sprites/s_icon_split_view/s_icon_split_view.yy index 1f6dbf1fc..b9bd3df9b 100644 --- a/sprites/s_icon_split_view/s_icon_split_view.yy +++ b/sprites/s_icon_split_view/s_icon_split_view.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_inspector_area/s_inspector_area.yy b/sprites/s_inspector_area/s_inspector_area.yy index 185f27475..5308be1dc 100644 --- a/sprites/s_inspector_area/s_inspector_area.yy +++ b/sprites/s_inspector_area/s_inspector_area.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 72, "height": 72, "textureGroupId": { diff --git a/sprites/s_inspector_padding/s_inspector_padding.yy b/sprites/s_inspector_padding/s_inspector_padding.yy index d2894fa86..a85524bad 100644 --- a/sprites/s_inspector_padding/s_inspector_padding.yy +++ b/sprites/s_inspector_padding/s_inspector_padding.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 96, "height": 96, "textureGroupId": { diff --git a/sprites/s_inspector_text_halign/s_inspector_text_halign.yy b/sprites/s_inspector_text_halign/s_inspector_text_halign.yy index 889e5c088..0889244ba 100644 --- a/sprites/s_inspector_text_halign/s_inspector_text_halign.yy +++ b/sprites/s_inspector_text_halign/s_inspector_text_halign.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_inspector_text_valign/s_inspector_text_valign.yy b/sprites/s_inspector_text_valign/s_inspector_text_valign.yy index 78de72409..4e6333096 100644 --- a/sprites/s_inspector_text_valign/s_inspector_text_valign.yy +++ b/sprites/s_inspector_text_valign/s_inspector_text_valign.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_junc_visible/s_junc_visible.yy b/sprites/s_junc_visible/s_junc_visible.yy index 78dddc42d..d15346eff 100644 --- a/sprites/s_junc_visible/s_junc_visible.yy +++ b/sprites/s_junc_visible/s_junc_visible.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_kenney/s_kenney.yy b/sprites/s_kenney/s_kenney.yy index 1cf335688..2f74a5ecc 100644 --- a/sprites/s_kenney/s_kenney.yy +++ b/sprites/s_kenney/s_kenney.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 75, "height": 30, "textureGroupId": { diff --git a/sprites/s_loading/s_loading.yy b/sprites/s_loading/s_loading.yy index 456d61273..1d5ee2aad 100644 --- a/sprites/s_loading/s_loading.yy +++ b/sprites/s_loading/s_loading.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 64, "height": 64, "textureGroupId": { diff --git a/sprites/s_loop_16/s_loop_16.yy b/sprites/s_loop_16/s_loop_16.yy index 0988fd21c..02492d0d5 100644 --- a/sprites/s_loop_16/s_loop_16.yy +++ b/sprites/s_loop_16/s_loop_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_menu_black/s_menu_black.yy b/sprites/s_menu_black/s_menu_black.yy index 5aea8004a..3e50c96ca 100644 --- a/sprites/s_menu_black/s_menu_black.yy +++ b/sprites/s_menu_black/s_menu_black.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_menu_button/s_menu_button.yy b/sprites/s_menu_button/s_menu_button.yy index 0fc33b3f2..2e2e33ba1 100644 --- a/sprites/s_menu_button/s_menu_button.yy +++ b/sprites/s_menu_button/s_menu_button.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_menu_separator/s_menu_separator.yy b/sprites/s_menu_separator/s_menu_separator.yy index 17d8d82cc..d18a7aa08 100644 --- a/sprites/s_menu_separator/s_menu_separator.yy +++ b/sprites/s_menu_separator/s_menu_separator.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 6, "height": 6, "textureGroupId": { diff --git a/sprites/s_menu_transparent/s_menu_transparent.yy b/sprites/s_menu_transparent/s_menu_transparent.yy index ced78a7c8..5eb365b03 100644 --- a/sprites/s_menu_transparent/s_menu_transparent.yy +++ b/sprites/s_menu_transparent/s_menu_transparent.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_menu_white/s_menu_white.yy b/sprites/s_menu_white/s_menu_white.yy index a0bca821b..4f6f1d72b 100644 --- a/sprites/s_menu_white/s_menu_white.yy +++ b/sprites/s_menu_white/s_menu_white.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_minus_24/s_minus_24.yy b/sprites/s_minus_24/s_minus_24.yy index 24f16d7ee..05fefd067 100644 --- a/sprites/s_minus_24/s_minus_24.yy +++ b/sprites/s_minus_24/s_minus_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_node_2d_light/s_node_2d_light.yy b/sprites/s_node_2d_light/s_node_2d_light.yy index 387cfb00a..72ace0a38 100644 --- a/sprites/s_node_2d_light/s_node_2d_light.yy +++ b/sprites/s_node_2d_light/s_node_2d_light.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_3d_cube/s_node_3d_cube.yy b/sprites/s_node_3d_cube/s_node_3d_cube.yy index d6c848645..c622cf460 100644 --- a/sprites/s_node_3d_cube/s_node_3d_cube.yy +++ b/sprites/s_node_3d_cube/s_node_3d_cube.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy b/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy index 0aa4c652a..ffe9636ba 100644 --- a/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy +++ b/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_3d_obj/s_node_3d_obj.yy b/sprites/s_node_3d_obj/s_node_3d_obj.yy index 74fd21f0c..b247a00cc 100644 --- a/sprites/s_node_3d_obj/s_node_3d_obj.yy +++ b/sprites/s_node_3d_obj/s_node_3d_obj.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_3d_transform/s_node_3d_transform.yy b/sprites/s_node_3d_transform/s_node_3d_transform.yy index 7c889d368..069d6921d 100644 --- a/sprites/s_node_3d_transform/s_node_3d_transform.yy +++ b/sprites/s_node_3d_transform/s_node_3d_transform.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_9patch/s_node_9patch.yy b/sprites/s_node_9patch/s_node_9patch.yy index e812b0ca5..28ac678b6 100644 --- a/sprites/s_node_9patch/s_node_9patch.yy +++ b/sprites/s_node_9patch/s_node_9patch.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_BW/s_node_BW.yy b/sprites/s_node_BW/s_node_BW.yy index 3bd62eccf..1cb78c312 100644 --- a/sprites/s_node_BW/s_node_BW.yy +++ b/sprites/s_node_BW/s_node_BW.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_RGB/s_node_RGB.yy b/sprites/s_node_RGB/s_node_RGB.yy index 0638f1d68..1f91b0a8a 100644 --- a/sprites/s_node_RGB/s_node_RGB.yy +++ b/sprites/s_node_RGB/s_node_RGB.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_active/s_node_active.yy b/sprites/s_node_active/s_node_active.yy index 4196f7c69..0973669c0 100644 --- a/sprites/s_node_active/s_node_active.yy +++ b/sprites/s_node_active/s_node_active.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_alpha_cut/s_node_alpha_cut.yy b/sprites/s_node_alpha_cut/s_node_alpha_cut.yy index a949d4437..1acc05c67 100644 --- a/sprites/s_node_alpha_cut/s_node_alpha_cut.yy +++ b/sprites/s_node_alpha_cut/s_node_alpha_cut.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_alpha_grey/s_node_alpha_grey.yy b/sprites/s_node_alpha_grey/s_node_alpha_grey.yy index e01d962ce..3c87cc8cd 100644 --- a/sprites/s_node_alpha_grey/s_node_alpha_grey.yy +++ b/sprites/s_node_alpha_grey/s_node_alpha_grey.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_area/s_node_area.yy b/sprites/s_node_area/s_node_area.yy index 19edead28..dc3a00521 100644 --- a/sprites/s_node_area/s_node_area.yy +++ b/sprites/s_node_area/s_node_area.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_array/s_node_array.yy b/sprites/s_node_array/s_node_array.yy index 7e3d573ef..8be50e672 100644 --- a/sprites/s_node_array/s_node_array.yy +++ b/sprites/s_node_array/s_node_array.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_array_get/s_node_array_get.yy b/sprites/s_node_array_get/s_node_array_get.yy index 9b4bd7318..ff9f53355 100644 --- a/sprites/s_node_array_get/s_node_array_get.yy +++ b/sprites/s_node_array_get/s_node_array_get.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_array_length/s_node_array_length.yy b/sprites/s_node_array_length/s_node_array_length.yy index de484c869..c962d919f 100644 --- a/sprites/s_node_array_length/s_node_array_length.yy +++ b/sprites/s_node_array_length/s_node_array_length.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_atlas/s_node_atlas.yy b/sprites/s_node_atlas/s_node_atlas.yy index 50db24045..c7cf13edc 100644 --- a/sprites/s_node_atlas/s_node_atlas.yy +++ b/sprites/s_node_atlas/s_node_atlas.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_bevel/s_node_bevel.yy b/sprites/s_node_bevel/s_node_bevel.yy index 7e4537647..d52c79bcb 100644 --- a/sprites/s_node_bevel/s_node_bevel.yy +++ b/sprites/s_node_bevel/s_node_bevel.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_bg/s_node_bg.yy b/sprites/s_node_bg/s_node_bg.yy index 99064d50a..66c89f52d 100644 --- a/sprites/s_node_bg/s_node_bg.yy +++ b/sprites/s_node_bg/s_node_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_bg_mini/s_node_bg_mini.yy b/sprites/s_node_bg_mini/s_node_bg_mini.yy index 233e1f1e4..bdd56c792 100644 --- a/sprites/s_node_bg_mini/s_node_bg_mini.yy +++ b/sprites/s_node_bg_mini/s_node_bg_mini.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 8, "height": 8, "textureGroupId": { diff --git a/sprites/s_node_blend/s_node_blend.yy b/sprites/s_node_blend/s_node_blend.yy index f1d60c613..dd938a077 100644 --- a/sprites/s_node_blend/s_node_blend.yy +++ b/sprites/s_node_blend/s_node_blend.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_bloom/s_node_bloom.yy b/sprites/s_node_bloom/s_node_bloom.yy index 8bdb5da90..13cd6b2aa 100644 --- a/sprites/s_node_bloom/s_node_bloom.yy +++ b/sprites/s_node_bloom/s_node_bloom.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_blur/s_node_blur.yy b/sprites/s_node_blur/s_node_blur.yy index 74c417d76..3542f867d 100644 --- a/sprites/s_node_blur/s_node_blur.yy +++ b/sprites/s_node_blur/s_node_blur.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_blur_contrast/s_node_blur_contrast.yy b/sprites/s_node_blur_contrast/s_node_blur_contrast.yy index c20ebc3f7..40e93196d 100644 --- a/sprites/s_node_blur_contrast/s_node_blur_contrast.yy +++ b/sprites/s_node_blur_contrast/s_node_blur_contrast.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_blur_directional/s_node_blur_directional.yy b/sprites/s_node_blur_directional/s_node_blur_directional.yy index 6821b1106..0d8a52b22 100644 --- a/sprites/s_node_blur_directional/s_node_blur_directional.yy +++ b/sprites/s_node_blur_directional/s_node_blur_directional.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_border/s_node_border.yy b/sprites/s_node_border/s_node_border.yy index c291d08ee..b446af7c7 100644 --- a/sprites/s_node_border/s_node_border.yy +++ b/sprites/s_node_border/s_node_border.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_canvas/s_node_canvas.yy b/sprites/s_node_canvas/s_node_canvas.yy index 9aab20589..fed16fde1 100644 --- a/sprites/s_node_canvas/s_node_canvas.yy +++ b/sprites/s_node_canvas/s_node_canvas.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_character/s_node_character.yy b/sprites/s_node_character/s_node_character.yy index f3cf4b761..007fe6d77 100644 --- a/sprites/s_node_character/s_node_character.yy +++ b/sprites/s_node_character/s_node_character.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_checker/s_node_checker.yy b/sprites/s_node_checker/s_node_checker.yy index 5495e2221..881bf6214 100644 --- a/sprites/s_node_checker/s_node_checker.yy +++ b/sprites/s_node_checker/s_node_checker.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy b/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy index 904593726..46c8f232a 100644 --- a/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy +++ b/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color/s_node_color.yy b/sprites/s_node_color/s_node_color.yy index dbb6e410c..fb94c3111 100644 --- a/sprites/s_node_color/s_node_color.yy +++ b/sprites/s_node_color/s_node_color.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_adjust/s_node_color_adjust.yy b/sprites/s_node_color_adjust/s_node_color_adjust.yy index a65727a0f..3ec4a40f1 100644 --- a/sprites/s_node_color_adjust/s_node_color_adjust.yy +++ b/sprites/s_node_color_adjust/s_node_color_adjust.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_data/s_node_color_data.yy b/sprites/s_node_color_data/s_node_color_data.yy index 7d967b0e8..72bd5f3fb 100644 --- a/sprites/s_node_color_data/s_node_color_data.yy +++ b/sprites/s_node_color_data/s_node_color_data.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy b/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy index 7fbf8e46e..b81ea7da7 100644 --- a/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy +++ b/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy b/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy index e16a47035..c6e1603f0 100644 --- a/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy +++ b/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_out/s_node_color_out.yy b/sprites/s_node_color_out/s_node_color_out.yy index fe84a1c49..2f389e62a 100644 --- a/sprites/s_node_color_out/s_node_color_out.yy +++ b/sprites/s_node_color_out/s_node_color_out.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_remove/s_node_color_remove.yy b/sprites/s_node_color_remove/s_node_color_remove.yy index 753594676..cbf96e75f 100644 --- a/sprites/s_node_color_remove/s_node_color_remove.yy +++ b/sprites/s_node_color_remove/s_node_color_remove.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_color_replace/s_node_color_replace.yy b/sprites/s_node_color_replace/s_node_color_replace.yy index 514e8f3fa..177ddbcfb 100644 --- a/sprites/s_node_color_replace/s_node_color_replace.yy +++ b/sprites/s_node_color_replace/s_node_color_replace.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_colorize/s_node_colorize.yy b/sprites/s_node_colorize/s_node_colorize.yy index 2d6952769..9aec138c8 100644 --- a/sprites/s_node_colorize/s_node_colorize.yy +++ b/sprites/s_node_colorize/s_node_colorize.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_compose/s_node_compose.yy b/sprites/s_node_compose/s_node_compose.yy index 91f634fea..9027825b8 100644 --- a/sprites/s_node_compose/s_node_compose.yy +++ b/sprites/s_node_compose/s_node_compose.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_condition/s_node_condition.yy b/sprites/s_node_condition/s_node_condition.yy index f0206c2ba..b66bab98d 100644 --- a/sprites/s_node_condition/s_node_condition.yy +++ b/sprites/s_node_condition/s_node_condition.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_corner/s_node_corner.yy b/sprites/s_node_corner/s_node_corner.yy index 8d470b9a3..f71d0d68e 100644 --- a/sprites/s_node_corner/s_node_corner.yy +++ b/sprites/s_node_corner/s_node_corner.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_counter/s_node_counter.yy b/sprites/s_node_counter/s_node_counter.yy index f4d612652..752a74c19 100644 --- a/sprites/s_node_counter/s_node_counter.yy +++ b/sprites/s_node_counter/s_node_counter.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_crop/s_node_crop.yy b/sprites/s_node_crop/s_node_crop.yy index aa37c4901..8c4676896 100644 --- a/sprites/s_node_crop/s_node_crop.yy +++ b/sprites/s_node_crop/s_node_crop.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_curve/s_node_curve.yy b/sprites/s_node_curve/s_node_curve.yy index 2c60fe152..4e5fa10e0 100644 --- a/sprites/s_node_curve/s_node_curve.yy +++ b/sprites/s_node_curve/s_node_curve.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_decorner/s_node_decorner.yy b/sprites/s_node_decorner/s_node_decorner.yy index 485eb3dd7..8a72351f3 100644 --- a/sprites/s_node_decorner/s_node_decorner.yy +++ b/sprites/s_node_decorner/s_node_decorner.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_destray/s_node_destray.yy b/sprites/s_node_destray/s_node_destray.yy index 08f79dee8..8f0358dc7 100644 --- a/sprites/s_node_destray/s_node_destray.yy +++ b/sprites/s_node_destray/s_node_destray.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_dilate/s_node_dilate.yy b/sprites/s_node_dilate/s_node_dilate.yy index 3082e2c84..5bda69c9d 100644 --- a/sprites/s_node_dilate/s_node_dilate.yy +++ b/sprites/s_node_dilate/s_node_dilate.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_displace/s_node_displace.yy b/sprites/s_node_displace/s_node_displace.yy index c4e52fb9b..01fa61472 100644 --- a/sprites/s_node_displace/s_node_displace.yy +++ b/sprites/s_node_displace/s_node_displace.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_dithering/s_node_dithering.yy b/sprites/s_node_dithering/s_node_dithering.yy index 829b52f9d..5f44542cd 100644 --- a/sprites/s_node_dithering/s_node_dithering.yy +++ b/sprites/s_node_dithering/s_node_dithering.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_draw_area/s_node_draw_area.yy b/sprites/s_node_draw_area/s_node_draw_area.yy index aec4c5c80..848946f37 100644 --- a/sprites/s_node_draw_area/s_node_draw_area.yy +++ b/sprites/s_node_draw_area/s_node_draw_area.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 40, "height": 40, "textureGroupId": { diff --git a/sprites/s_node_draw_path/s_node_draw_path.yy b/sprites/s_node_draw_path/s_node_draw_path.yy index c26f3aef0..c1d263c1b 100644 --- a/sprites/s_node_draw_path/s_node_draw_path.yy +++ b/sprites/s_node_draw_path/s_node_draw_path.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 40, "height": 40, "textureGroupId": { diff --git a/sprites/s_node_edge_detect/s_node_edge_detect.yy b/sprites/s_node_edge_detect/s_node_edge_detect.yy index 2d2de40b0..bed98afad 100644 --- a/sprites/s_node_edge_detect/s_node_edge_detect.yy +++ b/sprites/s_node_edge_detect/s_node_edge_detect.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_erode/s_node_erode.yy b/sprites/s_node_erode/s_node_erode.yy index 6607a7279..3fc23f4ef 100644 --- a/sprites/s_node_erode/s_node_erode.yy +++ b/sprites/s_node_erode/s_node_erode.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_error/s_node_error.yy b/sprites/s_node_error/s_node_error.yy index 304c072e1..ab854e08c 100644 --- a/sprites/s_node_error/s_node_error.yy +++ b/sprites/s_node_error/s_node_error.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_export/s_node_export.yy b/sprites/s_node_export/s_node_export.yy index efad9c382..ab0bc3da2 100644 --- a/sprites/s_node_export/s_node_export.yy +++ b/sprites/s_node_export/s_node_export.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_frame/s_node_frame.yy b/sprites/s_node_frame/s_node_frame.yy index 4228eb126..2d508decb 100644 --- a/sprites/s_node_frame/s_node_frame.yy +++ b/sprites/s_node_frame/s_node_frame.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_frame_bg/s_node_frame_bg.yy b/sprites/s_node_frame_bg/s_node_frame_bg.yy index 0772f6152..d296b5cab 100644 --- a/sprites/s_node_frame_bg/s_node_frame_bg.yy +++ b/sprites/s_node_frame_bg/s_node_frame_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_frame_bg_active/s_node_frame_bg_active.yy b/sprites/s_node_frame_bg_active/s_node_frame_bg_active.yy index a2c10b727..cb48f12de 100644 --- a/sprites/s_node_frame_bg_active/s_node_frame_bg_active.yy +++ b/sprites/s_node_frame_bg_active/s_node_frame_bg_active.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_glow/s_node_glow.yy b/sprites/s_node_glow/s_node_glow.yy index 5cd1450a6..9f485b068 100644 --- a/sprites/s_node_glow/s_node_glow.yy +++ b/sprites/s_node_glow/s_node_glow.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_gradient/s_node_gradient.yy b/sprites/s_node_gradient/s_node_gradient.yy index eb115ce90..1b98d8695 100644 --- a/sprites/s_node_gradient/s_node_gradient.yy +++ b/sprites/s_node_gradient/s_node_gradient.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_gradient_out/s_node_gradient_out.yy b/sprites/s_node_gradient_out/s_node_gradient_out.yy index b43cd2fb2..1956dd834 100644 --- a/sprites/s_node_gradient_out/s_node_gradient_out.yy +++ b/sprites/s_node_gradient_out/s_node_gradient_out.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_grey_alpha/s_node_grey_alpha.yy b/sprites/s_node_grey_alpha/s_node_grey_alpha.yy index 217bb185d..5b2ec6a9f 100644 --- a/sprites/s_node_grey_alpha/s_node_grey_alpha.yy +++ b/sprites/s_node_grey_alpha/s_node_grey_alpha.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_greyscale/s_node_greyscale.yy b/sprites/s_node_greyscale/s_node_greyscale.yy index db9c249e6..93c583621 100644 --- a/sprites/s_node_greyscale/s_node_greyscale.yy +++ b/sprites/s_node_greyscale/s_node_greyscale.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 33, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_grid/s_node_grid.yy b/sprites/s_node_grid/s_node_grid.yy index fe875d04d..a8fc04df2 100644 --- a/sprites/s_node_grid/s_node_grid.yy +++ b/sprites/s_node_grid/s_node_grid.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_grid_noise/s_node_grid_noise.yy b/sprites/s_node_grid_noise/s_node_grid_noise.yy index 53879b9b8..885ae0c3c 100644 --- a/sprites/s_node_grid_noise/s_node_grid_noise.yy +++ b/sprites/s_node_grid_noise/s_node_grid_noise.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_group/s_node_group.yy b/sprites/s_node_group/s_node_group.yy index aa8b1c500..52af965f5 100644 --- a/sprites/s_node_group/s_node_group.yy +++ b/sprites/s_node_group/s_node_group.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image/s_node_image.yy b/sprites/s_node_image/s_node_image.yy index bea93eb2c..11ff7d2c0 100644 --- a/sprites/s_node_image/s_node_image.yy +++ b/sprites/s_node_image/s_node_image.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image_animation/s_node_image_animation.yy b/sprites/s_node_image_animation/s_node_image_animation.yy index adfbdd04e..b8d7dd7b7 100644 --- a/sprites/s_node_image_animation/s_node_image_animation.yy +++ b/sprites/s_node_image_animation/s_node_image_animation.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image_copy/s_node_image_copy.yy b/sprites/s_node_image_copy/s_node_image_copy.yy index bf68e549f..fa3a213db 100644 --- a/sprites/s_node_image_copy/s_node_image_copy.yy +++ b/sprites/s_node_image_copy/s_node_image_copy.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image_gif/s_node_image_gif.yy b/sprites/s_node_image_gif/s_node_image_gif.yy index f027f3ce1..88551f944 100644 --- a/sprites/s_node_image_gif/s_node_image_gif.yy +++ b/sprites/s_node_image_gif/s_node_image_gif.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image_sequence/s_node_image_sequence.yy b/sprites/s_node_image_sequence/s_node_image_sequence.yy index 226439841..cfa161f31 100644 --- a/sprites/s_node_image_sequence/s_node_image_sequence.yy +++ b/sprites/s_node_image_sequence/s_node_image_sequence.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy b/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy index e6e74db37..337ea9e15 100644 --- a/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy +++ b/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_image_sheet/s_node_image_sheet.yy b/sprites/s_node_image_sheet/s_node_image_sheet.yy index d67f53c65..648bfc128 100644 --- a/sprites/s_node_image_sheet/s_node_image_sheet.yy +++ b/sprites/s_node_image_sheet/s_node_image_sheet.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_input/s_node_input.yy b/sprites/s_node_input/s_node_input.yy index 71e0aa3b8..ef87fb885 100644 --- a/sprites/s_node_input/s_node_input.yy +++ b/sprites/s_node_input/s_node_input.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_invert/s_node_invert.yy b/sprites/s_node_invert/s_node_invert.yy index 6095106c8..4ac77b61c 100644 --- a/sprites/s_node_invert/s_node_invert.yy +++ b/sprites/s_node_invert/s_node_invert.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_iterator_index/s_node_iterator_index.yy b/sprites/s_node_iterator_index/s_node_iterator_index.yy index 6ee991e55..67d4fc0e7 100644 --- a/sprites/s_node_iterator_index/s_node_iterator_index.yy +++ b/sprites/s_node_iterator_index/s_node_iterator_index.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_junction_name_bg/s_node_junction_name_bg.yy b/sprites/s_node_junction_name_bg/s_node_junction_name_bg.yy index 8127b4df6..f684c4bf7 100644 --- a/sprites/s_node_junction_name_bg/s_node_junction_name_bg.yy +++ b/sprites/s_node_junction_name_bg/s_node_junction_name_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_junctions_array/s_node_junctions_array.yy b/sprites/s_node_junctions_array/s_node_junctions_array.yy index f4adca0ef..b6e3ac8cb 100644 --- a/sprites/s_node_junctions_array/s_node_junctions_array.yy +++ b/sprites/s_node_junctions_array/s_node_junctions_array.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_junctions_array_hover/s_node_junctions_array_hover.yy b/sprites/s_node_junctions_array_hover/s_node_junctions_array_hover.yy index 4a7efca61..45000e334 100644 --- a/sprites/s_node_junctions_array_hover/s_node_junctions_array_hover.yy +++ b/sprites/s_node_junctions_array_hover/s_node_junctions_array_hover.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_junctions_single/s_node_junctions_single.yy b/sprites/s_node_junctions_single/s_node_junctions_single.yy index 99c0cb519..e8515126f 100644 --- a/sprites/s_node_junctions_single/s_node_junctions_single.yy +++ b/sprites/s_node_junctions_single/s_node_junctions_single.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_junctions_single_hover/s_node_junctions_single_hover.yy b/sprites/s_node_junctions_single_hover/s_node_junctions_single_hover.yy index 7299d0aa3..1dfa31f41 100644 --- a/sprites/s_node_junctions_single_hover/s_node_junctions_single_hover.yy +++ b/sprites/s_node_junctions_single_hover/s_node_junctions_single_hover.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_level/s_node_level.yy b/sprites/s_node_level/s_node_level.yy index 72eeab529..7264e585a 100644 --- a/sprites/s_node_level/s_node_level.yy +++ b/sprites/s_node_level/s_node_level.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_level_selector/s_node_level_selector.yy b/sprites/s_node_level_selector/s_node_level_selector.yy index bd84e88c3..77a850096 100644 --- a/sprites/s_node_level_selector/s_node_level_selector.yy +++ b/sprites/s_node_level_selector/s_node_level_selector.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_line/s_node_line.yy b/sprites/s_node_line/s_node_line.yy index 95e00dfde..cd3d35a0d 100644 --- a/sprites/s_node_line/s_node_line.yy +++ b/sprites/s_node_line/s_node_line.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_loop/s_node_loop.yy b/sprites/s_node_loop/s_node_loop.yy index 2e55b655a..02306f2fe 100644 --- a/sprites/s_node_loop/s_node_loop.yy +++ b/sprites/s_node_loop/s_node_loop.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_math/s_node_math.yy b/sprites/s_node_math/s_node_math.yy index 8d2ba8a4b..2c51266c4 100644 --- a/sprites/s_node_math/s_node_math.yy +++ b/sprites/s_node_math/s_node_math.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_mirror/s_node_mirror.yy b/sprites/s_node_mirror/s_node_mirror.yy index 706bec5bb..848684043 100644 --- a/sprites/s_node_mirror/s_node_mirror.yy +++ b/sprites/s_node_mirror/s_node_mirror.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_name/s_node_name.yy b/sprites/s_node_name/s_node_name.yy index 8a9ca9af1..7782c3ccf 100644 --- a/sprites/s_node_name/s_node_name.yy +++ b/sprites/s_node_name/s_node_name.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_noise_aniso/s_node_noise_aniso.yy b/sprites/s_node_noise_aniso/s_node_noise_aniso.yy index 2261f0e14..7e3ea0ea6 100644 --- a/sprites/s_node_noise_aniso/s_node_noise_aniso.yy +++ b/sprites/s_node_noise_aniso/s_node_noise_aniso.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_noise_cell/s_node_noise_cell.yy b/sprites/s_node_noise_cell/s_node_noise_cell.yy index 1692d2a1c..685d1be71 100644 --- a/sprites/s_node_noise_cell/s_node_noise_cell.yy +++ b/sprites/s_node_noise_cell/s_node_noise_cell.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_noise_perlin/s_node_noise_perlin.yy b/sprites/s_node_noise_perlin/s_node_noise_perlin.yy index 984b82319..ca5ecdba4 100644 --- a/sprites/s_node_noise_perlin/s_node_noise_perlin.yy +++ b/sprites/s_node_noise_perlin/s_node_noise_perlin.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_normal/s_node_normal.yy b/sprites/s_node_normal/s_node_normal.yy index 0dbb6b22c..ad4df2e24 100644 --- a/sprites/s_node_normal/s_node_normal.yy +++ b/sprites/s_node_normal/s_node_normal.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_normal_light/s_node_normal_light.yy b/sprites/s_node_normal_light/s_node_normal_light.yy index 6b6a46f28..595c68c06 100644 --- a/sprites/s_node_normal_light/s_node_normal_light.yy +++ b/sprites/s_node_normal_light/s_node_normal_light.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_number/s_node_number.yy b/sprites/s_node_number/s_node_number.yy index a3ba8dfc1..92e37ef30 100644 --- a/sprites/s_node_number/s_node_number.yy +++ b/sprites/s_node_number/s_node_number.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_output/s_node_output.yy b/sprites/s_node_output/s_node_output.yy index 07912e60a..ed7b7620a 100644 --- a/sprites/s_node_output/s_node_output.yy +++ b/sprites/s_node_output/s_node_output.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_padding/s_node_padding.yy b/sprites/s_node_padding/s_node_padding.yy index f0e273a53..6431f2939 100644 --- a/sprites/s_node_padding/s_node_padding.yy +++ b/sprites/s_node_padding/s_node_padding.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_palette/s_node_palette.yy b/sprites/s_node_palette/s_node_palette.yy index 7c933feed..c53c3bc47 100644 --- a/sprites/s_node_palette/s_node_palette.yy +++ b/sprites/s_node_palette/s_node_palette.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_particle/s_node_particle.yy b/sprites/s_node_particle/s_node_particle.yy index 0481bc8bf..a345544c5 100644 --- a/sprites/s_node_particle/s_node_particle.yy +++ b/sprites/s_node_particle/s_node_particle.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_particle_effector/s_node_particle_effector.yy b/sprites/s_node_particle_effector/s_node_particle_effector.yy index 2a531e715..e7861ddbd 100644 --- a/sprites/s_node_particle_effector/s_node_particle_effector.yy +++ b/sprites/s_node_particle_effector/s_node_particle_effector.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_path/s_node_path.yy b/sprites/s_node_path/s_node_path.yy index 0f2cb448b..b010ddd30 100644 --- a/sprites/s_node_path/s_node_path.yy +++ b/sprites/s_node_path/s_node_path.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_pin/s_node_pin.yy b/sprites/s_node_pin/s_node_pin.yy index f16c96ef3..e978a3068 100644 --- a/sprites/s_node_pin/s_node_pin.yy +++ b/sprites/s_node_pin/s_node_pin.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_pin_bg/s_node_pin_bg.yy b/sprites/s_node_pin_bg/s_node_pin_bg.yy index b312877a1..1d2dba2e1 100644 --- a/sprites/s_node_pin_bg/s_node_pin_bg.yy +++ b/sprites/s_node_pin_bg/s_node_pin_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_pin_bg_active/s_node_pin_bg_active.yy b/sprites/s_node_pin_bg_active/s_node_pin_bg_active.yy index d4a4c04d9..854394b41 100644 --- a/sprites/s_node_pin_bg_active/s_node_pin_bg_active.yy +++ b/sprites/s_node_pin_bg_active/s_node_pin_bg_active.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 40, "height": 40, "textureGroupId": { diff --git a/sprites/s_node_pin_bg_active_s/s_node_pin_bg_active_s.yy b/sprites/s_node_pin_bg_active_s/s_node_pin_bg_active_s.yy index f118d8fdd..643631d8f 100644 --- a/sprites/s_node_pin_bg_active_s/s_node_pin_bg_active_s.yy +++ b/sprites/s_node_pin_bg_active_s/s_node_pin_bg_active_s.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_pin_bg_s/s_node_pin_bg_s.yy b/sprites/s_node_pin_bg_s/s_node_pin_bg_s.yy index 3b83f409c..f09f24a7d 100644 --- a/sprites/s_node_pin_bg_s/s_node_pin_bg_s.yy +++ b/sprites/s_node_pin_bg_s/s_node_pin_bg_s.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy b/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy index 767460b6e..a991d19c1 100644 --- a/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy +++ b/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_polar/s_node_polar.yy b/sprites/s_node_polar/s_node_polar.yy index 5dbe662a3..50cfd78ce 100644 --- a/sprites/s_node_polar/s_node_polar.yy +++ b/sprites/s_node_polar/s_node_polar.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_posterize/s_node_posterize.yy b/sprites/s_node_posterize/s_node_posterize.yy index cd978ecb2..b59bc44d0 100644 --- a/sprites/s_node_posterize/s_node_posterize.yy +++ b/sprites/s_node_posterize/s_node_posterize.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_processor/s_node_processor.yy b/sprites/s_node_processor/s_node_processor.yy index 25c561fb3..5821a4232 100644 --- a/sprites/s_node_processor/s_node_processor.yy +++ b/sprites/s_node_processor/s_node_processor.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_resize/s_node_resize.yy b/sprites/s_node_resize/s_node_resize.yy index 36db8d57c..111127f0e 100644 --- a/sprites/s_node_resize/s_node_resize.yy +++ b/sprites/s_node_resize/s_node_resize.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_sampler/s_node_sampler.yy b/sprites/s_node_sampler/s_node_sampler.yy index 20d6a9f4f..6809b4479 100644 --- a/sprites/s_node_sampler/s_node_sampler.yy +++ b/sprites/s_node_sampler/s_node_sampler.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_scale/s_node_scale.yy b/sprites/s_node_scale/s_node_scale.yy index a55b6488c..8d0298b86 100644 --- a/sprites/s_node_scale/s_node_scale.yy +++ b/sprites/s_node_scale/s_node_scale.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_scale_algo/s_node_scale_algo.yy b/sprites/s_node_scale_algo/s_node_scale_algo.yy index 68ce05c46..565c2e5c2 100644 --- a/sprites/s_node_scale_algo/s_node_scale_algo.yy +++ b/sprites/s_node_scale_algo/s_node_scale_algo.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_scatter/s_node_scatter.yy b/sprites/s_node_scatter/s_node_scatter.yy index ac7f93e50..c7ef57450 100644 --- a/sprites/s_node_scatter/s_node_scatter.yy +++ b/sprites/s_node_scatter/s_node_scatter.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy b/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy index 0460bf852..f6fc64728 100644 --- a/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy +++ b/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_shadow/s_node_shadow.yy b/sprites/s_node_shadow/s_node_shadow.yy index dea900143..c76a607f5 100644 --- a/sprites/s_node_shadow/s_node_shadow.yy +++ b/sprites/s_node_shadow/s_node_shadow.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_shape/s_node_shape.yy b/sprites/s_node_shape/s_node_shape.yy index c986c41e3..22ce10700 100644 --- a/sprites/s_node_shape/s_node_shape.yy +++ b/sprites/s_node_shape/s_node_shape.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_solid/s_node_solid.yy b/sprites/s_node_solid/s_node_solid.yy index fab48e90c..f91440ff6 100644 --- a/sprites/s_node_solid/s_node_solid.yy +++ b/sprites/s_node_solid/s_node_solid.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy b/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy index 356e61164..948305a56 100644 --- a/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy +++ b/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_stack/s_node_stack.yy b/sprites/s_node_stack/s_node_stack.yy index bcbc715dc..9d631ba62 100644 --- a/sprites/s_node_stack/s_node_stack.yy +++ b/sprites/s_node_stack/s_node_stack.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 33, "textureGroupId": { diff --git a/sprites/s_node_state/s_node_state.yy b/sprites/s_node_state/s_node_state.yy index c72390c20..69b470b92 100644 --- a/sprites/s_node_state/s_node_state.yy +++ b/sprites/s_node_state/s_node_state.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_node_statistic/s_node_statistic.yy b/sprites/s_node_statistic/s_node_statistic.yy index 5ed41a0f3..999fe0edf 100644 --- a/sprites/s_node_statistic/s_node_statistic.yy +++ b/sprites/s_node_statistic/s_node_statistic.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_stripe/s_node_stripe.yy b/sprites/s_node_stripe/s_node_stripe.yy index edd290b86..e8d6c8e7e 100644 --- a/sprites/s_node_stripe/s_node_stripe.yy +++ b/sprites/s_node_stripe/s_node_stripe.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_text/s_node_text.yy b/sprites/s_node_text/s_node_text.yy index 27b2a3f19..23b211005 100644 --- a/sprites/s_node_text/s_node_text.yy +++ b/sprites/s_node_text/s_node_text.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_texture_map/s_node_texture_map.yy b/sprites/s_node_texture_map/s_node_texture_map.yy index ff4451b78..da64ef3f3 100644 --- a/sprites/s_node_texture_map/s_node_texture_map.yy +++ b/sprites/s_node_texture_map/s_node_texture_map.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_time_map/s_node_time_map.yy b/sprites/s_node_time_map/s_node_time_map.yy index b2f8e5335..9fcc18a48 100644 --- a/sprites/s_node_time_map/s_node_time_map.yy +++ b/sprites/s_node_time_map/s_node_time_map.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_timeline_preview/s_node_timeline_preview.yy b/sprites/s_node_timeline_preview/s_node_timeline_preview.yy index d1dae1a06..4f5f90618 100644 --- a/sprites/s_node_timeline_preview/s_node_timeline_preview.yy +++ b/sprites/s_node_timeline_preview/s_node_timeline_preview.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_trail/s_node_trail.yy b/sprites/s_node_trail/s_node_trail.yy index f1af73643..6c50edbde 100644 --- a/sprites/s_node_trail/s_node_trail.yy +++ b/sprites/s_node_trail/s_node_trail.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_transform/s_node_transform.yy b/sprites/s_node_transform/s_node_transform.yy index 1a411e9bf..23d31bbac 100644 --- a/sprites/s_node_transform/s_node_transform.yy +++ b/sprites/s_node_transform/s_node_transform.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_twirl/s_node_twirl.yy b/sprites/s_node_twirl/s_node_twirl.yy index 65694f050..7dbcd0275 100644 --- a/sprites/s_node_twirl/s_node_twirl.yy +++ b/sprites/s_node_twirl/s_node_twirl.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_unicode/s_node_unicode.yy b/sprites/s_node_unicode/s_node_unicode.yy index 46a26e7aa..551592b24 100644 --- a/sprites/s_node_unicode/s_node_unicode.yy +++ b/sprites/s_node_unicode/s_node_unicode.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_val/s_node_val.yy b/sprites/s_node_val/s_node_val.yy index 8d73b1f36..4a1ff59ef 100644 --- a/sprites/s_node_val/s_node_val.yy +++ b/sprites/s_node_val/s_node_val.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_node_vec2/s_node_vec2.yy b/sprites/s_node_vec2/s_node_vec2.yy index 7c2794a9d..3d402cde2 100644 --- a/sprites/s_node_vec2/s_node_vec2.yy +++ b/sprites/s_node_vec2/s_node_vec2.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_vec3/s_node_vec3.yy b/sprites/s_node_vec3/s_node_vec3.yy index 895f3096a..6caa0cfb2 100644 --- a/sprites/s_node_vec3/s_node_vec3.yy +++ b/sprites/s_node_vec3/s_node_vec3.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_vec4/s_node_vec4.yy b/sprites/s_node_vec4/s_node_vec4.yy index 51fdc15c9..83e98c408 100644 --- a/sprites/s_node_vec4/s_node_vec4.yy +++ b/sprites/s_node_vec4/s_node_vec4.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_vec_split/s_node_vec_split.yy b/sprites/s_node_vec_split/s_node_vec_split.yy index 117331a81..151aab815 100644 --- a/sprites/s_node_vec_split/s_node_vec_split.yy +++ b/sprites/s_node_vec_split/s_node_vec_split.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_warp/s_node_warp.yy b/sprites/s_node_warp/s_node_warp.yy index 9bc9b6b9f..bbbd4db29 100644 --- a/sprites/s_node_warp/s_node_warp.yy +++ b/sprites/s_node_warp/s_node_warp.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_warp_mesh/s_node_warp_mesh.yy b/sprites/s_node_warp_mesh/s_node_warp_mesh.yy index 0bc458cea..6e9e49e84 100644 --- a/sprites/s_node_warp_mesh/s_node_warp_mesh.yy +++ b/sprites/s_node_warp_mesh/s_node_warp_mesh.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_wiggler/s_node_wiggler.yy b/sprites/s_node_wiggler/s_node_wiggler.yy index 57bd52635..666d4d9c1 100644 --- a/sprites/s_node_wiggler/s_node_wiggler.yy +++ b/sprites/s_node_wiggler/s_node_wiggler.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_node_zigzag/s_node_zigzag.yy b/sprites/s_node_zigzag/s_node_zigzag.yy index cd34753a1..525742dd8 100644 --- a/sprites/s_node_zigzag/s_node_zigzag.yy +++ b/sprites/s_node_zigzag/s_node_zigzag.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 32, "height": 32, "textureGroupId": { diff --git a/sprites/s_noti_icon_complete/s_noti_icon_complete.yy b/sprites/s_noti_icon_complete/s_noti_icon_complete.yy index 038462346..e2ee68624 100644 --- a/sprites/s_noti_icon_complete/s_noti_icon_complete.yy +++ b/sprites/s_noti_icon_complete/s_noti_icon_complete.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy b/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy index a8dea0860..b10290f9b 100644 --- a/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy +++ b/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy b/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy index 84e852f63..371b97577 100644 --- a/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy +++ b/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_noti_icon_warning/s_noti_icon_warning.yy b/sprites/s_noti_icon_warning/s_noti_icon_warning.yy index 17cb27866..ebec64421 100644 --- a/sprites/s_noti_icon_warning/s_noti_icon_warning.yy +++ b/sprites/s_noti_icon_warning/s_noti_icon_warning.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_padding_link/s_padding_link.yy b/sprites/s_padding_link/s_padding_link.yy index b58f855b9..4b141beb2 100644 --- a/sprites/s_padding_link/s_padding_link.yy +++ b/sprites/s_padding_link/s_padding_link.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_panel_active_split/s_panel_active_split.yy b/sprites/s_panel_active_split/s_panel_active_split.yy index 9f3392212..3a613ade6 100644 --- a/sprites/s_panel_active_split/s_panel_active_split.yy +++ b/sprites/s_panel_active_split/s_panel_active_split.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_path_tools_add/s_path_tools_add.yy b/sprites/s_path_tools_add/s_path_tools_add.yy index eb1d500b4..163714b6e 100644 --- a/sprites/s_path_tools_add/s_path_tools_add.yy +++ b/sprites/s_path_tools_add/s_path_tools_add.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_path_tools_anchor/s_path_tools_anchor.yy b/sprites/s_path_tools_anchor/s_path_tools_anchor.yy index 9de0620ec..f13af5371 100644 --- a/sprites/s_path_tools_anchor/s_path_tools_anchor.yy +++ b/sprites/s_path_tools_anchor/s_path_tools_anchor.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_preview_crosshair/01da77e2-56fa-4345-aff7-99cd1c7373f2.png b/sprites/s_preview_crosshair/01da77e2-56fa-4345-aff7-99cd1c7373f2.png new file mode 100644 index 000000000..f794f3627 Binary files /dev/null and b/sprites/s_preview_crosshair/01da77e2-56fa-4345-aff7-99cd1c7373f2.png differ diff --git a/sprites/s_preview_crosshair/layers/01da77e2-56fa-4345-aff7-99cd1c7373f2/7907cd62-72ba-4dde-85cc-f8f4d1a81f46.png b/sprites/s_preview_crosshair/layers/01da77e2-56fa-4345-aff7-99cd1c7373f2/7907cd62-72ba-4dde-85cc-f8f4d1a81f46.png new file mode 100644 index 000000000..f794f3627 Binary files /dev/null and b/sprites/s_preview_crosshair/layers/01da77e2-56fa-4345-aff7-99cd1c7373f2/7907cd62-72ba-4dde-85cc-f8f4d1a81f46.png differ diff --git a/sprites/s_preview_crosshair/s_preview_crosshair.yy b/sprites/s_preview_crosshair/s_preview_crosshair.yy new file mode 100644 index 000000000..491ddf364 --- /dev/null +++ b/sprites/s_preview_crosshair/s_preview_crosshair.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "s_preview_crosshair", + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 1, + "bbox_right": 12, + "bbox_top": 1, + "bbox_bottom": 12, + "HTile": false, + "VTile": false, + "For3D": false, + "DynamicTexturePage": false, + "width": 14, + "height": 14, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"01da77e2-56fa-4345-aff7-99cd1c7373f2",}, + ], + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "s_preview_crosshair", + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"8332c6a9-8259-49e1-9af9-e9ffcafc00f4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"01da77e2-56fa-4345-aff7-99cd1c7373f2","path":"sprites/s_preview_crosshair/s_preview_crosshair.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 7, + "yorigin": 7, + "eventToFunction": {}, + "eventStubScript": null, + }, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7907cd62-72ba-4dde-85cc-f8f4d1a81f46","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + ], + "nineSlice": null, + "parent": { + "name": "preview", + "path": "folders/sprites/preview.yy", + }, +} \ No newline at end of file diff --git a/sprites/s_prop_gradient/s_prop_gradient.yy b/sprites/s_prop_gradient/s_prop_gradient.yy index bb4388e86..100cb001b 100644 --- a/sprites/s_prop_gradient/s_prop_gradient.yy +++ b/sprites/s_prop_gradient/s_prop_gradient.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_prop_keyframe/s_prop_keyframe.yy b/sprites/s_prop_keyframe/s_prop_keyframe.yy index 7bff7f8ac..66c5a6547 100644 --- a/sprites/s_prop_keyframe/s_prop_keyframe.yy +++ b/sprites/s_prop_keyframe/s_prop_keyframe.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_prop_on_end/s_prop_on_end.yy b/sprites/s_prop_on_end/s_prop_on_end.yy index 7534238a9..0c1508a5d 100644 --- a/sprites/s_prop_on_end/s_prop_on_end.yy +++ b/sprites/s_prop_on_end/s_prop_on_end.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_prop_selecting/s_prop_selecting.yy b/sprites/s_prop_selecting/s_prop_selecting.yy index 32a0a59b9..c0bcfb66f 100644 --- a/sprites/s_prop_selecting/s_prop_selecting.yy +++ b/sprites/s_prop_selecting/s_prop_selecting.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_refresh_16/s_refresh_16.yy b/sprites/s_refresh_16/s_refresh_16.yy index 1660b2eaf..fa3ccccf9 100644 --- a/sprites/s_refresh_16/s_refresh_16.yy +++ b/sprites/s_refresh_16/s_refresh_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_refresh_24/s_refresh_24.yy b/sprites/s_refresh_24/s_refresh_24.yy index 631084810..a068f8190 100644 --- a/sprites/s_refresh_24/s_refresh_24.yy +++ b/sprites/s_refresh_24/s_refresh_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_rotator_bg/s_rotator_bg.yy b/sprites/s_rotator_bg/s_rotator_bg.yy index 71730fb13..17942b386 100644 --- a/sprites/s_rotator_bg/s_rotator_bg.yy +++ b/sprites/s_rotator_bg/s_rotator_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 80, "height": 80, "textureGroupId": { diff --git a/sprites/s_rotator_knob/s_rotator_knob.yy b/sprites/s_rotator_knob/s_rotator_knob.yy index cc20306a4..e01bea6d3 100644 --- a/sprites/s_rotator_knob/s_rotator_knob.yy +++ b/sprites/s_rotator_knob/s_rotator_knob.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy b/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy index bd290d537..bf4310256 100644 --- a/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy +++ b/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_search_16/s_search_16.yy b/sprites/s_search_16/s_search_16.yy index f1a9b88ef..2cc6a2636 100644 --- a/sprites/s_search_16/s_search_16.yy +++ b/sprites/s_search_16/s_search_16.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_sequence_control/s_sequence_control.yy b/sprites/s_sequence_control/s_sequence_control.yy index 4f5c3507c..1a2888e03 100644 --- a/sprites/s_sequence_control/s_sequence_control.yy +++ b/sprites/s_sequence_control/s_sequence_control.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_slider/s_slider.yy b/sprites/s_slider/s_slider.yy index 98d74e6a0..320eac489 100644 --- a/sprites/s_slider/s_slider.yy +++ b/sprites/s_slider/s_slider.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_sort_24/s_sort_24.yy b/sprites/s_sort_24/s_sort_24.yy index 763bd8eef..54f4ed963 100644 --- a/sprites/s_sort_24/s_sort_24.yy +++ b/sprites/s_sort_24/s_sort_24.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_splice_draw/s_splice_draw.yy b/sprites/s_splice_draw/s_splice_draw.yy index 37b961d39..8d31f0fb8 100644 --- a/sprites/s_splice_draw/s_splice_draw.yy +++ b/sprites/s_splice_draw/s_splice_draw.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_text_bullet/s_text_bullet.yy b/sprites/s_text_bullet/s_text_bullet.yy index ec8e1c4b4..5ac33a6d1 100644 --- a/sprites/s_text_bullet/s_text_bullet.yy +++ b/sprites/s_text_bullet/s_text_bullet.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_text_slider/s_text_slider.yy b/sprites/s_text_slider/s_text_slider.yy index 8ab1de57b..6a9194f11 100644 --- a/sprites/s_text_slider/s_text_slider.yy +++ b/sprites/s_text_slider/s_text_slider.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_textbox/s_textbox.yy b/sprites/s_textbox/s_textbox.yy index 1b7d17f42..b26d02dcb 100644 --- a/sprites/s_textbox/s_textbox.yy +++ b/sprites/s_textbox/s_textbox.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_texture_default/s_texture_default.yy b/sprites/s_texture_default/s_texture_default.yy index 1f22be6d2..a1aba4e94 100644 --- a/sprites/s_texture_default/s_texture_default.yy +++ b/sprites/s_texture_default/s_texture_default.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 4, "height": 4, "textureGroupId": { diff --git a/sprites/s_timeline_clock/s_timeline_clock.yy b/sprites/s_timeline_clock/s_timeline_clock.yy index 7e3640714..5efb15df8 100644 --- a/sprites/s_timeline_clock/s_timeline_clock.yy +++ b/sprites/s_timeline_clock/s_timeline_clock.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_timeline_ease/s_timeline_ease.yy b/sprites/s_timeline_ease/s_timeline_ease.yy index 7c26c504d..dfa590911 100644 --- a/sprites/s_timeline_ease/s_timeline_ease.yy +++ b/sprites/s_timeline_ease/s_timeline_ease.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_timeline_elastic/s_timeline_elastic.yy b/sprites/s_timeline_elastic/s_timeline_elastic.yy index 32d57c358..37bdad825 100644 --- a/sprites/s_timeline_elastic/s_timeline_elastic.yy +++ b/sprites/s_timeline_elastic/s_timeline_elastic.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 8, "textureGroupId": { diff --git a/sprites/s_timeline_graph/s_timeline_graph.yy b/sprites/s_timeline_graph/s_timeline_graph.yy index 0322fbda7..bf88f7697 100644 --- a/sprites/s_timeline_graph/s_timeline_graph.yy +++ b/sprites/s_timeline_graph/s_timeline_graph.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_timeline_keyframe/s_timeline_keyframe.yy b/sprites/s_timeline_keyframe/s_timeline_keyframe.yy index 73f49c38e..471a1e5e0 100644 --- a/sprites/s_timeline_keyframe/s_timeline_keyframe.yy +++ b/sprites/s_timeline_keyframe/s_timeline_keyframe.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy b/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy index e4de26af8..dfc04c532 100644 --- a/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy +++ b/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 20, "height": 20, "textureGroupId": { diff --git a/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy b/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy index 9592c50b2..1987bca2c 100644 --- a/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy +++ b/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_toolbar_shadow/s_toolbar_shadow.yy b/sprites/s_toolbar_shadow/s_toolbar_shadow.yy index 0bb64cf58..462c29f67 100644 --- a/sprites/s_toolbar_shadow/s_toolbar_shadow.yy +++ b/sprites/s_toolbar_shadow/s_toolbar_shadow.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_transparent/s_transparent.yy b/sprites/s_transparent/s_transparent.yy index fa5d67199..62b706a00 100644 --- a/sprites/s_transparent/s_transparent.yy +++ b/sprites/s_transparent/s_transparent.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_ui_base_white/s_ui_base_white.yy b/sprites/s_ui_base_white/s_ui_base_white.yy index 69345bb18..c8747c40b 100644 --- a/sprites/s_ui_base_white/s_ui_base_white.yy +++ b/sprites/s_ui_base_white/s_ui_base_white.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 4, "height": 4, "textureGroupId": { diff --git a/sprites/s_ui_panel_active/s_ui_panel_active.yy b/sprites/s_ui_panel_active/s_ui_panel_active.yy index d307e46fa..9feb9fa67 100644 --- a/sprites/s_ui_panel_active/s_ui_panel_active.yy +++ b/sprites/s_ui_panel_active/s_ui_panel_active.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_ui_panel_bg/s_ui_panel_bg.yy b/sprites/s_ui_panel_bg/s_ui_panel_bg.yy index 3b5e60991..11c2cb38f 100644 --- a/sprites/s_ui_panel_bg/s_ui_panel_bg.yy +++ b/sprites/s_ui_panel_bg/s_ui_panel_bg.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_ui_panel_bg_dark/s_ui_panel_bg_dark.yy b/sprites/s_ui_panel_bg_dark/s_ui_panel_bg_dark.yy index fd7aa1d09..1abd71a05 100644 --- a/sprites/s_ui_panel_bg_dark/s_ui_panel_bg_dark.yy +++ b/sprites/s_ui_panel_bg_dark/s_ui_panel_bg_dark.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 12, "height": 12, "textureGroupId": { diff --git a/sprites/s_ui_scrollbar/s_ui_scrollbar.yy b/sprites/s_ui_scrollbar/s_ui_scrollbar.yy index 8790016c5..67e48c235 100644 --- a/sprites/s_ui_scrollbar/s_ui_scrollbar.yy +++ b/sprites/s_ui_scrollbar/s_ui_scrollbar.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 6, "height": 6, "textureGroupId": { diff --git a/sprites/s_view_mode/s_view_mode.yy b/sprites/s_view_mode/s_view_mode.yy index c87aafb9d..39bee1b2e 100644 --- a/sprites/s_view_mode/s_view_mode.yy +++ b/sprites/s_view_mode/s_view_mode.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 24, "height": 24, "textureGroupId": { diff --git a/sprites/s_workspace_0/s_workspace_0.yy b/sprites/s_workspace_0/s_workspace_0.yy index 5e69029df..a0a5443ce 100644 --- a/sprites/s_workspace_0/s_workspace_0.yy +++ b/sprites/s_workspace_0/s_workspace_0.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": { diff --git a/sprites/s_workspace_1/s_workspace_1.yy b/sprites/s_workspace_1/s_workspace_1.yy index e45edc54f..0b91d2b44 100644 --- a/sprites/s_workspace_1/s_workspace_1.yy +++ b/sprites/s_workspace_1/s_workspace_1.yy @@ -17,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 16, "height": 16, "textureGroupId": {