diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 890c88c22..cf572557c 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -173,6 +173,7 @@ {"name":"corner","order":43,"path":"folders/shader/filter/corner.yy",}, {"name":"dither","order":53,"path":"folders/shader/filter/dither.yy",}, {"name":"edge_shade","order":44,"path":"folders/shader/filter/edge_shade.yy",}, + {"name":"liquefy","order":60,"path":"folders/shader/filter/liquefy.yy",}, {"name":"jpeg","order":55,"path":"folders/shader/filter/jpeg.yy",}, {"name":"morph","order":45,"path":"folders/shader/filter/morph.yy",}, {"name":"shadow_caster","order":46,"path":"folders/shader/filter/shadow_caster.yy",}, @@ -383,6 +384,7 @@ {"name":"__node_shader_generator","order":4,"path":"scripts/__node_shader_generator/__node_shader_generator.yy",}, {"name":"__node_shader_processor","order":5,"path":"scripts/__node_shader_processor/__node_shader_processor.yy",}, {"name":"__node_shader","order":3,"path":"scripts/__node_shader/__node_shader.yy",}, + {"name":"__node_surface_filter","order":15,"path":"scripts/__node_surface_filter/__node_surface_filter.yy",}, {"name":"__node_value_array","order":12,"path":"scripts/__node_value_array/__node_value_array.yy",}, {"name":"__node_value_object","order":3,"path":"scripts/__node_value_object/__node_value_object.yy",}, {"name":"__node_value_processor","order":4,"path":"scripts/__node_value_processor/__node_value_processor.yy",}, @@ -927,6 +929,7 @@ {"name":"node_level_selector","order":8,"path":"scripts/node_level_selector/node_level_selector.yy",}, {"name":"node_level","order":7,"path":"scripts/node_level/node_level.yy",}, {"name":"node_line","order":4,"path":"scripts/node_line/node_line.yy",}, + {"name":"node_liquefy","order":10,"path":"scripts/node_liquefy/node_liquefy.yy",}, {"name":"node_local_analyze","order":16,"path":"scripts/node_local_analyze/node_local_analyze.yy",}, {"name":"node_lovify","order":1,"path":"scripts/node_lovify/node_lovify.yy",}, {"name":"node_lua_global","order":1,"path":"scripts/node_lua_global/node_lua_global.yy",}, @@ -1046,6 +1049,7 @@ {"name":"node_pin","order":2,"path":"scripts/node_pin/node_pin.yy",}, {"name":"node_pixel_builder","order":4,"path":"scripts/node_pixel_builder/node_pixel_builder.yy",}, {"name":"node_pixel_cloud","order":20,"path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",}, + {"name":"node_pixel_math","order":26,"path":"scripts/node_pixel_math/node_pixel_math.yy",}, {"name":"node_pixel_sampler","order":22,"path":"scripts/node_pixel_sampler/node_pixel_sampler.yy",}, {"name":"node_pixel_sort","order":12,"path":"scripts/node_pixel_sort/node_pixel_sort.yy",}, {"name":"node_plot_linear","order":5,"path":"scripts/node_plot_linear/node_plot_linear.yy",}, @@ -1600,6 +1604,9 @@ {"name":"sh_kuwahara","order":36,"path":"shaders/sh_kuwahara/sh_kuwahara.yy",}, {"name":"sh_level_selector","order":15,"path":"shaders/sh_level_selector/sh_level_selector.yy",}, {"name":"sh_level","order":14,"path":"shaders/sh_level/sh_level.yy",}, + {"name":"sh_liquefy_bloat","order":3,"path":"shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy",}, + {"name":"sh_liquefy_pinch","order":2,"path":"shaders/sh_liquefy_pinch/sh_liquefy_pinch.yy",}, + {"name":"sh_liquefy_twirl","order":1,"path":"shaders/sh_liquefy_twirl/sh_liquefy_twirl.yy",}, {"name":"sh_local_analyze","order":25,"path":"shaders/sh_local_analyze/sh_local_analyze.yy",}, {"name":"sh_lovify","order":2,"path":"shaders/sh_lovify/sh_lovify.yy",}, {"name":"sh_lum2alpha","order":16,"path":"shaders/sh_lum2alpha/sh_lum2alpha.yy",}, @@ -1671,6 +1678,7 @@ {"name":"sh_perlin_tiled","order":15,"path":"shaders/sh_perlin_tiled/sh_perlin_tiled.yy",}, {"name":"sh_perlin","order":12,"path":"shaders/sh_perlin/sh_perlin.yy",}, {"name":"sh_pixel_cloud","order":4,"path":"shaders/sh_pixel_cloud/sh_pixel_cloud.yy",}, + {"name":"sh_pixel_math","order":59,"path":"shaders/sh_pixel_math/sh_pixel_math.yy",}, {"name":"sh_pixel_sample","order":27,"path":"shaders/sh_pixel_sample/sh_pixel_sample.yy",}, {"name":"sh_pixel_sort","order":20,"path":"shaders/sh_pixel_sort/sh_pixel_sort.yy",}, {"name":"sh_polar","order":1,"path":"shaders/sh_polar/sh_polar.yy",}, @@ -2281,6 +2289,8 @@ {"name":"s_node_level_selector","order":33,"path":"sprites/s_node_level_selector/s_node_level_selector.yy",}, {"name":"s_node_level","order":32,"path":"sprites/s_node_level/s_node_level.yy",}, {"name":"s_node_line","order":7,"path":"sprites/s_node_line/s_node_line.yy",}, + {"name":"s_node_liquefy_type","order":30,"path":"sprites/s_node_liquefy_type/s_node_liquefy_type.yy",}, + {"name":"s_node_liquefy","order":71,"path":"sprites/s_node_liquefy/s_node_liquefy.yy",}, {"name":"s_node_local_analyze","order":34,"path":"sprites/s_node_local_analyze/s_node_local_analyze.yy",}, {"name":"s_node_logic_opr","order":1,"path":"sprites/s_node_logic_opr/s_node_logic_opr.yy",}, {"name":"s_node_logic","order":3,"path":"sprites/s_node_logic/s_node_logic.yy",}, @@ -2362,40 +2372,42 @@ {"name":"s_node_path_transform","order":16,"path":"sprites/s_node_path_transform/s_node_path_transform.yy",}, {"name":"s_node_path_trim","order":17,"path":"sprites/s_node_path_trim/s_node_path_trim.yy",}, {"name":"s_node_path_wave","order":18,"path":"sprites/s_node_path_wave/s_node_path_wave.yy",}, - {"name":"s_node_pb_box_contract","order":1,"path":"sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy",}, - {"name":"s_node_pb_box_divide_grid","order":3,"path":"sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy",}, - {"name":"s_node_pb_box_divide","order":2,"path":"sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy",}, - {"name":"s_node_pb_box_inset","order":4,"path":"sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy",}, - {"name":"s_node_pb_box_mirror","order":5,"path":"sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy",}, - {"name":"s_node_pb_box_split","order":6,"path":"sprites/s_node_pb_box_split/s_node_pb_box_split.yy",}, - {"name":"s_node_pb_box_transform","order":7,"path":"sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy",}, - {"name":"s_node_pb_draw_angle","order":8,"path":"sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy",}, - {"name":"s_node_pb_draw_blob","order":9,"path":"sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy",}, - {"name":"s_node_pb_draw_diamond","order":10,"path":"sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy",}, - {"name":"s_node_pb_draw_ellipse","order":11,"path":"sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy",}, - {"name":"s_node_pb_draw_fill","order":12,"path":"sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy",}, - {"name":"s_node_pb_draw_line","order":13,"path":"sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy",}, - {"name":"s_node_pb_draw_rectangle","order":14,"path":"sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy",}, - {"name":"s_node_pb_draw_roundrectangle","order":15,"path":"sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy",}, - {"name":"s_node_pb_draw_semi_ellipse","order":16,"path":"sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy",}, - {"name":"s_node_pb_draw_trapezoid","order":17,"path":"sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy",}, - {"name":"s_node_pb_fx_brick","order":18,"path":"sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy",}, - {"name":"s_node_pb_fx_hash","order":19,"path":"sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy",}, - {"name":"s_node_pb_fx_highlight","order":20,"path":"sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy",}, - {"name":"s_node_pb_fx_interesct","order":21,"path":"sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy",}, - {"name":"s_node_pb_fx_outline","order":22,"path":"sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy",}, - {"name":"s_node_pb_fx_radial","order":23,"path":"sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy",}, - {"name":"s_node_pb_fx_shading","order":24,"path":"sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy",}, - {"name":"s_node_pb_fx_stack","order":25,"path":"sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy",}, - {"name":"s_node_pb_fx_strip","order":26,"path":"sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy",}, - {"name":"s_node_pb_fx_subtract","order":27,"path":"sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy",}, - {"name":"s_node_pb_layer","order":28,"path":"sprites/s_node_pb_layer/s_node_pb_layer.yy",}, + {"name":"s_node_pb_box_contract","order":31,"path":"sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy",}, + {"name":"s_node_pb_box_divide_grid","order":33,"path":"sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy",}, + {"name":"s_node_pb_box_divide","order":32,"path":"sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy",}, + {"name":"s_node_pb_box_inset","order":34,"path":"sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy",}, + {"name":"s_node_pb_box_mirror","order":35,"path":"sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy",}, + {"name":"s_node_pb_box_split","order":36,"path":"sprites/s_node_pb_box_split/s_node_pb_box_split.yy",}, + {"name":"s_node_pb_box_transform","order":37,"path":"sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy",}, + {"name":"s_node_pb_draw_angle","order":39,"path":"sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy",}, + {"name":"s_node_pb_draw_blob","order":40,"path":"sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy",}, + {"name":"s_node_pb_draw_diamond","order":30,"path":"sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy",}, + {"name":"s_node_pb_draw_ellipse","order":41,"path":"sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy",}, + {"name":"s_node_pb_draw_fill","order":42,"path":"sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy",}, + {"name":"s_node_pb_draw_line","order":56,"path":"sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy",}, + {"name":"s_node_pb_draw_rectangle","order":43,"path":"sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy",}, + {"name":"s_node_pb_draw_roundrectangle","order":44,"path":"sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy",}, + {"name":"s_node_pb_draw_semi_ellipse","order":45,"path":"sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy",}, + {"name":"s_node_pb_draw_trapezoid","order":46,"path":"sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy",}, + {"name":"s_node_pb_fx_add","order":47,"path":"sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy",}, + {"name":"s_node_pb_fx_brick","order":58,"path":"sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy",}, + {"name":"s_node_pb_fx_hash","order":48,"path":"sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy",}, + {"name":"s_node_pb_fx_highlight","order":49,"path":"sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy",}, + {"name":"s_node_pb_fx_interesct","order":50,"path":"sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy",}, + {"name":"s_node_pb_fx_outline","order":51,"path":"sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy",}, + {"name":"s_node_pb_fx_radial","order":52,"path":"sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy",}, + {"name":"s_node_pb_fx_shading","order":53,"path":"sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy",}, + {"name":"s_node_pb_fx_stack","order":54,"path":"sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy",}, + {"name":"s_node_pb_fx_strip","order":57,"path":"sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy",}, + {"name":"s_node_pb_fx_subtract","order":55,"path":"sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy",}, + {"name":"s_node_pb_layer","order":38,"path":"sprites/s_node_pb_layer/s_node_pb_layer.yy",}, {"name":"s_node_perlin_extra","order":31,"path":"sprites/s_node_perlin_extra/s_node_perlin_extra.yy",}, {"name":"s_node_pin_array","order":42,"path":"sprites/s_node_pin_array/s_node_pin_array.yy",}, {"name":"s_node_pin","order":2,"path":"sprites/s_node_pin/s_node_pin.yy",}, {"name":"s_node_pixel_builder","order":29,"path":"sprites/s_node_pixel_builder/s_node_pixel_builder.yy",}, {"name":"s_node_pixel_cloud","order":40,"path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",}, {"name":"s_node_pixel_find","order":18,"path":"sprites/s_node_pixel_find/s_node_pixel_find.yy",}, + {"name":"s_node_pixel_math","order":70,"path":"sprites/s_node_pixel_math/s_node_pixel_math.yy",}, {"name":"s_node_pixel_sampler","order":54,"path":"sprites/s_node_pixel_sampler/s_node_pixel_sampler.yy",}, {"name":"s_node_pixel_sort","order":41,"path":"sprites/s_node_pixel_sort/s_node_pixel_sort.yy",}, {"name":"s_node_plot_linear_type","order":10,"path":"sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 1ed624a5d..f1bf36530 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -284,6 +284,7 @@ {"$GMFolder":"","%Name":"corner","folderPath":"folders/shader/filter/corner.yy","name":"corner","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"dither","folderPath":"folders/shader/filter/dither.yy","name":"dither","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"edge_shade","folderPath":"folders/shader/filter/edge_shade.yy","name":"edge_shade","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"liquefy","folderPath":"folders/shader/filter/liquefy.yy","name":"liquefy","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"jpeg","folderPath":"folders/shader/filter/jpeg.yy","name":"jpeg","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"morph","folderPath":"folders/shader/filter/morph.yy","name":"morph","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"shadow_caster","folderPath":"folders/shader/filter/shadow_caster.yy","name":"shadow_caster","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -868,6 +869,7 @@ {"id":{"name":"__node_shader_generator","path":"scripts/__node_shader_generator/__node_shader_generator.yy",},}, {"id":{"name":"__node_shader_processor","path":"scripts/__node_shader_processor/__node_shader_processor.yy",},}, {"id":{"name":"__node_shader","path":"scripts/__node_shader/__node_shader.yy",},}, + {"id":{"name":"__node_surface_filter","path":"scripts/__node_surface_filter/__node_surface_filter.yy",},}, {"id":{"name":"__node_template","path":"scripts/__node_template/__node_template.yy",},}, {"id":{"name":"__node_value_array","path":"scripts/__node_value_array/__node_value_array.yy",},}, {"id":{"name":"__node_value_object","path":"scripts/__node_value_object/__node_value_object.yy",},}, @@ -1503,6 +1505,7 @@ {"id":{"name":"node_level_selector","path":"scripts/node_level_selector/node_level_selector.yy",},}, {"id":{"name":"node_level","path":"scripts/node_level/node_level.yy",},}, {"id":{"name":"node_line","path":"scripts/node_line/node_line.yy",},}, + {"id":{"name":"node_liquefy","path":"scripts/node_liquefy/node_liquefy.yy",},}, {"id":{"name":"node_local_analyze","path":"scripts/node_local_analyze/node_local_analyze.yy",},}, {"id":{"name":"node_logic","path":"scripts/node_logic/node_logic.yy",},}, {"id":{"name":"node_lovify","path":"scripts/node_lovify/node_lovify.yy",},}, @@ -1634,6 +1637,7 @@ {"id":{"name":"node_pin","path":"scripts/node_pin/node_pin.yy",},}, {"id":{"name":"node_pixel_builder","path":"scripts/node_pixel_builder/node_pixel_builder.yy",},}, {"id":{"name":"node_pixel_cloud","path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",},}, + {"id":{"name":"node_pixel_math","path":"scripts/node_pixel_math/node_pixel_math.yy",},}, {"id":{"name":"node_pixel_sampler","path":"scripts/node_pixel_sampler/node_pixel_sampler.yy",},}, {"id":{"name":"node_pixel_sort","path":"scripts/node_pixel_sort/node_pixel_sort.yy",},}, {"id":{"name":"node_plot_linear","path":"scripts/node_plot_linear/node_plot_linear.yy",},}, @@ -2272,6 +2276,10 @@ {"id":{"name":"sh_kuwahara","path":"shaders/sh_kuwahara/sh_kuwahara.yy",},}, {"id":{"name":"sh_level_selector","path":"shaders/sh_level_selector/sh_level_selector.yy",},}, {"id":{"name":"sh_level","path":"shaders/sh_level/sh_level.yy",},}, + {"id":{"name":"sh_liquefy_bloat","path":"shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy",},}, + {"id":{"name":"sh_liquefy_pinch","path":"shaders/sh_liquefy_pinch/sh_liquefy_pinch.yy",},}, + {"id":{"name":"sh_liquefy_push","path":"shaders/sh_liquefy_push/sh_liquefy_push.yy",},}, + {"id":{"name":"sh_liquefy_twirl","path":"shaders/sh_liquefy_twirl/sh_liquefy_twirl.yy",},}, {"id":{"name":"sh_local_analyze","path":"shaders/sh_local_analyze/sh_local_analyze.yy",},}, {"id":{"name":"sh_lovify","path":"shaders/sh_lovify/sh_lovify.yy",},}, {"id":{"name":"sh_lum2alpha","path":"shaders/sh_lum2alpha/sh_lum2alpha.yy",},}, @@ -2355,6 +2363,7 @@ {"id":{"name":"sh_perlin_tiled","path":"shaders/sh_perlin_tiled/sh_perlin_tiled.yy",},}, {"id":{"name":"sh_perlin","path":"shaders/sh_perlin/sh_perlin.yy",},}, {"id":{"name":"sh_pixel_cloud","path":"shaders/sh_pixel_cloud/sh_pixel_cloud.yy",},}, + {"id":{"name":"sh_pixel_math","path":"shaders/sh_pixel_math/sh_pixel_math.yy",},}, {"id":{"name":"sh_pixel_sample","path":"shaders/sh_pixel_sample/sh_pixel_sample.yy",},}, {"id":{"name":"sh_pixel_sort","path":"shaders/sh_pixel_sort/sh_pixel_sort.yy",},}, {"id":{"name":"sh_polar","path":"shaders/sh_polar/sh_polar.yy",},}, @@ -3016,6 +3025,8 @@ {"id":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},}, {"id":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},}, {"id":{"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",},}, + {"id":{"name":"s_node_liquefy_type","path":"sprites/s_node_liquefy_type/s_node_liquefy_type.yy",},}, + {"id":{"name":"s_node_liquefy","path":"sprites/s_node_liquefy/s_node_liquefy.yy",},}, {"id":{"name":"s_node_local_analyze","path":"sprites/s_node_local_analyze/s_node_local_analyze.yy",},}, {"id":{"name":"s_node_logic_opr","path":"sprites/s_node_logic_opr/s_node_logic_opr.yy",},}, {"id":{"name":"s_node_logic","path":"sprites/s_node_logic/s_node_logic.yy",},}, @@ -3135,6 +3146,7 @@ {"id":{"name":"s_node_pixel_builder","path":"sprites/s_node_pixel_builder/s_node_pixel_builder.yy",},}, {"id":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},}, {"id":{"name":"s_node_pixel_find","path":"sprites/s_node_pixel_find/s_node_pixel_find.yy",},}, + {"id":{"name":"s_node_pixel_math","path":"sprites/s_node_pixel_math/s_node_pixel_math.yy",},}, {"id":{"name":"s_node_pixel_sampler","path":"sprites/s_node_pixel_sampler/s_node_pixel_sampler.yy",},}, {"id":{"name":"s_node_pixel_sort","path":"sprites/s_node_pixel_sort/s_node_pixel_sort.yy",},}, {"id":{"name":"s_node_plot_linear_type","path":"sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy",},}, diff --git a/scripts/__node_surface_filter/__node_surface_filter.gml b/scripts/__node_surface_filter/__node_surface_filter.gml new file mode 100644 index 000000000..68f1e5a25 --- /dev/null +++ b/scripts/__node_surface_filter/__node_surface_filter.gml @@ -0,0 +1,53 @@ +/* Surface filter template +function Node_(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { + name = ""; + + newInput(0, nodeValue_Surface("Surface in", self)); + + newInput(1, nodeValue_Bool("Active", self, true)); + active_index = 1; + + newInput(2, nodeValue_Surface("Mask", self)); + + newInput(3, nodeValue_Float("Mix", self, 1)) + .setDisplay(VALUE_DISPLAY.slider); + + newInput(4, nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) })); + + __init_mask_modifier(2); // inputs 5, 6, + + input_display_list = [ 1, 4, + ["Surfaces", true], 0, 2, 3, 5, 6, + ["Effect", false], + ] + + newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone)); + + attribute_surface_depth(); + attribute_oversample(); + + static step = function() { + __step_mask_modifier(); + } + + static processData = function(_outSurf, _data, _output_index, _array_index) { + + var _rad = _data[7]; + var _int = _data[8]; + var _dim = surface_get_dimension(_data[0]); + _outSurf = surface_verify(_outSurf, _dim[0], _dim[1]); + + surface_set_shader(_outSurf, SHADER, true, BLEND.over); + shader_set_i("sampleMode", attributes.oversample); + shader_set_2("dimension", _dim); + + draw_surface_safe(_data[0]); + surface_reset_shader(); + + __process_mask_modifier(_data); + _outSurf = mask_apply(_data[0], _outSurf, _data[2], _data[3]); + _outSurf = channel_apply(_data[0], _outSurf, _data[4]); + + return _outSurf; + } +} \ No newline at end of file diff --git a/scripts/__node_surface_filter/__node_surface_filter.yy b/scripts/__node_surface_filter/__node_surface_filter.yy new file mode 100644 index 000000000..849cbe150 --- /dev/null +++ b/scripts/__node_surface_filter/__node_surface_filter.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"__node_surface_filter", + "isCompatibility":false, + "isDnD":false, + "name":"__node_surface_filter", + "parent":{ + "name":"__base__", + "path":"folders/nodes/__base__.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 88b2b8498..9418e7a97 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -42,7 +42,7 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_01_0; SAVE_VERSION = 1_18_01_0; - VERSION_STRING = MAC? "1.18.003m" : "1.18.2.003"; + VERSION_STRING = MAC? "1.18.003m" : "1.18.2.004"; BUILD_NUMBER = 1_18_01_0; HOTKEYS = ds_map_create(); diff --git a/scripts/mask_function/mask_function.gml b/scripts/mask_function/mask_function.gml index 50603640d..e61643741 100644 --- a/scripts/mask_function/mask_function.gml +++ b/scripts/mask_function/mask_function.gml @@ -73,6 +73,7 @@ function mask_apply(original, edited, mask, mix = 1) { function channel_apply(original, edited, channel) { if(channel == 0b1111) return edited; + if(!surface_exists(original)) return edited; var _f = surface_get_format(edited); var _s = surface_create_size(original, _f); diff --git a/scripts/node_VFX_boids/node_VFX_boids.gml b/scripts/node_VFX_boids/node_VFX_boids.gml index dc017a008..962c7fc49 100644 --- a/scripts/node_VFX_boids/node_VFX_boids.gml +++ b/scripts/node_VFX_boids/node_VFX_boids.gml @@ -29,16 +29,35 @@ function Node_VFX_Boids(_x, _y, _group = noone) : Node(_x, _y, _group) construct newInput(7, nodeValue_Float("Speed amplification", self, 1 )); + newInput(8, nodeValue_Bool("Follow point", self, false )); + + newInput(9, nodeValue_Vec2("Point", self, [ 0, 0 ] )); + + newInput(10, nodeValue_Float("Fol. influence", self, 0.1 )) + .setDisplay(VALUE_DISPLAY.slider); + input_display_list = [ 0, 7, ["Separation", false], 1, 2, ["Alignment", false], 3, 4, ["Grouping", false], 5, 6, + ["Follow point", true, 8], 9, 10, ]; newOutput(0, nodeValue_Output("Particles", self, VALUE_TYPE.particle, -1 )); UPDATE_PART_FORWARD + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + var _fol_pnt = getInputData(8); + var _hov = false; + + if(_fol_pnt) { + var hv = inputs[9].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, 0, 64); _hov |= hv; + } + + return _hov; + } + static update = function(frame = CURRENT_FRAME) { var parts = getInputData(0); @@ -66,12 +85,19 @@ function Node_VFX_Boids(_x, _y, _group = noone) : Node(_x, _y, _group) construct var _grp_amo = getInputData(6); var _spd_amp = getInputData(7); + var _fol_pnt = getInputData( 8); + var _pnt_tar = getInputData( 9); + var _fol_inf = getInputData(10); + var amo = array_length(_allparts); var p0, p0x, p0y, p0vx, p0vy; var p1, p1x, p1y, p1vx, p1vy; var avx, avy, avc; var ax, ay, ac; + var tarx = _pnt_tar[0]; + var tary = _pnt_tar[1]; + var max_rad2 = max(_sep_rad2, _ali_rad2, _grp_rad2); for( var i = 0; i < amo; i++ ) { @@ -142,6 +168,11 @@ function Node_VFX_Boids(_x, _y, _group = noone) : Node(_x, _y, _group) construct p0y += (ay - p0y) * _grp_amo; } + if(_fol_pnt) { + p0x += (tarx - p0x) * _fol_inf; + p0y += (tary - p0y) * _fol_inf; + } + var dir = point_direction(p0.x, p0.y, p0x, p0y); var _disn = point_distance( p0.x, p0.y, p0x, p0y); diff --git a/scripts/node_blur_zoom/node_blur_zoom.gml b/scripts/node_blur_zoom/node_blur_zoom.gml index 2633dd7dc..d5247727d 100644 --- a/scripts/node_blur_zoom/node_blur_zoom.gml +++ b/scripts/node_blur_zoom/node_blur_zoom.gml @@ -46,7 +46,7 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_surface_depth(); attribute_oversample(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var pos = getInputData(2); var px = _x + pos[0] * _s; var py = _y + pos[1] * _s; @@ -56,15 +56,15 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) var hv = inputs[2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; return _hov; - } #endregion + } - static step = function() { #region + static step = function() { __step_mask_modifier(); inputs[1].mappableStep(); - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var _sam = struct_try_get(attributes, "oversample"); var _cen = array_clone(_data[2]); @@ -89,5 +89,5 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) _outSurf = channel_apply(_data[0], _outSurf, _data[9]); return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_liquefy/node_alpha_to_grey.yy b/scripts/node_liquefy/node_alpha_to_grey.yy new file mode 100644 index 000000000..fde448fca --- /dev/null +++ b/scripts/node_liquefy/node_alpha_to_grey.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_alpha_to_grey", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_bw.yy b/scripts/node_liquefy/node_bw.yy new file mode 100644 index 000000000..6d2681493 --- /dev/null +++ b/scripts/node_liquefy/node_bw.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_bw", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_color_adjustment.yy b/scripts/node_liquefy/node_color_adjustment.yy new file mode 100644 index 000000000..8df16cc8c --- /dev/null +++ b/scripts/node_liquefy/node_color_adjustment.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_color_adjustment", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_color_replacement.yy b/scripts/node_liquefy/node_color_replacement.yy new file mode 100644 index 000000000..024aa6a80 --- /dev/null +++ b/scripts/node_liquefy/node_color_replacement.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "process", + "path": "folders/nodes/data/process.yy", + }, + "resourceVersion": "1.0", + "name": "node_color_replacement", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_greyscale.yy b/scripts/node_liquefy/node_greyscale.yy new file mode 100644 index 000000000..ee372977e --- /dev/null +++ b/scripts/node_liquefy/node_greyscale.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_greyscale", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_liquefy.gml b/scripts/node_liquefy/node_liquefy.gml new file mode 100644 index 000000000..94bac7d3d --- /dev/null +++ b/scripts/node_liquefy/node_liquefy.gml @@ -0,0 +1,346 @@ +enum LIQUEFY_TYPE { + push, + twirl, + pinch, + bloat, +} + +function Node_Liquefy(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { + name = "Liquefy"; + + newInput(0, nodeValue_Surface("Surface in", self)); + + newInput(1, nodeValue_Bool("Active", self, true)); + active_index = 1; + + newInput(2, nodeValue_Surface("Mask", self)); + + newInput(3, nodeValue_Float("Mix", self, 1)) + .setDisplay(VALUE_DISPLAY.slider); + + newInput(4, nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) })); + + __init_mask_modifier(2); // inputs 5, 6, + + newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone)); + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + typeList = [ + new scrollItem("Push", s_node_liquefy_type, 0), + new scrollItem("Twirl", s_node_liquefy_type, 1), + new scrollItem("Pinch", s_node_liquefy_type, 2), + new scrollItem("Bloat", s_node_liquefy_type, 3), + ]; + typeListStr = array_create_ext(array_length(typeList), function(i) /*=>*/ {return typeList[i].name}); + + static createNewInput = function() { + var _index = array_length(inputs); + dynamic_input_inspecting = getInputAmount(); + + newInput(_index + 0, nodeValue_Enum_Scroll("Type", self, 0, typeList)); + + newInput(_index + 1, nodeValue_Vec2("Position", self, [ 0, 0 ])) + .setUnitRef(function(index) /*=>*/ {return getDimension(index)}, VALUE_UNIT.reference); + + newInput(_index + 2, nodeValue_Vec2("Position 2", self, [ 1, 0 ])) // push + .setUnitRef(function(index) /*=>*/ {return getDimension(index)}, VALUE_UNIT.reference); + + newInput(_index + 3, nodeValue_Float("Radius", self, 8)); + inputs[_index + 3].overlay_text_valign = fa_bottom; + + newInput(_index + 4, nodeValue_Float("Intensity", self, 0.1)) + .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01] }); + + newInput(_index + 5, nodeValue_Float("Falloff", self, 0)); + + newInput(_index + 6, nodeValue_Curve("Falloff Curve", self, CURVE_DEF_10)); + + newInput(_index + 7, nodeValue_Float("Push", self, 0.1)) + .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01] }); + + newInput(_index + 8, nodeValue_PathNode("Push path", self, noone)) + + newInput(_index + 9, nodeValue_Int("Push resolution", self, 16)); + + newInput(_index + 10, nodeValue_Float("Radius 2", self, 8)); + inputs[_index + 10].overlay_text_valign = fa_bottom; + + refreshDynamicDisplay(); + return inputs[_index]; + } + + effect_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { + + var bs = ui(24); + var bx = _x + ui(20); + var by = _y; + if(buttonInstant(THEME.button_hide, bx, by, bs, bs, _m, _focus, _hover, "", THEME.add_16, 0, COLORS._main_value_positive) == 2) { + createNewInput(); + triggerRender(); + } + + var amo = getInputAmount(); + var lh = ui(28); + var _h = ui(12) + lh * amo; + var yy = _y + bs + ui(4); + + var del_light = -1; + draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, yy, _w, _h, COLORS.node_composite_bg_blend, 1); + + for(var i = 0; i < amo; i++) { + var _x0 = _x + ui(24); + var _x1 = _x + _w - ui(16); + var _yy = ui(6) + yy + i * lh + lh / 2; + + var _ind = input_fix_len + i * data_length; + var _typ = current_data[_ind + 0]; + var _col = COLORS._main_icon; + + var tc = i == dynamic_input_inspecting? COLORS._main_text_accent : COLORS._main_icon; + var hov = _hover && point_in_rectangle(_m[0], _m[1], _x0, _yy - lh / 2, _x1, _yy + lh / 2 - 1); + + if(hov && _m[0] < _x1 - ui(32)) { + tc = COLORS._main_text; + + if(mouse_press(mb_left, _focus)) { + dynamic_input_inspecting = i; + refreshDynamicDisplay(); + } + } + + draw_sprite_ext(s_node_liquefy_type, _typ, _x0 + ui(8), _yy, 1, 1, 0, _col, .5 + .5 * (i == dynamic_input_inspecting)); + + draw_set_text(f_p2, fa_left, fa_center, tc); + draw_text_add(_x0 + ui(28), _yy, typeListStr[_typ]); + + if(amo > 1) { + var bs = ui(24); + var bx = _x1 - bs; + var by = _yy - bs / 2; + if(buttonInstant(THEME.button_hide, bx, by, bs, bs, _m, _focus, _hover, "", THEME.minus_16, 0, hov? COLORS._main_value_negative : COLORS._main_icon) == 2) + del_light = i; + } + } + + if(del_light > -1) + deleteDynamicInput(del_light); + + return ui(32) + _h; + }); + + input_display_dynamic = [ 0, + ["Regions", false], 1, 2, 8, 9, 3, 10, 5, + ["Effect", false], 4, 7, + ]; + + input_display_list = [ 1, 4, + ["Surfaces", true], 0, 2, 3, 5, 6, + new Inspector_Spacer(8, true), + new Inspector_Spacer(2, false, false), + effect_renderer, + ] + + setDynamicInput(11, false); + if(!LOADING && !APPENDING) createNewInput(); + + attribute_surface_depth(); + attribute_oversample(); + attribute_interpolation(); + + temp_surface = [ 0, 0 ]; + disp_path = []; + + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + PROCESSOR_OVERLAY_CHECK + + if(getInputAmount() == 0) return; + + dynamic_input_inspecting = clamp(dynamic_input_inspecting, 0, getInputAmount() - 1); + var _ind = input_fix_len + dynamic_input_inspecting * data_length; + var _type = current_data[_ind + 0]; + var _hov = false; + + draw_set_circle_precision(64); + + var pos = current_data[_ind + 1]; + var rad = current_data[_ind + 3] * _s; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + + switch(_type) { + case LIQUEFY_TYPE.push : + var _path = current_data[_ind + 8]; + var rad2 = current_data[_ind + 10] * _s; + + if(_path == noone) { + var pos2 = current_data[_ind + 2]; + var qx = _x + pos2[0] * _s; + var qy = _y + pos2[1] * _s; + + draw_set_color(COLORS._main_accent); + draw_circle(px, py, rad, true); + draw_circle(qx, qy, rad2, true); + + var hv = inputs[_ind + 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); hover &= !hv; + var hv = inputs[_ind + 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); hover &= !hv; + + var hv = inputs[_ind + 10].drawOverlay(hover, active, qx, qy, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); hover &= !hv; + + } else if(!array_empty(disp_path)) { + var ox, oy, nx, ny; + + ox = _x + disp_path[0] * _s; + oy = _y + disp_path[1] * _s; + + px = ox; + py = oy; + + draw_set_color(COLORS._main_accent); + draw_circle(px, py, rad, true); + + for( var i = 2, n = array_length(disp_path); i < n; i += 2 ) { + nx = _x + disp_path[i + 0] * _s; + ny = _y + disp_path[i + 1] * _s; + + draw_line(ox, oy, nx, ny); + + ox = nx; + oy = ny; + } + + draw_circle(ox, oy, rad2, true); + + var hv = inputs[_ind + 10].drawOverlay(hover, active, ox, oy, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); hover &= !hv; + } + break; + + default: + var hv = inputs[_ind + 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); hover &= !hv; + break; + } + + var hv = inputs[_ind + 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); hover &= !hv; + return _hov; + } + + static step = function() { + __step_mask_modifier(); + } + + static applyLiquefy = function(_data, _i) { + var _ind = input_fix_len + _i * data_length; + var _surf = _data[0]; + var _type = _data[_ind + 0]; + var _pos1 = _data[_ind + 1]; + var _pos2 = _data[_ind + 2]; + var _rad = _data[_ind + 3]; + var _int = _data[_ind + 4]; + var _fall = _data[_ind + 5]; + var _push = _data[_ind + 7]; + var _path = _data[_ind + 8]; + var _pthR = min(1024, _data[_ind + 9]); + var _rad2 = _data[_ind + 10]; + + var _shader = sh_liquefy_push; + + switch(_type) { + case LIQUEFY_TYPE.push : _shader = sh_liquefy_push; break; + case LIQUEFY_TYPE.twirl : _shader = sh_liquefy_twirl; break; + case LIQUEFY_TYPE.pinch : _shader = sh_liquefy_pinch; break; + case LIQUEFY_TYPE.bloat : _shader = sh_liquefy_bloat; break; + } + + surface_set_shader(temp_surface[0], _shader, true, BLEND.over); + shader_set_interpolation(_surf); + shader_set_dim("dimension", _surf); + shader_set_2("pos1", _pos1); + shader_set_2("pos2", _pos2); + shader_set_f("radius", _rad); + shader_set_f("radius2", _rad2); + shader_set_f("intensity", _int); + shader_set_f("falloff", _fall); + shader_set_f("pushIntens", _push); + + if(_type == LIQUEFY_TYPE.push) { + var _usePath = _path != noone; + var _pthList = array_create(_pthR * 2); + var _p = new __vec2(); + + if(_usePath) { + for( var i = 0; i < _pthR; i++ ) { + _p = _path.getPointRatio(i / (_pthR - 1) ,0, _p); + _pthList[i * 2 + 0] = _p.x; + _pthList[i * 2 + 1] = _p.y; + } + + if(_i == dynamic_input_inspecting) + disp_path = _pthList; + } + + shader_set_i("usePath", _usePath); + shader_set_i("pathResolution", _pthR); + shader_set_f("pathList", _pthList); + } + + draw_surface_safe(temp_surface[1]); + surface_reset_shader(); + + surface_set_shader(temp_surface[1], noone, true, BLEND.over); + draw_surface_safe(temp_surface[0]); + surface_reset_shader(); + + } + + static processData = function(_outSurf, _data, _output_index, _array_index) { + var _amo = getInputAmount(); + if(_amo == 0) return _outSurf; + + var sam = struct_try_get(attributes, "oversample"); + var _surf = _data[0]; + + if(!is_surface(_surf)) return _outSurf; + + #region visibility + dynamic_input_inspecting = clamp(dynamic_input_inspecting, 0, _amo - 1); + var _ind = input_fix_len + dynamic_input_inspecting * data_length; + var _type = _data[_ind + 0]; + + inputs[_ind + 2].setVisible(_type == 0); + inputs[_ind + 7].setVisible(_type == 0); + inputs[_ind + 8].setVisible(_type == 0, _type == 0); + inputs[_ind + 9].setVisible(_type == 0); + inputs[_ind + 10].setVisible(_type == 0); + + if(_type == LIQUEFY_TYPE.push) { + var _path = _data[_ind + 8]; + var _usePath = _path != noone; + + inputs[_ind + 1].setVisible(!_usePath); + inputs[_ind + 2].setVisible(!_usePath); + inputs[_ind + 9].setVisible( _usePath); + } + #endregion + + var _dim = surface_get_dimension(_surf); + for( var i = 0, n = array_length(temp_surface); i < n; i++ ) + temp_surface[i] = surface_verify(temp_surface[i], _dim[0], _dim[1]); + + surface_set_shader(temp_surface[1], noone, true, BLEND.over); + draw_surface_safe(_surf); + surface_reset_shader(); + + for(var i = 0; i < _amo; i++) + applyLiquefy(_data, i); + + surface_set_shader(_outSurf, noone, true, BLEND.over); + draw_surface_safe(temp_surface[1]); + surface_reset_shader(); + + __process_mask_modifier(_data); + _outSurf = mask_apply(_surf, _outSurf, _data[2], _data[3]); + _outSurf = channel_apply(_surf, _outSurf, _data[4]); + + return _outSurf; + } +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_liquefy.yy b/scripts/node_liquefy/node_liquefy.yy new file mode 100644 index 000000000..49f5eb80c --- /dev/null +++ b/scripts/node_liquefy/node_liquefy.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"node_liquefy", + "isCompatibility":false, + "isDnD":false, + "name":"node_liquefy", + "parent":{ + "name":"warps", + "path":"folders/nodes/data/filter/warps.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/node_liquefy/node_outline.yy b/scripts/node_liquefy/node_outline.yy new file mode 100644 index 000000000..86468bc09 --- /dev/null +++ b/scripts/node_liquefy/node_outline.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "process", + "path": "folders/nodes/data/process.yy", + }, + "resourceVersion": "1.0", + "name": "node_outline", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_bw.yy b/scripts/node_pixel_math/node_bw.yy new file mode 100644 index 000000000..6d2681493 --- /dev/null +++ b/scripts/node_pixel_math/node_bw.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_bw", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_color_adjustment.yy b/scripts/node_pixel_math/node_color_adjustment.yy new file mode 100644 index 000000000..8df16cc8c --- /dev/null +++ b/scripts/node_pixel_math/node_color_adjustment.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_color_adjustment", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_color_replacement.yy b/scripts/node_pixel_math/node_color_replacement.yy new file mode 100644 index 000000000..024aa6a80 --- /dev/null +++ b/scripts/node_pixel_math/node_color_replacement.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "process", + "path": "folders/nodes/data/process.yy", + }, + "resourceVersion": "1.0", + "name": "node_color_replacement", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_greyscale.yy b/scripts/node_pixel_math/node_greyscale.yy new file mode 100644 index 000000000..ee372977e --- /dev/null +++ b/scripts/node_pixel_math/node_greyscale.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "filter", + "path": "folders/nodes/data/filter.yy", + }, + "resourceVersion": "1.0", + "name": "node_greyscale", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_outline.yy b/scripts/node_pixel_math/node_outline.yy new file mode 100644 index 000000000..86468bc09 --- /dev/null +++ b/scripts/node_pixel_math/node_outline.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "process", + "path": "folders/nodes/data/process.yy", + }, + "resourceVersion": "1.0", + "name": "node_outline", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_pixel_math.gml b/scripts/node_pixel_math/node_pixel_math.gml new file mode 100644 index 000000000..123e1e28e --- /dev/null +++ b/scripts/node_pixel_math/node_pixel_math.gml @@ -0,0 +1,109 @@ +function Node_Pixel_Math(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { + name = "Pixel Math"; + + newInput(0, nodeValue_Surface("Surface in", self)); + + newInput(1, nodeValue_Bool("Active", self, true)); + active_index = 1; + + newInput(2, nodeValue_Surface("Mask", self)); + + newInput(3, nodeValue_Float("Mix", self, 1)) + .setDisplay(VALUE_DISPLAY.slider); + + newInput(4, nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) })); + + __init_mask_modifier(2); // inputs 5, 6, + + oprList = [ "Add", "Subtract", "Multiply", "Divide", "Power", "Root", "Sin", "Cos", "Tan", "Modulo", + "Floor", "Ceil", "Round", "Abs", "Clamp" ]; + newInput(7, nodeValue_Enum_Scroll("Operator", self, 0, oprList)); + + newInput(8, nodeValue_Vec4("Operand", self, [ 0, 0, 0, 0 ])); + + newInput(9, nodeValue_Vec2("Range", self, [ 0, 0 ])); + + newInput(10, nodeValue_Enum_Button("Operand type", self, 0, [ "Vec4", "Surface" ])); + + newInput(11, nodeValue_Surface("Mask", self)); + + newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone)); + + input_display_list = [ 1, 4, + ["Surfaces", false], 0, 2, 3, 5, 6, + ["Operation", false], 7, 10, 8, 9, 11, + ] + + attribute_surface_depth(); + + static step = function() { + __step_mask_modifier(); + } + + static processData = function(_outSurf, _data, _output_index, _array_index) { + var type = _data[7]; + var op4 = _data[8]; + var op2 = _data[9]; + var opType = _data[10]; + var opS = _data[11]; + + var _oprand = oprList[type]; + setDisplayName(_oprand); + + if(opType == 0) { + switch(_oprand) { + case "Add" : + case "Subtract" : + case "Multiply" : + case "Divide" : + case "Power" : + case "Root" : + case "Modulo" : + inputs[8].setVisible( true); + inputs[9].setVisible(false); + break; + + case "Sin" : + case "Cos" : + case "Tan" : + + case "Floor" : + case "Ceil" : + case "Round" : + case "Abs" : + inputs[8].setVisible(false); + inputs[9].setVisible(false); + break; + + case "Clamp" : + inputs[8].setVisible(false); + inputs[9].setVisible( true); + break; + + } + + inputs[11].setVisible(false, false); + + } else { + inputs[ 8].setVisible(false); + inputs[ 9].setVisible(false); + inputs[11].setVisible(true, true); + } + + surface_set_shader(_outSurf, sh_pixel_math); + shader_set_i("operator", type); + + shader_set_i("operandType", opType ); + shader_set_surface("operandSurf", opS ); + shader_set_4("operand", _oprand == "Clamp"? [ op2[0], op2[1], 0, 0] : op4 ); + + draw_surface_safe(_data[0]); + surface_reset_shader(); + + __process_mask_modifier(_data); + _outSurf = mask_apply(_data[0], _outSurf, _data[2], _data[3]); + _outSurf = channel_apply(_data[0], _outSurf, _data[4]); + + return _outSurf; + } +} \ No newline at end of file diff --git a/scripts/node_pixel_math/node_pixel_math.yy b/scripts/node_pixel_math/node_pixel_math.yy new file mode 100644 index 000000000..0eace559d --- /dev/null +++ b/scripts/node_pixel_math/node_pixel_math.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"node_pixel_math", + "isCompatibility":false, + "isDnD":false, + "name":"node_pixel_math", + "parent":{ + "name":"effects", + "path":"folders/nodes/data/filter/effects.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/node_processor/node_processor.gml b/scripts/node_processor/node_processor.gml index 67db1e68f..878eef39f 100644 --- a/scripts/node_processor/node_processor.gml +++ b/scripts/node_processor/node_processor.gml @@ -243,8 +243,9 @@ function Node_Processor(_x, _y, _group = noone) : Node(_x, _y, _group) construct if(dimension_index > -1) { var _dim = getDimension(); - for(var i = 0; i < _os; i++) + for(var i = 0; i < _os; i++) { if(outputs[i].type == VALUE_TYPE.surface) _out[i] = surface_verify(_out[i], _dim[0], _dim[1], _dep); + } } if(_os == 1) { diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index e65c8ff55..402326a2b 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -618,6 +618,7 @@ function __initNodes() { addNodeObject(filter, "Time Remap", s_node_time_map, "Node_Time_Remap", [1, Node_Time_Remap],, "Remap image using texture as time map. Where brighter pixel means using pixel from an older frame."); addNodeObject(filter, "Shape Map", s_node_shape_map, "Node_Shape_Map", [1, Node_Shape_Map],, "Map image into shapes.").setVersion(11660); addNodeObject(filter, "Morph Surface", s_node_morph_surface, "Node_Morph_Surface", [1, Node_Morph_Surface],, "Morph pixel between two surfaces.").setVersion(1141); + addNodeObject(filter, "Liquefy", s_node_liquefy, "Node_Liquefy", [1, Node_Liquefy],, "Distort image using variety of tools.").setVersion(1_18_02_0); ds_list_add(filter, "Effects"); addNodeObject(filter, "Outline", s_node_border, "Node_Outline", [1, Node_Outline], ["border"], "Add border to the image."); @@ -644,6 +645,7 @@ function __initNodes() { addNodeObject(filter, "JPEG", s_node_JPEG, "Node_JPEG", [1, Node_JPEG],, "Apply JPEG compression to the image.").setVersion(11730); addNodeObject(filter, "Interlace", s_node_interlace, "Node_Interlaced", [1, Node_Interlaced],, "Apply interlace effect to an image.").setVersion(11760); addNodeObject(filter, "Blend Edge", s_node_blend_edge, "Node_Blend_Edge", [1, Node_Blend_Edge],, "Blend the edges of an image to create tilable patterns.").setVersion(11740); + addNodeObject(filter, "Pixel Math", s_node_pixel_math, "Node_Pixel_Math", [1, Node_Pixel_Math],, "Apply mathematical operation directly on RGBA value.").setVersion(1_18_02_0); ds_list_add(filter, "Colors"); addNodeObject(filter, "Replace Palette", s_node_replace_palette, "Node_Color_replace", [1, Node_Color_replace], ["isolate color", "select color", "palette swap", "color replace"], "Match image to a palette then remap it to another palette."); diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 907a07115..ac95d245a 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -415,6 +415,8 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { value_draggings = []; value_drag_from = noone; + node_drag_search = false; + frame_hovering = noone; _frame_hovering = noone; #endregion @@ -1992,6 +1994,14 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { connectDraggingValueTo(target); } + // if(keyboard_check_pressed(vk_anykey)) { + // var k = keyboard_lastkey; + + // if(k >= ord("A") && k <= ord("z") && !node_drag_search) { + // node_drag_search = true; + // } + // } + if(mouse_release(mb_left)) value_draggings = []; } @@ -2000,6 +2010,8 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { if(value_dragging) draggingValue(); + else + node_drag_search = false; if(value_dragging == noone && value_focus && mouse_press(mb_left, _focus) && !key_mod_press(ALT)) { value_dragging = value_focus; @@ -2677,6 +2689,8 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { //// ============ Action ============ function createNodeHotkey(_node, _param = noone) { + // if(value_dragging != noone) return; + var node; if(mouse_create_x == undefined || mouse_create_sx != mouse_grid_x || mouse_create_sy != mouse_grid_y) { diff --git a/shaders/sh_liquefy_bloat/sh_liquefy_bloat.fsh b/shaders/sh_liquefy_bloat/sh_liquefy_bloat.fsh new file mode 100644 index 000000000..7b3dd6295 --- /dev/null +++ b/shaders/sh_liquefy_bloat/sh_liquefy_bloat.fsh @@ -0,0 +1,95 @@ +#define TAU 6.28318530718 + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec2 dimension; +uniform vec2 pos1; +uniform vec2 pos2; +uniform float radius; +uniform float intensity; +uniform float falloff; + +#region /////////////// SAMPLING /////////////// + + const float PI = 3.14159265358979323846; + uniform int interpolation; + uniform vec2 sampleDimension; + + const int RSIN_RADIUS = 1; + + float sinc ( float x ) { return x == 0.? 1. : sin(x * PI) / (x * PI); } + + vec4 texture2D_bilinear( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension - .5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + + vec4 mixed = mix( + mix( + texture2D( texture, (iuv + vec2(0., 0.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 0.)) / sampleDimension ), + fuv.x + ), + mix( + texture2D( texture, (iuv + vec2(0., 1.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 1.)) / sampleDimension ), + fuv.x + ), + fuv.y + ); + + mixed.rgb /= mixed.a; + + return mixed; + } + + vec4 texture2D_rsin( sampler2D texture, vec2 uv ) { + vec2 tx = 1.0 / sampleDimension; + vec2 p = uv * sampleDimension - vec2(0.5); + + vec4 sum = vec4(0.0); + float weights = 0.; + + for (int x = -RSIN_RADIUS; x <= RSIN_RADIUS; x++) + for (int y = -RSIN_RADIUS; y <= RSIN_RADIUS; y++) { + float a = length(vec2(float(x), float(y))) / float(RSIN_RADIUS); + if(a > 1.) continue; + float w = sinc(a * PI * tx.x) * sinc(a * PI * tx.y); + vec2 offset = vec2(float(x), float(y)) * tx; + vec4 sample = texture2D_bilinear(texture, (p + offset + vec2(0.5)) / sampleDimension); + sum += w * sample; + weights += w; + } + + return sum / weights; + } + + vec4 texture2D_bicubic( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension + 0.5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + uv = iuv + fuv * fuv * (3.0 - 2.0 * fuv); + uv = (uv - 0.5) / sampleDimension; + return texture2D_bilinear( texture, uv ); + } + + vec4 texture2Dintp( sampler2D texture, vec2 uv ) { + if(interpolation == 1) return texture2D_bilinear( texture, uv ); + else if(interpolation == 2) return texture2D_bicubic( texture, uv ); + else if(interpolation == 3) return texture2D_rsin( texture, uv ); + return texture2D( texture, uv ); + } + +#endregion /////////////// SAMPLING /////////////// + +void main() { + vec2 tx = 1. / dimension; + vec2 p1 = pos1 * tx; + + float dis = distance(v_vTexcoord * dimension, p1 * dimension); + float inf = 1. - smoothstep(radius - falloff, radius + falloff, dis); + vec2 stx = v_vTexcoord - (v_vTexcoord - p1) * intensity * inf; + + gl_FragColor = texture2Dintp( gm_BaseTexture, stx ); +} diff --git a/shaders/sh_liquefy_bloat/sh_liquefy_bloat.vsh b/shaders/sh_liquefy_bloat/sh_liquefy_bloat.vsh new file mode 100644 index 000000000..3900c20f4 --- /dev/null +++ b/shaders/sh_liquefy_bloat/sh_liquefy_bloat.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy b/shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy new file mode 100644 index 000000000..2b48491ec --- /dev/null +++ b/shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"sh_liquefy_bloat", + "name":"sh_liquefy_bloat", + "parent":{ + "name":"liquefy", + "path":"folders/shader/filter/liquefy.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/sh_liquefy_pinch/sh_liquefy_pinch.fsh b/shaders/sh_liquefy_pinch/sh_liquefy_pinch.fsh new file mode 100644 index 000000000..d7c0e55e5 --- /dev/null +++ b/shaders/sh_liquefy_pinch/sh_liquefy_pinch.fsh @@ -0,0 +1,95 @@ +#define TAU 6.28318530718 + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec2 dimension; +uniform vec2 pos1; +uniform vec2 pos2; +uniform float radius; +uniform float intensity; +uniform float falloff; + +#region /////////////// SAMPLING /////////////// + + const float PI = 3.14159265358979323846; + uniform int interpolation; + uniform vec2 sampleDimension; + + const int RSIN_RADIUS = 1; + + float sinc ( float x ) { return x == 0.? 1. : sin(x * PI) / (x * PI); } + + vec4 texture2D_bilinear( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension - .5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + + vec4 mixed = mix( + mix( + texture2D( texture, (iuv + vec2(0., 0.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 0.)) / sampleDimension ), + fuv.x + ), + mix( + texture2D( texture, (iuv + vec2(0., 1.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 1.)) / sampleDimension ), + fuv.x + ), + fuv.y + ); + + mixed.rgb /= mixed.a; + + return mixed; + } + + vec4 texture2D_rsin( sampler2D texture, vec2 uv ) { + vec2 tx = 1.0 / sampleDimension; + vec2 p = uv * sampleDimension - vec2(0.5); + + vec4 sum = vec4(0.0); + float weights = 0.; + + for (int x = -RSIN_RADIUS; x <= RSIN_RADIUS; x++) + for (int y = -RSIN_RADIUS; y <= RSIN_RADIUS; y++) { + float a = length(vec2(float(x), float(y))) / float(RSIN_RADIUS); + if(a > 1.) continue; + float w = sinc(a * PI * tx.x) * sinc(a * PI * tx.y); + vec2 offset = vec2(float(x), float(y)) * tx; + vec4 sample = texture2D_bilinear(texture, (p + offset + vec2(0.5)) / sampleDimension); + sum += w * sample; + weights += w; + } + + return sum / weights; + } + + vec4 texture2D_bicubic( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension + 0.5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + uv = iuv + fuv * fuv * (3.0 - 2.0 * fuv); + uv = (uv - 0.5) / sampleDimension; + return texture2D_bilinear( texture, uv ); + } + + vec4 texture2Dintp( sampler2D texture, vec2 uv ) { + if(interpolation == 1) return texture2D_bilinear( texture, uv ); + else if(interpolation == 2) return texture2D_bicubic( texture, uv ); + else if(interpolation == 3) return texture2D_rsin( texture, uv ); + return texture2D( texture, uv ); + } + +#endregion /////////////// SAMPLING /////////////// + +void main() { + vec2 tx = 1. / dimension; + vec2 p1 = pos1 * tx; + + float dis = distance(v_vTexcoord * dimension, p1 * dimension); + float inf = 1. - smoothstep(radius - falloff, radius + falloff, dis); + vec2 stx = v_vTexcoord + (v_vTexcoord - p1) * intensity * inf; + + gl_FragColor = texture2Dintp( gm_BaseTexture, stx ); +} diff --git a/shaders/sh_liquefy_pinch/sh_liquefy_pinch.vsh b/shaders/sh_liquefy_pinch/sh_liquefy_pinch.vsh new file mode 100644 index 000000000..3900c20f4 --- /dev/null +++ b/shaders/sh_liquefy_pinch/sh_liquefy_pinch.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/sh_liquefy_pinch/sh_liquefy_pinch.yy b/shaders/sh_liquefy_pinch/sh_liquefy_pinch.yy new file mode 100644 index 000000000..d621f4df7 --- /dev/null +++ b/shaders/sh_liquefy_pinch/sh_liquefy_pinch.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"sh_liquefy_pinch", + "name":"sh_liquefy_pinch", + "parent":{ + "name":"liquefy", + "path":"folders/shader/filter/liquefy.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/sh_liquefy_push/sh_liquefy_push.fsh b/shaders/sh_liquefy_push/sh_liquefy_push.fsh new file mode 100644 index 000000000..b4cd1941d --- /dev/null +++ b/shaders/sh_liquefy_push/sh_liquefy_push.fsh @@ -0,0 +1,143 @@ +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec2 dimension; +uniform vec2 pos1; +uniform vec2 pos2; +uniform int usePath; +uniform int pathResolution; +uniform vec2 pathList[1024]; + +uniform float radius; +uniform float radius2; +uniform float intensity; +uniform float falloff; +uniform float pushIntens; + +#region /////////////// SAMPLING /////////////// + + const float PI = 3.14159265358979323846; + uniform int interpolation; + uniform vec2 sampleDimension; + + const int RSIN_RADIUS = 1; + + float sinc ( float x ) { return x == 0.? 1. : sin(x * PI) / (x * PI); } + + vec4 texture2D_bilinear( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension - .5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + + vec4 mixed = mix( + mix( + texture2D( texture, (iuv + vec2(0., 0.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 0.)) / sampleDimension ), + fuv.x + ), + mix( + texture2D( texture, (iuv + vec2(0., 1.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 1.)) / sampleDimension ), + fuv.x + ), + fuv.y + ); + + mixed.rgb /= mixed.a; + + return mixed; + } + + vec4 texture2D_rsin( sampler2D texture, vec2 uv ) { + vec2 tx = 1.0 / sampleDimension; + vec2 p = uv * sampleDimension - vec2(0.5); + + vec4 sum = vec4(0.0); + float weights = 0.; + + for (int x = -RSIN_RADIUS; x <= RSIN_RADIUS; x++) + for (int y = -RSIN_RADIUS; y <= RSIN_RADIUS; y++) { + float a = length(vec2(float(x), float(y))) / float(RSIN_RADIUS); + if(a > 1.) continue; + float w = sinc(a * PI * tx.x) * sinc(a * PI * tx.y); + vec2 offset = vec2(float(x), float(y)) * tx; + vec4 sample = texture2D_bilinear(texture, (p + offset + vec2(0.5)) / sampleDimension); + sum += w * sample; + weights += w; + } + + return sum / weights; + } + + vec4 texture2D_bicubic( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension + 0.5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + uv = iuv + fuv * fuv * (3.0 - 2.0 * fuv); + uv = (uv - 0.5) / sampleDimension; + return texture2D_bilinear( texture, uv ); + } + + vec4 texture2Dintp( sampler2D texture, vec2 uv ) { + if(interpolation == 1) return texture2D_bilinear( texture, uv ); + else if(interpolation == 2) return texture2D_bicubic( texture, uv ); + else if(interpolation == 3) return texture2D_rsin( texture, uv ); + return texture2D( texture, uv ); + } + +#endregion /////////////// SAMPLING /////////////// + +vec2 closestPointOnLine(vec2 P, vec2 A, vec2 B, out float t) { + vec2 AP = P - A; + vec2 AB = B - A; + t = dot(AP, AB) / dot(AB, AB); + t = clamp(t, 0.0, 1.0); + return A + t * AB; +} + +void main() { + vec2 tx = 1. / dimension; + vec2 pushPoint = vec2(0.); + vec2 pushDir = vec2(0.); + float pushT = 0.; + float inf = 0.; + vec2 stx = v_vTexcoord; + vec2 p1, p2; + + if(usePath == 0) { + p1 = pos1 * tx; + p2 = pos2 * tx; + pushDir = p2 - p1; + + pushPoint = closestPointOnLine(v_vTexcoord, p1, p2, pushT); + float dis = distance(v_vTexcoord * dimension, pushPoint * dimension); + float rad = mix(radius, radius2, pushT); + inf = 1. - smoothstep(rad - falloff, rad + falloff, dis); + stx -= (pushPoint - stx) * inf * intensity * pushIntens; + stx -= pushDir * inf * intensity * pushT; + + } else { + float minDist = 9999.; + float _intRes = intensity; + float _pshRes = pushIntens / float(pathResolution); + vec2 cpc; + + for(int i = pathResolution - 2; i >= 0; i--) { + p1 = pathList[i] * tx; + p2 = pathList[i + 1] * tx; + cpc = closestPointOnLine(stx, p1, p2, pushT); + + pushPoint = cpc; + pushDir = p2 - p1; + + float rad = mix(radius, radius2, (float(i) + pushT) / float(pathResolution)); + float dis = distance(stx * dimension, pushPoint * dimension); + inf = 1. - smoothstep(rad - falloff, rad + falloff, dis); + + stx += (pushPoint - v_vTexcoord) * inf * _intRes * _pshRes; + stx -= pushDir * inf * _intRes * pushT; + } + } + + gl_FragColor = texture2Dintp( gm_BaseTexture, stx ); +} diff --git a/shaders/sh_liquefy_push/sh_liquefy_push.vsh b/shaders/sh_liquefy_push/sh_liquefy_push.vsh new file mode 100644 index 000000000..3900c20f4 --- /dev/null +++ b/shaders/sh_liquefy_push/sh_liquefy_push.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/sh_liquefy_push/sh_liquefy_push.yy b/shaders/sh_liquefy_push/sh_liquefy_push.yy new file mode 100644 index 000000000..120fa1028 --- /dev/null +++ b/shaders/sh_liquefy_push/sh_liquefy_push.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"sh_liquefy_push", + "name":"sh_liquefy_push", + "parent":{ + "name":"liquefy", + "path":"folders/shader/filter/liquefy.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/sh_liquefy_twirl/sh_liquefy_twirl.fsh b/shaders/sh_liquefy_twirl/sh_liquefy_twirl.fsh new file mode 100644 index 000000000..6900861b8 --- /dev/null +++ b/shaders/sh_liquefy_twirl/sh_liquefy_twirl.fsh @@ -0,0 +1,99 @@ +#define TAU 6.28318530718 + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec2 dimension; +uniform vec2 pos1; +uniform vec2 pos2; +uniform float radius; +uniform float intensity; +uniform float falloff; + +#region /////////////// SAMPLING /////////////// + + const float PI = 3.14159265358979323846; + uniform int interpolation; + uniform vec2 sampleDimension; + + const int RSIN_RADIUS = 1; + + float sinc ( float x ) { return x == 0.? 1. : sin(x * PI) / (x * PI); } + + vec4 texture2D_bilinear( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension - .5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + + vec4 mixed = mix( + mix( + texture2D( texture, (iuv + vec2(0., 0.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 0.)) / sampleDimension ), + fuv.x + ), + mix( + texture2D( texture, (iuv + vec2(0., 1.)) / sampleDimension ), + texture2D( texture, (iuv + vec2(1., 1.)) / sampleDimension ), + fuv.x + ), + fuv.y + ); + + mixed.rgb /= mixed.a; + + return mixed; + } + + vec4 texture2D_rsin( sampler2D texture, vec2 uv ) { + vec2 tx = 1.0 / sampleDimension; + vec2 p = uv * sampleDimension - vec2(0.5); + + vec4 sum = vec4(0.0); + float weights = 0.; + + for (int x = -RSIN_RADIUS; x <= RSIN_RADIUS; x++) + for (int y = -RSIN_RADIUS; y <= RSIN_RADIUS; y++) { + float a = length(vec2(float(x), float(y))) / float(RSIN_RADIUS); + if(a > 1.) continue; + float w = sinc(a * PI * tx.x) * sinc(a * PI * tx.y); + vec2 offset = vec2(float(x), float(y)) * tx; + vec4 sample = texture2D_bilinear(texture, (p + offset + vec2(0.5)) / sampleDimension); + sum += w * sample; + weights += w; + } + + return sum / weights; + } + + vec4 texture2D_bicubic( sampler2D texture, vec2 uv ) { + uv = uv * sampleDimension + 0.5; + vec2 iuv = floor( uv ); + vec2 fuv = fract( uv ); + uv = iuv + fuv * fuv * (3.0 - 2.0 * fuv); + uv = (uv - 0.5) / sampleDimension; + return texture2D_bilinear( texture, uv ); + } + + vec4 texture2Dintp( sampler2D texture, vec2 uv ) { + if(interpolation == 1) return texture2D_bilinear( texture, uv ); + else if(interpolation == 2) return texture2D_bicubic( texture, uv ); + else if(interpolation == 3) return texture2D_rsin( texture, uv ); + return texture2D( texture, uv ); + } + +#endregion /////////////// SAMPLING /////////////// + +void main() { + vec2 tx = 1. / dimension; + vec2 p1 = pos1 * tx; + + float dis = distance(v_vTexcoord * dimension, p1 * dimension); + float inf = 1. - smoothstep(radius - falloff, radius + falloff, dis); + + vec2 stx = v_vTexcoord; + float ang = TAU * intensity * inf; + + stx = p1 + (v_vTexcoord - p1) * mat2(cos(ang), -sin(ang), sin(ang), cos(ang)); + + gl_FragColor = texture2Dintp( gm_BaseTexture, stx ); +} diff --git a/shaders/sh_liquefy_twirl/sh_liquefy_twirl.vsh b/shaders/sh_liquefy_twirl/sh_liquefy_twirl.vsh new file mode 100644 index 000000000..3900c20f4 --- /dev/null +++ b/shaders/sh_liquefy_twirl/sh_liquefy_twirl.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/sh_liquefy_twirl/sh_liquefy_twirl.yy b/shaders/sh_liquefy_twirl/sh_liquefy_twirl.yy new file mode 100644 index 000000000..661225d1a --- /dev/null +++ b/shaders/sh_liquefy_twirl/sh_liquefy_twirl.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"sh_liquefy_twirl", + "name":"sh_liquefy_twirl", + "parent":{ + "name":"liquefy", + "path":"folders/shader/filter/liquefy.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/sh_pixel_math/sh_pixel_math.fsh b/shaders/sh_pixel_math/sh_pixel_math.fsh new file mode 100644 index 000000000..9683f95f6 --- /dev/null +++ b/shaders/sh_pixel_math/sh_pixel_math.fsh @@ -0,0 +1,89 @@ +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform int operator; +uniform vec4 operand; + +uniform int operandType; +uniform sampler2D operandSurf; + +float round(float i) { return floor(i + .5); } + +void main() { + vec4 res = texture2D( gm_BaseTexture, v_vTexcoord ); + vec4 op = operandType == 1? texture2D( operandSurf, v_vTexcoord ) : operand; + + if(operator == 0) { res = res + op; } + else if(operator == 1) { res = res - op; } + else if(operator == 2) { res = res * op; } + else if(operator == 3) { res = res / op; } + else if(operator == 4) { + res.r = pow(res.r, op.r); + res.g = pow(res.g, op.g); + res.b = pow(res.b, op.b); + res.a = pow(res.a, op.a); + + } else if(operator == 5) { + res.r = pow(res.r, 1. / op.r); + res.g = pow(res.g, 1. / op.g); + res.b = pow(res.b, 1. / op.b); + res.a = pow(res.a, 1. / op.a); + + } else if(operator == 6) { + res.r = sin(res.r); + res.g = sin(res.g); + res.b = sin(res.b); + res.a = sin(res.a); + + } else if(operator == 7) { + res.r = cos(res.r); + res.g = cos(res.g); + res.b = cos(res.b); + res.a = cos(res.a); + + } else if(operator == 8) { + res.r = tan(res.r); + res.g = tan(res.g); + res.b = tan(res.b); + res.a = tan(res.a); + + } else if(operator == 9) { + res.r = mod(res.r, op.r); + res.g = mod(res.g, op.g); + res.b = mod(res.b, op.b); + res.a = mod(res.a, op.a); + + } else if(operator == 10) { + res.r = floor(res.r); + res.g = floor(res.g); + res.b = floor(res.b); + res.a = floor(res.a); + + } else if(operator == 11) { + res.r = ceil(res.r); + res.g = ceil(res.g); + res.b = ceil(res.b); + res.a = ceil(res.a); + + } else if(operator == 12) { + res.r = round(res.r); + res.g = round(res.g); + res.b = round(res.b); + res.a = round(res.a); + + } else if(operator == 13) { + res.r = abs(res.r); + res.g = abs(res.g); + res.b = abs(res.b); + res.a = abs(res.a); + + } else if(operator == 14) { + res.r = clamp(res.r, op.x, op.y); + res.g = clamp(res.g, op.x, op.y); + res.b = clamp(res.b, op.x, op.y); + res.a = clamp(res.a, op.x, op.y); + + } + + gl_FragColor = res; +} diff --git a/shaders/sh_pixel_math/sh_pixel_math.vsh b/shaders/sh_pixel_math/sh_pixel_math.vsh new file mode 100644 index 000000000..3900c20f4 --- /dev/null +++ b/shaders/sh_pixel_math/sh_pixel_math.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/sh_pixel_math/sh_pixel_math.yy b/shaders/sh_pixel_math/sh_pixel_math.yy new file mode 100644 index 000000000..a581685fc --- /dev/null +++ b/shaders/sh_pixel_math/sh_pixel_math.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"sh_pixel_math", + "name":"sh_pixel_math", + "parent":{ + "name":"filter", + "path":"folders/shader/filter.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/sprites/s_node_array_rearrange/1abde720-6d65-48cc-a023-6cfc020c025c.png b/sprites/s_node_array_rearrange/1abde720-6d65-48cc-a023-6cfc020c025c.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_array_rearrange/1abde720-6d65-48cc-a023-6cfc020c025c.png and /dev/null differ diff --git a/sprites/s_node_array_rearrange/71e985e8-dfb3-40c4-8851-70a267b541c8.png b/sprites/s_node_array_rearrange/71e985e8-dfb3-40c4-8851-70a267b541c8.png new file mode 100644 index 000000000..5bda5dcc1 Binary files /dev/null and b/sprites/s_node_array_rearrange/71e985e8-dfb3-40c4-8851-70a267b541c8.png differ diff --git a/sprites/s_node_array_rearrange/layers/1abde720-6d65-48cc-a023-6cfc020c025c/5a1d002f-016b-4b7f-a707-e48391d86a1e.png b/sprites/s_node_array_rearrange/layers/1abde720-6d65-48cc-a023-6cfc020c025c/5a1d002f-016b-4b7f-a707-e48391d86a1e.png deleted file mode 100644 index b0035541e..000000000 Binary files a/sprites/s_node_array_rearrange/layers/1abde720-6d65-48cc-a023-6cfc020c025c/5a1d002f-016b-4b7f-a707-e48391d86a1e.png and /dev/null differ diff --git a/sprites/s_node_array_rearrange/layers/71e985e8-dfb3-40c4-8851-70a267b541c8/f27180a8-7bae-4df5-a475-a888eb83e5a8.png b/sprites/s_node_array_rearrange/layers/71e985e8-dfb3-40c4-8851-70a267b541c8/f27180a8-7bae-4df5-a475-a888eb83e5a8.png new file mode 100644 index 000000000..5bda5dcc1 Binary files /dev/null and b/sprites/s_node_array_rearrange/layers/71e985e8-dfb3-40c4-8851-70a267b541c8/f27180a8-7bae-4df5-a475-a888eb83e5a8.png differ diff --git a/sprites/s_node_array_rearrange/s_node_array_rearrange.yy b/sprites/s_node_array_rearrange/s_node_array_rearrange.yy index aea6182c6..153d537f2 100644 --- a/sprites/s_node_array_rearrange/s_node_array_rearrange.yy +++ b/sprites/s_node_array_rearrange/s_node_array_rearrange.yy @@ -4,7 +4,7 @@ "bboxMode":0, "bbox_bottom":51, "bbox_left":0, - "bbox_right":64, + "bbox_right":63, "bbox_top":6, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1abde720-6d65-48cc-a023-6cfc020c025c","name":"1abde720-6d65-48cc-a023-6cfc020c025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"71e985e8-dfb3-40c4-8851-70a267b541c8","name":"71e985e8-dfb3-40c4-8851-70a267b541c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"5a1d002f-016b-4b7f-a707-e48391d86a1e","blendMode":0,"displayName":"default","isLocked":false,"name":"5a1d002f-016b-4b7f-a707-e48391d86a1e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f27180a8-7bae-4df5-a475-a888eb83e5a8","blendMode":0,"displayName":"default","isLocked":false,"name":"f27180a8-7bae-4df5-a475-a888eb83e5a8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_array_rearrange", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1abde720-6d65-48cc-a023-6cfc020c025c","path":"sprites/s_node_array_rearrange/s_node_array_rearrange.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cabea50-6e00-4a39-9c77-a29a5621fe3a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71e985e8-dfb3-40c4-8851-70a267b541c8","path":"sprites/s_node_array_rearrange/s_node_array_rearrange.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fd124077-7e63-41fb-a695-ecbd385bb9b5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_array_sample/250a0cb7-4471-4e96-afd2-601e9f6bacce.png b/sprites/s_node_array_sample/250a0cb7-4471-4e96-afd2-601e9f6bacce.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_array_sample/250a0cb7-4471-4e96-afd2-601e9f6bacce.png and /dev/null differ diff --git a/sprites/s_node_array_sample/57825667-53dd-4d78-b094-b56ff07b9ec8.png b/sprites/s_node_array_sample/57825667-53dd-4d78-b094-b56ff07b9ec8.png new file mode 100644 index 000000000..04e4fc8e1 Binary files /dev/null and b/sprites/s_node_array_sample/57825667-53dd-4d78-b094-b56ff07b9ec8.png differ diff --git a/sprites/s_node_array_sample/layers/250a0cb7-4471-4e96-afd2-601e9f6bacce/35763b32-1f69-4500-8ebd-2ad0aa7baeae.png b/sprites/s_node_array_sample/layers/250a0cb7-4471-4e96-afd2-601e9f6bacce/35763b32-1f69-4500-8ebd-2ad0aa7baeae.png deleted file mode 100644 index f5d3b0bf7..000000000 Binary files a/sprites/s_node_array_sample/layers/250a0cb7-4471-4e96-afd2-601e9f6bacce/35763b32-1f69-4500-8ebd-2ad0aa7baeae.png and /dev/null differ diff --git a/sprites/s_node_array_sample/layers/57825667-53dd-4d78-b094-b56ff07b9ec8/9d6cf28c-9759-4020-b50e-c68339f68afc.png b/sprites/s_node_array_sample/layers/57825667-53dd-4d78-b094-b56ff07b9ec8/9d6cf28c-9759-4020-b50e-c68339f68afc.png new file mode 100644 index 000000000..04e4fc8e1 Binary files /dev/null and b/sprites/s_node_array_sample/layers/57825667-53dd-4d78-b094-b56ff07b9ec8/9d6cf28c-9759-4020-b50e-c68339f68afc.png differ diff --git a/sprites/s_node_array_sample/s_node_array_sample.yy b/sprites/s_node_array_sample/s_node_array_sample.yy index 779d08ef2..24a85daba 100644 --- a/sprites/s_node_array_sample/s_node_array_sample.yy +++ b/sprites/s_node_array_sample/s_node_array_sample.yy @@ -4,22 +4,22 @@ "bboxMode":0, "bbox_bottom":44, "bbox_left":0, - "bbox_right":64, - "bbox_top":18, + "bbox_right":63, + "bbox_top":19, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"250a0cb7-4471-4e96-afd2-601e9f6bacce","name":"250a0cb7-4471-4e96-afd2-601e9f6bacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"57825667-53dd-4d78-b094-b56ff07b9ec8","name":"57825667-53dd-4d78-b094-b56ff07b9ec8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"35763b32-1f69-4500-8ebd-2ad0aa7baeae","blendMode":0,"displayName":"default","isLocked":false,"name":"35763b32-1f69-4500-8ebd-2ad0aa7baeae","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"9d6cf28c-9759-4020-b50e-c68339f68afc","blendMode":0,"displayName":"default","isLocked":false,"name":"9d6cf28c-9759-4020-b50e-c68339f68afc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_array_sample", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"250a0cb7-4471-4e96-afd2-601e9f6bacce","path":"sprites/s_node_array_sample/s_node_array_sample.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aaebe2c7-6fd2-4905-bb8b-46a235fd1d70","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57825667-53dd-4d78-b094-b56ff07b9ec8","path":"sprites/s_node_array_sample/s_node_array_sample.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"37893806-5f62-4f9a-9ff8-5da4fc2188b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_array_split/1852e31e-5ca1-441b-b57b-3fd7b1633e18.png b/sprites/s_node_array_split/1852e31e-5ca1-441b-b57b-3fd7b1633e18.png new file mode 100644 index 000000000..dc7f3bf52 Binary files /dev/null and b/sprites/s_node_array_split/1852e31e-5ca1-441b-b57b-3fd7b1633e18.png differ diff --git a/sprites/s_node_array_split/55e51c88-9225-4333-808a-b01c472bc894.png b/sprites/s_node_array_split/55e51c88-9225-4333-808a-b01c472bc894.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_array_split/55e51c88-9225-4333-808a-b01c472bc894.png and /dev/null differ diff --git a/sprites/s_node_array_split/layers/1852e31e-5ca1-441b-b57b-3fd7b1633e18/5892e839-dbbf-45a0-9893-79f99d208b1d.png b/sprites/s_node_array_split/layers/1852e31e-5ca1-441b-b57b-3fd7b1633e18/5892e839-dbbf-45a0-9893-79f99d208b1d.png new file mode 100644 index 000000000..dc7f3bf52 Binary files /dev/null and b/sprites/s_node_array_split/layers/1852e31e-5ca1-441b-b57b-3fd7b1633e18/5892e839-dbbf-45a0-9893-79f99d208b1d.png differ diff --git a/sprites/s_node_array_split/layers/55e51c88-9225-4333-808a-b01c472bc894/52cf3dc8-7774-4149-b00a-619f280008b9.png b/sprites/s_node_array_split/layers/55e51c88-9225-4333-808a-b01c472bc894/52cf3dc8-7774-4149-b00a-619f280008b9.png deleted file mode 100644 index 17ab6eb0d..000000000 Binary files a/sprites/s_node_array_split/layers/55e51c88-9225-4333-808a-b01c472bc894/52cf3dc8-7774-4149-b00a-619f280008b9.png and /dev/null differ diff --git a/sprites/s_node_array_split/s_node_array_split.yy b/sprites/s_node_array_split/s_node_array_split.yy index c94a96cfe..a7aa149b8 100644 --- a/sprites/s_node_array_split/s_node_array_split.yy +++ b/sprites/s_node_array_split/s_node_array_split.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_array_split", "bboxMode":0, - "bbox_bottom":62, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":63, + "bbox_left":3, + "bbox_right":59, "bbox_top":0, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"55e51c88-9225-4333-808a-b01c472bc894","name":"55e51c88-9225-4333-808a-b01c472bc894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"1852e31e-5ca1-441b-b57b-3fd7b1633e18","name":"1852e31e-5ca1-441b-b57b-3fd7b1633e18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"52cf3dc8-7774-4149-b00a-619f280008b9","blendMode":0,"displayName":"default","isLocked":false,"name":"52cf3dc8-7774-4149-b00a-619f280008b9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"5892e839-dbbf-45a0-9893-79f99d208b1d","blendMode":0,"displayName":"default","isLocked":false,"name":"5892e839-dbbf-45a0-9893-79f99d208b1d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_array_split", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e51c88-9225-4333-808a-b01c472bc894","path":"sprites/s_node_array_split/s_node_array_split.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"934e9d98-291d-4607-9990-ab1381a0cab7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1852e31e-5ca1-441b-b57b-3fd7b1633e18","path":"sprites/s_node_array_split/s_node_array_split.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d50afe7e-04c9-49a5-9939-0917de162282","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_audio_volume/08607cdf-7c44-436a-87a5-1729203ea759.png b/sprites/s_node_audio_volume/08607cdf-7c44-436a-87a5-1729203ea759.png new file mode 100644 index 000000000..708e66717 Binary files /dev/null and b/sprites/s_node_audio_volume/08607cdf-7c44-436a-87a5-1729203ea759.png differ diff --git a/sprites/s_node_audio_volume/22015c73-a2da-4804-b114-0d5e033f2a8d.png b/sprites/s_node_audio_volume/22015c73-a2da-4804-b114-0d5e033f2a8d.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_audio_volume/22015c73-a2da-4804-b114-0d5e033f2a8d.png and /dev/null differ diff --git a/sprites/s_node_audio_volume/layers/08607cdf-7c44-436a-87a5-1729203ea759/15c3eec1-fdd3-4966-bd31-e1228f4c38e8.png b/sprites/s_node_audio_volume/layers/08607cdf-7c44-436a-87a5-1729203ea759/15c3eec1-fdd3-4966-bd31-e1228f4c38e8.png new file mode 100644 index 000000000..708e66717 Binary files /dev/null and b/sprites/s_node_audio_volume/layers/08607cdf-7c44-436a-87a5-1729203ea759/15c3eec1-fdd3-4966-bd31-e1228f4c38e8.png differ diff --git a/sprites/s_node_audio_volume/layers/22015c73-a2da-4804-b114-0d5e033f2a8d/9ebaed0c-70ea-4835-8322-15c3933af5b0.png b/sprites/s_node_audio_volume/layers/22015c73-a2da-4804-b114-0d5e033f2a8d/9ebaed0c-70ea-4835-8322-15c3933af5b0.png deleted file mode 100644 index a3c33d6e1..000000000 Binary files a/sprites/s_node_audio_volume/layers/22015c73-a2da-4804-b114-0d5e033f2a8d/9ebaed0c-70ea-4835-8322-15c3933af5b0.png and /dev/null differ diff --git a/sprites/s_node_audio_volume/s_node_audio_volume.yy b/sprites/s_node_audio_volume/s_node_audio_volume.yy index 597715738..2ca3bd979 100644 --- a/sprites/s_node_audio_volume/s_node_audio_volume.yy +++ b/sprites/s_node_audio_volume/s_node_audio_volume.yy @@ -3,23 +3,23 @@ "%Name":"s_node_audio_volume", "bboxMode":0, "bbox_bottom":56, - "bbox_left":0, - "bbox_right":64, - "bbox_top":6, + "bbox_left":1, + "bbox_right":63, + "bbox_top":7, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22015c73-a2da-4804-b114-0d5e033f2a8d","name":"22015c73-a2da-4804-b114-0d5e033f2a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"08607cdf-7c44-436a-87a5-1729203ea759","name":"08607cdf-7c44-436a-87a5-1729203ea759","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"9ebaed0c-70ea-4835-8322-15c3933af5b0","blendMode":0,"displayName":"default","isLocked":false,"name":"9ebaed0c-70ea-4835-8322-15c3933af5b0","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"15c3eec1-fdd3-4966-bd31-e1228f4c38e8","blendMode":0,"displayName":"default","isLocked":false,"name":"15c3eec1-fdd3-4966-bd31-e1228f4c38e8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_audio_volume", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22015c73-a2da-4804-b114-0d5e033f2a8d","path":"sprites/s_node_audio_volume/s_node_audio_volume.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"480b6822-b883-48c7-bb72-0b99824b450d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08607cdf-7c44-436a-87a5-1729203ea759","path":"sprites/s_node_audio_volume/s_node_audio_volume.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"34116eaa-7e2b-4890-9be8-d3c83a20eb6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_liquefy/666ec55f-187c-41d8-8780-d3f0d57c0a79.png b/sprites/s_node_liquefy/666ec55f-187c-41d8-8780-d3f0d57c0a79.png new file mode 100644 index 000000000..f48ef1574 Binary files /dev/null and b/sprites/s_node_liquefy/666ec55f-187c-41d8-8780-d3f0d57c0a79.png differ diff --git a/sprites/s_node_liquefy/layers/666ec55f-187c-41d8-8780-d3f0d57c0a79/29af7d9b-aac3-4b5b-83f4-254c46568644.png b/sprites/s_node_liquefy/layers/666ec55f-187c-41d8-8780-d3f0d57c0a79/29af7d9b-aac3-4b5b-83f4-254c46568644.png new file mode 100644 index 000000000..f48ef1574 Binary files /dev/null and b/sprites/s_node_liquefy/layers/666ec55f-187c-41d8-8780-d3f0d57c0a79/29af7d9b-aac3-4b5b-83f4-254c46568644.png differ diff --git a/sprites/s_node_liquefy/s_node_liquefy.yy b/sprites/s_node_liquefy/s_node_liquefy.yy new file mode 100644 index 000000000..fe64f2b5c --- /dev/null +++ b/sprites/s_node_liquefy/s_node_liquefy.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_liquefy", + "bboxMode":0, + "bbox_bottom":61, + "bbox_left":2, + "bbox_right":61, + "bbox_top":2, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"666ec55f-187c-41d8-8780-d3f0d57c0a79","name":"666ec55f-187c-41d8-8780-d3f0d57c0a79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"29af7d9b-aac3-4b5b-83f4-254c46568644","blendMode":0,"displayName":"default","isLocked":false,"name":"29af7d9b-aac3-4b5b-83f4-254c46568644","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_liquefy", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"filter", + "path":"folders/nodes/icons/filter.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_liquefy", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_liquefy", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"666ec55f-187c-41d8-8780-d3f0d57c0a79","path":"sprites/s_node_liquefy/s_node_liquefy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f01792d4-7af9-45d2-b926-7370eb473145","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":32, + "yorigin":32, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/s_node_liquefy_type/223bdbc0-caf0-4d86-8193-c10664f72d21.png b/sprites/s_node_liquefy_type/223bdbc0-caf0-4d86-8193-c10664f72d21.png new file mode 100644 index 000000000..e53dca7c6 Binary files /dev/null and b/sprites/s_node_liquefy_type/223bdbc0-caf0-4d86-8193-c10664f72d21.png differ diff --git a/sprites/s_node_liquefy_type/4d22cb3d-17d5-4430-ac44-65302d0e6e3c.png b/sprites/s_node_liquefy_type/4d22cb3d-17d5-4430-ac44-65302d0e6e3c.png new file mode 100644 index 000000000..44b06b723 Binary files /dev/null and b/sprites/s_node_liquefy_type/4d22cb3d-17d5-4430-ac44-65302d0e6e3c.png differ diff --git a/sprites/s_node_liquefy_type/62795d6f-8d6c-4771-9a1c-b96157bc70ff.png b/sprites/s_node_liquefy_type/62795d6f-8d6c-4771-9a1c-b96157bc70ff.png new file mode 100644 index 000000000..2ea121e5c Binary files /dev/null and b/sprites/s_node_liquefy_type/62795d6f-8d6c-4771-9a1c-b96157bc70ff.png differ diff --git a/sprites/s_node_liquefy_type/b55fa215-e0e0-4c7e-8066-d41490cd6294.png b/sprites/s_node_liquefy_type/b55fa215-e0e0-4c7e-8066-d41490cd6294.png new file mode 100644 index 000000000..60a86312e Binary files /dev/null and b/sprites/s_node_liquefy_type/b55fa215-e0e0-4c7e-8066-d41490cd6294.png differ diff --git a/sprites/s_node_liquefy_type/layers/223bdbc0-caf0-4d86-8193-c10664f72d21/54188ba3-61f3-4275-a410-170437c12ecd.png b/sprites/s_node_liquefy_type/layers/223bdbc0-caf0-4d86-8193-c10664f72d21/54188ba3-61f3-4275-a410-170437c12ecd.png new file mode 100644 index 000000000..e53dca7c6 Binary files /dev/null and b/sprites/s_node_liquefy_type/layers/223bdbc0-caf0-4d86-8193-c10664f72d21/54188ba3-61f3-4275-a410-170437c12ecd.png differ diff --git a/sprites/s_node_liquefy_type/layers/4d22cb3d-17d5-4430-ac44-65302d0e6e3c/54188ba3-61f3-4275-a410-170437c12ecd.png b/sprites/s_node_liquefy_type/layers/4d22cb3d-17d5-4430-ac44-65302d0e6e3c/54188ba3-61f3-4275-a410-170437c12ecd.png new file mode 100644 index 000000000..44b06b723 Binary files /dev/null and b/sprites/s_node_liquefy_type/layers/4d22cb3d-17d5-4430-ac44-65302d0e6e3c/54188ba3-61f3-4275-a410-170437c12ecd.png differ diff --git a/sprites/s_node_liquefy_type/layers/62795d6f-8d6c-4771-9a1c-b96157bc70ff/54188ba3-61f3-4275-a410-170437c12ecd.png b/sprites/s_node_liquefy_type/layers/62795d6f-8d6c-4771-9a1c-b96157bc70ff/54188ba3-61f3-4275-a410-170437c12ecd.png new file mode 100644 index 000000000..2ea121e5c Binary files /dev/null and b/sprites/s_node_liquefy_type/layers/62795d6f-8d6c-4771-9a1c-b96157bc70ff/54188ba3-61f3-4275-a410-170437c12ecd.png differ diff --git a/sprites/s_node_liquefy_type/layers/b55fa215-e0e0-4c7e-8066-d41490cd6294/54188ba3-61f3-4275-a410-170437c12ecd.png b/sprites/s_node_liquefy_type/layers/b55fa215-e0e0-4c7e-8066-d41490cd6294/54188ba3-61f3-4275-a410-170437c12ecd.png new file mode 100644 index 000000000..60a86312e Binary files /dev/null and b/sprites/s_node_liquefy_type/layers/b55fa215-e0e0-4c7e-8066-d41490cd6294/54188ba3-61f3-4275-a410-170437c12ecd.png differ diff --git a/sprites/s_node_liquefy_type/s_node_liquefy_type.yy b/sprites/s_node_liquefy_type/s_node_liquefy_type.yy new file mode 100644 index 000000000..544063b24 --- /dev/null +++ b/sprites/s_node_liquefy_type/s_node_liquefy_type.yy @@ -0,0 +1,102 @@ +{ + "$GMSprite":"", + "%Name":"s_node_liquefy_type", + "bboxMode":0, + "bbox_bottom":21, + "bbox_left":1, + "bbox_right":22, + "bbox_top":2, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b55fa215-e0e0-4c7e-8066-d41490cd6294","name":"b55fa215-e0e0-4c7e-8066-d41490cd6294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"223bdbc0-caf0-4d86-8193-c10664f72d21","name":"223bdbc0-caf0-4d86-8193-c10664f72d21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"62795d6f-8d6c-4771-9a1c-b96157bc70ff","name":"62795d6f-8d6c-4771-9a1c-b96157bc70ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"4d22cb3d-17d5-4430-ac44-65302d0e6e3c","name":"4d22cb3d-17d5-4430-ac44-65302d0e6e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":24, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"54188ba3-61f3-4275-a410-170437c12ecd","blendMode":0,"displayName":"default","isLocked":false,"name":"54188ba3-61f3-4275-a410-170437c12ecd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_liquefy_type", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"nodes", + "path":"folders/sprites/nodes.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_liquefy_type", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_liquefy_type", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fa215-e0e0-4c7e-8066-d41490cd6294","path":"sprites/s_node_liquefy_type/s_node_liquefy_type.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"14852392-fc66-4c6a-b3c4-5bb9d458a6d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"223bdbc0-caf0-4d86-8193-c10664f72d21","path":"sprites/s_node_liquefy_type/s_node_liquefy_type.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7f7051ec-26af-4598-81b9-3a7d56b279dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62795d6f-8d6c-4771-9a1c-b96157bc70ff","path":"sprites/s_node_liquefy_type/s_node_liquefy_type.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a977655a-54ce-4a09-8f63-ba7a843ba9c8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d22cb3d-17d5-4430-ac44-65302d0e6e3c","path":"sprites/s_node_liquefy_type/s_node_liquefy_type.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2f94942e-0c9a-4192-b055-eb0083e5ae9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":12, + "yorigin":12, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":24, +} \ No newline at end of file diff --git a/sprites/s_node_noise_perlin/806e8bf8-289a-4cb0-878d-c2c0017b72cf.png b/sprites/s_node_noise_perlin/806e8bf8-289a-4cb0-878d-c2c0017b72cf.png new file mode 100644 index 000000000..8b1c5fd65 Binary files /dev/null and b/sprites/s_node_noise_perlin/806e8bf8-289a-4cb0-878d-c2c0017b72cf.png differ diff --git a/sprites/s_node_noise_perlin/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9.png b/sprites/s_node_noise_perlin/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9.png deleted file mode 100644 index f9e6072c1..000000000 Binary files a/sprites/s_node_noise_perlin/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9.png and /dev/null differ diff --git a/sprites/s_node_noise_perlin/layers/806e8bf8-289a-4cb0-878d-c2c0017b72cf/7cb1626c-f19d-40a9-8ed3-b3f819754668.png b/sprites/s_node_noise_perlin/layers/806e8bf8-289a-4cb0-878d-c2c0017b72cf/7cb1626c-f19d-40a9-8ed3-b3f819754668.png new file mode 100644 index 000000000..8b1c5fd65 Binary files /dev/null and b/sprites/s_node_noise_perlin/layers/806e8bf8-289a-4cb0-878d-c2c0017b72cf/7cb1626c-f19d-40a9-8ed3-b3f819754668.png differ diff --git a/sprites/s_node_noise_perlin/layers/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9/1e673824-1dd2-491d-9822-3b5a58956e5a.png b/sprites/s_node_noise_perlin/layers/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9/1e673824-1dd2-491d-9822-3b5a58956e5a.png deleted file mode 100644 index aee1aa595..000000000 Binary files a/sprites/s_node_noise_perlin/layers/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9/1e673824-1dd2-491d-9822-3b5a58956e5a.png and /dev/null differ 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 227134caf..1b1a6912e 100644 --- a/sprites/s_node_noise_perlin/s_node_noise_perlin.yy +++ b/sprites/s_node_noise_perlin/s_node_noise_perlin.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_noise_perlin", "bboxMode":0, - "bbox_bottom":62, - "bbox_left":0, - "bbox_right":63, + "bbox_bottom":61, + "bbox_left":2, + "bbox_right":62, "bbox_top":2, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9","name":"b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"806e8bf8-289a-4cb0-878d-c2c0017b72cf","name":"806e8bf8-289a-4cb0-878d-c2c0017b72cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"1e673824-1dd2-491d-9822-3b5a58956e5a","blendMode":0,"displayName":"default","isLocked":false,"name":"1e673824-1dd2-491d-9822-3b5a58956e5a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"7cb1626c-f19d-40a9-8ed3-b3f819754668","blendMode":0,"displayName":"default","isLocked":false,"name":"7cb1626c-f19d-40a9-8ed3-b3f819754668","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_noise_perlin", "nineSlice":null, @@ -69,14 +69,11 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"177721c5-d5a0-40e1-9638-766534ff633e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"806e8bf8-289a-4cb0-878d-c2c0017b72cf","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7d669c96-d6be-4a49-97f7-779124219369","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":32, "yorigin":32, @@ -89,5 +86,5 @@ }, "type":0, "VTile":false, - "width":64, + "width":65, } \ No newline at end of file diff --git a/sprites/s_node_path_from_mask/6f414f05-5229-4d82-80d0-2b4b1751ceed.png b/sprites/s_node_path_from_mask/6f414f05-5229-4d82-80d0-2b4b1751ceed.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_path_from_mask/6f414f05-5229-4d82-80d0-2b4b1751ceed.png and /dev/null differ diff --git a/sprites/s_node_path_from_mask/d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45.png b/sprites/s_node_path_from_mask/d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45.png new file mode 100644 index 000000000..358cc270d Binary files /dev/null and b/sprites/s_node_path_from_mask/d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45.png differ diff --git a/sprites/s_node_path_from_mask/layers/6f414f05-5229-4d82-80d0-2b4b1751ceed/b4080dbe-183a-4e0b-a864-33ac939af08a.png b/sprites/s_node_path_from_mask/layers/6f414f05-5229-4d82-80d0-2b4b1751ceed/b4080dbe-183a-4e0b-a864-33ac939af08a.png deleted file mode 100644 index 723affc55..000000000 Binary files a/sprites/s_node_path_from_mask/layers/6f414f05-5229-4d82-80d0-2b4b1751ceed/b4080dbe-183a-4e0b-a864-33ac939af08a.png and /dev/null differ diff --git a/sprites/s_node_path_from_mask/layers/d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45/3047c127-f811-4ee7-9eca-328c264f5472.png b/sprites/s_node_path_from_mask/layers/d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45/3047c127-f811-4ee7-9eca-328c264f5472.png new file mode 100644 index 000000000..358cc270d Binary files /dev/null and b/sprites/s_node_path_from_mask/layers/d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45/3047c127-f811-4ee7-9eca-328c264f5472.png differ diff --git a/sprites/s_node_path_from_mask/s_node_path_from_mask.yy b/sprites/s_node_path_from_mask/s_node_path_from_mask.yy index 4c90d6ee5..c92374a53 100644 --- a/sprites/s_node_path_from_mask/s_node_path_from_mask.yy +++ b/sprites/s_node_path_from_mask/s_node_path_from_mask.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_path_from_mask", "bboxMode":0, - "bbox_bottom":59, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":60, + "bbox_left":7, + "bbox_right":56, "bbox_top":3, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f414f05-5229-4d82-80d0-2b4b1751ceed","name":"6f414f05-5229-4d82-80d0-2b4b1751ceed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45","name":"d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"b4080dbe-183a-4e0b-a864-33ac939af08a","blendMode":0,"displayName":"default","isLocked":false,"name":"b4080dbe-183a-4e0b-a864-33ac939af08a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"3047c127-f811-4ee7-9eca-328c264f5472","blendMode":0,"displayName":"default","isLocked":false,"name":"3047c127-f811-4ee7-9eca-328c264f5472","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_path_from_mask", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f414f05-5229-4d82-80d0-2b4b1751ceed","path":"sprites/s_node_path_from_mask/s_node_path_from_mask.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a10eef47-8695-40cf-a856-053639e2c6cb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4a52f42-d7f5-4ad8-8f47-cc76e8aedc45","path":"sprites/s_node_path_from_mask/s_node_path_from_mask.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0f0aaddb-96f3-4c4c-9bd7-bdf7103b2370","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_path_mapp/7402137e-9a3a-4a5b-81a8-89090fb58e80.png b/sprites/s_node_path_mapp/7402137e-9a3a-4a5b-81a8-89090fb58e80.png new file mode 100644 index 000000000..8b1cb7d16 Binary files /dev/null and b/sprites/s_node_path_mapp/7402137e-9a3a-4a5b-81a8-89090fb58e80.png differ diff --git a/sprites/s_node_path_mapp/9d8c0dbe-84df-4114-af56-7dc2f6c33138.png b/sprites/s_node_path_mapp/9d8c0dbe-84df-4114-af56-7dc2f6c33138.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_path_mapp/9d8c0dbe-84df-4114-af56-7dc2f6c33138.png and /dev/null differ diff --git a/sprites/s_node_path_mapp/layers/7402137e-9a3a-4a5b-81a8-89090fb58e80/1b164945-5656-400e-9de1-56abf195c56d.png b/sprites/s_node_path_mapp/layers/7402137e-9a3a-4a5b-81a8-89090fb58e80/1b164945-5656-400e-9de1-56abf195c56d.png new file mode 100644 index 000000000..8b1cb7d16 Binary files /dev/null and b/sprites/s_node_path_mapp/layers/7402137e-9a3a-4a5b-81a8-89090fb58e80/1b164945-5656-400e-9de1-56abf195c56d.png differ diff --git a/sprites/s_node_path_mapp/layers/9d8c0dbe-84df-4114-af56-7dc2f6c33138/83408926-eb4a-491e-a535-c8dee4c222ba.png b/sprites/s_node_path_mapp/layers/9d8c0dbe-84df-4114-af56-7dc2f6c33138/83408926-eb4a-491e-a535-c8dee4c222ba.png deleted file mode 100644 index 4fcf5367e..000000000 Binary files a/sprites/s_node_path_mapp/layers/9d8c0dbe-84df-4114-af56-7dc2f6c33138/83408926-eb4a-491e-a535-c8dee4c222ba.png and /dev/null differ diff --git a/sprites/s_node_path_mapp/s_node_path_mapp.yy b/sprites/s_node_path_mapp/s_node_path_mapp.yy index 5b44e46cd..371428851 100644 --- a/sprites/s_node_path_mapp/s_node_path_mapp.yy +++ b/sprites/s_node_path_mapp/s_node_path_mapp.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_path_mapp", "bboxMode":0, - "bbox_bottom":59, - "bbox_left":0, - "bbox_right":64, - "bbox_top":4, + "bbox_bottom":60, + "bbox_left":2, + "bbox_right":60, + "bbox_top":5, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d8c0dbe-84df-4114-af56-7dc2f6c33138","name":"9d8c0dbe-84df-4114-af56-7dc2f6c33138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"7402137e-9a3a-4a5b-81a8-89090fb58e80","name":"7402137e-9a3a-4a5b-81a8-89090fb58e80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"83408926-eb4a-491e-a535-c8dee4c222ba","blendMode":0,"displayName":"default","isLocked":false,"name":"83408926-eb4a-491e-a535-c8dee4c222ba","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"1b164945-5656-400e-9de1-56abf195c56d","blendMode":0,"displayName":"default","isLocked":false,"name":"1b164945-5656-400e-9de1-56abf195c56d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_path_mapp", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d8c0dbe-84df-4114-af56-7dc2f6c33138","path":"sprites/s_node_path_mapp/s_node_path_mapp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93b1b957-a621-4531-b996-86a1747de5df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7402137e-9a3a-4a5b-81a8-89090fb58e80","path":"sprites/s_node_path_mapp/s_node_path_mapp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ee51f9c-3e87-44e5-8b05-c7fb27219781","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_path_scatter/02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab.png b/sprites/s_node_path_scatter/02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab.png deleted file mode 100644 index f9e6072c1..000000000 Binary files a/sprites/s_node_path_scatter/02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab.png and /dev/null differ diff --git a/sprites/s_node_path_scatter/a7b696ed-a140-4934-a4e3-7ba2d2444747.png b/sprites/s_node_path_scatter/a7b696ed-a140-4934-a4e3-7ba2d2444747.png new file mode 100644 index 000000000..05ca9c7f7 Binary files /dev/null and b/sprites/s_node_path_scatter/a7b696ed-a140-4934-a4e3-7ba2d2444747.png differ diff --git a/sprites/s_node_path_scatter/layers/02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab/1bc10b85-a441-42ec-a5a5-2d4f6b3dfdcc.png b/sprites/s_node_path_scatter/layers/02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab/1bc10b85-a441-42ec-a5a5-2d4f6b3dfdcc.png deleted file mode 100644 index c39cfad49..000000000 Binary files a/sprites/s_node_path_scatter/layers/02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab/1bc10b85-a441-42ec-a5a5-2d4f6b3dfdcc.png and /dev/null differ diff --git a/sprites/s_node_path_scatter/layers/a7b696ed-a140-4934-a4e3-7ba2d2444747/cb6a988a-f423-44a9-bb83-2467a447614e.png b/sprites/s_node_path_scatter/layers/a7b696ed-a140-4934-a4e3-7ba2d2444747/cb6a988a-f423-44a9-bb83-2467a447614e.png new file mode 100644 index 000000000..05ca9c7f7 Binary files /dev/null and b/sprites/s_node_path_scatter/layers/a7b696ed-a140-4934-a4e3-7ba2d2444747/cb6a988a-f423-44a9-bb83-2467a447614e.png differ diff --git a/sprites/s_node_path_scatter/s_node_path_scatter.yy b/sprites/s_node_path_scatter/s_node_path_scatter.yy index 1f580398e..ea5cc75c5 100644 --- a/sprites/s_node_path_scatter/s_node_path_scatter.yy +++ b/sprites/s_node_path_scatter/s_node_path_scatter.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_path_scatter", "bboxMode":0, - "bbox_bottom":61, - "bbox_left":0, - "bbox_right":63, + "bbox_bottom":60, + "bbox_left":5, + "bbox_right":60, "bbox_top":3, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab","name":"02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a7b696ed-a140-4934-a4e3-7ba2d2444747","name":"a7b696ed-a140-4934-a4e3-7ba2d2444747","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"1bc10b85-a441-42ec-a5a5-2d4f6b3dfdcc","blendMode":0,"displayName":"default","isLocked":false,"name":"1bc10b85-a441-42ec-a5a5-2d4f6b3dfdcc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"cb6a988a-f423-44a9-bb83-2467a447614e","blendMode":0,"displayName":"default","isLocked":false,"name":"cb6a988a-f423-44a9-bb83-2467a447614e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_path_scatter", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"02cb8882-7fbe-42bc-9a5e-e9fc2f54d2ab","path":"sprites/s_node_path_scatter/s_node_path_scatter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1904a981-39d4-4ba3-b2bb-17009bb6c5e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b696ed-a140-4934-a4e3-7ba2d2444747","path":"sprites/s_node_path_scatter/s_node_path_scatter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee4532b3-9814-42e2-a0ba-32e83dd5f948","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":64, + "width":65, } \ No newline at end of file diff --git a/sprites/s_node_path_smooth/6eb91a9b-3c6e-48cf-9663-0e1b58a33577.png b/sprites/s_node_path_smooth/6eb91a9b-3c6e-48cf-9663-0e1b58a33577.png new file mode 100644 index 000000000..4c32d030d Binary files /dev/null and b/sprites/s_node_path_smooth/6eb91a9b-3c6e-48cf-9663-0e1b58a33577.png differ diff --git a/sprites/s_node_path_smooth/7c3c3b80-585f-46e9-b5f2-761883e36c30.png b/sprites/s_node_path_smooth/7c3c3b80-585f-46e9-b5f2-761883e36c30.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_path_smooth/7c3c3b80-585f-46e9-b5f2-761883e36c30.png and /dev/null differ diff --git a/sprites/s_node_path_smooth/layers/6eb91a9b-3c6e-48cf-9663-0e1b58a33577/73953ad8-f02b-484e-a290-b9e168fea387.png b/sprites/s_node_path_smooth/layers/6eb91a9b-3c6e-48cf-9663-0e1b58a33577/73953ad8-f02b-484e-a290-b9e168fea387.png new file mode 100644 index 000000000..4c32d030d Binary files /dev/null and b/sprites/s_node_path_smooth/layers/6eb91a9b-3c6e-48cf-9663-0e1b58a33577/73953ad8-f02b-484e-a290-b9e168fea387.png differ diff --git a/sprites/s_node_path_smooth/layers/7c3c3b80-585f-46e9-b5f2-761883e36c30/9fcb5c62-43f1-458a-9dfd-a972443c7639.png b/sprites/s_node_path_smooth/layers/7c3c3b80-585f-46e9-b5f2-761883e36c30/9fcb5c62-43f1-458a-9dfd-a972443c7639.png deleted file mode 100644 index 22d8f3fd4..000000000 Binary files a/sprites/s_node_path_smooth/layers/7c3c3b80-585f-46e9-b5f2-761883e36c30/9fcb5c62-43f1-458a-9dfd-a972443c7639.png and /dev/null differ diff --git a/sprites/s_node_path_smooth/s_node_path_smooth.yy b/sprites/s_node_path_smooth/s_node_path_smooth.yy index 7e03fd6b0..560b6d86b 100644 --- a/sprites/s_node_path_smooth/s_node_path_smooth.yy +++ b/sprites/s_node_path_smooth/s_node_path_smooth.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_path_smooth", "bboxMode":0, - "bbox_bottom":57, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":58, + "bbox_left":2, + "bbox_right":60, "bbox_top":2, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7c3c3b80-585f-46e9-b5f2-761883e36c30","name":"7c3c3b80-585f-46e9-b5f2-761883e36c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"6eb91a9b-3c6e-48cf-9663-0e1b58a33577","name":"6eb91a9b-3c6e-48cf-9663-0e1b58a33577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"9fcb5c62-43f1-458a-9dfd-a972443c7639","blendMode":0,"displayName":"default","isLocked":false,"name":"9fcb5c62-43f1-458a-9dfd-a972443c7639","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"73953ad8-f02b-484e-a290-b9e168fea387","blendMode":0,"displayName":"default","isLocked":false,"name":"73953ad8-f02b-484e-a290-b9e168fea387","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_path_smooth", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c3c3b80-585f-46e9-b5f2-761883e36c30","path":"sprites/s_node_path_smooth/s_node_path_smooth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8690a239-dda4-401e-a2d1-ab925c5dde04","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eb91a9b-3c6e-48cf-9663-0e1b58a33577","path":"sprites/s_node_path_smooth/s_node_path_smooth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a956220c-5760-4d88-926b-003a7503235a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_box_contract/eebc968b-0742-4da3-ac64-19d25f803300.png b/sprites/s_node_pb_box_contract/22139f27-c683-4057-8fa3-4d0e123c3700.png similarity index 83% rename from sprites/s_node_pb_box_contract/eebc968b-0742-4da3-ac64-19d25f803300.png rename to sprites/s_node_pb_box_contract/22139f27-c683-4057-8fa3-4d0e123c3700.png index a94663783..d5bcc6522 100644 Binary files a/sprites/s_node_pb_box_contract/eebc968b-0742-4da3-ac64-19d25f803300.png and b/sprites/s_node_pb_box_contract/22139f27-c683-4057-8fa3-4d0e123c3700.png differ diff --git a/sprites/s_node_pb_box_contract/layers/22139f27-c683-4057-8fa3-4d0e123c3700/fd7b4250-9035-4769-9c2d-cb34865972fb.png b/sprites/s_node_pb_box_contract/layers/22139f27-c683-4057-8fa3-4d0e123c3700/fd7b4250-9035-4769-9c2d-cb34865972fb.png new file mode 100644 index 000000000..d5bcc6522 Binary files /dev/null and b/sprites/s_node_pb_box_contract/layers/22139f27-c683-4057-8fa3-4d0e123c3700/fd7b4250-9035-4769-9c2d-cb34865972fb.png differ diff --git a/sprites/s_node_pb_box_contract/layers/eebc968b-0742-4da3-ac64-19d25f803300/358c56f5-c906-4371-99c1-84eee20162d3.png b/sprites/s_node_pb_box_contract/layers/eebc968b-0742-4da3-ac64-19d25f803300/358c56f5-c906-4371-99c1-84eee20162d3.png deleted file mode 100644 index 5100fc871..000000000 Binary files a/sprites/s_node_pb_box_contract/layers/eebc968b-0742-4da3-ac64-19d25f803300/358c56f5-c906-4371-99c1-84eee20162d3.png and /dev/null differ diff --git a/sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy b/sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy index 8cec86b7d..5c09bb6b2 100644 --- a/sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy +++ b/sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"eebc968b-0742-4da3-ac64-19d25f803300","name":"eebc968b-0742-4da3-ac64-19d25f803300","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"22139f27-c683-4057-8fa3-4d0e123c3700","name":"22139f27-c683-4057-8fa3-4d0e123c3700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"358c56f5-c906-4371-99c1-84eee20162d3","blendMode":0,"displayName":"default","isLocked":false,"name":"358c56f5-c906-4371-99c1-84eee20162d3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"fd7b4250-9035-4769-9c2d-cb34865972fb","blendMode":0,"displayName":"default","isLocked":false,"name":"fd7b4250-9035-4769-9c2d-cb34865972fb","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_contract", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eebc968b-0742-4da3-ac64-19d25f803300","path":"sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa5e1841-45a9-4080-aa76-6135039db8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22139f27-c683-4057-8fa3-4d0e123c3700","path":"sprites/s_node_pb_box_contract/s_node_pb_box_contract.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"96052707-7517-45c9-9ebe-c5aba447ab97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_box_divide/c5702c06-4c48-48e0-9cdd-674d0ec4e4de.png b/sprites/s_node_pb_box_divide/252d37e4-15c2-49c5-b053-95bfb2267cfc.png similarity index 85% rename from sprites/s_node_pb_box_divide/c5702c06-4c48-48e0-9cdd-674d0ec4e4de.png rename to sprites/s_node_pb_box_divide/252d37e4-15c2-49c5-b053-95bfb2267cfc.png index 51c068977..318f451da 100644 Binary files a/sprites/s_node_pb_box_divide/c5702c06-4c48-48e0-9cdd-674d0ec4e4de.png and b/sprites/s_node_pb_box_divide/252d37e4-15c2-49c5-b053-95bfb2267cfc.png differ diff --git a/sprites/s_node_pb_box_divide/layers/252d37e4-15c2-49c5-b053-95bfb2267cfc/928e7ab2-2063-45c0-9fb0-356eb77a72ff.png b/sprites/s_node_pb_box_divide/layers/252d37e4-15c2-49c5-b053-95bfb2267cfc/928e7ab2-2063-45c0-9fb0-356eb77a72ff.png new file mode 100644 index 000000000..318f451da Binary files /dev/null and b/sprites/s_node_pb_box_divide/layers/252d37e4-15c2-49c5-b053-95bfb2267cfc/928e7ab2-2063-45c0-9fb0-356eb77a72ff.png differ diff --git a/sprites/s_node_pb_box_divide/layers/c5702c06-4c48-48e0-9cdd-674d0ec4e4de/2eb763a2-2214-4c7a-9e9a-6ffc199ac74b.png b/sprites/s_node_pb_box_divide/layers/c5702c06-4c48-48e0-9cdd-674d0ec4e4de/2eb763a2-2214-4c7a-9e9a-6ffc199ac74b.png deleted file mode 100644 index fad670fc4..000000000 Binary files a/sprites/s_node_pb_box_divide/layers/c5702c06-4c48-48e0-9cdd-674d0ec4e4de/2eb763a2-2214-4c7a-9e9a-6ffc199ac74b.png and /dev/null differ diff --git a/sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy b/sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy index 6eba27311..9df0d3725 100644 --- a/sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy +++ b/sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5702c06-4c48-48e0-9cdd-674d0ec4e4de","name":"c5702c06-4c48-48e0-9cdd-674d0ec4e4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"252d37e4-15c2-49c5-b053-95bfb2267cfc","name":"252d37e4-15c2-49c5-b053-95bfb2267cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"2eb763a2-2214-4c7a-9e9a-6ffc199ac74b","blendMode":0,"displayName":"default","isLocked":false,"name":"2eb763a2-2214-4c7a-9e9a-6ffc199ac74b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"928e7ab2-2063-45c0-9fb0-356eb77a72ff","blendMode":0,"displayName":"default","isLocked":false,"name":"928e7ab2-2063-45c0-9fb0-356eb77a72ff","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_divide", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5702c06-4c48-48e0-9cdd-674d0ec4e4de","path":"sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fabb0af8-33bf-46de-a2cf-ea3b19a5c649","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"252d37e4-15c2-49c5-b053-95bfb2267cfc","path":"sprites/s_node_pb_box_divide/s_node_pb_box_divide.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9f1fe75e-f292-4578-8de1-6650be3956ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_box_divide_grid/4576a40b-5c91-491e-bbe9-4abc9d24e01a.png b/sprites/s_node_pb_box_divide_grid/6befa950-1445-447b-bf88-8b41052e49c2.png similarity index 83% rename from sprites/s_node_pb_box_divide_grid/4576a40b-5c91-491e-bbe9-4abc9d24e01a.png rename to sprites/s_node_pb_box_divide_grid/6befa950-1445-447b-bf88-8b41052e49c2.png index 5671702ab..cd13fe332 100644 Binary files a/sprites/s_node_pb_box_divide_grid/4576a40b-5c91-491e-bbe9-4abc9d24e01a.png and b/sprites/s_node_pb_box_divide_grid/6befa950-1445-447b-bf88-8b41052e49c2.png differ diff --git a/sprites/s_node_pb_box_divide_grid/layers/4576a40b-5c91-491e-bbe9-4abc9d24e01a/1cd47b55-566f-40d6-99f3-682ce1387822.png b/sprites/s_node_pb_box_divide_grid/layers/4576a40b-5c91-491e-bbe9-4abc9d24e01a/1cd47b55-566f-40d6-99f3-682ce1387822.png deleted file mode 100644 index f29dbe9a9..000000000 Binary files a/sprites/s_node_pb_box_divide_grid/layers/4576a40b-5c91-491e-bbe9-4abc9d24e01a/1cd47b55-566f-40d6-99f3-682ce1387822.png and /dev/null differ diff --git a/sprites/s_node_pb_box_divide_grid/layers/6befa950-1445-447b-bf88-8b41052e49c2/43821d9e-13f4-49a9-8c71-13e349c181f9.png b/sprites/s_node_pb_box_divide_grid/layers/6befa950-1445-447b-bf88-8b41052e49c2/43821d9e-13f4-49a9-8c71-13e349c181f9.png new file mode 100644 index 000000000..cd13fe332 Binary files /dev/null and b/sprites/s_node_pb_box_divide_grid/layers/6befa950-1445-447b-bf88-8b41052e49c2/43821d9e-13f4-49a9-8c71-13e349c181f9.png differ diff --git a/sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy b/sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy index 2b8adc82b..18cb2e47f 100644 --- a/sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy +++ b/sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4576a40b-5c91-491e-bbe9-4abc9d24e01a","name":"4576a40b-5c91-491e-bbe9-4abc9d24e01a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"6befa950-1445-447b-bf88-8b41052e49c2","name":"6befa950-1445-447b-bf88-8b41052e49c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"1cd47b55-566f-40d6-99f3-682ce1387822","blendMode":0,"displayName":"default","isLocked":false,"name":"1cd47b55-566f-40d6-99f3-682ce1387822","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"43821d9e-13f4-49a9-8c71-13e349c181f9","blendMode":0,"displayName":"default","isLocked":false,"name":"43821d9e-13f4-49a9-8c71-13e349c181f9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_divide_grid", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4576a40b-5c91-491e-bbe9-4abc9d24e01a","path":"sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88b507e2-49c2-4afe-86ce-f3ba702e2731","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6befa950-1445-447b-bf88-8b41052e49c2","path":"sprites/s_node_pb_box_divide_grid/s_node_pb_box_divide_grid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e70a447e-3bfe-4716-b166-6cce06328f72","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_box_inset/4d539121-9d57-4039-a5ec-8e19bc9d34db.png b/sprites/s_node_pb_box_inset/ea51851c-fca9-471e-9d2c-16454d4e5213.png similarity index 77% rename from sprites/s_node_pb_box_inset/4d539121-9d57-4039-a5ec-8e19bc9d34db.png rename to sprites/s_node_pb_box_inset/ea51851c-fca9-471e-9d2c-16454d4e5213.png index 173cdbfec..b42d4357c 100644 Binary files a/sprites/s_node_pb_box_inset/4d539121-9d57-4039-a5ec-8e19bc9d34db.png and b/sprites/s_node_pb_box_inset/ea51851c-fca9-471e-9d2c-16454d4e5213.png differ diff --git a/sprites/s_node_pb_box_inset/layers/4d539121-9d57-4039-a5ec-8e19bc9d34db/f16ceb5f-fff1-4630-bee0-5216c37619c5.png b/sprites/s_node_pb_box_inset/layers/4d539121-9d57-4039-a5ec-8e19bc9d34db/f16ceb5f-fff1-4630-bee0-5216c37619c5.png deleted file mode 100644 index 65ae90f69..000000000 Binary files a/sprites/s_node_pb_box_inset/layers/4d539121-9d57-4039-a5ec-8e19bc9d34db/f16ceb5f-fff1-4630-bee0-5216c37619c5.png and /dev/null differ diff --git a/sprites/s_node_pb_box_inset/layers/ea51851c-fca9-471e-9d2c-16454d4e5213/855a3751-cd05-4bd9-a146-d792c9262ad6.png b/sprites/s_node_pb_box_inset/layers/ea51851c-fca9-471e-9d2c-16454d4e5213/855a3751-cd05-4bd9-a146-d792c9262ad6.png new file mode 100644 index 000000000..b42d4357c Binary files /dev/null and b/sprites/s_node_pb_box_inset/layers/ea51851c-fca9-471e-9d2c-16454d4e5213/855a3751-cd05-4bd9-a146-d792c9262ad6.png differ diff --git a/sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy b/sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy index 84a5e20c4..36a4e3b26 100644 --- a/sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy +++ b/sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4d539121-9d57-4039-a5ec-8e19bc9d34db","name":"4d539121-9d57-4039-a5ec-8e19bc9d34db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"ea51851c-fca9-471e-9d2c-16454d4e5213","name":"ea51851c-fca9-471e-9d2c-16454d4e5213","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"f16ceb5f-fff1-4630-bee0-5216c37619c5","blendMode":0,"displayName":"default","isLocked":false,"name":"f16ceb5f-fff1-4630-bee0-5216c37619c5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"855a3751-cd05-4bd9-a146-d792c9262ad6","blendMode":0,"displayName":"default","isLocked":false,"name":"855a3751-cd05-4bd9-a146-d792c9262ad6","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_inset", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d539121-9d57-4039-a5ec-8e19bc9d34db","path":"sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2da757fb-3a45-4637-9577-74336932faee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea51851c-fca9-471e-9d2c-16454d4e5213","path":"sprites/s_node_pb_box_inset/s_node_pb_box_inset.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5e822d44-ddbc-4047-a13f-7a429d01eb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_box_mirror/4a2fb848-cfc0-44e5-8c98-f7c7d999d150.png b/sprites/s_node_pb_box_mirror/b803c62a-87de-4b0b-88af-f8b9b94e5d0f.png similarity index 85% rename from sprites/s_node_pb_box_mirror/4a2fb848-cfc0-44e5-8c98-f7c7d999d150.png rename to sprites/s_node_pb_box_mirror/b803c62a-87de-4b0b-88af-f8b9b94e5d0f.png index 5daff40ce..951e5c2a5 100644 Binary files a/sprites/s_node_pb_box_mirror/4a2fb848-cfc0-44e5-8c98-f7c7d999d150.png and b/sprites/s_node_pb_box_mirror/b803c62a-87de-4b0b-88af-f8b9b94e5d0f.png differ diff --git a/sprites/s_node_pb_box_mirror/layers/4a2fb848-cfc0-44e5-8c98-f7c7d999d150/317201a7-2a1c-4447-9bd7-76fe64663166.png b/sprites/s_node_pb_box_mirror/layers/4a2fb848-cfc0-44e5-8c98-f7c7d999d150/317201a7-2a1c-4447-9bd7-76fe64663166.png deleted file mode 100644 index 887aa40b3..000000000 Binary files a/sprites/s_node_pb_box_mirror/layers/4a2fb848-cfc0-44e5-8c98-f7c7d999d150/317201a7-2a1c-4447-9bd7-76fe64663166.png and /dev/null differ diff --git a/sprites/s_node_pb_box_mirror/layers/b803c62a-87de-4b0b-88af-f8b9b94e5d0f/ec2d5e59-0a6c-4093-be28-eec6a33e89ed.png b/sprites/s_node_pb_box_mirror/layers/b803c62a-87de-4b0b-88af-f8b9b94e5d0f/ec2d5e59-0a6c-4093-be28-eec6a33e89ed.png new file mode 100644 index 000000000..951e5c2a5 Binary files /dev/null and b/sprites/s_node_pb_box_mirror/layers/b803c62a-87de-4b0b-88af-f8b9b94e5d0f/ec2d5e59-0a6c-4093-be28-eec6a33e89ed.png differ diff --git a/sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy b/sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy index bf8fd0e0a..5ea0dcb32 100644 --- a/sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy +++ b/sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4a2fb848-cfc0-44e5-8c98-f7c7d999d150","name":"4a2fb848-cfc0-44e5-8c98-f7c7d999d150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"b803c62a-87de-4b0b-88af-f8b9b94e5d0f","name":"b803c62a-87de-4b0b-88af-f8b9b94e5d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"317201a7-2a1c-4447-9bd7-76fe64663166","blendMode":0,"displayName":"default","isLocked":false,"name":"317201a7-2a1c-4447-9bd7-76fe64663166","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"ec2d5e59-0a6c-4093-be28-eec6a33e89ed","blendMode":0,"displayName":"default","isLocked":false,"name":"ec2d5e59-0a6c-4093-be28-eec6a33e89ed","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_mirror", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a2fb848-cfc0-44e5-8c98-f7c7d999d150","path":"sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"081ae4cc-818a-4f51-887c-878778887b07","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b803c62a-87de-4b0b-88af-f8b9b94e5d0f","path":"sprites/s_node_pb_box_mirror/s_node_pb_box_mirror.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2776af7-7252-481b-b6ec-9ba7979bc0c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_box_split/cd706c97-ed52-419b-906d-59b4bcd9f2c4.png b/sprites/s_node_pb_box_split/cf8ff9af-070e-4367-ad33-34800842b3c8.png similarity index 74% rename from sprites/s_node_pb_box_split/cd706c97-ed52-419b-906d-59b4bcd9f2c4.png rename to sprites/s_node_pb_box_split/cf8ff9af-070e-4367-ad33-34800842b3c8.png index 947494ced..ad0c12514 100644 Binary files a/sprites/s_node_pb_box_split/cd706c97-ed52-419b-906d-59b4bcd9f2c4.png and b/sprites/s_node_pb_box_split/cf8ff9af-070e-4367-ad33-34800842b3c8.png differ diff --git a/sprites/s_node_pb_box_split/layers/cd706c97-ed52-419b-906d-59b4bcd9f2c4/e0df8020-0b1d-4f54-83d6-c9a0c33b7f3b.png b/sprites/s_node_pb_box_split/layers/cd706c97-ed52-419b-906d-59b4bcd9f2c4/e0df8020-0b1d-4f54-83d6-c9a0c33b7f3b.png deleted file mode 100644 index c1661a476..000000000 Binary files a/sprites/s_node_pb_box_split/layers/cd706c97-ed52-419b-906d-59b4bcd9f2c4/e0df8020-0b1d-4f54-83d6-c9a0c33b7f3b.png and /dev/null differ diff --git a/sprites/s_node_pb_box_split/layers/cf8ff9af-070e-4367-ad33-34800842b3c8/a6b7c53a-0961-4013-b7f4-2ed302e969ec.png b/sprites/s_node_pb_box_split/layers/cf8ff9af-070e-4367-ad33-34800842b3c8/a6b7c53a-0961-4013-b7f4-2ed302e969ec.png new file mode 100644 index 000000000..ad0c12514 Binary files /dev/null and b/sprites/s_node_pb_box_split/layers/cf8ff9af-070e-4367-ad33-34800842b3c8/a6b7c53a-0961-4013-b7f4-2ed302e969ec.png differ diff --git a/sprites/s_node_pb_box_split/s_node_pb_box_split.yy b/sprites/s_node_pb_box_split/s_node_pb_box_split.yy index bafd661df..245c86e53 100644 --- a/sprites/s_node_pb_box_split/s_node_pb_box_split.yy +++ b/sprites/s_node_pb_box_split/s_node_pb_box_split.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd706c97-ed52-419b-906d-59b4bcd9f2c4","name":"cd706c97-ed52-419b-906d-59b4bcd9f2c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"cf8ff9af-070e-4367-ad33-34800842b3c8","name":"cf8ff9af-070e-4367-ad33-34800842b3c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"e0df8020-0b1d-4f54-83d6-c9a0c33b7f3b","blendMode":0,"displayName":"default","isLocked":false,"name":"e0df8020-0b1d-4f54-83d6-c9a0c33b7f3b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"a6b7c53a-0961-4013-b7f4-2ed302e969ec","blendMode":0,"displayName":"default","isLocked":false,"name":"a6b7c53a-0961-4013-b7f4-2ed302e969ec","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_split", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd706c97-ed52-419b-906d-59b4bcd9f2c4","path":"sprites/s_node_pb_box_split/s_node_pb_box_split.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc4bb61d-d785-47c4-a30b-d931bf31693b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf8ff9af-070e-4367-ad33-34800842b3c8","path":"sprites/s_node_pb_box_split/s_node_pb_box_split.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ba9b0b4a-3f34-407d-a4f4-17e6754adbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_box_transform/03599f23-1af8-4466-9137-7619cb80e40e.png b/sprites/s_node_pb_box_transform/2bc18230-1c57-41a3-a411-a23578838a55.png similarity index 77% rename from sprites/s_node_pb_box_transform/03599f23-1af8-4466-9137-7619cb80e40e.png rename to sprites/s_node_pb_box_transform/2bc18230-1c57-41a3-a411-a23578838a55.png index e3cbd28f8..7d33d7ffa 100644 Binary files a/sprites/s_node_pb_box_transform/03599f23-1af8-4466-9137-7619cb80e40e.png and b/sprites/s_node_pb_box_transform/2bc18230-1c57-41a3-a411-a23578838a55.png differ diff --git a/sprites/s_node_pb_box_transform/layers/03599f23-1af8-4466-9137-7619cb80e40e/8f37128d-7263-4731-8a92-c2d957821789.png b/sprites/s_node_pb_box_transform/layers/03599f23-1af8-4466-9137-7619cb80e40e/8f37128d-7263-4731-8a92-c2d957821789.png deleted file mode 100644 index 06744486c..000000000 Binary files a/sprites/s_node_pb_box_transform/layers/03599f23-1af8-4466-9137-7619cb80e40e/8f37128d-7263-4731-8a92-c2d957821789.png and /dev/null differ diff --git a/sprites/s_node_pb_box_transform/layers/2bc18230-1c57-41a3-a411-a23578838a55/d97408dc-1c5b-49ee-bd57-b7a14c034ff5.png b/sprites/s_node_pb_box_transform/layers/2bc18230-1c57-41a3-a411-a23578838a55/d97408dc-1c5b-49ee-bd57-b7a14c034ff5.png new file mode 100644 index 000000000..7d33d7ffa Binary files /dev/null and b/sprites/s_node_pb_box_transform/layers/2bc18230-1c57-41a3-a411-a23578838a55/d97408dc-1c5b-49ee-bd57-b7a14c034ff5.png differ diff --git a/sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy b/sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy index 93ab24944..7e7a188a8 100644 --- a/sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy +++ b/sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03599f23-1af8-4466-9137-7619cb80e40e","name":"03599f23-1af8-4466-9137-7619cb80e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"2bc18230-1c57-41a3-a411-a23578838a55","name":"2bc18230-1c57-41a3-a411-a23578838a55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"8f37128d-7263-4731-8a92-c2d957821789","blendMode":0,"displayName":"default","isLocked":false,"name":"8f37128d-7263-4731-8a92-c2d957821789","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"d97408dc-1c5b-49ee-bd57-b7a14c034ff5","blendMode":0,"displayName":"default","isLocked":false,"name":"d97408dc-1c5b-49ee-bd57-b7a14c034ff5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_box_transform", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03599f23-1af8-4466-9137-7619cb80e40e","path":"sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cbd103d-778e-42b0-9e1b-11dd7cc8f637","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bc18230-1c57-41a3-a411-a23578838a55","path":"sprites/s_node_pb_box_transform/s_node_pb_box_transform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5aca5eba-a324-4988-9816-aec365ae2086","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_draw_angle/a0da37c9-1511-4b32-8528-23cc2de4e3ea.png b/sprites/s_node_pb_draw_angle/99547066-3a0d-45e1-95a5-c7775b665ed5.png similarity index 66% rename from sprites/s_node_pb_draw_angle/a0da37c9-1511-4b32-8528-23cc2de4e3ea.png rename to sprites/s_node_pb_draw_angle/99547066-3a0d-45e1-95a5-c7775b665ed5.png index 755f8bb69..564b26d3f 100644 Binary files a/sprites/s_node_pb_draw_angle/a0da37c9-1511-4b32-8528-23cc2de4e3ea.png and b/sprites/s_node_pb_draw_angle/99547066-3a0d-45e1-95a5-c7775b665ed5.png differ diff --git a/sprites/s_node_pb_draw_angle/layers/99547066-3a0d-45e1-95a5-c7775b665ed5/20c464a6-cd95-4acc-941f-7f212693d3a2.png b/sprites/s_node_pb_draw_angle/layers/99547066-3a0d-45e1-95a5-c7775b665ed5/20c464a6-cd95-4acc-941f-7f212693d3a2.png new file mode 100644 index 000000000..564b26d3f Binary files /dev/null and b/sprites/s_node_pb_draw_angle/layers/99547066-3a0d-45e1-95a5-c7775b665ed5/20c464a6-cd95-4acc-941f-7f212693d3a2.png differ diff --git a/sprites/s_node_pb_draw_angle/layers/a0da37c9-1511-4b32-8528-23cc2de4e3ea/417eb560-e62c-45e5-8148-0666a30482d1.png b/sprites/s_node_pb_draw_angle/layers/a0da37c9-1511-4b32-8528-23cc2de4e3ea/417eb560-e62c-45e5-8148-0666a30482d1.png deleted file mode 100644 index 752757bc0..000000000 Binary files a/sprites/s_node_pb_draw_angle/layers/a0da37c9-1511-4b32-8528-23cc2de4e3ea/417eb560-e62c-45e5-8148-0666a30482d1.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy b/sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy index 9ed72a052..c494b8ac0 100644 --- a/sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy +++ b/sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a0da37c9-1511-4b32-8528-23cc2de4e3ea","name":"a0da37c9-1511-4b32-8528-23cc2de4e3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"99547066-3a0d-45e1-95a5-c7775b665ed5","name":"99547066-3a0d-45e1-95a5-c7775b665ed5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"417eb560-e62c-45e5-8148-0666a30482d1","blendMode":0,"displayName":"default","isLocked":false,"name":"417eb560-e62c-45e5-8148-0666a30482d1","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"20c464a6-cd95-4acc-941f-7f212693d3a2","blendMode":0,"displayName":"default","isLocked":false,"name":"20c464a6-cd95-4acc-941f-7f212693d3a2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_angle", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0da37c9-1511-4b32-8528-23cc2de4e3ea","path":"sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"14c52bd8-32c1-4419-b167-dc0a9d186f13","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99547066-3a0d-45e1-95a5-c7775b665ed5","path":"sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8d8fe5bf-5108-41bb-8e4d-9863a1d7f6ab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_draw_blob/1b070141-4dbf-4dbd-9549-f57b80df0593.png b/sprites/s_node_pb_draw_blob/bd44e150-df29-4e1e-a8bc-cc2e561c8a42.png similarity index 82% rename from sprites/s_node_pb_draw_blob/1b070141-4dbf-4dbd-9549-f57b80df0593.png rename to sprites/s_node_pb_draw_blob/bd44e150-df29-4e1e-a8bc-cc2e561c8a42.png index a91ca3da9..28c56016c 100644 Binary files a/sprites/s_node_pb_draw_blob/1b070141-4dbf-4dbd-9549-f57b80df0593.png and b/sprites/s_node_pb_draw_blob/bd44e150-df29-4e1e-a8bc-cc2e561c8a42.png differ diff --git a/sprites/s_node_pb_draw_blob/layers/1b070141-4dbf-4dbd-9549-f57b80df0593/20370e99-2f9d-406a-96ae-b13eda9d8396.png b/sprites/s_node_pb_draw_blob/layers/1b070141-4dbf-4dbd-9549-f57b80df0593/20370e99-2f9d-406a-96ae-b13eda9d8396.png deleted file mode 100644 index d7e9c5bf0..000000000 Binary files a/sprites/s_node_pb_draw_blob/layers/1b070141-4dbf-4dbd-9549-f57b80df0593/20370e99-2f9d-406a-96ae-b13eda9d8396.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_blob/layers/bd44e150-df29-4e1e-a8bc-cc2e561c8a42/14f6e5ce-ae05-469e-b008-0fc81f65216b.png b/sprites/s_node_pb_draw_blob/layers/bd44e150-df29-4e1e-a8bc-cc2e561c8a42/14f6e5ce-ae05-469e-b008-0fc81f65216b.png new file mode 100644 index 000000000..28c56016c Binary files /dev/null and b/sprites/s_node_pb_draw_blob/layers/bd44e150-df29-4e1e-a8bc-cc2e561c8a42/14f6e5ce-ae05-469e-b008-0fc81f65216b.png differ diff --git a/sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy b/sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy index 9ee52e99f..951d9cbfb 100644 --- a/sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy +++ b/sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b070141-4dbf-4dbd-9549-f57b80df0593","name":"1b070141-4dbf-4dbd-9549-f57b80df0593","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"bd44e150-df29-4e1e-a8bc-cc2e561c8a42","name":"bd44e150-df29-4e1e-a8bc-cc2e561c8a42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"20370e99-2f9d-406a-96ae-b13eda9d8396","blendMode":0,"displayName":"default","isLocked":false,"name":"20370e99-2f9d-406a-96ae-b13eda9d8396","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"14f6e5ce-ae05-469e-b008-0fc81f65216b","blendMode":0,"displayName":"default","isLocked":false,"name":"14f6e5ce-ae05-469e-b008-0fc81f65216b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_blob", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b070141-4dbf-4dbd-9549-f57b80df0593","path":"sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4d851d2-747c-4a68-8f11-c55d79b6d368","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd44e150-df29-4e1e-a8bc-cc2e561c8a42","path":"sprites/s_node_pb_draw_blob/s_node_pb_draw_blob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"74573d21-b931-4193-ab26-e738ded178cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_draw_diamond/408b70af-193c-41da-a888-9d8d5ac0563e.png b/sprites/s_node_pb_draw_diamond/628fae34-b596-494c-898a-49bbcadf6e5e.png similarity index 65% rename from sprites/s_node_pb_draw_diamond/408b70af-193c-41da-a888-9d8d5ac0563e.png rename to sprites/s_node_pb_draw_diamond/628fae34-b596-494c-898a-49bbcadf6e5e.png index de8d91c9c..2c493cd1f 100644 Binary files a/sprites/s_node_pb_draw_diamond/408b70af-193c-41da-a888-9d8d5ac0563e.png and b/sprites/s_node_pb_draw_diamond/628fae34-b596-494c-898a-49bbcadf6e5e.png differ diff --git a/sprites/s_node_pb_draw_diamond/layers/408b70af-193c-41da-a888-9d8d5ac0563e/3989f1b2-07e4-4233-9325-d54568474f15.png b/sprites/s_node_pb_draw_diamond/layers/408b70af-193c-41da-a888-9d8d5ac0563e/3989f1b2-07e4-4233-9325-d54568474f15.png deleted file mode 100644 index f368f83ad..000000000 Binary files a/sprites/s_node_pb_draw_diamond/layers/408b70af-193c-41da-a888-9d8d5ac0563e/3989f1b2-07e4-4233-9325-d54568474f15.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_diamond/layers/628fae34-b596-494c-898a-49bbcadf6e5e/d49a01b3-6777-427c-a71c-818b1e7d8ca8.png b/sprites/s_node_pb_draw_diamond/layers/628fae34-b596-494c-898a-49bbcadf6e5e/d49a01b3-6777-427c-a71c-818b1e7d8ca8.png new file mode 100644 index 000000000..2c493cd1f Binary files /dev/null and b/sprites/s_node_pb_draw_diamond/layers/628fae34-b596-494c-898a-49bbcadf6e5e/d49a01b3-6777-427c-a71c-818b1e7d8ca8.png differ diff --git a/sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy b/sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy index 2f9bd5721..36ff957da 100644 --- a/sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy +++ b/sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"408b70af-193c-41da-a888-9d8d5ac0563e","name":"408b70af-193c-41da-a888-9d8d5ac0563e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"628fae34-b596-494c-898a-49bbcadf6e5e","name":"628fae34-b596-494c-898a-49bbcadf6e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"3989f1b2-07e4-4233-9325-d54568474f15","blendMode":0,"displayName":"default","isLocked":false,"name":"3989f1b2-07e4-4233-9325-d54568474f15","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"d49a01b3-6777-427c-a71c-818b1e7d8ca8","blendMode":0,"displayName":"default","isLocked":false,"name":"d49a01b3-6777-427c-a71c-818b1e7d8ca8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_diamond", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"408b70af-193c-41da-a888-9d8d5ac0563e","path":"sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93382f55-43e8-4097-bbbb-d539a2e650d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"628fae34-b596-494c-898a-49bbcadf6e5e","path":"sprites/s_node_pb_draw_diamond/s_node_pb_draw_diamond.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9813a3b1-6ad3-4249-8364-6407657fb901","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pb_draw_ellipse/5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc.png b/sprites/s_node_pb_draw_ellipse/5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc.png new file mode 100644 index 000000000..e1d9b01ff Binary files /dev/null and b/sprites/s_node_pb_draw_ellipse/5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc.png differ diff --git a/sprites/s_node_pb_draw_ellipse/9e622acf-2d1d-4810-895b-e467525dc0a2.png b/sprites/s_node_pb_draw_ellipse/9e622acf-2d1d-4810-895b-e467525dc0a2.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_ellipse/9e622acf-2d1d-4810-895b-e467525dc0a2.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_ellipse/layers/5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc/f4020301-4349-42db-b2fe-c2fcf053f45d.png b/sprites/s_node_pb_draw_ellipse/layers/5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc/f4020301-4349-42db-b2fe-c2fcf053f45d.png new file mode 100644 index 000000000..e1d9b01ff Binary files /dev/null and b/sprites/s_node_pb_draw_ellipse/layers/5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc/f4020301-4349-42db-b2fe-c2fcf053f45d.png differ diff --git a/sprites/s_node_pb_draw_ellipse/layers/9e622acf-2d1d-4810-895b-e467525dc0a2/d78a8dcf-5ddd-4f3e-9aa4-513a7aaafc84.png b/sprites/s_node_pb_draw_ellipse/layers/9e622acf-2d1d-4810-895b-e467525dc0a2/d78a8dcf-5ddd-4f3e-9aa4-513a7aaafc84.png deleted file mode 100644 index 3c59c0a78..000000000 Binary files a/sprites/s_node_pb_draw_ellipse/layers/9e622acf-2d1d-4810-895b-e467525dc0a2/d78a8dcf-5ddd-4f3e-9aa4-513a7aaafc84.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy b/sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy index 8ee1ac35d..9fa93b61d 100644 --- a/sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy +++ b/sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_draw_ellipse", "bboxMode":0, - "bbox_bottom":52, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":53, + "bbox_left":10, + "bbox_right":53, "bbox_top":10, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e622acf-2d1d-4810-895b-e467525dc0a2","name":"9e622acf-2d1d-4810-895b-e467525dc0a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc","name":"5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"d78a8dcf-5ddd-4f3e-9aa4-513a7aaafc84","blendMode":0,"displayName":"default","isLocked":false,"name":"d78a8dcf-5ddd-4f3e-9aa4-513a7aaafc84","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f4020301-4349-42db-b2fe-c2fcf053f45d","blendMode":0,"displayName":"default","isLocked":false,"name":"f4020301-4349-42db-b2fe-c2fcf053f45d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_ellipse", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e622acf-2d1d-4810-895b-e467525dc0a2","path":"sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"796d7001-d3d5-423f-8c57-85d9dfd48578","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e93fd6c-3e32-41c4-9d63-bd6eaba9e5cc","path":"sprites/s_node_pb_draw_ellipse/s_node_pb_draw_ellipse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"353f9904-000f-4196-9d69-8cc9bfbe5a21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_draw_fill/7572c897-1c99-4370-9910-88b8c93072c6.png b/sprites/s_node_pb_draw_fill/7572c897-1c99-4370-9910-88b8c93072c6.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_fill/7572c897-1c99-4370-9910-88b8c93072c6.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_fill/e658d431-90c6-4bd2-8255-f5f2762273fd.png b/sprites/s_node_pb_draw_fill/e658d431-90c6-4bd2-8255-f5f2762273fd.png new file mode 100644 index 000000000..e356513de Binary files /dev/null and b/sprites/s_node_pb_draw_fill/e658d431-90c6-4bd2-8255-f5f2762273fd.png differ diff --git a/sprites/s_node_pb_draw_fill/layers/7572c897-1c99-4370-9910-88b8c93072c6/05ef720c-ee6d-4a46-aaf2-9dc4ebeabd33.png b/sprites/s_node_pb_draw_fill/layers/7572c897-1c99-4370-9910-88b8c93072c6/05ef720c-ee6d-4a46-aaf2-9dc4ebeabd33.png deleted file mode 100644 index 6be0fd392..000000000 Binary files a/sprites/s_node_pb_draw_fill/layers/7572c897-1c99-4370-9910-88b8c93072c6/05ef720c-ee6d-4a46-aaf2-9dc4ebeabd33.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_fill/layers/e658d431-90c6-4bd2-8255-f5f2762273fd/78006f1c-d6fa-4bf3-abe9-1b997de130f2.png b/sprites/s_node_pb_draw_fill/layers/e658d431-90c6-4bd2-8255-f5f2762273fd/78006f1c-d6fa-4bf3-abe9-1b997de130f2.png new file mode 100644 index 000000000..e356513de Binary files /dev/null and b/sprites/s_node_pb_draw_fill/layers/e658d431-90c6-4bd2-8255-f5f2762273fd/78006f1c-d6fa-4bf3-abe9-1b997de130f2.png differ diff --git a/sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy b/sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy index c210afd85..244f873c6 100644 --- a/sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy +++ b/sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_draw_fill", "bboxMode":0, - "bbox_bottom":58, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":59, + "bbox_left":2, + "bbox_right":60, "bbox_top":3, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7572c897-1c99-4370-9910-88b8c93072c6","name":"7572c897-1c99-4370-9910-88b8c93072c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"e658d431-90c6-4bd2-8255-f5f2762273fd","name":"e658d431-90c6-4bd2-8255-f5f2762273fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"05ef720c-ee6d-4a46-aaf2-9dc4ebeabd33","blendMode":0,"displayName":"default","isLocked":false,"name":"05ef720c-ee6d-4a46-aaf2-9dc4ebeabd33","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"78006f1c-d6fa-4bf3-abe9-1b997de130f2","blendMode":0,"displayName":"default","isLocked":false,"name":"78006f1c-d6fa-4bf3-abe9-1b997de130f2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_fill", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7572c897-1c99-4370-9910-88b8c93072c6","path":"sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fcb3aba-7462-4a04-b75c-9e047c07aaf6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e658d431-90c6-4bd2-8255-f5f2762273fd","path":"sprites/s_node_pb_draw_fill/s_node_pb_draw_fill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea6e089-a5cc-4e7e-856d-fc2ff23bdb5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_draw_line/1659db6d-d70d-40fb-9cfa-51e977229571.png b/sprites/s_node_pb_draw_line/1659db6d-d70d-40fb-9cfa-51e977229571.png new file mode 100644 index 000000000..d4e08aecf Binary files /dev/null and b/sprites/s_node_pb_draw_line/1659db6d-d70d-40fb-9cfa-51e977229571.png differ diff --git a/sprites/s_node_pb_draw_line/d3251e42-20c7-4f2f-b236-5f9992e4e5e2.png b/sprites/s_node_pb_draw_line/d3251e42-20c7-4f2f-b236-5f9992e4e5e2.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_line/d3251e42-20c7-4f2f-b236-5f9992e4e5e2.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_line/layers/1659db6d-d70d-40fb-9cfa-51e977229571/f5342143-7280-46ac-8026-cf759dc967f4.png b/sprites/s_node_pb_draw_line/layers/1659db6d-d70d-40fb-9cfa-51e977229571/f5342143-7280-46ac-8026-cf759dc967f4.png new file mode 100644 index 000000000..d4e08aecf Binary files /dev/null and b/sprites/s_node_pb_draw_line/layers/1659db6d-d70d-40fb-9cfa-51e977229571/f5342143-7280-46ac-8026-cf759dc967f4.png differ diff --git a/sprites/s_node_pb_draw_line/layers/d3251e42-20c7-4f2f-b236-5f9992e4e5e2/eb1c1842-5df1-48e5-a6c2-22d27252495c.png b/sprites/s_node_pb_draw_line/layers/d3251e42-20c7-4f2f-b236-5f9992e4e5e2/eb1c1842-5df1-48e5-a6c2-22d27252495c.png deleted file mode 100644 index 01b78d6ad..000000000 Binary files a/sprites/s_node_pb_draw_line/layers/d3251e42-20c7-4f2f-b236-5f9992e4e5e2/eb1c1842-5df1-48e5-a6c2-22d27252495c.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy b/sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy index c46bb6e9b..ccabdaad4 100644 --- a/sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy +++ b/sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_draw_line", "bboxMode":0, - "bbox_bottom":52, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":53, + "bbox_left":10, + "bbox_right":53, "bbox_top":10, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d3251e42-20c7-4f2f-b236-5f9992e4e5e2","name":"d3251e42-20c7-4f2f-b236-5f9992e4e5e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"1659db6d-d70d-40fb-9cfa-51e977229571","name":"1659db6d-d70d-40fb-9cfa-51e977229571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"eb1c1842-5df1-48e5-a6c2-22d27252495c","blendMode":0,"displayName":"default","isLocked":false,"name":"eb1c1842-5df1-48e5-a6c2-22d27252495c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f5342143-7280-46ac-8026-cf759dc967f4","blendMode":0,"displayName":"default","isLocked":false,"name":"f5342143-7280-46ac-8026-cf759dc967f4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_line", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3251e42-20c7-4f2f-b236-5f9992e4e5e2","path":"sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"14c60e04-aee2-4720-8e96-b8c6f73b3be5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1659db6d-d70d-40fb-9cfa-51e977229571","path":"sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7d306b15-8530-4f53-a60b-a5e7b58eb1d0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_draw_rectangle/237543a6-00d1-433e-af4d-a4ea04b21686.png b/sprites/s_node_pb_draw_rectangle/237543a6-00d1-433e-af4d-a4ea04b21686.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_rectangle/237543a6-00d1-433e-af4d-a4ea04b21686.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_rectangle/3d1fccd7-b812-49a3-abf5-e9589a254a3b.png b/sprites/s_node_pb_draw_rectangle/3d1fccd7-b812-49a3-abf5-e9589a254a3b.png new file mode 100644 index 000000000..826f0c15a Binary files /dev/null and b/sprites/s_node_pb_draw_rectangle/3d1fccd7-b812-49a3-abf5-e9589a254a3b.png differ diff --git a/sprites/s_node_pb_draw_rectangle/layers/237543a6-00d1-433e-af4d-a4ea04b21686/f26b419b-740d-4dbc-b535-64c84efdf34c.png b/sprites/s_node_pb_draw_rectangle/layers/237543a6-00d1-433e-af4d-a4ea04b21686/f26b419b-740d-4dbc-b535-64c84efdf34c.png deleted file mode 100644 index b7326a7bd..000000000 Binary files a/sprites/s_node_pb_draw_rectangle/layers/237543a6-00d1-433e-af4d-a4ea04b21686/f26b419b-740d-4dbc-b535-64c84efdf34c.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_rectangle/layers/3d1fccd7-b812-49a3-abf5-e9589a254a3b/ba03e874-ccf0-47ca-8286-9971e0d75642.png b/sprites/s_node_pb_draw_rectangle/layers/3d1fccd7-b812-49a3-abf5-e9589a254a3b/ba03e874-ccf0-47ca-8286-9971e0d75642.png new file mode 100644 index 000000000..826f0c15a Binary files /dev/null and b/sprites/s_node_pb_draw_rectangle/layers/3d1fccd7-b812-49a3-abf5-e9589a254a3b/ba03e874-ccf0-47ca-8286-9971e0d75642.png differ diff --git a/sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy b/sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy index 8e5d20b83..b56d6e1c3 100644 --- a/sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy +++ b/sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_draw_rectangle", "bboxMode":0, "bbox_bottom":53, - "bbox_left":0, - "bbox_right":64, + "bbox_left":10, + "bbox_right":53, "bbox_top":10, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"237543a6-00d1-433e-af4d-a4ea04b21686","name":"237543a6-00d1-433e-af4d-a4ea04b21686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"3d1fccd7-b812-49a3-abf5-e9589a254a3b","name":"3d1fccd7-b812-49a3-abf5-e9589a254a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"f26b419b-740d-4dbc-b535-64c84efdf34c","blendMode":0,"displayName":"default","isLocked":false,"name":"f26b419b-740d-4dbc-b535-64c84efdf34c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"ba03e874-ccf0-47ca-8286-9971e0d75642","blendMode":0,"displayName":"default","isLocked":false,"name":"ba03e874-ccf0-47ca-8286-9971e0d75642","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_rectangle", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"237543a6-00d1-433e-af4d-a4ea04b21686","path":"sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49d0cc40-7f3c-4fc4-8f35-9bfa9ac16cf7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d1fccd7-b812-49a3-abf5-e9589a254a3b","path":"sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0af4c2eb-86b4-4703-b589-f04930973fb1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_draw_roundrectangle/0118bdfb-ede3-4506-a4b9-fd491e377417.png b/sprites/s_node_pb_draw_roundrectangle/0118bdfb-ede3-4506-a4b9-fd491e377417.png new file mode 100644 index 000000000..f2d1da11c Binary files /dev/null and b/sprites/s_node_pb_draw_roundrectangle/0118bdfb-ede3-4506-a4b9-fd491e377417.png differ diff --git a/sprites/s_node_pb_draw_roundrectangle/c17ea5c0-694c-430c-837b-f3cc1996886e.png b/sprites/s_node_pb_draw_roundrectangle/c17ea5c0-694c-430c-837b-f3cc1996886e.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_roundrectangle/c17ea5c0-694c-430c-837b-f3cc1996886e.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_roundrectangle/layers/0118bdfb-ede3-4506-a4b9-fd491e377417/7a975c4e-781e-4fbd-8cf9-56c10bed48f2.png b/sprites/s_node_pb_draw_roundrectangle/layers/0118bdfb-ede3-4506-a4b9-fd491e377417/7a975c4e-781e-4fbd-8cf9-56c10bed48f2.png new file mode 100644 index 000000000..f2d1da11c Binary files /dev/null and b/sprites/s_node_pb_draw_roundrectangle/layers/0118bdfb-ede3-4506-a4b9-fd491e377417/7a975c4e-781e-4fbd-8cf9-56c10bed48f2.png differ diff --git a/sprites/s_node_pb_draw_roundrectangle/layers/c17ea5c0-694c-430c-837b-f3cc1996886e/9ee7bd2a-0218-4e33-85bd-7815e3226492.png b/sprites/s_node_pb_draw_roundrectangle/layers/c17ea5c0-694c-430c-837b-f3cc1996886e/9ee7bd2a-0218-4e33-85bd-7815e3226492.png deleted file mode 100644 index 69837a6a7..000000000 Binary files a/sprites/s_node_pb_draw_roundrectangle/layers/c17ea5c0-694c-430c-837b-f3cc1996886e/9ee7bd2a-0218-4e33-85bd-7815e3226492.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy b/sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy index 0eeb07571..3699d639d 100644 --- a/sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy +++ b/sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_draw_roundrectangle", "bboxMode":0, - "bbox_bottom":52, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":53, + "bbox_left":10, + "bbox_right":53, "bbox_top":10, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c17ea5c0-694c-430c-837b-f3cc1996886e","name":"c17ea5c0-694c-430c-837b-f3cc1996886e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"0118bdfb-ede3-4506-a4b9-fd491e377417","name":"0118bdfb-ede3-4506-a4b9-fd491e377417","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"9ee7bd2a-0218-4e33-85bd-7815e3226492","blendMode":0,"displayName":"default","isLocked":false,"name":"9ee7bd2a-0218-4e33-85bd-7815e3226492","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"7a975c4e-781e-4fbd-8cf9-56c10bed48f2","blendMode":0,"displayName":"default","isLocked":false,"name":"7a975c4e-781e-4fbd-8cf9-56c10bed48f2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_roundrectangle", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c17ea5c0-694c-430c-837b-f3cc1996886e","path":"sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a02d9244-649e-4dd9-a0be-b3c1d50885af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0118bdfb-ede3-4506-a4b9-fd491e377417","path":"sprites/s_node_pb_draw_roundrectangle/s_node_pb_draw_roundrectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"da42ecf5-4663-4848-b68a-cfc16672eab3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_draw_semi_ellipse/08c27be6-6694-435f-a1cc-6aa9969b1790.png b/sprites/s_node_pb_draw_semi_ellipse/08c27be6-6694-435f-a1cc-6aa9969b1790.png new file mode 100644 index 000000000..9d5a2ab58 Binary files /dev/null and b/sprites/s_node_pb_draw_semi_ellipse/08c27be6-6694-435f-a1cc-6aa9969b1790.png differ diff --git a/sprites/s_node_pb_draw_semi_ellipse/8609cdda-6bcf-4e38-9e4e-14b0b2a78f00.png b/sprites/s_node_pb_draw_semi_ellipse/8609cdda-6bcf-4e38-9e4e-14b0b2a78f00.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_semi_ellipse/8609cdda-6bcf-4e38-9e4e-14b0b2a78f00.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_semi_ellipse/layers/08c27be6-6694-435f-a1cc-6aa9969b1790/312ce63b-ad30-4856-97f6-063e47031749.png b/sprites/s_node_pb_draw_semi_ellipse/layers/08c27be6-6694-435f-a1cc-6aa9969b1790/312ce63b-ad30-4856-97f6-063e47031749.png new file mode 100644 index 000000000..9d5a2ab58 Binary files /dev/null and b/sprites/s_node_pb_draw_semi_ellipse/layers/08c27be6-6694-435f-a1cc-6aa9969b1790/312ce63b-ad30-4856-97f6-063e47031749.png differ diff --git a/sprites/s_node_pb_draw_semi_ellipse/layers/8609cdda-6bcf-4e38-9e4e-14b0b2a78f00/f4778376-618f-46d2-a959-816900676bb3.png b/sprites/s_node_pb_draw_semi_ellipse/layers/8609cdda-6bcf-4e38-9e4e-14b0b2a78f00/f4778376-618f-46d2-a959-816900676bb3.png deleted file mode 100644 index fa9e91f20..000000000 Binary files a/sprites/s_node_pb_draw_semi_ellipse/layers/8609cdda-6bcf-4e38-9e4e-14b0b2a78f00/f4778376-618f-46d2-a959-816900676bb3.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy b/sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy index a35fe6cd3..81fe0b070 100644 --- a/sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy +++ b/sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_draw_semi_ellipse", "bboxMode":0, "bbox_bottom":53, - "bbox_left":0, - "bbox_right":64, + "bbox_left":10, + "bbox_right":53, "bbox_top":10, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8609cdda-6bcf-4e38-9e4e-14b0b2a78f00","name":"8609cdda-6bcf-4e38-9e4e-14b0b2a78f00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"08c27be6-6694-435f-a1cc-6aa9969b1790","name":"08c27be6-6694-435f-a1cc-6aa9969b1790","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"f4778376-618f-46d2-a959-816900676bb3","blendMode":0,"displayName":"default","isLocked":false,"name":"f4778376-618f-46d2-a959-816900676bb3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"312ce63b-ad30-4856-97f6-063e47031749","blendMode":0,"displayName":"default","isLocked":false,"name":"312ce63b-ad30-4856-97f6-063e47031749","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_semi_ellipse", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8609cdda-6bcf-4e38-9e4e-14b0b2a78f00","path":"sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0489b7a3-5b50-428c-9564-149b2fc885b5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08c27be6-6694-435f-a1cc-6aa9969b1790","path":"sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e4f211b3-a997-4f7f-8bf9-82867c558d36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_draw_trapezoid/4f063ad7-45ca-415f-bb9d-c90a91cc5613.png b/sprites/s_node_pb_draw_trapezoid/4f063ad7-45ca-415f-bb9d-c90a91cc5613.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_draw_trapezoid/4f063ad7-45ca-415f-bb9d-c90a91cc5613.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_trapezoid/c85cadbf-820e-40e5-9766-2bcc2701ed4e.png b/sprites/s_node_pb_draw_trapezoid/c85cadbf-820e-40e5-9766-2bcc2701ed4e.png new file mode 100644 index 000000000..2b912d35b Binary files /dev/null and b/sprites/s_node_pb_draw_trapezoid/c85cadbf-820e-40e5-9766-2bcc2701ed4e.png differ diff --git a/sprites/s_node_pb_draw_trapezoid/layers/4f063ad7-45ca-415f-bb9d-c90a91cc5613/e419457b-78da-4959-a857-a166e5081cf2.png b/sprites/s_node_pb_draw_trapezoid/layers/4f063ad7-45ca-415f-bb9d-c90a91cc5613/e419457b-78da-4959-a857-a166e5081cf2.png deleted file mode 100644 index 76bdc800b..000000000 Binary files a/sprites/s_node_pb_draw_trapezoid/layers/4f063ad7-45ca-415f-bb9d-c90a91cc5613/e419457b-78da-4959-a857-a166e5081cf2.png and /dev/null differ diff --git a/sprites/s_node_pb_draw_trapezoid/layers/c85cadbf-820e-40e5-9766-2bcc2701ed4e/9f1008fd-6f7b-4d65-a0eb-837647e8218c.png b/sprites/s_node_pb_draw_trapezoid/layers/c85cadbf-820e-40e5-9766-2bcc2701ed4e/9f1008fd-6f7b-4d65-a0eb-837647e8218c.png new file mode 100644 index 000000000..2b912d35b Binary files /dev/null and b/sprites/s_node_pb_draw_trapezoid/layers/c85cadbf-820e-40e5-9766-2bcc2701ed4e/9f1008fd-6f7b-4d65-a0eb-837647e8218c.png differ diff --git a/sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy b/sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy index e1a8ef01a..9cf3f43d4 100644 --- a/sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy +++ b/sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_draw_trapezoid", "bboxMode":0, "bbox_bottom":53, - "bbox_left":0, - "bbox_right":64, + "bbox_left":10, + "bbox_right":53, "bbox_top":10, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f063ad7-45ca-415f-bb9d-c90a91cc5613","name":"4f063ad7-45ca-415f-bb9d-c90a91cc5613","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"c85cadbf-820e-40e5-9766-2bcc2701ed4e","name":"c85cadbf-820e-40e5-9766-2bcc2701ed4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"e419457b-78da-4959-a857-a166e5081cf2","blendMode":0,"displayName":"default","isLocked":false,"name":"e419457b-78da-4959-a857-a166e5081cf2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"9f1008fd-6f7b-4d65-a0eb-837647e8218c","blendMode":0,"displayName":"default","isLocked":false,"name":"9f1008fd-6f7b-4d65-a0eb-837647e8218c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_draw_trapezoid", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f063ad7-45ca-415f-bb9d-c90a91cc5613","path":"sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daa1b3b7-0a57-4ad7-8ef3-ccb462368826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85cadbf-820e-40e5-9766-2bcc2701ed4e","path":"sprites/s_node_pb_draw_trapezoid/s_node_pb_draw_trapezoid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d624f3f0-5466-4972-ba98-956f96de3684","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_add/64615ad8-f48b-4e03-bff1-243b5da3ac92.png b/sprites/s_node_pb_fx_add/64615ad8-f48b-4e03-bff1-243b5da3ac92.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_add/64615ad8-f48b-4e03-bff1-243b5da3ac92.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_add/7630972f-dde9-4470-8c6d-92209981f6d3.png b/sprites/s_node_pb_fx_add/7630972f-dde9-4470-8c6d-92209981f6d3.png new file mode 100644 index 000000000..45a89603f Binary files /dev/null and b/sprites/s_node_pb_fx_add/7630972f-dde9-4470-8c6d-92209981f6d3.png differ diff --git a/sprites/s_node_pb_fx_add/layers/64615ad8-f48b-4e03-bff1-243b5da3ac92/9c8d68c1-3838-4af2-82a6-95f65a67afdf.png b/sprites/s_node_pb_fx_add/layers/64615ad8-f48b-4e03-bff1-243b5da3ac92/9c8d68c1-3838-4af2-82a6-95f65a67afdf.png deleted file mode 100644 index 02ebe9b0d..000000000 Binary files a/sprites/s_node_pb_fx_add/layers/64615ad8-f48b-4e03-bff1-243b5da3ac92/9c8d68c1-3838-4af2-82a6-95f65a67afdf.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_add/layers/7630972f-dde9-4470-8c6d-92209981f6d3/d99819e4-35bc-4744-a85a-f81b82dd172c.png b/sprites/s_node_pb_fx_add/layers/7630972f-dde9-4470-8c6d-92209981f6d3/d99819e4-35bc-4744-a85a-f81b82dd172c.png new file mode 100644 index 000000000..45a89603f Binary files /dev/null and b/sprites/s_node_pb_fx_add/layers/7630972f-dde9-4470-8c6d-92209981f6d3/d99819e4-35bc-4744-a85a-f81b82dd172c.png differ diff --git a/sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy b/sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy index c8c9a0b47..bff0d5024 100644 --- a/sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy +++ b/sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_fx_add", "bboxMode":0, - "bbox_bottom":54, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":55, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64615ad8-f48b-4e03-bff1-243b5da3ac92","name":"64615ad8-f48b-4e03-bff1-243b5da3ac92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"7630972f-dde9-4470-8c6d-92209981f6d3","name":"7630972f-dde9-4470-8c6d-92209981f6d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"9c8d68c1-3838-4af2-82a6-95f65a67afdf","blendMode":0,"displayName":"default","isLocked":false,"name":"9c8d68c1-3838-4af2-82a6-95f65a67afdf","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"d99819e4-35bc-4744-a85a-f81b82dd172c","blendMode":0,"displayName":"default","isLocked":false,"name":"d99819e4-35bc-4744-a85a-f81b82dd172c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_add", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64615ad8-f48b-4e03-bff1-243b5da3ac92","path":"sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"181b3338-7e53-4440-8c4f-1e71643c973d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7630972f-dde9-4470-8c6d-92209981f6d3","path":"sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"93d50d2a-ce70-4678-8e14-7ce63587cc29","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_brick/490de187-cb7b-4ffa-b1fd-0d091f0ef93e.png b/sprites/s_node_pb_fx_brick/490de187-cb7b-4ffa-b1fd-0d091f0ef93e.png new file mode 100644 index 000000000..a13bd6d8f Binary files /dev/null and b/sprites/s_node_pb_fx_brick/490de187-cb7b-4ffa-b1fd-0d091f0ef93e.png differ diff --git a/sprites/s_node_pb_fx_brick/ee1824ee-fb4c-4c4b-8e21-71a0cf514b42.png b/sprites/s_node_pb_fx_brick/ee1824ee-fb4c-4c4b-8e21-71a0cf514b42.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_brick/ee1824ee-fb4c-4c4b-8e21-71a0cf514b42.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_brick/layers/490de187-cb7b-4ffa-b1fd-0d091f0ef93e/4ae17e88-c5ed-4072-bdb4-2d3c272cb0e1.png b/sprites/s_node_pb_fx_brick/layers/490de187-cb7b-4ffa-b1fd-0d091f0ef93e/4ae17e88-c5ed-4072-bdb4-2d3c272cb0e1.png new file mode 100644 index 000000000..a13bd6d8f Binary files /dev/null and b/sprites/s_node_pb_fx_brick/layers/490de187-cb7b-4ffa-b1fd-0d091f0ef93e/4ae17e88-c5ed-4072-bdb4-2d3c272cb0e1.png differ diff --git a/sprites/s_node_pb_fx_brick/layers/ee1824ee-fb4c-4c4b-8e21-71a0cf514b42/720bd5ac-cb1a-4bcd-a8d1-03a085fe545b.png b/sprites/s_node_pb_fx_brick/layers/ee1824ee-fb4c-4c4b-8e21-71a0cf514b42/720bd5ac-cb1a-4bcd-a8d1-03a085fe545b.png deleted file mode 100644 index 5adff4288..000000000 Binary files a/sprites/s_node_pb_fx_brick/layers/ee1824ee-fb4c-4c4b-8e21-71a0cf514b42/720bd5ac-cb1a-4bcd-a8d1-03a085fe545b.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy b/sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy index 542e81769..158dd8fef 100644 --- a/sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy +++ b/sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_brick", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ee1824ee-fb4c-4c4b-8e21-71a0cf514b42","name":"ee1824ee-fb4c-4c4b-8e21-71a0cf514b42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"490de187-cb7b-4ffa-b1fd-0d091f0ef93e","name":"490de187-cb7b-4ffa-b1fd-0d091f0ef93e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"720bd5ac-cb1a-4bcd-a8d1-03a085fe545b","blendMode":0,"displayName":"default","isLocked":false,"name":"720bd5ac-cb1a-4bcd-a8d1-03a085fe545b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"4ae17e88-c5ed-4072-bdb4-2d3c272cb0e1","blendMode":0,"displayName":"default","isLocked":false,"name":"4ae17e88-c5ed-4072-bdb4-2d3c272cb0e1","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_brick", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee1824ee-fb4c-4c4b-8e21-71a0cf514b42","path":"sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d782342-194b-44b8-8e4e-cb4309d132bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"490de187-cb7b-4ffa-b1fd-0d091f0ef93e","path":"sprites/s_node_pb_fx_brick/s_node_pb_fx_brick.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4bd0f6cc-17e0-4c30-ab92-7ff440ae4020","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_hash/0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a.png b/sprites/s_node_pb_fx_hash/0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a.png new file mode 100644 index 000000000..23f83ade9 Binary files /dev/null and b/sprites/s_node_pb_fx_hash/0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a.png differ diff --git a/sprites/s_node_pb_fx_hash/4966587c-3bff-409e-999e-369173888825.png b/sprites/s_node_pb_fx_hash/4966587c-3bff-409e-999e-369173888825.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_hash/4966587c-3bff-409e-999e-369173888825.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_hash/layers/0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a/6ce33259-57da-4244-a136-388a263ab58f.png b/sprites/s_node_pb_fx_hash/layers/0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a/6ce33259-57da-4244-a136-388a263ab58f.png new file mode 100644 index 000000000..23f83ade9 Binary files /dev/null and b/sprites/s_node_pb_fx_hash/layers/0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a/6ce33259-57da-4244-a136-388a263ab58f.png differ diff --git a/sprites/s_node_pb_fx_hash/layers/4966587c-3bff-409e-999e-369173888825/c6ca5291-d0f0-44d9-b91a-ab0ba3e818cc.png b/sprites/s_node_pb_fx_hash/layers/4966587c-3bff-409e-999e-369173888825/c6ca5291-d0f0-44d9-b91a-ab0ba3e818cc.png deleted file mode 100644 index 03b395ee7..000000000 Binary files a/sprites/s_node_pb_fx_hash/layers/4966587c-3bff-409e-999e-369173888825/c6ca5291-d0f0-44d9-b91a-ab0ba3e818cc.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy b/sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy index 9500871a1..a6cfcf7ee 100644 --- a/sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy +++ b/sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_hash", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4966587c-3bff-409e-999e-369173888825","name":"4966587c-3bff-409e-999e-369173888825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a","name":"0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"c6ca5291-d0f0-44d9-b91a-ab0ba3e818cc","blendMode":0,"displayName":"default","isLocked":false,"name":"c6ca5291-d0f0-44d9-b91a-ab0ba3e818cc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"6ce33259-57da-4244-a136-388a263ab58f","blendMode":0,"displayName":"default","isLocked":false,"name":"6ce33259-57da-4244-a136-388a263ab58f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_hash", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4966587c-3bff-409e-999e-369173888825","path":"sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"241ae106-8491-4b6c-b64c-0cf926968dfd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fd7124c-107f-4cbe-9fe1-2d76e4d6b71a","path":"sprites/s_node_pb_fx_hash/s_node_pb_fx_hash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"551a0231-2418-4df4-bb38-383c51c22cd5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_highlight/0fd5d741-6db8-455d-9e3c-1afc9b9d052b.png b/sprites/s_node_pb_fx_highlight/0fd5d741-6db8-455d-9e3c-1afc9b9d052b.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_highlight/0fd5d741-6db8-455d-9e3c-1afc9b9d052b.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_highlight/119c9179-3f36-4310-8a19-579f0547c0e0.png b/sprites/s_node_pb_fx_highlight/119c9179-3f36-4310-8a19-579f0547c0e0.png new file mode 100644 index 000000000..f797b0c4d Binary files /dev/null and b/sprites/s_node_pb_fx_highlight/119c9179-3f36-4310-8a19-579f0547c0e0.png differ diff --git a/sprites/s_node_pb_fx_highlight/layers/0fd5d741-6db8-455d-9e3c-1afc9b9d052b/e171d026-5b3b-4a6b-857e-3e0aa8dde157.png b/sprites/s_node_pb_fx_highlight/layers/0fd5d741-6db8-455d-9e3c-1afc9b9d052b/e171d026-5b3b-4a6b-857e-3e0aa8dde157.png deleted file mode 100644 index 8400c8aea..000000000 Binary files a/sprites/s_node_pb_fx_highlight/layers/0fd5d741-6db8-455d-9e3c-1afc9b9d052b/e171d026-5b3b-4a6b-857e-3e0aa8dde157.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_highlight/layers/119c9179-3f36-4310-8a19-579f0547c0e0/cc9fc731-ec71-4d8c-8ad5-e0d112ca52b0.png b/sprites/s_node_pb_fx_highlight/layers/119c9179-3f36-4310-8a19-579f0547c0e0/cc9fc731-ec71-4d8c-8ad5-e0d112ca52b0.png new file mode 100644 index 000000000..f797b0c4d Binary files /dev/null and b/sprites/s_node_pb_fx_highlight/layers/119c9179-3f36-4310-8a19-579f0547c0e0/cc9fc731-ec71-4d8c-8ad5-e0d112ca52b0.png differ diff --git a/sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy b/sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy index 4c28b3343..b5868ebeb 100644 --- a/sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy +++ b/sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_highlight", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0fd5d741-6db8-455d-9e3c-1afc9b9d052b","name":"0fd5d741-6db8-455d-9e3c-1afc9b9d052b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"119c9179-3f36-4310-8a19-579f0547c0e0","name":"119c9179-3f36-4310-8a19-579f0547c0e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"e171d026-5b3b-4a6b-857e-3e0aa8dde157","blendMode":0,"displayName":"default","isLocked":false,"name":"e171d026-5b3b-4a6b-857e-3e0aa8dde157","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"cc9fc731-ec71-4d8c-8ad5-e0d112ca52b0","blendMode":0,"displayName":"default","isLocked":false,"name":"cc9fc731-ec71-4d8c-8ad5-e0d112ca52b0","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_highlight", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fd5d741-6db8-455d-9e3c-1afc9b9d052b","path":"sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96b1cf51-e6b6-4640-a6ad-43f9c9557e65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"119c9179-3f36-4310-8a19-579f0547c0e0","path":"sprites/s_node_pb_fx_highlight/s_node_pb_fx_highlight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b406c14f-4c52-4d42-9e81-bf112ca824a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_interesct/78660804-8097-4f2b-8fd4-5c908f97318f.png b/sprites/s_node_pb_fx_interesct/78660804-8097-4f2b-8fd4-5c908f97318f.png new file mode 100644 index 000000000..57f41cacb Binary files /dev/null and b/sprites/s_node_pb_fx_interesct/78660804-8097-4f2b-8fd4-5c908f97318f.png differ diff --git a/sprites/s_node_pb_fx_interesct/c62ff99d-20e0-4d03-9dee-489b1be62ef5.png b/sprites/s_node_pb_fx_interesct/c62ff99d-20e0-4d03-9dee-489b1be62ef5.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_interesct/c62ff99d-20e0-4d03-9dee-489b1be62ef5.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_interesct/layers/78660804-8097-4f2b-8fd4-5c908f97318f/2bcdeb2d-4f46-4541-aa8f-76cf5376496c.png b/sprites/s_node_pb_fx_interesct/layers/78660804-8097-4f2b-8fd4-5c908f97318f/2bcdeb2d-4f46-4541-aa8f-76cf5376496c.png new file mode 100644 index 000000000..57f41cacb Binary files /dev/null and b/sprites/s_node_pb_fx_interesct/layers/78660804-8097-4f2b-8fd4-5c908f97318f/2bcdeb2d-4f46-4541-aa8f-76cf5376496c.png differ diff --git a/sprites/s_node_pb_fx_interesct/layers/c62ff99d-20e0-4d03-9dee-489b1be62ef5/2848d87e-5fcf-4c8a-a30d-7d59b3a0b540.png b/sprites/s_node_pb_fx_interesct/layers/c62ff99d-20e0-4d03-9dee-489b1be62ef5/2848d87e-5fcf-4c8a-a30d-7d59b3a0b540.png deleted file mode 100644 index 742738649..000000000 Binary files a/sprites/s_node_pb_fx_interesct/layers/c62ff99d-20e0-4d03-9dee-489b1be62ef5/2848d87e-5fcf-4c8a-a30d-7d59b3a0b540.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy b/sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy index 5e7cca6c9..39a10ac06 100644 --- a/sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy +++ b/sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_fx_interesct", "bboxMode":0, - "bbox_bottom":54, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":55, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c62ff99d-20e0-4d03-9dee-489b1be62ef5","name":"c62ff99d-20e0-4d03-9dee-489b1be62ef5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"78660804-8097-4f2b-8fd4-5c908f97318f","name":"78660804-8097-4f2b-8fd4-5c908f97318f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"2848d87e-5fcf-4c8a-a30d-7d59b3a0b540","blendMode":0,"displayName":"default","isLocked":false,"name":"2848d87e-5fcf-4c8a-a30d-7d59b3a0b540","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"2bcdeb2d-4f46-4541-aa8f-76cf5376496c","blendMode":0,"displayName":"default","isLocked":false,"name":"2bcdeb2d-4f46-4541-aa8f-76cf5376496c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_interesct", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c62ff99d-20e0-4d03-9dee-489b1be62ef5","path":"sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"922395d3-fa31-4310-b403-e9e5513b230b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78660804-8097-4f2b-8fd4-5c908f97318f","path":"sprites/s_node_pb_fx_interesct/s_node_pb_fx_interesct.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f20dfdc2-d12c-4b29-84cf-40af41daa90d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_outline/9310e752-0b9a-46c7-9567-386c6d0e5a2c.png b/sprites/s_node_pb_fx_outline/9310e752-0b9a-46c7-9567-386c6d0e5a2c.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_outline/9310e752-0b9a-46c7-9567-386c6d0e5a2c.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_outline/b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f.png b/sprites/s_node_pb_fx_outline/b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f.png new file mode 100644 index 000000000..d9ee34671 Binary files /dev/null and b/sprites/s_node_pb_fx_outline/b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f.png differ diff --git a/sprites/s_node_pb_fx_outline/layers/9310e752-0b9a-46c7-9567-386c6d0e5a2c/deef49b3-5fd2-4095-9aad-193c80498dbe.png b/sprites/s_node_pb_fx_outline/layers/9310e752-0b9a-46c7-9567-386c6d0e5a2c/deef49b3-5fd2-4095-9aad-193c80498dbe.png deleted file mode 100644 index 4a79dcae3..000000000 Binary files a/sprites/s_node_pb_fx_outline/layers/9310e752-0b9a-46c7-9567-386c6d0e5a2c/deef49b3-5fd2-4095-9aad-193c80498dbe.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_outline/layers/b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f/707de12d-fcc7-456a-8edd-7753edb339bf.png b/sprites/s_node_pb_fx_outline/layers/b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f/707de12d-fcc7-456a-8edd-7753edb339bf.png new file mode 100644 index 000000000..d9ee34671 Binary files /dev/null and b/sprites/s_node_pb_fx_outline/layers/b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f/707de12d-fcc7-456a-8edd-7753edb339bf.png differ diff --git a/sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy b/sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy index e1f395b96..d9701478d 100644 --- a/sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy +++ b/sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_outline", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9310e752-0b9a-46c7-9567-386c6d0e5a2c","name":"9310e752-0b9a-46c7-9567-386c6d0e5a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f","name":"b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"deef49b3-5fd2-4095-9aad-193c80498dbe","blendMode":0,"displayName":"default","isLocked":false,"name":"deef49b3-5fd2-4095-9aad-193c80498dbe","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"707de12d-fcc7-456a-8edd-7753edb339bf","blendMode":0,"displayName":"default","isLocked":false,"name":"707de12d-fcc7-456a-8edd-7753edb339bf","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_outline", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9310e752-0b9a-46c7-9567-386c6d0e5a2c","path":"sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b41cb77-194b-423d-a387-4e8a4d07626d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b166bdd9-a9a9-4b3e-aa9b-6ff1641a474f","path":"sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e6ceedcd-ab78-4565-b7e7-93e0078b579d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_radial/31aef9b8-6d1e-4b95-b200-c52fcd45bd95.png b/sprites/s_node_pb_fx_radial/31aef9b8-6d1e-4b95-b200-c52fcd45bd95.png new file mode 100644 index 000000000..1aad12065 Binary files /dev/null and b/sprites/s_node_pb_fx_radial/31aef9b8-6d1e-4b95-b200-c52fcd45bd95.png differ diff --git a/sprites/s_node_pb_fx_radial/940083cd-babb-4a70-bab7-6bcf081ffda0.png b/sprites/s_node_pb_fx_radial/940083cd-babb-4a70-bab7-6bcf081ffda0.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_radial/940083cd-babb-4a70-bab7-6bcf081ffda0.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_radial/layers/31aef9b8-6d1e-4b95-b200-c52fcd45bd95/09fbe6eb-fa95-437d-a218-dcbf47b3ffc8.png b/sprites/s_node_pb_fx_radial/layers/31aef9b8-6d1e-4b95-b200-c52fcd45bd95/09fbe6eb-fa95-437d-a218-dcbf47b3ffc8.png new file mode 100644 index 000000000..1aad12065 Binary files /dev/null and b/sprites/s_node_pb_fx_radial/layers/31aef9b8-6d1e-4b95-b200-c52fcd45bd95/09fbe6eb-fa95-437d-a218-dcbf47b3ffc8.png differ diff --git a/sprites/s_node_pb_fx_radial/layers/940083cd-babb-4a70-bab7-6bcf081ffda0/c8023e7c-8344-48ac-aa2e-cb86101daab0.png b/sprites/s_node_pb_fx_radial/layers/940083cd-babb-4a70-bab7-6bcf081ffda0/c8023e7c-8344-48ac-aa2e-cb86101daab0.png deleted file mode 100644 index 7d6a5c7fa..000000000 Binary files a/sprites/s_node_pb_fx_radial/layers/940083cd-babb-4a70-bab7-6bcf081ffda0/c8023e7c-8344-48ac-aa2e-cb86101daab0.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy b/sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy index 407627005..2015abec9 100644 --- a/sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy +++ b/sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_fx_radial", "bboxMode":0, - "bbox_bottom":58, - "bbox_left":3, - "bbox_right":62, + "bbox_bottom":59, + "bbox_left":4, + "bbox_right":59, "bbox_top":4, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"940083cd-babb-4a70-bab7-6bcf081ffda0","name":"940083cd-babb-4a70-bab7-6bcf081ffda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"31aef9b8-6d1e-4b95-b200-c52fcd45bd95","name":"31aef9b8-6d1e-4b95-b200-c52fcd45bd95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"c8023e7c-8344-48ac-aa2e-cb86101daab0","blendMode":0,"displayName":"default","isLocked":false,"name":"c8023e7c-8344-48ac-aa2e-cb86101daab0","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"09fbe6eb-fa95-437d-a218-dcbf47b3ffc8","blendMode":0,"displayName":"default","isLocked":false,"name":"09fbe6eb-fa95-437d-a218-dcbf47b3ffc8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_radial", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"940083cd-babb-4a70-bab7-6bcf081ffda0","path":"sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4dce2568-836c-4d86-b6c9-a7c0569da8e9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31aef9b8-6d1e-4b95-b200-c52fcd45bd95","path":"sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6deda682-04d9-4854-aae4-1316dea99480","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_shading/138010ef-679d-438d-9495-2bad1e2f60ec.png b/sprites/s_node_pb_fx_shading/138010ef-679d-438d-9495-2bad1e2f60ec.png new file mode 100644 index 000000000..f3f0d746e Binary files /dev/null and b/sprites/s_node_pb_fx_shading/138010ef-679d-438d-9495-2bad1e2f60ec.png differ diff --git a/sprites/s_node_pb_fx_shading/8f2b8aff-e648-4c67-9bcb-58948a12de51.png b/sprites/s_node_pb_fx_shading/8f2b8aff-e648-4c67-9bcb-58948a12de51.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_shading/8f2b8aff-e648-4c67-9bcb-58948a12de51.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_shading/layers/138010ef-679d-438d-9495-2bad1e2f60ec/58380363-37d6-4b6b-bd37-89976983149a.png b/sprites/s_node_pb_fx_shading/layers/138010ef-679d-438d-9495-2bad1e2f60ec/58380363-37d6-4b6b-bd37-89976983149a.png new file mode 100644 index 000000000..f3f0d746e Binary files /dev/null and b/sprites/s_node_pb_fx_shading/layers/138010ef-679d-438d-9495-2bad1e2f60ec/58380363-37d6-4b6b-bd37-89976983149a.png differ diff --git a/sprites/s_node_pb_fx_shading/layers/8f2b8aff-e648-4c67-9bcb-58948a12de51/b5cb0e2a-698f-4de4-9eaf-159ee96addcd.png b/sprites/s_node_pb_fx_shading/layers/8f2b8aff-e648-4c67-9bcb-58948a12de51/b5cb0e2a-698f-4de4-9eaf-159ee96addcd.png deleted file mode 100644 index 790dd2b01..000000000 Binary files a/sprites/s_node_pb_fx_shading/layers/8f2b8aff-e648-4c67-9bcb-58948a12de51/b5cb0e2a-698f-4de4-9eaf-159ee96addcd.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy b/sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy index e3fd37fec..a116db9c6 100644 --- a/sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy +++ b/sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_shading", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8f2b8aff-e648-4c67-9bcb-58948a12de51","name":"8f2b8aff-e648-4c67-9bcb-58948a12de51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"138010ef-679d-438d-9495-2bad1e2f60ec","name":"138010ef-679d-438d-9495-2bad1e2f60ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"b5cb0e2a-698f-4de4-9eaf-159ee96addcd","blendMode":0,"displayName":"default","isLocked":false,"name":"b5cb0e2a-698f-4de4-9eaf-159ee96addcd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"58380363-37d6-4b6b-bd37-89976983149a","blendMode":0,"displayName":"default","isLocked":false,"name":"58380363-37d6-4b6b-bd37-89976983149a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_shading", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f2b8aff-e648-4c67-9bcb-58948a12de51","path":"sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9eb36920-efe6-4519-88ef-c084ff79805c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"138010ef-679d-438d-9495-2bad1e2f60ec","path":"sprites/s_node_pb_fx_shading/s_node_pb_fx_shading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"db99b703-b2f2-41f2-a9ae-cab0543f8bd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_stack/31370d8b-7839-43d5-8958-44923740b091.png b/sprites/s_node_pb_fx_stack/31370d8b-7839-43d5-8958-44923740b091.png new file mode 100644 index 000000000..d715e7c86 Binary files /dev/null and b/sprites/s_node_pb_fx_stack/31370d8b-7839-43d5-8958-44923740b091.png differ diff --git a/sprites/s_node_pb_fx_stack/7e687309-38bb-4652-a324-7cb6f172e4cd.png b/sprites/s_node_pb_fx_stack/7e687309-38bb-4652-a324-7cb6f172e4cd.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_stack/7e687309-38bb-4652-a324-7cb6f172e4cd.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_stack/layers/31370d8b-7839-43d5-8958-44923740b091/4025a586-5b9d-4ecf-8224-39f35dff75cb.png b/sprites/s_node_pb_fx_stack/layers/31370d8b-7839-43d5-8958-44923740b091/4025a586-5b9d-4ecf-8224-39f35dff75cb.png new file mode 100644 index 000000000..d715e7c86 Binary files /dev/null and b/sprites/s_node_pb_fx_stack/layers/31370d8b-7839-43d5-8958-44923740b091/4025a586-5b9d-4ecf-8224-39f35dff75cb.png differ diff --git a/sprites/s_node_pb_fx_stack/layers/7e687309-38bb-4652-a324-7cb6f172e4cd/9829528d-50fa-4608-970b-04d12d00baa2.png b/sprites/s_node_pb_fx_stack/layers/7e687309-38bb-4652-a324-7cb6f172e4cd/9829528d-50fa-4608-970b-04d12d00baa2.png deleted file mode 100644 index d1976b8e9..000000000 Binary files a/sprites/s_node_pb_fx_stack/layers/7e687309-38bb-4652-a324-7cb6f172e4cd/9829528d-50fa-4608-970b-04d12d00baa2.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy b/sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy index 01167bf78..473080136 100644 --- a/sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy +++ b/sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_stack", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7e687309-38bb-4652-a324-7cb6f172e4cd","name":"7e687309-38bb-4652-a324-7cb6f172e4cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"31370d8b-7839-43d5-8958-44923740b091","name":"31370d8b-7839-43d5-8958-44923740b091","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"9829528d-50fa-4608-970b-04d12d00baa2","blendMode":0,"displayName":"default","isLocked":false,"name":"9829528d-50fa-4608-970b-04d12d00baa2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"4025a586-5b9d-4ecf-8224-39f35dff75cb","blendMode":0,"displayName":"default","isLocked":false,"name":"4025a586-5b9d-4ecf-8224-39f35dff75cb","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_stack", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e687309-38bb-4652-a324-7cb6f172e4cd","path":"sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"024b4a8d-4e5d-4f43-8774-2657333979e4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31370d8b-7839-43d5-8958-44923740b091","path":"sprites/s_node_pb_fx_stack/s_node_pb_fx_stack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04cdacec-8a9c-419a-8a58-073a41bb8ae6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_strip/5596981a-1ffe-4b82-a9ef-5488701f0e50.png b/sprites/s_node_pb_fx_strip/5596981a-1ffe-4b82-a9ef-5488701f0e50.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_strip/5596981a-1ffe-4b82-a9ef-5488701f0e50.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_strip/a15c803e-e2f8-47cc-bdb3-449fa45e62ac.png b/sprites/s_node_pb_fx_strip/a15c803e-e2f8-47cc-bdb3-449fa45e62ac.png new file mode 100644 index 000000000..90044e412 Binary files /dev/null and b/sprites/s_node_pb_fx_strip/a15c803e-e2f8-47cc-bdb3-449fa45e62ac.png differ diff --git a/sprites/s_node_pb_fx_strip/layers/5596981a-1ffe-4b82-a9ef-5488701f0e50/fb8fe204-2bb0-4f49-aae4-adfb1f143ba4.png b/sprites/s_node_pb_fx_strip/layers/5596981a-1ffe-4b82-a9ef-5488701f0e50/fb8fe204-2bb0-4f49-aae4-adfb1f143ba4.png deleted file mode 100644 index 393b8fe01..000000000 Binary files a/sprites/s_node_pb_fx_strip/layers/5596981a-1ffe-4b82-a9ef-5488701f0e50/fb8fe204-2bb0-4f49-aae4-adfb1f143ba4.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_strip/layers/a15c803e-e2f8-47cc-bdb3-449fa45e62ac/b29c143b-3976-42d5-a376-b64f0c6b662f.png b/sprites/s_node_pb_fx_strip/layers/a15c803e-e2f8-47cc-bdb3-449fa45e62ac/b29c143b-3976-42d5-a376-b64f0c6b662f.png new file mode 100644 index 000000000..90044e412 Binary files /dev/null and b/sprites/s_node_pb_fx_strip/layers/a15c803e-e2f8-47cc-bdb3-449fa45e62ac/b29c143b-3976-42d5-a376-b64f0c6b662f.png differ diff --git a/sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy b/sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy index 359f8c33c..2cc3cd269 100644 --- a/sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy +++ b/sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy @@ -3,8 +3,8 @@ "%Name":"s_node_pb_fx_strip", "bboxMode":0, "bbox_bottom":55, - "bbox_left":0, - "bbox_right":64, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5596981a-1ffe-4b82-a9ef-5488701f0e50","name":"5596981a-1ffe-4b82-a9ef-5488701f0e50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a15c803e-e2f8-47cc-bdb3-449fa45e62ac","name":"a15c803e-e2f8-47cc-bdb3-449fa45e62ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"fb8fe204-2bb0-4f49-aae4-adfb1f143ba4","blendMode":0,"displayName":"default","isLocked":false,"name":"fb8fe204-2bb0-4f49-aae4-adfb1f143ba4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"b29c143b-3976-42d5-a376-b64f0c6b662f","blendMode":0,"displayName":"default","isLocked":false,"name":"b29c143b-3976-42d5-a376-b64f0c6b662f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_strip", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5596981a-1ffe-4b82-a9ef-5488701f0e50","path":"sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e9cea53-053a-4754-b7d0-ddb142ee4d2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a15c803e-e2f8-47cc-bdb3-449fa45e62ac","path":"sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"820cf98f-b1a8-418b-8e89-e322da0d189d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_fx_subtract/13e6fe4d-f6b0-42dd-ba2a-133826be3a0c.png b/sprites/s_node_pb_fx_subtract/13e6fe4d-f6b0-42dd-ba2a-133826be3a0c.png deleted file mode 100644 index 943317d5b..000000000 Binary files a/sprites/s_node_pb_fx_subtract/13e6fe4d-f6b0-42dd-ba2a-133826be3a0c.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_subtract/ec43993b-538f-465c-a524-3544100d9cde.png b/sprites/s_node_pb_fx_subtract/ec43993b-538f-465c-a524-3544100d9cde.png new file mode 100644 index 000000000..493a0095b Binary files /dev/null and b/sprites/s_node_pb_fx_subtract/ec43993b-538f-465c-a524-3544100d9cde.png differ diff --git a/sprites/s_node_pb_fx_subtract/layers/13e6fe4d-f6b0-42dd-ba2a-133826be3a0c/53ecd1cf-b5ea-41fb-900e-74c2503006d5.png b/sprites/s_node_pb_fx_subtract/layers/13e6fe4d-f6b0-42dd-ba2a-133826be3a0c/53ecd1cf-b5ea-41fb-900e-74c2503006d5.png deleted file mode 100644 index b5243799e..000000000 Binary files a/sprites/s_node_pb_fx_subtract/layers/13e6fe4d-f6b0-42dd-ba2a-133826be3a0c/53ecd1cf-b5ea-41fb-900e-74c2503006d5.png and /dev/null differ diff --git a/sprites/s_node_pb_fx_subtract/layers/ec43993b-538f-465c-a524-3544100d9cde/44fbcdc7-372c-41ce-b766-b9dd70bc4d28.png b/sprites/s_node_pb_fx_subtract/layers/ec43993b-538f-465c-a524-3544100d9cde/44fbcdc7-372c-41ce-b766-b9dd70bc4d28.png new file mode 100644 index 000000000..493a0095b Binary files /dev/null and b/sprites/s_node_pb_fx_subtract/layers/ec43993b-538f-465c-a524-3544100d9cde/44fbcdc7-372c-41ce-b766-b9dd70bc4d28.png differ diff --git a/sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy b/sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy index 6de3a0284..e0ce2f7a6 100644 --- a/sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy +++ b/sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_pb_fx_subtract", "bboxMode":0, - "bbox_bottom":54, - "bbox_left":0, - "bbox_right":64, + "bbox_bottom":55, + "bbox_left":8, + "bbox_right":55, "bbox_top":8, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"13e6fe4d-f6b0-42dd-ba2a-133826be3a0c","name":"13e6fe4d-f6b0-42dd-ba2a-133826be3a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"ec43993b-538f-465c-a524-3544100d9cde","name":"ec43993b-538f-465c-a524-3544100d9cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"53ecd1cf-b5ea-41fb-900e-74c2503006d5","blendMode":0,"displayName":"default","isLocked":false,"name":"53ecd1cf-b5ea-41fb-900e-74c2503006d5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"44fbcdc7-372c-41ce-b766-b9dd70bc4d28","blendMode":0,"displayName":"default","isLocked":false,"name":"44fbcdc7-372c-41ce-b766-b9dd70bc4d28","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_fx_subtract", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13e6fe4d-f6b0-42dd-ba2a-133826be3a0c","path":"sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc0e82db-143a-412f-80ff-ac388508d89e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec43993b-538f-465c-a524-3544100d9cde","path":"sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b01904c3-a673-477f-9cfe-c1f8139ebf14","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":65, + "width":64, } \ No newline at end of file diff --git a/sprites/s_node_pb_layer/46ffaeec-41e4-4ebc-8ec2-14ede4deca9e.png b/sprites/s_node_pb_layer/08504e1f-ad1c-49fe-87ca-553d0276df83.png similarity index 90% rename from sprites/s_node_pb_layer/46ffaeec-41e4-4ebc-8ec2-14ede4deca9e.png rename to sprites/s_node_pb_layer/08504e1f-ad1c-49fe-87ca-553d0276df83.png index e39010724..713ba23ba 100644 Binary files a/sprites/s_node_pb_layer/46ffaeec-41e4-4ebc-8ec2-14ede4deca9e.png and b/sprites/s_node_pb_layer/08504e1f-ad1c-49fe-87ca-553d0276df83.png differ diff --git a/sprites/s_node_pb_layer/layers/08504e1f-ad1c-49fe-87ca-553d0276df83/f6f0f528-63e1-4679-923e-d1e3990fb751.png b/sprites/s_node_pb_layer/layers/08504e1f-ad1c-49fe-87ca-553d0276df83/f6f0f528-63e1-4679-923e-d1e3990fb751.png new file mode 100644 index 000000000..713ba23ba Binary files /dev/null and b/sprites/s_node_pb_layer/layers/08504e1f-ad1c-49fe-87ca-553d0276df83/f6f0f528-63e1-4679-923e-d1e3990fb751.png differ diff --git a/sprites/s_node_pb_layer/layers/46ffaeec-41e4-4ebc-8ec2-14ede4deca9e/4ac80c06-cb8e-4b52-b817-bc6a363d636f.png b/sprites/s_node_pb_layer/layers/46ffaeec-41e4-4ebc-8ec2-14ede4deca9e/4ac80c06-cb8e-4b52-b817-bc6a363d636f.png deleted file mode 100644 index 8f3379bb2..000000000 Binary files a/sprites/s_node_pb_layer/layers/46ffaeec-41e4-4ebc-8ec2-14ede4deca9e/4ac80c06-cb8e-4b52-b817-bc6a363d636f.png and /dev/null differ diff --git a/sprites/s_node_pb_layer/s_node_pb_layer.yy b/sprites/s_node_pb_layer/s_node_pb_layer.yy index 134b863bc..2ec734963 100644 --- a/sprites/s_node_pb_layer/s_node_pb_layer.yy +++ b/sprites/s_node_pb_layer/s_node_pb_layer.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"46ffaeec-41e4-4ebc-8ec2-14ede4deca9e","name":"46ffaeec-41e4-4ebc-8ec2-14ede4deca9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"08504e1f-ad1c-49fe-87ca-553d0276df83","name":"08504e1f-ad1c-49fe-87ca-553d0276df83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"4ac80c06-cb8e-4b52-b817-bc6a363d636f","blendMode":0,"displayName":"default","isLocked":false,"name":"4ac80c06-cb8e-4b52-b817-bc6a363d636f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f6f0f528-63e1-4679-923e-d1e3990fb751","blendMode":0,"displayName":"default","isLocked":false,"name":"f6f0f528-63e1-4679-923e-d1e3990fb751","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_pb_layer", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46ffaeec-41e4-4ebc-8ec2-14ede4deca9e","path":"sprites/s_node_pb_layer/s_node_pb_layer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"797b1498-20c5-4890-9e7a-63a464d41c0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08504e1f-ad1c-49fe-87ca-553d0276df83","path":"sprites/s_node_pb_layer/s_node_pb_layer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f32a50e3-c6c3-4a57-91a5-0fc5f7290709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_pixel_math/458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a.png b/sprites/s_node_pixel_math/458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a.png new file mode 100644 index 000000000..b83d6e580 Binary files /dev/null and b/sprites/s_node_pixel_math/458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a.png differ diff --git a/sprites/s_node_pixel_math/layers/458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a/b73e46d8-683d-475b-a584-16d5b98f8c1f.png b/sprites/s_node_pixel_math/layers/458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a/b73e46d8-683d-475b-a584-16d5b98f8c1f.png new file mode 100644 index 000000000..b83d6e580 Binary files /dev/null and b/sprites/s_node_pixel_math/layers/458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a/b73e46d8-683d-475b-a584-16d5b98f8c1f.png differ diff --git a/sprites/s_node_pixel_math/s_node_pixel_math.yy b/sprites/s_node_pixel_math/s_node_pixel_math.yy new file mode 100644 index 000000000..448139353 --- /dev/null +++ b/sprites/s_node_pixel_math/s_node_pixel_math.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_pixel_math", + "bboxMode":0, + "bbox_bottom":61, + "bbox_left":2, + "bbox_right":61, + "bbox_top":2, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a","name":"458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b73e46d8-683d-475b-a584-16d5b98f8c1f","blendMode":0,"displayName":"default","isLocked":false,"name":"b73e46d8-683d-475b-a584-16d5b98f8c1f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_pixel_math", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"filter", + "path":"folders/nodes/icons/filter.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_pixel_math", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_pixel_math", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"458e2a33-cbc0-4af1-a0e3-d7d14b9f0b8a","path":"sprites/s_node_pixel_math/s_node_pixel_math.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bbad8201-72b6-4389-8029-7f6e15694df4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":32, + "yorigin":32, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/s_node_profile/0cf255a2-572f-4968-a930-cd4c48df41ee.png b/sprites/s_node_profile/0cf255a2-572f-4968-a930-cd4c48df41ee.png deleted file mode 100644 index f9e6072c1..000000000 Binary files a/sprites/s_node_profile/0cf255a2-572f-4968-a930-cd4c48df41ee.png and /dev/null differ diff --git a/sprites/s_node_profile/965f2328-8c8e-4915-aed7-0c926d86549d.png b/sprites/s_node_profile/965f2328-8c8e-4915-aed7-0c926d86549d.png new file mode 100644 index 000000000..f6541779d Binary files /dev/null and b/sprites/s_node_profile/965f2328-8c8e-4915-aed7-0c926d86549d.png differ diff --git a/sprites/s_node_profile/layers/0cf255a2-572f-4968-a930-cd4c48df41ee/a43912f9-916d-4be8-8b43-2307f712d2f9.png b/sprites/s_node_profile/layers/0cf255a2-572f-4968-a930-cd4c48df41ee/a43912f9-916d-4be8-8b43-2307f712d2f9.png deleted file mode 100644 index f1db6587c..000000000 Binary files a/sprites/s_node_profile/layers/0cf255a2-572f-4968-a930-cd4c48df41ee/a43912f9-916d-4be8-8b43-2307f712d2f9.png and /dev/null differ diff --git a/sprites/s_node_profile/layers/965f2328-8c8e-4915-aed7-0c926d86549d/1012a8f7-6be2-4a87-9487-09a3e5d1529b.png b/sprites/s_node_profile/layers/965f2328-8c8e-4915-aed7-0c926d86549d/1012a8f7-6be2-4a87-9487-09a3e5d1529b.png new file mode 100644 index 000000000..f6541779d Binary files /dev/null and b/sprites/s_node_profile/layers/965f2328-8c8e-4915-aed7-0c926d86549d/1012a8f7-6be2-4a87-9487-09a3e5d1529b.png differ diff --git a/sprites/s_node_profile/s_node_profile.yy b/sprites/s_node_profile/s_node_profile.yy index 73c0167fe..a06d5b1dd 100644 --- a/sprites/s_node_profile/s_node_profile.yy +++ b/sprites/s_node_profile/s_node_profile.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"s_node_profile", "bboxMode":0, - "bbox_bottom":61, - "bbox_left":0, - "bbox_right":63, + "bbox_bottom":60, + "bbox_left":15, + "bbox_right":57, "bbox_top":3, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0cf255a2-572f-4968-a930-cd4c48df41ee","name":"0cf255a2-572f-4968-a930-cd4c48df41ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"965f2328-8c8e-4915-aed7-0c926d86549d","name":"965f2328-8c8e-4915-aed7-0c926d86549d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"a43912f9-916d-4be8-8b43-2307f712d2f9","blendMode":0,"displayName":"default","isLocked":false,"name":"a43912f9-916d-4be8-8b43-2307f712d2f9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"1012a8f7-6be2-4a87-9487-09a3e5d1529b","blendMode":0,"displayName":"default","isLocked":false,"name":"1012a8f7-6be2-4a87-9487-09a3e5d1529b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_profile", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0cf255a2-572f-4968-a930-cd4c48df41ee","path":"sprites/s_node_profile/s_node_profile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b64c5522-de0b-43df-b928-cd65547241cb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965f2328-8c8e-4915-aed7-0c926d86549d","path":"sprites/s_node_profile/s_node_profile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5688951a-2618-4eaa-8de1-54a1dad8bc10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, @@ -86,5 +86,5 @@ }, "type":0, "VTile":false, - "width":64, + "width":65, } \ No newline at end of file