diff --git a/Pixels Composer.yyp b/Pixels Composer.yyp index ab95b646c..152ce4c17 100644 --- a/Pixels Composer.yyp +++ b/Pixels Composer.yyp @@ -1,82 +1,84 @@ { "resources": [ {"id":{"name":"panel_function","path":"scripts/panel_function/panel_function.yy",},"order":6,}, + {"id":{"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",},"order":30,}, {"id":{"name":"node_time_remap","path":"scripts/node_time_remap/node_time_remap.yy",},"order":33,}, - {"id":{"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",},"order":70,}, + {"id":{"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",},"order":26,}, {"id":{"name":"sh_perlin","path":"shaders/sh_perlin/sh_perlin.yy",},"order":1,}, {"id":{"name":"s_ui_panel_active","path":"sprites/s_ui_panel_active/s_ui_panel_active.yy",},"order":0,}, - {"id":{"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"order":84,}, {"id":{"name":"sh_normal_light","path":"shaders/sh_normal_light/sh_normal_light.yy",},"order":0,}, {"id":{"name":"s_node_active","path":"sprites/s_node_active/s_node_active.yy",},"order":0,}, {"id":{"name":"sh_scale3x","path":"shaders/sh_scale3x/sh_scale3x.yy",},"order":34,}, {"id":{"name":"surface_modify","path":"scripts/surface_modify/surface_modify.yy",},"order":2,}, + {"id":{"name":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",},"order":49,}, {"id":{"name":"sh_dither","path":"shaders/sh_dither/sh_dither.yy",},"order":33,}, {"id":{"name":"panel_data","path":"scripts/panel_data/panel_data.yy",},"order":0,}, {"id":{"name":"node_3D_obj","path":"scripts/node_3D_obj/node_3D_obj.yy",},"order":8,}, - {"id":{"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",},"order":75,}, {"id":{"name":"o_dialog_menubox","path":"objects/o_dialog_menubox/o_dialog_menubox.yy",},"order":8,}, {"id":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"order":3,}, - {"id":{"name":"s_node_normal","path":"sprites/s_node_normal/s_node_normal.yy",},"order":60,}, - {"id":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"order":19,}, - {"id":{"name":"s_node_surface_data","path":"sprites/s_node_surface_data/s_node_surface_data.yy",},"order":9,}, {"id":{"name":"node_line","path":"scripts/node_line/node_line.yy",},"order":11,}, - {"id":{"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",},"order":26,}, + {"id":{"name":"s_node_image_copy","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"order":48,}, + {"id":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"order":18,}, {"id":{"name":"s_cursor_path_add","path":"sprites/s_cursor_path_add/s_cursor_path_add.yy",},"order":0,}, - {"id":{"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",},"order":0,}, + {"id":{"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",},"order":8,}, {"id":{"name":"node_2d_light","path":"scripts/node_2d_light/node_2d_light.yy",},"order":40,}, {"id":{"name":"s_minus_24","path":"sprites/s_minus_24/s_minus_24.yy",},"order":17,}, {"id":{"name":"node_dither","path":"scripts/node_dither/node_dither.yy",},"order":11,}, {"id":{"name":"sh_perlin_smear","path":"shaders/sh_perlin_smear/sh_perlin_smear.yy",},"order":7,}, {"id":{"name":"sh_corner","path":"shaders/sh_corner/sh_corner.yy",},"order":24,}, + {"id":{"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",},"order":19,}, {"id":{"name":"s_button_path_icon","path":"sprites/s_button_path_icon/s_button_path_icon.yy",},"order":4,}, + {"id":{"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",},"order":75,}, {"id":{"name":"s_add_24","path":"sprites/s_add_24/s_add_24.yy",},"order":0,}, {"id":{"name":"node_array","path":"scripts/node_array/node_array.yy",},"order":3,}, - {"id":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"order":110,}, {"id":{"name":"sh_colorize","path":"shaders/sh_colorize/sh_colorize.yy",},"order":5,}, {"id":{"name":"s_timeline_graph","path":"sprites/s_timeline_graph/s_timeline_graph.yy",},"order":28,}, {"id":{"name":"perlin_noise","path":"scripts/perlin_noise/perlin_noise.yy",},"order":5,}, - {"id":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"order":51,}, - {"id":{"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"order":5,}, {"id":{"name":"node_functions","path":"scripts/node_functions/node_functions.yy",},"order":15,}, + {"id":{"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",},"order":96,}, {"id":{"name":"s_inspector_area","path":"sprites/s_inspector_area/s_inspector_area.yy",},"order":7,}, {"id":{"name":"node_math","path":"scripts/node_math/node_math.yy",},"order":6,}, {"id":{"name":"array_functions","path":"scripts/array_functions/array_functions.yy",},"order":2,}, {"id":{"name":"sh_blur_final","path":"shaders/sh_blur_final/sh_blur_final.yy",},"order":3,}, {"id":{"name":"panel_preview","path":"scripts/panel_preview/panel_preview.yy",},"order":4,}, - {"id":{"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",},"order":31,}, {"id":{"name":"node_blend","path":"scripts/node_blend/node_blend.yy",},"order":13,}, {"id":{"name":"s_refresh_16","path":"sprites/s_refresh_16/s_refresh_16.yy",},"order":19,}, {"id":{"name":"node_scatter","path":"scripts/node_scatter/node_scatter.yy",},"order":4,}, + {"id":{"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",},"order":107,}, {"id":{"name":"s_prop_keyframe","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"order":4,}, {"id":{"name":"node_image","path":"scripts/node_image/node_image.yy",},"order":0,}, + {"id":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"order":56,}, {"id":{"name":"sh_cell_noise","path":"shaders/sh_cell_noise/sh_cell_noise.yy",},"order":0,}, - {"id":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"order":54,}, {"id":{"name":"sh_blend_max","path":"shaders/sh_blend_max/sh_blend_max.yy",},"order":8,}, + {"id":{"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"order":62,}, {"id":{"name":"_3D","path":"scripts/_3D/_3D.yy",},"order":6,}, - {"id":{"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"order":85,}, + {"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"order":88,}, {"id":{"name":"s_button","path":"sprites/s_button/s_button.yy",},"order":0,}, {"id":{"name":"node_outline","path":"scripts/node_outline/node_outline.yy",},"order":0,}, {"id":{"name":"math_function","path":"scripts/math_function/math_function.yy",},"order":7,}, - {"id":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"order":11,}, {"id":{"name":"scrollBox","path":"scripts/scrollBox/scrollBox.yy",},"order":13,}, {"id":{"name":"draw_surface_blend","path":"scripts/draw_surface_blend/draw_surface_blend.yy",},"order":1,}, + {"id":{"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",},"order":53,}, + {"id":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"order":4,}, {"id":{"name":"blurSurface","path":"scripts/blurSurface/blurSurface.yy",},"order":0,}, {"id":{"name":"s_animate_node_go","path":"sprites/s_animate_node_go/s_animate_node_go.yy",},"order":26,}, + {"id":{"name":"s_node_particle","path":"sprites/s_node_particle/s_node_particle.yy",},"order":68,}, {"id":{"name":"s_node_processor","path":"sprites/s_node_processor/s_node_processor.yy",},"order":18,}, {"id":{"name":"s_canvas_tools_pencil","path":"sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy",},"order":4,}, - {"id":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},"order":12,}, {"id":{"name":"s_add_32","path":"sprites/s_add_32/s_add_32.yy",},"order":1,}, {"id":{"name":"sh_cell_noise_edge","path":"shaders/sh_cell_noise_edge/sh_cell_noise_edge.yy",},"order":5,}, {"id":{"name":"node_stripe","path":"scripts/node_stripe/node_stripe.yy",},"order":15,}, {"id":{"name":"sh_texture_atlas","path":"shaders/sh_texture_atlas/sh_texture_atlas.yy",},"order":0,}, + {"id":{"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"order":44,}, {"id":{"name":"icon_24","path":"sprites/icon_24/icon_24.yy",},"order":0,}, - {"id":{"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",},"order":98,}, {"id":{"name":"sh_polar","path":"shaders/sh_polar/sh_polar.yy",},"order":31,}, {"id":{"name":"sh_pixel_cloud","path":"shaders/sh_pixel_cloud/sh_pixel_cloud.yy",},"order":13,}, + {"id":{"name":"s_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"order":84,}, + {"id":{"name":"node_iterate","path":"scripts/node_iterate/node_iterate.yy",},"order":1,}, + {"id":{"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"order":15,}, {"id":{"name":"sh_de_stray","path":"shaders/sh_de_stray/sh_de_stray.yy",},"order":17,}, {"id":{"name":"sh_cell_noise_round","path":"shaders/sh_cell_noise_round/sh_cell_noise_round.yy",},"order":9,}, {"id":{"name":"event_recorder","path":"scripts/event_recorder/event_recorder.yy",},"order":4,}, - {"id":{"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"order":25,}, {"id":{"name":"node_colorize","path":"scripts/node_colorize/node_colorize.yy",},"order":9,}, {"id":{"name":"sh_channel_B","path":"shaders/sh_channel_B/sh_channel_B.yy",},"order":14,}, {"id":{"name":"s_cursor_path_remove","path":"sprites/s_cursor_path_remove/s_cursor_path_remove.yy",},"order":3,}, @@ -84,142 +86,148 @@ {"id":{"name":"icon_32","path":"sprites/icon_32/icon_32.yy",},"order":1,}, {"id":{"name":"sh_level_selector","path":"shaders/sh_level_selector/sh_level_selector.yy",},"order":28,}, {"id":{"name":"string_eval","path":"scripts/string_eval/string_eval.yy",},"order":0,}, + {"id":{"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"order":69,}, {"id":{"name":"globals","path":"scripts/globals/globals.yy",},"order":1,}, {"id":{"name":"s_text_bullet","path":"sprites/s_text_bullet/s_text_bullet.yy",},"order":22,}, - {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},"order":107,}, + {"id":{"name":"s_node_palette","path":"sprites/s_node_palette/s_node_palette.yy",},"order":67,}, {"id":{"name":"s_canvas_tools_ellip","path":"sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy",},"order":1,}, - {"id":{"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},"order":7,}, - {"id":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"order":81,}, - {"id":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"order":30,}, {"id":{"name":"s_animate_clock","path":"sprites/s_animate_clock/s_animate_clock.yy",},"order":2,}, + {"id":{"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",},"order":41,}, {"id":{"name":"node_normal_light","path":"scripts/node_normal_light/node_normal_light.yy",},"order":0,}, {"id":{"name":"s_cache","path":"sprites/s_cache/s_cache.yy",},"order":5,}, {"id":{"name":"o_dialog_release_note","path":"objects/o_dialog_release_note/o_dialog_release_note.yy",},"order":16,}, {"id":{"name":"s_inspector_text_halign","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"order":0,}, + {"id":{"name":"s_node_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"order":100,}, {"id":{"name":"panel_inspector","path":"scripts/panel_inspector/panel_inspector.yy",},"order":2,}, - {"id":{"name":"s_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"order":103,}, + {"id":{"name":"s_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"order":50,}, {"id":{"name":"s_node_junctions","path":"sprites/s_node_junctions/s_node_junctions.yy",},"order":0,}, - {"id":{"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"order":24,}, - {"id":{"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"order":49,}, {"id":{"name":"node_padding","path":"scripts/node_padding/node_padding.yy",},"order":10,}, + {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},"order":31,}, + {"id":{"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",},"order":57,}, {"id":{"name":"node_noise_grid","path":"scripts/node_noise_grid/node_noise_grid.yy",},"order":12,}, + {"id":{"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",},"order":42,}, {"id":{"name":"s_menu_black","path":"sprites/s_menu_black/s_menu_black.yy",},"order":2,}, - {"id":{"name":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",},"order":41,}, - {"id":{"name":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",},"order":96,}, {"id":{"name":"sh_blend_multiply","path":"shaders/sh_blend_multiply/sh_blend_multiply.yy",},"order":0,}, {"id":{"name":"node_bevel","path":"scripts/node_bevel/node_bevel.yy",},"order":3,}, + {"id":{"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"order":60,}, {"id":{"name":"s_anchor","path":"sprites/s_anchor/s_anchor.yy",},"order":0,}, {"id":{"name":"s_color_picker_sample","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"order":4,}, {"id":{"name":"rotatorRange","path":"scripts/rotatorRange/rotatorRange.yy",},"order":12,}, {"id":{"name":"point_rotate","path":"scripts/point_rotate/point_rotate.yy",},"order":1,}, {"id":{"name":"FileDropper","path":"extensions/FileDropper/FileDropper.yy",},"order":1,}, {"id":{"name":"node_displacement","path":"scripts/node_displacement/node_displacement.yy",},"order":8,}, - {"id":{"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",},"order":53,}, {"id":{"name":"s_workspace_0","path":"sprites/s_workspace_0/s_workspace_0.yy",},"order":0,}, - {"id":{"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"order":59,}, - {"id":{"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",},"order":2,}, - {"id":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"order":109,}, - {"id":{"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"order":20,}, + {"id":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},"order":5,}, + {"id":{"name":"s_node_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"order":3,}, {"id":{"name":"buttonGroup","path":"scripts/buttonGroup/buttonGroup.yy",},"order":5,}, + {"id":{"name":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"order":38,}, {"id":{"name":"s_anchor_selector","path":"sprites/s_anchor_selector/s_anchor_selector.yy",},"order":3,}, {"id":{"name":"o_dialog_scrollbox","path":"objects/o_dialog_scrollbox/o_dialog_scrollbox.yy",},"order":7,}, + {"id":{"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",},"order":92,}, {"id":{"name":"s_junc_visible","path":"sprites/s_junc_visible/s_junc_visible.yy",},"order":36,}, + {"id":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},"order":20,}, {"id":{"name":"curve_damping_function","path":"scripts/curve_damping_function/curve_damping_function.yy",},"order":2,}, {"id":{"name":"sh_blur_box_contrast","path":"shaders/sh_blur_box_contrast/sh_blur_box_contrast.yy",},"order":25,}, + {"id":{"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"order":34,}, {"id":{"name":"node_color_from_rgb","path":"scripts/node_color_from_rgb/node_color_from_rgb.yy",},"order":5,}, {"id":{"name":"node_transform","path":"scripts/node_transform/node_transform.yy",},"order":0,}, + {"id":{"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",},"order":16,}, {"id":{"name":"curveBox","path":"scripts/curveBox/curveBox.yy",},"order":8,}, {"id":{"name":"importFile","path":"extensions/importFile/importFile.yy",},"order":0,}, {"id":{"name":"node_blur_directional","path":"scripts/node_blur_directional/node_blur_directional.yy",},"order":26,}, - {"id":{"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",},"order":86,}, {"id":{"name":"s_hamburger","path":"sprites/s_hamburger/s_hamburger.yy",},"order":13,}, {"id":{"name":"s_canvas_tools_eraser","path":"sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy",},"order":3,}, {"id":{"name":"o_dialog_splash","path":"objects/o_dialog_splash/o_dialog_splash.yy",},"order":19,}, {"id":{"name":"s_dialog_bg","path":"sprites/s_dialog_bg/s_dialog_bg.yy",},"order":1,}, {"id":{"name":"node_gradient","path":"scripts/node_gradient/node_gradient.yy",},"order":1,}, + {"id":{"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},"order":40,}, {"id":{"name":"s_node_junctions_hover","path":"sprites/s_node_junctions_hover/s_node_junctions_hover.yy",},"order":3,}, + {"id":{"name":"s_node_solid","path":"sprites/s_node_solid/s_node_solid.yy",},"order":83,}, {"id":{"name":"textBox","path":"scripts/textBox/textBox.yy",},"order":17,}, {"id":{"name":"sh_draw_surface_part_tiled","path":"shaders/sh_draw_surface_part_tiled/sh_draw_surface_part_tiled.yy",},"order":32,}, {"id":{"name":"o_dialog_add_node","path":"objects/o_dialog_add_node/o_dialog_add_node.yy",},"order":1,}, {"id":{"name":"sh_blend_normal","path":"shaders/sh_blend_normal/sh_blend_normal.yy",},"order":1,}, + {"id":{"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"order":95,}, {"id":{"name":"sh_blur_directional","path":"shaders/sh_blur_directional/sh_blur_directional.yy",},"order":16,}, {"id":{"name":"node_processor","path":"scripts/node_processor/node_processor.yy",},"order":1,}, {"id":{"name":"sh_zigzag","path":"shaders/sh_zigzag/sh_zigzag.yy",},"order":11,}, - {"id":{"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",},"order":90,}, {"id":{"name":"sh_color_remove","path":"shaders/sh_color_remove/sh_color_remove.yy",},"order":27,}, {"id":{"name":"surface_valid","path":"scripts/surface_valid/surface_valid.yy",},"order":3,}, - {"id":{"name":"s_node_transform_single","path":"sprites/s_node_transform_single/s_node_transform_single.yy",},"order":89,}, {"id":{"name":"s_button_hide_fill","path":"sprites/s_button_hide_fill/s_button_hide_fill.yy",},"order":15,}, {"id":{"name":"sh_blur_radial","path":"shaders/sh_blur_radial/sh_blur_radial.yy",},"order":18,}, + {"id":{"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"order":22,}, + {"id":{"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"order":51,}, {"id":{"name":"sh_grid","path":"shaders/sh_grid/sh_grid.yy",},"order":14,}, {"id":{"name":"s_button_hide","path":"sprites/s_button_hide/s_button_hide.yy",},"order":10,}, {"id":{"name":"sh_twirl","path":"shaders/sh_twirl/sh_twirl.yy",},"order":19,}, {"id":{"name":"s_checkbox","path":"sprites/s_checkbox/s_checkbox.yy",},"order":11,}, - {"id":{"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"order":50,}, + {"id":{"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"order":80,}, + {"id":{"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"order":28,}, {"id":{"name":"s_button_lime","path":"sprites/s_button_lime/s_button_lime.yy",},"order":1,}, {"id":{"name":"node_level_selector","path":"scripts/node_level_selector/node_level_selector.yy",},"order":39,}, {"id":{"name":"node_posterize","path":"scripts/node_posterize/node_posterize.yy",},"order":10,}, - {"id":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},"order":29,}, + {"id":{"name":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",},"order":108,}, {"id":{"name":"libxprocess","path":"extensions/libxprocess/libxprocess.yy",},"order":2,}, {"id":{"name":"o_dialog_image_array_edit","path":"objects/o_dialog_image_array_edit/o_dialog_image_array_edit.yy",},"order":21,}, {"id":{"name":"s_ui_base_white","path":"sprites/s_ui_base_white/s_ui_base_white.yy",},"order":2,}, - {"id":{"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",},"order":18,}, - {"id":{"name":"s_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"order":102,}, {"id":{"name":"node_blur","path":"scripts/node_blur/node_blur.yy",},"order":16,}, {"id":{"name":"node_zigzag","path":"scripts/node_zigzag/node_zigzag.yy",},"order":16,}, {"id":{"name":"f_h5","path":"fonts/f_h5/f_h5.yy",},"order":2,}, {"id":{"name":"node_color","path":"scripts/node_color/node_color.yy",},"order":0,}, - {"id":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"order":17,}, {"id":{"name":"node_surface_data","path":"scripts/node_surface_data/node_surface_data.yy",},"order":10,}, + {"id":{"name":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",},"order":59,}, {"id":{"name":"load_palette","path":"scripts/load_palette/load_palette.yy",},"order":3,}, {"id":{"name":"sh_alpha_cutoff","path":"shaders/sh_alpha_cutoff/sh_alpha_cutoff.yy",},"order":26,}, {"id":{"name":"checkbox","path":"scripts/checkbox/checkbox.yy",},"order":7,}, + {"id":{"name":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",},"order":29,}, {"id":{"name":"s_menu_separator","path":"sprites/s_menu_separator/s_menu_separator.yy",},"order":16,}, {"id":{"name":"s_ui_panel_bg_dark","path":"sprites/s_ui_panel_bg_dark/s_ui_panel_bg_dark.yy",},"order":5,}, {"id":{"name":"s_node_junctions_array_hover","path":"sprites/s_node_junctions_array_hover/s_node_junctions_array_hover.yy",},"order":2,}, - {"id":{"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",},"order":83,}, + {"id":{"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"order":101,}, {"id":{"name":"node_mirror","path":"scripts/node_mirror/node_mirror.yy",},"order":3,}, {"id":{"name":"node_corner","path":"scripts/node_corner/node_corner.yy",},"order":35,}, + {"id":{"name":"s_node_condition","path":"sprites/s_node_condition/s_node_condition.yy",},"order":110,}, {"id":{"name":"vertex_function","path":"scripts/vertex_function/vertex_function.yy",},"order":0,}, {"id":{"name":"o_dialog_palette","path":"objects/o_dialog_palette/o_dialog_palette.yy",},"order":2,}, {"id":{"name":"f_p0","path":"fonts/f_p0/f_p0.yy",},"order":0,}, - {"id":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"order":1,}, + {"id":{"name":"node_condition","path":"scripts/node_condition/node_condition.yy",},"order":0,}, {"id":{"name":"sh_draw_normal","path":"shaders/sh_draw_normal/sh_draw_normal.yy",},"order":12,}, {"id":{"name":"sh_seperate_shape_index","path":"shaders/sh_seperate_shape_index/sh_seperate_shape_index.yy",},"order":0,}, - {"id":{"name":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",},"order":71,}, {"id":{"name":"node_registry","path":"scripts/node_registry/node_registry.yy",},"order":1,}, {"id":{"name":"sh_checkerboard","path":"shaders/sh_checkerboard/sh_checkerboard.yy",},"order":12,}, {"id":{"name":"node_character","path":"scripts/node_character/node_character.yy",},"order":9,}, + {"id":{"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",},"order":13,}, + {"id":{"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"order":64,}, {"id":{"name":"draw_set_text","path":"scripts/draw_set_text/draw_set_text.yy",},"order":1,}, {"id":{"name":"s_button_right","path":"sprites/s_button_right/s_button_right.yy",},"order":6,}, - {"id":{"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",},"order":4,}, {"id":{"name":"node_color_data","path":"scripts/node_color_data/node_color_data.yy",},"order":4,}, {"id":{"name":"node_noise_ani","path":"scripts/node_noise_ani/node_noise_ani.yy",},"order":7,}, {"id":{"name":"s_cursor_path_anchor","path":"sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy",},"order":1,}, {"id":{"name":"node_canvas","path":"scripts/node_canvas/node_canvas.yy",},"order":6,}, - {"id":{"name":"node_pin","path":"scripts/node_pin/node_pin.yy",},"order":13,}, + {"id":{"name":"node_pin","path":"scripts/node_pin/node_pin.yy",},"order":2,}, + {"id":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},"order":89,}, {"id":{"name":"sh_bw","path":"shaders/sh_bw/sh_bw.yy",},"order":1,}, - {"id":{"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",},"order":93,}, + {"id":{"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"order":102,}, {"id":{"name":"sh_grey_alpha","path":"shaders/sh_grey_alpha/sh_grey_alpha.yy",},"order":11,}, + {"id":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"order":94,}, {"id":{"name":"sh_normal","path":"shaders/sh_normal/sh_normal.yy",},"order":1,}, - {"id":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"order":108,}, + {"id":{"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",},"order":9,}, {"id":{"name":"node_crop","path":"scripts/node_crop/node_crop.yy",},"order":8,}, + {"id":{"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"order":1,}, {"id":{"name":"buttonPalette","path":"scripts/buttonPalette/buttonPalette.yy",},"order":6,}, {"id":{"name":"node_keyframe","path":"scripts/node_keyframe/node_keyframe.yy",},"order":7,}, {"id":{"name":"o_dialog_drag_folder","path":"objects/o_dialog_drag_folder/o_dialog_drag_folder.yy",},"order":20,}, {"id":{"name":"sh_blend_multiply_alpha","path":"shaders/sh_blend_multiply_alpha/sh_blend_multiply_alpha.yy",},"order":4,}, {"id":{"name":"node_noise_cell","path":"scripts/node_noise_cell/node_noise_cell.yy",},"order":3,}, + {"id":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"order":7,}, {"id":{"name":"s_node_draw_path","path":"sprites/s_node_draw_path/s_node_draw_path.yy",},"order":1,}, {"id":{"name":"sh_scale2x","path":"shaders/sh_scale2x/sh_scale2x.yy",},"order":32,}, - {"id":{"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"order":66,}, {"id":{"name":"node_vector","path":"scripts/node_vector/node_vector.yy",},"order":2,}, {"id":{"name":"s_canvas_tools_bucket","path":"sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy",},"order":0,}, {"id":{"name":"s_text_slider","path":"sprites/s_text_slider/s_text_slider.yy",},"order":23,}, {"id":{"name":"node_palette","path":"scripts/node_palette/node_palette.yy",},"order":2,}, {"id":{"name":"buttonColor","path":"scripts/buttonColor/buttonColor.yy",},"order":3,}, - {"id":{"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",},"order":67,}, {"id":{"name":"s_cursor_path_move","path":"sprites/s_cursor_path_move/s_cursor_path_move.yy",},"order":2,}, - {"id":{"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"order":40,}, {"id":{"name":"node_color_from_hsv","path":"scripts/node_color_from_hsv/node_color_from_hsv.yy",},"order":6,}, {"id":{"name":"s_node_resize","path":"sprites/s_node_resize/s_node_resize.yy",},"order":12,}, {"id":{"name":"s_folder_24","path":"sprites/s_folder_24/s_folder_24.yy",},"order":8,}, @@ -230,7 +238,7 @@ {"id":{"name":"node_9slice","path":"scripts/node_9slice/node_9slice.yy",},"order":6,}, {"id":{"name":"node_data","path":"scripts/node_data/node_data.yy",},"order":0,}, {"id":{"name":"node_wiggler","path":"scripts/node_wiggler/node_wiggler.yy",},"order":2,}, - {"id":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},"order":14,}, + {"id":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"order":70,}, {"id":{"name":"o_dialog_grid","path":"objects/o_dialog_grid/o_dialog_grid.yy",},"order":24,}, {"id":{"name":"node_image_gif","path":"scripts/node_image_gif/node_image_gif.yy",},"order":7,}, {"id":{"name":"icon_64","path":"sprites/icon_64/icon_64.yy",},"order":2,}, @@ -242,44 +250,47 @@ {"id":{"name":"global_data","path":"scripts/global_data/global_data.yy",},"order":0,}, {"id":{"name":"sh_color_adjust","path":"shaders/sh_color_adjust/sh_color_adjust.yy",},"order":2,}, {"id":{"name":"surface_get_palette","path":"scripts/surface_get_palette/surface_get_palette.yy",},"order":2,}, - {"id":{"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",},"order":69,}, {"id":{"name":"sh_texture_remap","path":"shaders/sh_texture_remap/sh_texture_remap.yy",},"order":29,}, {"id":{"name":"ds_extra","path":"scripts/ds_extra/ds_extra.yy",},"order":1,}, + {"id":{"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",},"order":77,}, + {"id":{"name":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",},"order":97,}, + {"id":{"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",},"order":98,}, {"id":{"name":"s_sequence_control","path":"sprites/s_sequence_control/s_sequence_control.yy",},"order":21,}, {"id":{"name":"s_node_frame_bg","path":"sprites/s_node_frame_bg/s_node_frame_bg.yy",},"order":10,}, - {"id":{"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",},"order":58,}, + {"id":{"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",},"order":73,}, {"id":{"name":"o_dialog_gradient","path":"objects/o_dialog_gradient/o_dialog_gradient.yy",},"order":1,}, {"id":{"name":"s_node_draw_area","path":"sprites/s_node_draw_area/s_node_draw_area.yy",},"order":0,}, + {"id":{"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"order":78,}, {"id":{"name":"sh_blend_subtract","path":"shaders/sh_blend_subtract/sh_blend_subtract.yy",},"order":5,}, + {"id":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"order":72,}, {"id":{"name":"o_dialog_file_name","path":"objects/o_dialog_file_name/o_dialog_file_name.yy",},"order":12,}, - {"id":{"name":"s_node_math","path":"sprites/s_node_math/s_node_math.yy",},"order":55,}, {"id":{"name":"panel_animation","path":"scripts/panel_animation/panel_animation.yy",},"order":5,}, {"id":{"name":"sh_gradient","path":"shaders/sh_gradient/sh_gradient.yy",},"order":8,}, {"id":{"name":"sh_glow","path":"shaders/sh_glow/sh_glow.yy",},"order":21,}, {"id":{"name":"sh_posterize","path":"shaders/sh_posterize/sh_posterize.yy",},"order":23,}, {"id":{"name":"sh_color_replace","path":"shaders/sh_color_replace/sh_color_replace.yy",},"order":4,}, {"id":{"name":"rotator","path":"scripts/rotator/rotator.yy",},"order":11,}, - {"id":{"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"order":105,}, {"id":{"name":"s_graph","path":"sprites/s_graph/s_graph.yy",},"order":11,}, - {"id":{"name":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",},"order":87,}, {"id":{"name":"node_blur_radial","path":"scripts/node_blur_radial/node_blur_radial.yy",},"order":29,}, + {"id":{"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",},"order":109,}, {"id":{"name":"s_path_tools_anchor","path":"sprites/s_path_tools_anchor/s_path_tools_anchor.yy",},"order":5,}, - {"id":{"name":"s_node_export_gif","path":"sprites/s_node_export_gif/s_node_export_gif.yy",},"order":115,}, + {"id":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"order":24,}, {"id":{"name":"node_bloom","path":"scripts/node_bloom/node_bloom.yy",},"order":15,}, {"id":{"name":"sh_bevel","path":"shaders/sh_bevel/sh_bevel.yy",},"order":3,}, - {"id":{"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",},"order":6,}, {"id":{"name":"node_sprite_stack","path":"scripts/node_sprite_stack/node_sprite_stack.yy",},"order":4,}, + {"id":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"order":47,}, {"id":{"name":"sh_shape","path":"shaders/sh_shape/sh_shape.yy",},"order":3,}, {"id":{"name":"draw_line_width2","path":"scripts/draw_line_width2/draw_line_width2.yy",},"order":2,}, - {"id":{"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"order":28,}, {"id":{"name":"node_particle_effector","path":"scripts/node_particle_effector/node_particle_effector.yy",},"order":9,}, + {"id":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},"order":46,}, {"id":{"name":"s_noti_icon_file_load","path":"sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy",},"order":5,}, {"id":{"name":"areaBox","path":"scripts/areaBox/areaBox.yy",},"order":1,}, - {"id":{"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"order":39,}, {"id":{"name":"node_particle","path":"scripts/node_particle/node_particle.yy",},"order":0,}, + {"id":{"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",},"order":91,}, {"id":{"name":"append_function","path":"scripts/append_function/append_function.yy",},"order":1,}, - {"id":{"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"order":37,}, {"id":{"name":"s_dialog_active","path":"sprites/s_dialog_active/s_dialog_active.yy",},"order":0,}, + {"id":{"name":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",},"order":81,}, + {"id":{"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",},"order":76,}, {"id":{"name":"obj_reader","path":"scripts/obj_reader/obj_reader.yy",},"order":2,}, {"id":{"name":"sh_invert","path":"shaders/sh_invert/sh_invert.yy",},"order":30,}, {"id":{"name":"save_function","path":"scripts/save_function/save_function.yy",},"order":0,}, @@ -291,140 +302,135 @@ {"id":{"name":"point_rect_overlap","path":"scripts/point_rect_overlap/point_rect_overlap.yy",},"order":2,}, {"id":{"name":"s_icon_accept_32","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"order":15,}, {"id":{"name":"sh_seperate_shape_counter","path":"shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.yy",},"order":1,}, + {"id":{"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",},"order":99,}, {"id":{"name":"node_timeline_preview","path":"scripts/node_timeline_preview/node_timeline_preview.yy",},"order":2,}, {"id":{"name":"sh_greyscale","path":"shaders/sh_greyscale/sh_greyscale.yy",},"order":6,}, {"id":{"name":"node_global","path":"scripts/node_global/node_global.yy",},"order":17,}, {"id":{"name":"sh_outline","path":"shaders/sh_outline/sh_outline.yy",},"order":21,}, + {"id":{"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"order":52,}, {"id":{"name":"node_checkerboard","path":"scripts/node_checkerboard/node_checkerboard.yy",},"order":17,}, + {"id":{"name":"s_node_invert","path":"sprites/s_node_invert/s_node_invert.yy",},"order":54,}, {"id":{"name":"node_gradient_output","path":"scripts/node_gradient_output/node_gradient_output.yy",},"order":3,}, {"id":{"name":"o_dialog_color_selector","path":"objects/o_dialog_color_selector/o_dialog_color_selector.yy",},"order":0,}, - {"id":{"name":"s_node_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"order":21,}, {"id":{"name":"s_color_picker_dropper","path":"sprites/s_color_picker_dropper/s_color_picker_dropper.yy",},"order":6,}, {"id":{"name":"sh_bloom_pass1","path":"shaders/sh_bloom_pass1/sh_bloom_pass1.yy",},"order":0,}, {"id":{"name":"node_seperate_shapes","path":"scripts/node_seperate_shapes/node_seperate_shapes.yy",},"order":13,}, {"id":{"name":"node_sequence_to_anim","path":"scripts/node_sequence_to_anim/node_sequence_to_anim.yy",},"order":3,}, + {"id":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"order":90,}, + {"id":{"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"order":0,}, {"id":{"name":"s_anchor_scale","path":"sprites/s_anchor_scale/s_anchor_scale.yy",},"order":2,}, {"id":{"name":"node_image_sheet","path":"scripts/node_image_sheet/node_image_sheet.yy",},"order":4,}, {"id":{"name":"s_slider","path":"sprites/s_slider/s_slider.yy",},"order":12,}, - {"id":{"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",},"order":95,}, {"id":{"name":"sh_posterize_palette","path":"shaders/sh_posterize_palette/sh_posterize_palette.yy",},"order":8,}, {"id":{"name":"collection_data","path":"scripts/collection_data/collection_data.yy",},"order":1,}, {"id":{"name":"safe_operation","path":"scripts/safe_operation/safe_operation.yy",},"order":6,}, {"id":{"name":"node_shadow","path":"scripts/node_shadow/node_shadow.yy",},"order":17,}, {"id":{"name":"s_group_24","path":"sprites/s_group_24/s_group_24.yy",},"order":30,}, {"id":{"name":"s_prop_on_end","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"order":5,}, + {"id":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"order":65,}, + {"id":{"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"order":104,}, {"id":{"name":"node_simple_shape","path":"scripts/node_simple_shape/node_simple_shape.yy",},"order":5,}, + {"id":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"order":39,}, {"id":{"name":"node_atlas","path":"scripts/node_atlas/node_atlas.yy",},"order":42,}, {"id":{"name":"node_glow","path":"scripts/node_glow/node_glow.yy",},"order":14,}, {"id":{"name":"sh_blend_min","path":"shaders/sh_blend_min/sh_blend_min.yy",},"order":9,}, {"id":{"name":"s_animation_timing","path":"sprites/s_animation_timing/s_animation_timing.yy",},"order":27,}, {"id":{"name":"node_polar","path":"scripts/node_polar/node_polar.yy",},"order":5,}, - {"id":{"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"order":23,}, {"id":{"name":"s_node_name","path":"sprites/s_node_name/s_node_name.yy",},"order":3,}, + {"id":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"order":23,}, + {"id":{"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",},"order":79,}, {"id":{"name":"sh_2d_light","path":"shaders/sh_2d_light/sh_2d_light.yy",},"order":11,}, {"id":{"name":"node_image_animated","path":"scripts/node_image_animated/node_image_animated.yy",},"order":2,}, - {"id":{"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",},"order":38,}, + {"id":{"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",},"order":11,}, {"id":{"name":"string_hexadecimal","path":"scripts/string_hexadecimal/string_hexadecimal.yy",},"order":1,}, - {"id":{"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"order":65,}, {"id":{"name":"s_sort_24","path":"sprites/s_sort_24/s_sort_24.yy",},"order":33,}, {"id":{"name":"string_splice","path":"scripts/string_splice/string_splice.yy",},"order":5,}, {"id":{"name":"sh_seperate_shape_ite","path":"shaders/sh_seperate_shape_ite/sh_seperate_shape_ite.yy",},"order":2,}, {"id":{"name":"s_inspector_text_valign","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"order":1,}, {"id":{"name":"o_main","path":"objects/o_main/o_main.yy",},"order":1,}, {"id":{"name":"area_function","path":"scripts/area_function/area_function.yy",},"order":2,}, - {"id":{"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",},"order":88,}, - {"id":{"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",},"order":57,}, {"id":{"name":"sh_blend_alpha_addition","path":"shaders/sh_blend_alpha_addition/sh_blend_alpha_addition.yy",},"order":13,}, - {"id":{"name":"s_node_palette","path":"sprites/s_node_palette/s_node_palette.yy",},"order":74,}, {"id":{"name":"sh_erode","path":"shaders/sh_erode/sh_erode.yy",},"order":20,}, - {"id":{"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",},"order":112,}, {"id":{"name":"node_pixel_cloud","path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",},"order":19,}, + {"id":{"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",},"order":111,}, {"id":{"name":"sh_alpha_grey","path":"shaders/sh_alpha_grey/sh_alpha_grey.yy",},"order":9,}, {"id":{"name":"s_transparent","path":"sprites/s_transparent/s_transparent.yy",},"order":1,}, {"id":{"name":"o_dialog_animation","path":"objects/o_dialog_animation/o_dialog_animation.yy",},"order":9,}, {"id":{"name":"f_p0b","path":"fonts/f_p0b/f_p0b.yy",},"order":5,}, {"id":{"name":"o_dialog_keyframe_curve","path":"objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy",},"order":22,}, - {"id":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},"order":22,}, - {"id":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},"order":119,}, - {"id":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"order":111,}, {"id":{"name":"s_button_middle","path":"sprites/s_button_middle/s_button_middle.yy",},"order":7,}, + {"id":{"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",},"order":86,}, {"id":{"name":"node_twirl","path":"scripts/node_twirl/node_twirl.yy",},"order":30,}, {"id":{"name":"s_noti_icon_complete","path":"sprites/s_noti_icon_complete/s_noti_icon_complete.yy",},"order":0,}, {"id":{"name":"sh_blend_add_alpha_adj","path":"shaders/sh_blend_add_alpha_adj/sh_blend_add_alpha_adj.yy",},"order":2,}, {"id":{"name":"node_text","path":"scripts/node_text/node_text.yy",},"order":14,}, {"id":{"name":"s_rotator_knob","path":"sprites/s_rotator_knob/s_rotator_knob.yy",},"order":17,}, + {"id":{"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",},"order":33,}, {"id":{"name":"panel_collection","path":"scripts/panel_collection/panel_collection.yy",},"order":0,}, - {"id":{"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",},"order":62,}, - {"id":{"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"order":27,}, - {"id":{"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"order":3,}, {"id":{"name":"lerp_float","path":"scripts/lerp_float/lerp_float.yy",},"order":1,}, {"id":{"name":"vectorRangeBox","path":"scripts/vectorRangeBox/vectorRangeBox.yy",},"order":19,}, {"id":{"name":"sh_draw_vertex_aa","path":"shaders/sh_draw_vertex_aa/sh_draw_vertex_aa.yy",},"order":0,}, {"id":{"name":"sh_outline_only","path":"shaders/sh_outline_only/sh_outline_only.yy",},"order":25,}, {"id":{"name":"node_color_sampler","path":"scripts/node_color_sampler/node_color_sampler.yy",},"order":1,}, - {"id":{"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"order":114,}, + {"id":{"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",},"order":35,}, {"id":{"name":"s_textbox","path":"sprites/s_textbox/s_textbox.yy",},"order":3,}, {"id":{"name":"ase_reader","path":"scripts/ase_reader/ase_reader.yy",},"order":1,}, {"id":{"name":"node_path","path":"scripts/node_path/node_path.yy",},"order":8,}, {"id":{"name":"sh_seperate_shape_sep","path":"shaders/sh_seperate_shape_sep/sh_seperate_shape_sep.yy",},"order":3,}, - {"id":{"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"order":63,}, {"id":{"name":"s_noti_icon_warning","path":"sprites/s_noti_icon_warning/s_noti_icon_warning.yy",},"order":3,}, - {"id":{"name":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"order":36,}, {"id":{"name":"sh_content_sampler","path":"shaders/sh_content_sampler/sh_content_sampler.yy",},"order":34,}, - {"id":{"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"order":15,}, {"id":{"name":"s_menu_white","path":"sprites/s_menu_white/s_menu_white.yy",},"order":1,}, {"id":{"name":"node_trail","path":"scripts/node_trail/node_trail.yy",},"order":6,}, - {"id":{"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",},"order":10,}, {"id":{"name":"byte_reader","path":"scripts/byte_reader/byte_reader.yy",},"order":0,}, + {"id":{"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"order":82,}, {"id":{"name":"_p_dialog","path":"objects/_p_dialog/_p_dialog.yy",},"order":0,}, {"id":{"name":"render_data","path":"scripts/render_data/render_data.yy",},"order":2,}, + {"id":{"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",},"order":17,}, {"id":{"name":"distance_to_line","path":"scripts/distance_to_line/distance_to_line.yy",},"order":0,}, {"id":{"name":"s_canvas_tools_rect","path":"sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy",},"order":5,}, - {"id":{"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",},"order":76,}, {"id":{"name":"s_file","path":"sprites/s_file/s_file.yy",},"order":7,}, - {"id":{"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",},"order":33,}, - {"id":{"name":"s_node_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"order":32,}, {"id":{"name":"s_control_edit","path":"sprites/s_control_edit/s_control_edit.yy",},"order":2,}, - {"id":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"order":56,}, {"id":{"name":"s_scroll_box_arrow","path":"sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy",},"order":32,}, - {"id":{"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",},"order":72,}, {"id":{"name":"node_animate_curve","path":"scripts/node_animate_curve/node_animate_curve.yy",},"order":0,}, {"id":{"name":"s_node_state","path":"sprites/s_node_state/s_node_state.yy",},"order":7,}, {"id":{"name":"curve_bounce_function","path":"scripts/curve_bounce_function/curve_bounce_function.yy",},"order":1,}, {"id":{"name":"s_anchor_scale_hori","path":"sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy",},"order":9,}, + {"id":{"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",},"order":36,}, + {"id":{"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",},"order":66,}, + {"id":{"name":"s_node_color","path":"sprites/s_node_color/s_node_color.yy",},"order":21,}, + {"id":{"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"order":6,}, {"id":{"name":"gif_reader","path":"scripts/gif_reader/gif_reader.yy",},"order":4,}, {"id":{"name":"s_loading","path":"sprites/s_loading/s_loading.yy",},"order":37,}, {"id":{"name":"node_group_input","path":"scripts/node_group_input/node_group_input.yy",},"order":1,}, {"id":{"name":"draw_rect_border","path":"scripts/draw_rect_border/draw_rect_border.yy",},"order":6,}, {"id":{"name":"node_composite","path":"scripts/node_composite/node_composite.yy",},"order":4,}, + {"id":{"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"order":85,}, {"id":{"name":"sh_dilate","path":"shaders/sh_dilate/sh_dilate.yy",},"order":22,}, {"id":{"name":"node_image_sequence","path":"scripts/node_image_sequence/node_image_sequence.yy",},"order":1,}, + {"id":{"name":"s_node_math","path":"sprites/s_node_math/s_node_math.yy",},"order":58,}, {"id":{"name":"s_menu_transparent","path":"sprites/s_menu_transparent/s_menu_transparent.yy",},"order":0,}, + {"id":{"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"order":27,}, + {"id":{"name":"s_node_normal","path":"sprites/s_node_normal/s_node_normal.yy",},"order":63,}, {"id":{"name":"key_press","path":"scripts/key_press/key_press.yy",},"order":0,}, {"id":{"name":"sh_mirror","path":"shaders/sh_mirror/sh_mirror.yy",},"order":10,}, - {"id":{"name":"s_node_particle_sampler","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",},"order":44,}, {"id":{"name":"sh_cell_noise_random","path":"shaders/sh_cell_noise_random/sh_cell_noise_random.yy",},"order":6,}, + {"id":{"name":"node_iteration_input","path":"scripts/node_iteration_input/node_iteration_input.yy",},"order":2,}, {"id":{"name":"s_inspector_padding","path":"sprites/s_inspector_padding/s_inspector_padding.yy",},"order":8,}, {"id":{"name":"node_normal","path":"scripts/node_normal/node_normal.yy",},"order":1,}, - {"id":{"name":"s_node_lerp","path":"sprites/s_node_lerp/s_node_lerp.yy",},"order":118,}, {"id":{"name":"node_array_length","path":"scripts/node_array_length/node_array_length.yy",},"order":13,}, - {"id":{"name":"s_node_solid","path":"sprites/s_node_solid/s_node_solid.yy",},"order":13,}, {"id":{"name":"node_erode","path":"scripts/node_erode/node_erode.yy",},"order":31,}, {"id":{"name":"node_wrap_mesh","path":"scripts/node_wrap_mesh/node_wrap_mesh.yy",},"order":7,}, {"id":{"name":"sh_blur_alpha","path":"shaders/sh_blur_alpha/sh_blur_alpha.yy",},"order":2,}, {"id":{"name":"node_sprite_sheet","path":"scripts/node_sprite_sheet/node_sprite_sheet.yy",},"order":0,}, - {"id":{"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"order":116,}, - {"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"order":34,}, - {"id":{"name":"s_node_invert","path":"sprites/s_node_invert/s_node_invert.yy",},"order":106,}, {"id":{"name":"compat_path_array","path":"scripts/compat_path_array/compat_path_array.yy",},"order":0,}, {"id":{"name":"node_export","path":"scripts/node_export/node_export.yy",},"order":1,}, {"id":{"name":"s_timeline_keyframe","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"order":24,}, {"id":{"name":"s_group_16","path":"sprites/s_group_16/s_group_16.yy",},"order":12,}, {"id":{"name":"s_ui_panel_bg","path":"sprites/s_ui_panel_bg/s_ui_panel_bg.yy",},"order":1,}, {"id":{"name":"s_grad_blend","path":"sprites/s_grad_blend/s_grad_blend.yy",},"order":34,}, - {"id":{"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",},"order":48,}, {"id":{"name":"sh_vertex_pt","path":"shaders/sh_vertex_pt/sh_vertex_pt.yy",},"order":2,}, {"id":{"name":"node_color_replacement","path":"scripts/node_color_replacement/node_color_replacement.yy",},"order":4,}, + {"id":{"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",},"order":10,}, {"id":{"name":"path_reader","path":"scripts/path_reader/path_reader.yy",},"order":5,}, {"id":{"name":"node_blur_contrast","path":"scripts/node_blur_contrast/node_blur_contrast.yy",},"order":36,}, {"id":{"name":"s_fx_pixel","path":"sprites/s_fx_pixel/s_fx_pixel.yy",},"order":0,}, @@ -433,25 +439,30 @@ {"id":{"name":"s_refresh_24","path":"sprites/s_refresh_24/s_refresh_24.yy",},"order":29,}, {"id":{"name":"node_scale_algo","path":"scripts/node_scale_algo/node_scale_algo.yy",},"order":43,}, {"id":{"name":"s_timeline_clock","path":"sprites/s_timeline_clock/s_timeline_clock.yy",},"order":25,}, + {"id":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},"order":87,}, + {"id":{"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"order":2,}, {"id":{"name":"string_cut","path":"scripts/string_cut/string_cut.yy",},"order":4,}, {"id":{"name":"node_3d_prim_cylinder","path":"scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.yy",},"order":7,}, - {"id":{"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",},"order":73,}, {"id":{"name":"node_grid","path":"scripts/node_grid/node_grid.yy",},"order":20,}, + {"id":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"order":25,}, {"id":{"name":"s_texture_default","path":"sprites/s_texture_default/s_texture_default.yy",},"order":1,}, {"id":{"name":"node_dilate","path":"scripts/node_dilate/node_dilate.yy",},"order":34,}, - {"id":{"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"order":100,}, {"id":{"name":"sh_stripe","path":"shaders/sh_stripe/sh_stripe.yy",},"order":10,}, {"id":{"name":"s_search_16","path":"sprites/s_search_16/s_search_16.yy",},"order":20,}, {"id":{"name":"node_3d_prim_cube","path":"scripts/node_3d_prim_cube/node_3d_prim_cube.yy",},"order":5,}, + {"id":{"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",},"order":74,}, {"id":{"name":"node_3d_transform","path":"scripts/node_3d_transform/node_3d_transform.yy",},"order":2,}, {"id":{"name":"s_prop_gradient","path":"sprites/s_prop_gradient/s_prop_gradient.yy",},"order":11,}, + {"id":{"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"order":106,}, {"id":{"name":"s_kenney","path":"sprites/s_kenney/s_kenney.yy",},"order":0,}, + {"id":{"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",},"order":12,}, {"id":{"name":"sh_grid_noise","path":"shaders/sh_grid_noise/sh_grid_noise.yy",},"order":8,}, {"id":{"name":"panel_graph","path":"scripts/panel_graph/panel_graph.yy",},"order":1,}, {"id":{"name":"s_folder_add","path":"sprites/s_folder_add/s_folder_add.yy",},"order":9,}, + {"id":{"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"order":43,}, {"id":{"name":"node_counter","path":"scripts/node_counter/node_counter.yy",},"order":1,}, + {"id":{"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",},"order":14,}, {"id":{"name":"sh_color_picker","path":"shaders/sh_color_picker/sh_color_picker.yy",},"order":3,}, - {"id":{"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"order":43,}, {"id":{"name":"scrollPane","path":"scripts/scrollPane/scrollPane.yy",},"order":14,}, {"id":{"name":"node_transform_single","path":"scripts/node_transform_single/node_transform_single.yy",},"order":1,}, {"id":{"name":"s_canvas_tools_rect_fill","path":"sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy",},"order":6,}, @@ -461,45 +472,42 @@ {"id":{"name":"s_workspace_1","path":"sprites/s_workspace_1/s_workspace_1.yy",},"order":1,}, {"id":{"name":"string_decimal","path":"scripts/string_decimal/string_decimal.yy",},"order":0,}, {"id":{"name":"f_h3","path":"fonts/f_h3/f_h3.yy",},"order":3,}, - {"id":{"name":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",},"order":52,}, + {"id":{"name":"node_iteration_index","path":"scripts/node_iteration_index/node_iteration_index.yy",},"order":4,}, {"id":{"name":"node_greyscale","path":"scripts/node_greyscale/node_greyscale.yy",},"order":19,}, {"id":{"name":"node_color_adjustment","path":"scripts/node_color_adjustment/node_color_adjustment.yy",},"order":5,}, {"id":{"name":"sh_ani_noise","path":"shaders/sh_ani_noise/sh_ani_noise.yy",},"order":4,}, - {"id":{"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"order":61,}, {"id":{"name":"rectangle_collision","path":"scripts/rectangle_collision/rectangle_collision.yy",},"order":0,}, {"id":{"name":"libfilesystem","path":"extensions/libfilesystem/libfilesystem.yy",},"order":3,}, + {"id":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},"order":55,}, {"id":{"name":"sh_level","path":"shaders/sh_level/sh_level.yy",},"order":7,}, {"id":{"name":"panel_menu","path":"scripts/panel_menu/panel_menu.yy",},"order":3,}, {"id":{"name":"draw_line_round","path":"scripts/draw_line_round/draw_line_round.yy",},"order":4,}, {"id":{"name":"vectorBox","path":"scripts/vectorBox/vectorBox.yy",},"order":18,}, {"id":{"name":"sh_blend_normal_dim","path":"shaders/sh_blend_normal_dim/sh_blend_normal_dim.yy",},"order":10,}, - {"id":{"name":"s_node_particle","path":"sprites/s_node_particle/s_node_particle.yy",},"order":78,}, - {"id":{"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",},"order":64,}, - {"id":{"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",},"order":42,}, {"id":{"name":"s_anchor_rotate","path":"sprites/s_anchor_rotate/s_anchor_rotate.yy",},"order":1,}, {"id":{"name":"sh_remove_black","path":"shaders/sh_remove_black/sh_remove_black.yy",},"order":37,}, + {"id":{"name":"s_node_iterator_index","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"order":103,}, {"id":{"name":"path_parser","path":"scripts/path_parser/path_parser.yy",},"order":3,}, {"id":{"name":"node_area","path":"scripts/node_area/node_area.yy",},"order":11,}, {"id":{"name":"path_function","path":"scripts/path_function/path_function.yy",},"order":4,}, {"id":{"name":"node_grey_to_alpha","path":"scripts/node_grey_to_alpha/node_grey_to_alpha.yy",},"order":23,}, - {"id":{"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",},"order":16,}, {"id":{"name":"sh_blend_add","path":"shaders/sh_blend_add/sh_blend_add.yy",},"order":7,}, {"id":{"name":"s_fill_16","path":"sprites/s_fill_16/s_fill_16.yy",},"order":35,}, + {"id":{"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"order":45,}, {"id":{"name":"node_de_stray","path":"scripts/node_de_stray/node_de_stray.yy",},"order":27,}, {"id":{"name":"s_node_pin_bg","path":"sprites/s_node_pin_bg/s_node_pin_bg.yy",},"order":8,}, {"id":{"name":"s_icon_accept_24","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"order":14,}, - {"id":{"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"order":82,}, {"id":{"name":"sh_channel_G","path":"shaders/sh_channel_G/sh_channel_G.yy",},"order":13,}, + {"id":{"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",},"order":93,}, {"id":{"name":"s_node_pin_bg_active","path":"sprites/s_node_pin_bg_active/s_node_pin_bg_active.yy",},"order":9,}, - {"id":{"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",},"order":101,}, {"id":{"name":"node_collection","path":"scripts/node_collection/node_collection.yy",},"order":18,}, - {"id":{"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",},"order":120,}, + {"id":{"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",},"order":32,}, + {"id":{"name":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"order":105,}, {"id":{"name":"node_value","path":"scripts/node_value/node_value.yy",},"order":6,}, {"id":{"name":"draw_line_curve","path":"scripts/draw_line_curve/draw_line_curve.yy",},"order":5,}, {"id":{"name":"s_splice_draw","path":"sprites/s_splice_draw/s_splice_draw.yy",},"order":6,}, {"id":{"name":"sh_blend_screen","path":"shaders/sh_blend_screen/sh_blend_screen.yy",},"order":3,}, {"id":{"name":"node_group_output","path":"scripts/node_group_output/node_group_output.yy",},"order":2,}, - {"id":{"name":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"order":99,}, {"id":{"name":"s_node_junctions_array","path":"sprites/s_node_junctions_array/s_node_junctions_array.yy",},"order":1,}, {"id":{"name":"f_p2","path":"fonts/f_p2/f_p2.yy",},"order":4,}, {"id":{"name":"button","path":"scripts/button/button.yy",},"order":2,}, @@ -515,39 +523,35 @@ {"id":{"name":"o_dialog_warning","path":"objects/o_dialog_warning/o_dialog_warning.yy",},"order":14,}, {"id":{"name":"string_scale","path":"scripts/string_scale/string_scale.yy",},"order":6,}, {"id":{"name":"node_value_processor","path":"scripts/node_value_processor/node_value_processor.yy",},"order":1,}, - {"id":{"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",},"order":80,}, - {"id":{"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"order":104,}, {"id":{"name":"sample_projects","path":"scripts/sample_projects/sample_projects.yy",},"order":6,}, {"id":{"name":"s_path_tools_add","path":"sprites/s_path_tools_add/s_path_tools_add.yy",},"order":4,}, {"id":{"name":"s_ui_scrollbar","path":"sprites/s_ui_scrollbar/s_ui_scrollbar.yy",},"order":3,}, {"id":{"name":"load_function","path":"scripts/load_function/load_function.yy",},"order":2,}, {"id":{"name":"ds_map","path":"scripts/ds_map/ds_map.yy",},"order":0,}, {"id":{"name":"sh_atlas","path":"shaders/sh_atlas/sh_atlas.yy",},"order":31,}, + {"id":{"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",},"order":37,}, {"id":{"name":"node_scale","path":"scripts/node_scale/node_scale.yy",},"order":9,}, {"id":{"name":"s_prop_selecting","path":"sprites/s_prop_selecting/s_prop_selecting.yy",},"order":6,}, {"id":{"name":"sh_displace","path":"shaders/sh_displace/sh_displace.yy",},"order":7,}, {"id":{"name":"node_group","path":"scripts/node_group/node_group.yy",},"order":0,}, {"id":{"name":"rangeBox","path":"scripts/rangeBox/rangeBox.yy",},"order":10,}, - {"id":{"name":"node_frame","path":"scripts/node_frame/node_frame.yy",},"order":14,}, - {"id":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},"order":97,}, + {"id":{"name":"node_frame","path":"scripts/node_frame/node_frame.yy",},"order":1,}, {"id":{"name":"node_bw","path":"scripts/node_bw/node_bw.yy",},"order":20,}, {"id":{"name":"sh_de_corner","path":"shaders/sh_de_corner/sh_de_corner.yy",},"order":15,}, {"id":{"name":"node_de_corner","path":"scripts/node_de_corner/node_de_corner.yy",},"order":25,}, {"id":{"name":"preferences","path":"scripts/preferences/preferences.yy",},"order":5,}, {"id":{"name":"timer_function","path":"scripts/timer_function/timer_function.yy",},"order":0,}, - {"id":{"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",},"order":8,}, {"id":{"name":"sh_mask","path":"shaders/sh_mask/sh_mask.yy",},"order":36,}, - {"id":{"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",},"order":113,}, {"id":{"name":"node_alpha_to_grey","path":"scripts/node_alpha_to_grey/node_alpha_to_grey.yy",},"order":21,}, {"id":{"name":"o_dialog_preference","path":"objects/o_dialog_preference/o_dialog_preference.yy",},"order":15,}, {"id":{"name":"node_wrap","path":"scripts/node_wrap/node_wrap.yy",},"order":2,}, - {"id":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"order":117,}, {"id":{"name":"o_dialog_about","path":"objects/o_dialog_about/o_dialog_about.yy",},"order":13,}, - {"id":{"name":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",},"order":68,}, + {"id":{"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"order":61,}, {"id":{"name":"s_node_bg","path":"sprites/s_node_bg/s_node_bg.yy",},"order":1,}, {"id":{"name":"dialog_management","path":"scripts/dialog_management/dialog_management.yy",},"order":5,}, {"id":{"name":"node_channels","path":"scripts/node_channels/node_channels.yy",},"order":24,}, {"id":{"name":"node_solid","path":"scripts/node_solid/node_solid.yy",},"order":18,}, + {"id":{"name":"node_iteration_output","path":"scripts/node_iteration_output/node_iteration_output.yy",},"order":3,}, {"id":{"name":"debug","path":"scripts/debug/debug.yy",},"order":9,}, {"id":{"name":"node_lerp","path":"scripts/node_lerp/node_lerp.yy",},"order":12,}, {"id":{"name":"node_texture_remap","path":"scripts/node_texture_remap/node_texture_remap.yy",},"order":32,}, @@ -645,6 +649,8 @@ {"folderPath":"folders/sprites/preview/path.yy","order":8,"resourceVersion":"1.0","name":"path","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/functions/debug.yy","order":15,"resourceVersion":"1.0","name":"debug","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/functions/save load.yy","order":16,"resourceVersion":"1.0","name":"save load","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/nodes/data/iterate.yy","order":19,"resourceVersion":"1.0","name":"iterate","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/nodes/data/node.yy","order":20,"resourceVersion":"1.0","name":"node","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 02136fb00..b90540748 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -18,10 +18,7 @@ event_inherited(); anchor = ANCHOR.left | ANCHOR.top; - if(PANEL_GRAPH.getCurrentContext() == -1 && ADD_NODE_PAGE == "Group") - ADD_NODE_PAGE = NODE_CATAGORY[| 0]; - - page_key = ADD_NODE_PAGE == ""? NODE_CATAGORY[| 0] : ADD_NODE_PAGE; + page_key = ADD_NODE_PAGE == ""? NODE_CATAGORY[| 2] : ADD_NODE_PAGE; page = ALL_NODES[? page_key]; function buildNode(_node) { @@ -53,12 +50,24 @@ event_inherited(); var hh = 0; var hg = 28; var key = ds_map_find_first(ALL_NODES); + var cnt = PANEL_GRAPH.getCurrentContext(); + var context = cnt == -1? "" : instanceof(cnt); for(var i = 0; i < ds_list_size(NODE_CATAGORY); i++) { var key = NODE_CATAGORY[| i]; - if(PANEL_GRAPH.getCurrentContext() == -1 && key == "Group") continue; - draw_set_text(f_p0, fa_left, fa_center, c_white); + + switch(key) { + case "Group" : + if(context != "Node_Group") continue; + draw_set_text(f_p0, fa_left, fa_center, c_ui_orange); + break; + case "Loop" : + if(context != "Node_Iterate") continue; + draw_set_text(f_p0, fa_left, fa_center, c_ui_orange); + break; + } + if(key == page_key) { draw_sprite_stretched(s_ui_panel_bg, 0, 0, _y + hh, 132, hg); } else if(point_in_rectangle(_m[0], _m[1], 0, _y + hh, 100, _y + hh + hg - 1)) { @@ -171,12 +180,24 @@ event_inherited(); var index = 0; var name_height = 0; var amo = 0; - var use_mouse = false; + var cnt = PANEL_GRAPH.getCurrentContext(); + var context = cnt == -1? "" : instanceof(cnt); var search_lower = string_lower(search_string); for(var i = 0; i < ds_list_size(NODE_CATAGORY); i++) { - var _page = ALL_NODES[? NODE_CATAGORY[| i]]; + var key = NODE_CATAGORY[| i]; + + switch(key) { + case "Group" : + if(context != "Node_Group") continue; + break; + case "Loop" : + if(context != "Node_Iterate") continue; + break; + } + + var _page = ALL_NODES[? key]; for(var j = 0; j < ds_list_size(_page); j++) { var _node = _page[| j]; diff --git a/objects/o_main/Alarm_0.gml b/objects/o_main/Alarm_0.gml index 41ffed326..cf18938a6 100644 --- a/objects/o_main/Alarm_0.gml +++ b/objects/o_main/Alarm_0.gml @@ -1,2 +1,2 @@ /// @description force update -NODE_rerender(); +renderAll(); diff --git a/objects/o_main/Create_0.gml b/objects/o_main/Create_0.gml index 958d43e48..27c6ae1db 100644 --- a/objects/o_main/Create_0.gml +++ b/objects/o_main/Create_0.gml @@ -46,7 +46,7 @@ display_reset(0, 1); addHotkey("", "Render all", vk_f5, MOD_KEY.none, function() { for(var i = 0; i < ds_list_size(NODES); i++) - NODES[| i].rendered = false; + NODES[| i].setRenderStatus(false); UPDATE = true; }); diff --git a/objects/o_main/Draw_75.gml b/objects/o_main/Draw_75.gml index d8a009cc6..9f57764f6 100644 --- a/objects/o_main/Draw_75.gml +++ b/objects/o_main/Draw_75.gml @@ -2,14 +2,12 @@ #region tooltip if(TOOLTIP != "") { draw_set_text(f_p0, fa_left, fa_top, c_white); - var _w = string_width(TOOLTIP); var mx = mouse_mx + 16; var my = mouse_my + 16; - var tw = clamp(_w, 400, WIN_W - mx - 32); - var th = string_height_ext(TOOLTIP, -1, tw); - tw = string_width_ext(TOOLTIP, -1, tw); + var tw = string_width(TOOLTIP); + var th = string_height(TOOLTIP); if(mouse_mx + tw > WIN_W - 32) mx = mouse_mx - 16 - tw; @@ -17,7 +15,7 @@ my = mouse_my - 16 - th; draw_sprite_stretched(s_textbox, 0, mx - 8, my - 8, tw + 16, th + 16); - draw_text_ext(mx, my, TOOLTIP, -1, tw); + draw_text(mx, my, TOOLTIP); } TOOLTIP = ""; #endregion diff --git a/objects/o_main/Step_1.gml b/objects/o_main/Step_1.gml index 1c187ea85..8ff2a8db9 100644 --- a/objects/o_main/Step_1.gml +++ b/objects/o_main/Step_1.gml @@ -49,6 +49,7 @@ } if(UPDATE) { + //renderUpdated(); renderAll(); UPDATE = false; } diff --git a/scripts/append_function/append_function.gml b/scripts/append_function/append_function.gml index c93073180..87c3b96e8 100644 --- a/scripts/append_function/append_function.gml +++ b/scripts/append_function/append_function.gml @@ -61,29 +61,29 @@ function APPEND(_path) { appended_list[| i].postConnect(); } - //for(var i = 0; i < ds_list_size(appended_list); i++) { - // appended_list[| i].doUpdate(); - //} + for(var i = 0; i < ds_list_size(appended_list); i++) { + appended_list[| i].doUpdate(); + } ds_list_destroy(appended_list); - //renderAll(); + renderAll(); - //if(!ds_queue_empty(CONNECTION_CONFLICT)) { - // var pass = 0; + if(!ds_queue_empty(CONNECTION_CONFLICT)) { + var pass = 0; - // while(++pass < 2 && !ds_queue_empty(CONNECTION_CONFLICT)) { - // var size = ds_queue_size(CONNECTION_CONFLICT); - // log_message("LOAD", "[Connect] " + string(size) + " Connection conflict(s) detected ( pass: " + string(pass) + " )"); - // repeat(size) { - // ds_queue_dequeue(CONNECTION_CONFLICT).connect(); - // } - // renderAll(); - // } + while(++pass < 2 && !ds_queue_empty(CONNECTION_CONFLICT)) { + var size = ds_queue_size(CONNECTION_CONFLICT); + log_message("LOAD", "[Connect] " + string(size) + " Connection conflict(s) detected ( pass: " + string(pass) + " )"); + repeat(size) { + ds_queue_dequeue(CONNECTION_CONFLICT).connect(); + } + renderAll(); + } - // if(!ds_queue_empty(CONNECTION_CONFLICT)) - // PANEL_MENU.addNotiExtra("Some connection(s) is unsolved. This may caused by render node not being update properly, or image path is broken."); - //} + if(!ds_queue_empty(CONNECTION_CONFLICT)) + PANEL_MENU.addNotiExtra("Some connection(s) is unsolved. This may caused by render node not being update properly, or image path is broken."); + } APPENDING = false; PANEL_ANIMATION.updatePropertyList(); diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 40208b40c..1b9ad5148 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -14,9 +14,9 @@ DEBUG = false; globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING; - VERSION = 82; + VERSION = 90; SAVEFILE_VERSION = 82; - VERSION_STRING = "0.8.2"; + VERSION_STRING = "0.9.0"; globalvar NODES, ANIMATOR, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT; diff --git a/scripts/node_array/node_array.gml b/scripts/node_array/node_array.gml index 05de62100..d74e33e98 100644 --- a/scripts/node_array/node_array.gml +++ b/scripts/node_array/node_array.gml @@ -8,8 +8,6 @@ function Node_Array(_x, _y) : Node(_x, _y) constructor { name = "Array"; previewable = false; - input_size = 0; - w = 96; min_h = 0; diff --git a/scripts/node_collection/node_collection.gml b/scripts/node_collection/node_collection.gml index 23f1ec3b7..e1a91c00d 100644 --- a/scripts/node_collection/node_collection.gml +++ b/scripts/node_collection/node_collection.gml @@ -1,6 +1,9 @@ function Node_Collection(_x, _y) : Node(_x, _y) constructor { nodes = ds_list_create(); + custom_input_index = 0; + custom_output_index = 0; + function add(_node) { ds_list_add(nodes, _node); var list = _node.group == -1? PANEL_GRAPH.nodes_list : _node.group.nodes; @@ -21,7 +24,7 @@ function Node_Collection(_x, _y) : Node(_x, _y) constructor { _node.group = group; } - function stepBegin() { + static stepBegin = function() { for(var i = 0; i < ds_list_size(nodes); i++) { nodes[| i].stepBegin(); } @@ -40,6 +43,17 @@ function Node_Collection(_x, _y) : Node(_x, _y) constructor { } } + static updateForward = function() { + doUpdate(); + + for(var i = custom_input_index; i < ds_list_size(inputs); i++) { + var jun_node = inputs[| i].from; + jun_node.updateForward(); + } + + doUpdateForward(); + } + static preConnect = function() { sortIO(); deserialize(keyframe_scale); @@ -49,15 +63,18 @@ function Node_Collection(_x, _y) : Node(_x, _y) constructor { var siz = ds_list_size(inputs); var ar = ds_priority_create(); - for( var i = 0; i < siz; i++ ) { + for( var i = custom_input_index; i < siz; i++ ) { var _in = inputs[| i]; var _or = _in.from.inputs[| 5].getValue(); ds_priority_add(ar, _in, _or); } - ds_list_clear(inputs); - for( var i = 0; i < siz; i++ ) { + for( var i = siz - 1; i >= custom_input_index; i-- ) { + ds_list_delete(inputs, i); + } + + for( var i = custom_input_index; i < siz; i++ ) { var _jin = ds_priority_delete_min(ar); _jin.index = i; ds_list_add(inputs, _jin); @@ -68,15 +85,18 @@ function Node_Collection(_x, _y) : Node(_x, _y) constructor { var siz = ds_list_size(outputs); var ar = ds_priority_create(); - for( var i = 0; i < siz; i++ ) { + for( var i = custom_output_index; i < siz; i++ ) { var _out = outputs[| i]; var _or = _out.from.inputs[| 1].getValue(); ds_priority_add(ar, _out, _or); } - ds_list_clear(outputs); - for( var i = 0; i < siz; i++ ) { + for( var i = siz - 1; i >= custom_output_index; i-- ) { + ds_list_delete(outputs, i); + } + + for( var i = custom_output_index; i < siz; i++ ) { var _jout = ds_priority_delete_min(ar); _jout.index = i; ds_list_add(outputs, _jout); diff --git a/scripts/node_condition/node_condition.gml b/scripts/node_condition/node_condition.gml new file mode 100644 index 000000000..36cce2d8b --- /dev/null +++ b/scripts/node_condition/node_condition.gml @@ -0,0 +1,54 @@ +function Node_create_Condition(_x, _y) { + var node = new Node_Condition(_x, _y); + ds_list_add(PANEL_GRAPH.nodes_list, node); + return node; +} + +function Node_Condition(_x, _y) : Node(_x, _y) constructor { + name = "Condition"; + previewable = false; + + w = 96; + min_h = 0; + + inputs[| 0] = nodeValue( 0, "Check", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + .setVisible(true, true); + + inputs[| 1] = nodeValue( 1, "If", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ) + .setDisplay(VALUE_DISPLAY.enum_scroll, ["Equal", "Not equal", "Less", "Less or equal", "Greater", "Greater or equal"]); + inputs[| 2] = nodeValue( 2, "To / Than", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ); + + inputs[| 3] = nodeValue( 3, "True", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1 ) + .setVisible(true, true); + inputs[| 4] = nodeValue( 4, "False", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1 ) + .setVisible(true, true); + + input_display_list = [ + ["Condition", false], 0, 1, 2, + ["Result", false], 3, 4 + ] + + outputs[| 0] = nodeValue(0, "Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); + + static update = function() { + var _chck = inputs[| 0].getValue(); + var _cond = inputs[| 1].getValue(); + var _valu = inputs[| 2].getValue(); + + var _true = inputs[| 3].getValue(); + var _fals = inputs[| 4].getValue(); + + var res = false; + + switch(_cond) { + case 0 : res = _chck == _valu; break; + case 1 : res = _chck != _valu; break; + case 2 : res = _chck < _valu; break; + case 3 : res = _chck <= _valu; break; + case 4 : res = _chck > _valu; break; + case 5 : res = _chck >= _valu; break; + } + + output[| 0].setValue(res? _true : _fals); + } +} \ No newline at end of file diff --git a/scripts/node_condition/node_condition.yy b/scripts/node_condition/node_condition.yy new file mode 100644 index 000000000..9d4d2f937 --- /dev/null +++ b/scripts/node_condition/node_condition.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "node", + "path": "folders/nodes/data/node.yy", + }, + "resourceVersion": "1.0", + "name": "node_condition", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 84d249ccd..b25f83422 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -89,13 +89,13 @@ function Node(_x, _y) constructor { for(var j = 0; j < array_length(val); j++) { var _surf = val[j]; if(!is_surface(_surf) || _surf == DEF_SURFACE) { - rendered = false; + setRenderStatus(false); UPDATE = true; } } } else { if(!is_surface(val) || val == DEF_SURFACE) { - rendered = false; + setRenderStatus(false); UPDATE = true; } } @@ -108,7 +108,7 @@ function Node(_x, _y) constructor { doUpdate(); for(var i = 0; i < ds_list_size(inputs); i++) { if(inputs[| i].isAnim()) { - rendered = false; + setRenderStatus(false); UPDATE = true; } } @@ -123,7 +123,7 @@ function Node(_x, _y) constructor { static doUpdate = function() { var t = get_timer(); update(); - rendered = true; + setRenderStatus(true); render_time = get_timer() - t; } @@ -134,7 +134,9 @@ function Node(_x, _y) constructor { static updateValueFrom = function(index) {} static updateForward = function() { - if(auto_update) doUpdate(); + rendered = false; + UPDATE = true; + //if(auto_update) doUpdate(); for(var i = 0; i < ds_list_size(outputs); i++) { var jun = outputs[| i]; @@ -150,6 +152,10 @@ function Node(_x, _y) constructor { static doUpdateForward = function() {} + static setRenderStatus = function(result) { + rendered = result; + } + static pointIn = function(_mx, _my) { var xx = x; var yy = y; @@ -456,11 +462,16 @@ function Node(_x, _y) constructor { } } - static checkConnectGroup = function() { + static checkConnectGroup = function(_type = "group") { for(var i = 0; i < ds_list_size(inputs); i++) { var _in = inputs[| i]; if(_in.value_from && _in.value_from.node.group != group) { - var input_node = new Node_Group_Input(x - w - 64, y, group); + var input_node; + switch(_type) { + case "group" : input_node = new Node_Group_Input(x - w - 64, y, group); break; + case "loop" : input_node = new Node_Iterator_Input(x - w - 64, y, group); break; + } + input_node.inputs[| 2].setValue(_in.type); input_node.inputs[| 0].setValue(_in.display_type); @@ -476,7 +487,12 @@ function Node(_x, _y) constructor { for(var j = 0; j < ds_list_size(_ou.value_to); j++) { var _to = _ou.value_to[| j]; if(_to.node.active && _to.node.group != group) { - var output_node = new Node_Group_Output(x + w + 64, y, group); + var output_node; + switch(_type) { + case "group" : output_node = new Node_Group_Output(x + w + 64, y, group); break; + case "loop" : output_node = new Node_Iterator_Output(x + w + 64, y, group); break; + } + ds_list_add(group.nodes, output_node); _to.setFrom(output_node.outParent); diff --git a/scripts/node_frame/node_frame.yy b/scripts/node_frame/node_frame.yy index e52eec715..77ceb09f0 100644 --- a/scripts/node_frame/node_frame.yy +++ b/scripts/node_frame/node_frame.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "data", - "path": "folders/nodes/data.yy", + "name": "node", + "path": "folders/nodes/data/node.yy", }, "resourceVersion": "1.0", "name": "node_frame", diff --git a/scripts/node_group_input/node_group_input.gml b/scripts/node_group_input/node_group_input.gml index 797cb85e5..150329a10 100644 --- a/scripts/node_group_input/node_group_input.gml +++ b/scripts/node_group_input/node_group_input.gml @@ -135,14 +135,9 @@ function Node_Group_Input(_x, _y, _group) : Node(_x, _y) constructor { } } - static createInput = function(override_order = false) { + static createInput = function() { if(group && is_struct(group)) { - if(override_order) { - input_index = ds_list_size(group.inputs); - inputs[| 5].setValue(input_index); - } else { - input_index = inputs[| 5].getValue(); - } + input_index = inputs[| 5].getValue(); inParent = nodeValue(ds_list_size(group.inputs), "Value", group, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1) .setVisible(true, true); @@ -196,7 +191,7 @@ function Node_Group_Input(_x, _y, _group) : Node(_x, _y) constructor { } static postDeserialize = function() { - createInput(false); + createInput(); onValueUpdate(0); } diff --git a/scripts/node_image_gif/node_image_gif.gml b/scripts/node_image_gif/node_image_gif.gml index d5567dcd1..f35dcf2ca 100644 --- a/scripts/node_image_gif/node_image_gif.gml +++ b/scripts/node_image_gif/node_image_gif.gml @@ -21,7 +21,7 @@ function Node_create_Image_gif_path(_x, _y, path) { node.doUpdate(); ds_list_add(PANEL_GRAPH.nodes_list, node); - return node; + return node; } function Node_Image_gif(_x, _y) : Node(_x, _y) constructor { diff --git a/scripts/node_iterate/node_iterate.gml b/scripts/node_iterate/node_iterate.gml new file mode 100644 index 000000000..f75a65bba --- /dev/null +++ b/scripts/node_iterate/node_iterate.gml @@ -0,0 +1,47 @@ +function Node_create_Iterate(_x, _y) { + var node = new Node_Iterate(_x, _y); + ds_list_add(PANEL_GRAPH.nodes_list, node); + return node; +} + +function Node_Iterate(_x, _y) : Node_Collection(_x, _y) constructor { + name = "Iterate"; + color = c_ui_lime; + icon = s_group_16; + previewable = false; + + w = 96; + min_h = 0; + + iterated = 0; + + inputs[| 0] = nodeValue( 0, "Repeat", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + + custom_input_index = 1; + + static setRenderStatus = function(result) { + rendered = result; + if(!rendered) iterated = 0; + } + + static outputRendered = function() { + var iter = true; + for( var i = 0; i < ds_list_size(outputs); i++ ) { + var _out = outputs[| i].node; + iter &= _out.rendered; + } + + if(iter) { + iterated++; + if(iterated >= inputs[| 0].getValue()) + return 2; + + for( var i = 0; i < ds_list_size(nodes); i++ ) { + nodes[| i].setRenderStatus(false); + } + return 1; + } + + return 0; + } +} \ No newline at end of file diff --git a/scripts/node_iterate/node_iterate.yy b/scripts/node_iterate/node_iterate.yy new file mode 100644 index 000000000..4e881ab62 --- /dev/null +++ b/scripts/node_iterate/node_iterate.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "iterate", + "path": "folders/nodes/data/iterate.yy", + }, + "resourceVersion": "1.0", + "name": "node_iterate", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_iteration_index/node_iteration_index.gml b/scripts/node_iteration_index/node_iteration_index.gml new file mode 100644 index 000000000..adc7285d7 --- /dev/null +++ b/scripts/node_iteration_index/node_iteration_index.gml @@ -0,0 +1,21 @@ +function Node_create_Iterator_Index(_x, _y) { + var node = new Node_Iterator_Index(_x, _y); + ds_list_add(PANEL_GRAPH.nodes_list, node); + return node; +} + +function Node_Iterator_Index(_x, _y) : Node(_x, _y) constructor { + name = "Index"; + color = c_ui_cyan; + previewable = false; + + w = 96; + min_h = 32 + 24 * 1; + + outputs[| 0] = nodeValue(0, "Index", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + + update = function() { + if(instanceof(group) == "Node_Iterate") + return group.iterated; + } +} \ No newline at end of file diff --git a/scripts/node_iteration_index/node_iteration_index.yy b/scripts/node_iteration_index/node_iteration_index.yy new file mode 100644 index 000000000..29902a9fe --- /dev/null +++ b/scripts/node_iteration_index/node_iteration_index.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "iterate", + "path": "folders/nodes/data/iterate.yy", + }, + "resourceVersion": "1.0", + "name": "node_iteration_index", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_iteration_input/node_iteration_input.gml b/scripts/node_iteration_input/node_iteration_input.gml new file mode 100644 index 000000000..1e6e5c625 --- /dev/null +++ b/scripts/node_iteration_input/node_iteration_input.gml @@ -0,0 +1,216 @@ +function Node_create_Iterator_Input(_x, _y) { + if(!LOADING && !APPENDING && PANEL_GRAPH.getCurrentContext() == -1) return; + var node = new Node_Iterator_Input(_x, _y, PANEL_GRAPH.getCurrentContext()); + ds_list_add(PANEL_GRAPH.nodes_list, node); + return node; +} + +function Node_Iterator_Input(_x, _y, _group) : Node(_x, _y) constructor { + name = "Input"; + color = c_ui_yellow; + previewable = false; + auto_height = false; + input_index = -1; + + group = _group; + inParent = undefined; + local_output = noone; + + w = 96; + h = 32 + 24; + min_h = h; + + inputs[| 0] = nodeValue(0, "Display type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Default", "Range", "Enum Scroll", "Enum Button", "Rotation", "Rotation range", + "Slider", "Slider range", "Gradient", "Palette", "Padding", "Vector", "Vector range", "Area", "Curve" ]); + + inputs[| 1] = nodeValue(1, "Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 1]) + .setDisplay(VALUE_DISPLAY.vector) + .setVisible(false); + + inputs[| 2] = nodeValue(2, "Input type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Integer", "Float", "Boolean", "Color", "Surface", "Path", "Curve", "Text", "Object", "Any" ]); + + inputs[| 3] = nodeValue(3, "Enum label", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + .setVisible(false); + + inputs[| 4] = nodeValue(4, "Vector size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + .setDisplay(VALUE_DISPLAY.enum_button, [ "2", "3", "4" ]) + .setVisible(false); + + inputs[| 5] = nodeValue(5, "Order", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + + input_display_list = [ + ["Display", false], 5, + ["Data", false], 2, 0, 4, 1, 3, + ]; + + outputs[| 0] = nodeValue(0, "Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0].getValueDefault = method(outputs[| 0], outputs[| 0].getValueRecursive); + outputs[| 0].getValueRecursive = function() { + show_debug_message("iteration " + string(group.iterated)); + + if(local_output == noone || group.iterated == 0) { + show_debug_message("get default value"); + return outputs[| 0].getValueDefault(); + } + + show_debug_message("get local output"); + return [ local_output.node.cache_value, inputs[| 2].getValue() ]; + } + + static onValueUpdate = function(index) { + if(is_undefined(inParent)) return; + + var _dtype = inputs[| 0].getValue(); + var _range = inputs[| 1].getValue(); + var _val_type = inputs[| 2].getValue(); + var _enum_label = inputs[| 3].getValue(); + var _vec_size = inputs[| 4].getValue(); + + if(index == 2) { + var _o = outputs[| 0]; + for(var j = 0; j < ds_list_size(_o.value_to); j++) { + var _to = _o.value_to[| j]; + if(_to.value_from == _o) + _to.removeFrom(); + } + } + + inParent.type = _val_type; + outputs[| 0].type = _val_type; + var _val = inParent.getValue(); + + switch(_dtype) { + case VALUE_DISPLAY.range : + case VALUE_DISPLAY.slider : + inParent.setDisplay(_dtype, [_range[0], _range[1], 0.01]); + break; + + case VALUE_DISPLAY.slider_range : + inParent.setDisplay(_dtype, [_range[0], _range[1], 0.01]); + case VALUE_DISPLAY.rotation_range : + if(!is_array(_val) || array_length(_val) != 2) + inParent.value = new animValue([0, 0], inParent); + inParent.setDisplay(_dtype); + break; + + case VALUE_DISPLAY.enum_button : + case VALUE_DISPLAY.enum_scroll : + inParent.setDisplay(_dtype, string_splice(_enum_label, ",")); + break; + + case VALUE_DISPLAY.padding : + if(!is_array(_val) || array_length(_val) != 4) + inParent.value = new animValue([0, 0, 0, 0], inParent); + inParent.setDisplay(_dtype); + break; + + case VALUE_DISPLAY.area : + if(!is_array(_val) || array_length(_val) != 5) + inParent.value = new animValue([0, 0, 0, 0, 5], inParent); + inParent.setDisplay(_dtype); + break; + + case VALUE_DISPLAY.vector : + case VALUE_DISPLAY.vector_range : + switch(_vec_size) { + case 0 : + if(!is_array(_val) || array_length(_val) != 2) + inParent.value = new animValue([0, 0], inParent); + break; + case 1 : + if(!is_array(_val) || array_length(_val) != 3) + inParent.value = new animValue([0, 0, 0], inParent); + break; + case 2 : + if(!is_array(_val) || array_length(_val) != 4) + inParent.value = new animValue([0, 0, 0, 0], inParent); + break; + } + + inParent.setDisplay(_dtype); + break; + + case VALUE_DISPLAY.palette : + if(!is_array(_val)) + inParent.value = new animValue([c_black], inParent); + inParent.setDisplay(_dtype); + break; + + default : + inParent.setDisplay(_dtype); + break; + } + + if(index == 5) { + group.sortIO(); + } + } + + static createInput = function() { + if(group && is_struct(group)) { + input_index = inputs[| 5].getValue(); + + inParent = nodeValue(ds_list_size(group.inputs), "Value", group, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1) + .setVisible(true, true); + inParent.from = self; + + ds_list_add(group.inputs, inParent); + outputs[| 0].setFrom(inParent, false, false); + group.setHeight(); + group.sortIO(); + + onValueUpdate(0); + } + } + + if(!LOADING && !APPENDING) + createInput(); + + dtype = -1; + range = 0; + + static step = function() { + if(is_undefined(inParent)) return; + + inParent.name = name; + } + + static update = function() { + if(is_undefined(inParent)) return; + + var _dtype = inputs[| 0].getValue(); + + inputs[| 1].setVisible(false); + inputs[| 3].setVisible(false); + inputs[| 4].setVisible(false); + + switch(_dtype) { + case VALUE_DISPLAY.range : + case VALUE_DISPLAY.slider : + case VALUE_DISPLAY.slider_range : + inputs[| 1].setVisible(true); + break; + case VALUE_DISPLAY.enum_button : + case VALUE_DISPLAY.enum_scroll : + inputs[| 3].setVisible(true); + break; + case VALUE_DISPLAY.vector : + case VALUE_DISPLAY.vector_range : + inputs[| 4].setVisible(true); + break; + } + } + + static postDeserialize = function() { + createInput(); + onValueUpdate(0); + } + + static onDestroy = function() { + if(is_undefined(inParent)) return; + + ds_list_remove(group.inputs, inParent); + } +} \ No newline at end of file diff --git a/scripts/node_iteration_input/node_iteration_input.yy b/scripts/node_iteration_input/node_iteration_input.yy new file mode 100644 index 000000000..9280fbe9a --- /dev/null +++ b/scripts/node_iteration_input/node_iteration_input.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "iterate", + "path": "folders/nodes/data/iterate.yy", + }, + "resourceVersion": "1.0", + "name": "node_iteration_input", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_iteration_output/node_group_input.yy b/scripts/node_iteration_output/node_group_input.yy new file mode 100644 index 000000000..b48fa62c4 --- /dev/null +++ b/scripts/node_iteration_output/node_group_input.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "group", + "path": "folders/nodes/data/group.yy", + }, + "resourceVersion": "1.0", + "name": "node_group_input", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_iteration_output/node_iteration_output.gml b/scripts/node_iteration_output/node_iteration_output.gml new file mode 100644 index 000000000..0ca9b26fb --- /dev/null +++ b/scripts/node_iteration_output/node_iteration_output.gml @@ -0,0 +1,116 @@ +function Node_create_Iterator_Output(_x, _y) { + if(!LOADING && !APPENDING && PANEL_GRAPH.getCurrentContext() == -1) return; + var node = new Node_Iterator_Output(_x, _y, PANEL_GRAPH.getCurrentContext()); + ds_list_add(PANEL_GRAPH.nodes_list, node); + return node; +} + +function Node_Iterator_Output(_x, _y, _group) : Node(_x, _y) constructor { + name = "Output"; + color = c_ui_yellow; + previewable = false; + auto_height = false; + + self.group = _group; + + w = 96; + h = 32 + 24; + min_h = h; + + inputs[| 0] = nodeValue(0, "Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1) + .setVisible(true, true); + + inputs[| 1] = nodeValue(1, "Order", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + + inputs[| 2] = nodeValue(2, "Use as input", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, -1); + + cache_value = -1; + outParent = undefined; + output_index = -1; + + static onValueUpdate = function(index) { + if(is_undefined(outParent)) return; + group.sortIO(); + + if(index == 2) { + var _v = inputs[| 2].getValue(); + for( var i = 1; i < ds_list_size(group.inputs); i++ ) { + var _in = group.inputs[| i].from; + if(i - 1 == _v) + _in.local_output = inputs[| 0]; + else if(_in.local_output == inputs[| 0]) + _in.local_output = noone; + } + } + } + + static createOutput = function(override_order = true) { + if(group && is_struct(group)) { + if(override_order) { + output_index = ds_list_size(group.outputs); + inputs[| 1].setValue(output_index); + } else { + output_index = inputs[| 1].getValue(); + } + + outParent = nodeValue(ds_list_size(group.outputs), "Value", group, JUNCTION_CONNECT.output, VALUE_TYPE.any, -1) + .setVisible(true, true); + outParent.from = self; + + ds_list_add(group.outputs, outParent); + group.setHeight(); + group.sortIO(); + + outParent.setFrom(inputs[| 0]); + } + } + + if(!LOADING && !APPENDING) + createOutput(); + + static step = function() { + if(is_undefined(outParent)) return; + + outParent.name = name; + + if(inputs[| 0].value_from) { + outParent.type = inputs[| 0].value_from.type; + inputs[| 0].type = inputs[| 0].value_from.type; + } else { + inputs[| 0].type = VALUE_TYPE.any; + } + } + static doUpdateForward = function() { + if(is_undefined(outParent)) return; + + for(var j = 0; j < ds_list_size(outParent.value_to); j++) { + if(outParent.value_to[| j].value_from == outParent) { + outParent.value_to[| j].node.updateForward(); + } + } + } + + static update = function() { + var _val_get = inputs[| 0].getValue(); + + switch(inputs[| 0].type) { + case VALUE_TYPE.surface : + if(is_surface(cache_value)) + surface_free(cache_value); + if(is_surface(_val_get)) + cache_value = surface_clone(_val_get); + break; + default : + cache_value = _val_get; + } + } + + static postDeserialize = function() { + createOutput(false); + } + + static onDestroy = function() { + if(is_undefined(outParent)) return; + ds_list_delete(group.outputs, ds_list_find_index(group.outputs, outParent)); + } +} \ No newline at end of file diff --git a/scripts/node_iteration_output/node_iteration_output.yy b/scripts/node_iteration_output/node_iteration_output.yy new file mode 100644 index 000000000..f7684f4f8 --- /dev/null +++ b/scripts/node_iteration_output/node_iteration_output.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "iterate", + "path": "folders/nodes/data/iterate.yy", + }, + "resourceVersion": "1.0", + "name": "node_iteration_output", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_pin/node_pin.yy b/scripts/node_pin/node_pin.yy index fec3c0275..f1c614e2e 100644 --- a/scripts/node_pin/node_pin.yy +++ b/scripts/node_pin/node_pin.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "data", - "path": "folders/nodes/data.yy", + "name": "node", + "path": "folders/nodes/data/node.yy", }, "resourceVersion": "1.0", "name": "node_pin", diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 2668adec7..ddee1ee10 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -49,14 +49,25 @@ function NodeObject(_name, _spr, _create, tags = []) constructor { return _node; } + var group = ds_list_create(); + addNodeCatagory("Group", group); + addNodeObject(group, "Input", s_node_input, "Node_Group_Input", Node_create_Group_Input); + addNodeObject(group, "Output", s_node_output, "Node_Group_Output", Node_create_Group_Output); + + var iter = ds_list_create(); + addNodeCatagory("Loop", iter); + addNodeObject(iter, "Index", s_node_iterator_index, "Node_Iterator_Index", Node_create_Iterator_Index); + addNodeObject(iter, "Input", s_node_input, "Node_Iterator_Input", Node_create_Iterator_Input); + addNodeObject(iter, "Output", s_node_output, "Node_Iterator_Output", Node_create_Iterator_Output); + var input = ds_list_create(); addNodeCatagory("Input", input); - addNodeObject(input, "Canvas", s_node_canvas, "Node_Canvas", Node_create_Canvas, ["draw"]); - addNodeObject(input, "Image", s_node_image, "Node_Image", Node_create_Image); - addNodeObject(input, "Image gif", s_node_image_gif, "Node_Image_gif", Node_create_Image_gif); - addNodeObject(input, "Splice spritesheet", s_node_image_sheet, "Node_Image_Sheet", Node_create_Image_Sheet); - addNodeObject(input, "Image array", s_node_image_sequence, "Node_Image_Sequence", Node_create_Image_Sequence); - addNodeObject(input, "Animation", s_node_image_animation, "Node_Image_Animated", Node_create_Image_Animated); + addNodeObject(input, "Canvas", s_node_canvas, "Node_Canvas", Node_create_Canvas, ["draw"]); + addNodeObject(input, "Image", s_node_image, "Node_Image", Node_create_Image); + addNodeObject(input, "Image gif", s_node_image_gif, "Node_Image_gif", Node_create_Image_gif); + addNodeObject(input, "Splice spritesheet", s_node_image_sheet, "Node_Image_Sheet", Node_create_Image_Sheet); + addNodeObject(input, "Image array", s_node_image_sequence, "Node_Image_Sequence", Node_create_Image_Sequence); + addNodeObject(input, "Animation", s_node_image_animation, "Node_Image_Animated", Node_create_Image_Animated); addNodeObject(input, "Array to anim", s_node_image_sequence_to_anim, "Node_Sequence_Anim", Node_create_Sequence_Anim); var transform = ds_list_create(); @@ -137,7 +148,7 @@ function NodeObject(_name, _spr, _create, tags = []) constructor { addNodeObject(number, "Unicode", s_node_unicode, "Node_Unicode", Node_create_Unicode); addNodeObject(number, "Path", s_node_path, "Node_Path", Node_create_Path); addNodeObject(number, "Area", s_node_area, "Node_Area", Node_create_Area); - addNodeObject(number, "Surface data", s_node_surface_data, "Node_Surface_data", Node_create_Surface_data); + //addNodeObject(number, "Surface data", s_node_surface_data, "Node_Surface_data", Node_create_Surface_data); var color = ds_list_create(); addNodeCatagory("Color", color); @@ -181,15 +192,11 @@ function NodeObject(_name, _spr, _create, tags = []) constructor { addNodeObject(render, "Export", s_node_export, "Node_Export", Node_create_Export); addNodeObject(render, "Preview timeline", s_node_timeline_preview,"Node_Timeline_Preview", Node_create_Timeline_Preview); - var group = ds_list_create(); - addNodeCatagory("Group", group); - addNodeObject(group, "Input", s_node_input, "Node_Group_Input", Node_create_Group_Input); - addNodeObject(group, "Output", s_node_output, "Node_Group_Output", Node_create_Group_Output); - var node = ds_list_create(); addNodeCatagory("Node", node); - addNodeObject(node, "Pin", s_node_pin, "Node_Pin", Node_create_Pin); - addNodeObject(node, "Frame", s_node_frame, "Node_Frame", Node_create_Frame); + addNodeObject(node, "Pin", s_node_pin, "Node_Pin", Node_create_Pin); + addNodeObject(node, "Frame", s_node_frame, "Node_Frame", Node_create_Frame); + addNodeObject(node, "Condition", s_node_condition, "Node_Condition", Node_create_Condition); NODE_CREATE_FUCTION[? "Node_Group"] = Node_create_Group; #endregion diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index ac56ed5a1..ff44b67af 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -467,9 +467,9 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T } } else updated = _o != _n; - + if(updated) { - if(connect_type == JUNCTION_CONNECT.input && node.auto_update) + if(node.auto_update && connect_type == JUNCTION_CONNECT.input) node.updateForward(); node.onValueUpdate(index); diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 941e8e503..17f63bf9f 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -91,6 +91,8 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { addHotkey("Graph", "Group", "G", MOD_KEY.ctrl, function() { doGroup(); }); addHotkey("Graph", "Ungroup", "G", MOD_KEY.ctrl | MOD_KEY.shift, function() { doUngroup(); }); + addHotkey("Graph", "Loop", "L", MOD_KEY.ctrl, function() { doLoop(); }); + addHotkey("Graph", "Canvas", "C", MOD_KEY.ctrl | MOD_KEY.shift, function() { setCurrentCanvas(); }); addHotkey("Graph", "Canvas blend", "C", MOD_KEY.ctrl | MOD_KEY.alt, function() { setCurrentCanvasBlend(); }); @@ -598,6 +600,33 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { } } + function doLoop() { + if(ds_list_empty(nodes_select_list) && node_focus != noone) + ds_list_add(nodes_select_list, node_focus); + + if(!ds_list_empty(nodes_select_list)) { + var cx = 0; + var cy = 0; + for(var i = 0; i < ds_list_size(nodes_select_list); i++) { + var _node = nodes_select_list[| i]; + cx += _node.x; + cy += _node.y; + } + cx = round(cx / ds_list_size(nodes_select_list) / 32) * 32; + cy = round(cy / ds_list_size(nodes_select_list) / 32) * 32; + + var _group = Node_create_Iterate(cx, cy); + for(var i = 0; i < ds_list_size(nodes_select_list); i++) { + _group.add(nodes_select_list[| i]); + } + for(var i = 0; i < ds_list_size(nodes_select_list); i++) { + nodes_select_list[| i].checkConnectGroup("loop"); + } + + ds_list_clear(nodes_select_list); + } + } + function doFrame() { var x0 = 999999, y0 = 999999, x1 = -999999, y1 = -999999; diff --git a/scripts/panel_menu/panel_menu.gml b/scripts/panel_menu/panel_menu.gml index 00453e4e5..be7834d80 100644 --- a/scripts/panel_menu/panel_menu.gml +++ b/scripts/panel_menu/panel_menu.gml @@ -50,7 +50,7 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { ["Rendering", [ [ "Render all nodes", function() { for(var i = 0; i < ds_list_size(NODES); i++) - NODES[| i].rendered = false; + NODES[| i].setRenderStatus(false); UPDATE = true; }, ["", "Render all"] ] ]], diff --git a/scripts/render_data/render_data.gml b/scripts/render_data/render_data.gml index 16a43ec61..c95ca4d8c 100644 --- a/scripts/render_data/render_data.gml +++ b/scripts/render_data/render_data.gml @@ -1,16 +1,17 @@ -function NODE_rerender() { +function renderAll() { var _key = ds_map_find_first(NODE_MAP); + var amo = ds_map_size(NODE_MAP); - for(var i = 0; i < ds_map_size(NODE_MAP); i++) { + repeat(amo) { var _node = NODE_MAP[? _key]; - _node.rendered = false; + _node.setRenderStatus(false); _key = ds_map_find_next(NODE_MAP, _key); } - renderAll(); + renderUpdated(); } -function renderAll() { +function renderUpdated() { var render_q = ds_queue_create(); var rendering = noone; @@ -22,7 +23,7 @@ function renderAll() { var _startNode = true; for(var j = 0; j < ds_list_size(_node.inputs); j++) { var _in = _node.inputs[| j]; - _node.rendered = false; + _node.setRenderStatus(false); if(_in.value_from != noone) _startNode = false; @@ -37,33 +38,53 @@ function renderAll() { while(!ds_queue_empty(render_q)) { rendering = ds_queue_dequeue(render_q); - var _ready = true; + var _ready = true; //check if all the previous junctions is rendered for(var j = 0; j < ds_list_size(rendering.inputs); j++) { var _in = rendering.inputs[| j]; if(_in.value_from && !_in.value_from.node.rendered) _ready = false; } - if(_ready) { - if(!rendering.rendered && (LOADING || APPENDING || rendering.auto_update)) + if(_ready) { //if all junctions is rendered, start render + if(!rendering.rendered && (LOADING || APPENDING || rendering.auto_update)) { rendering.doUpdate(); - } else { - ds_queue_enqueue(render_q, rendering); + rendering.setRenderStatus(true); + } + } else { //some junction is not rendered yet, push this node back in queue + ds_queue_enqueue(render_q, rendering); } - if(instanceof(rendering) == "Node_Group_Output") { + if(instanceof(rendering) == "Node_Group_Output") { //Group output in-junction connect automatically to parent out-junction var _ot = rendering.outParent; - if(_ot != undefined) { + for(var j = 0; j < ds_list_size(_ot.value_to); j++) { + var _to = _ot.value_to[| j]; + + if(_to.node.active && _to.value_from != noone && _to.value_from.node == rendering.group) { + _to.node.setRenderStatus(false); + ds_queue_enqueue(render_q, _to.node); + } + } + } else if(instanceof(rendering) == "Node_Iterator_Output") { //Iterator input, check iteration result + var _node_it = rendering.group; + var _ren = _node_it.outputRendered(); + + if(_ren == 1) { //Go back to the beginning of the loop + var _ot = rendering.group.inputs; + for(var j = 1; j < ds_list_size(_ot); j++) { + ds_queue_enqueue(render_q, _ot[| j].from); + } + } else if(_ren == 2) { //Go out of loop + var _ot = rendering.outParent; for(var j = 0; j < ds_list_size(_ot.value_to); j++) { var _to = _ot.value_to[| j]; if(_to.node.active && _to.value_from != noone && _to.value_from.node == rendering.group) { - _to.node.rendered = false; + _to.node.setRenderStatus(false); ds_queue_enqueue(render_q, _to.node); } } } - } else { + } else { //queue next node connected from each junction for(var i = 0; i < ds_list_size(rendering.outputs); i++) { var _ot = rendering.outputs[| i]; @@ -71,14 +92,12 @@ function renderAll() { var _to = _ot.value_to[| j]; if(_to.node.active && _to.value_from != noone && _to.value_from.node == rendering) { - _to.node.rendered = false; + _to.node.setRenderStatus(false); ds_queue_enqueue(render_q, _to.node); } } } } - - rendering.rendered = true; } ds_queue_destroy(render_q); @@ -92,7 +111,7 @@ function renderNodeBackward(_node) { for(var i = 0; i < ds_map_size(NODE_MAP); i++) { var _allnode = NODE_MAP[? key]; if(_allnode && !is_undefined(_allnode) && is_struct(_allnode) && string_pos("Node", instanceof(_allnode))) - _allnode.rendered = false; + _allnode.setRenderStatus(false); key = ds_map_find_next(NODE_MAP, key); } @@ -118,7 +137,7 @@ function renderNodeBackward(_node) { if(_leaf) { //show_debug_message("Rendering " + _rendering.name + " at " + string(ANIMATOR.current_frame)); - _rendering.rendered = true; + _rendering.setRenderStatus(true); if(_rendering.use_cache) { if(!_rendering.recoverCache()) _rendering.doUpdate(); diff --git a/sprites/s_node_2d_light/3ae6c6e4-2217-4634-8408-394ea861b899.png b/sprites/s_node_2d_light/3ae6c6e4-2217-4634-8408-394ea861b899.png new file mode 100644 index 000000000..d4d38f717 Binary files /dev/null and b/sprites/s_node_2d_light/3ae6c6e4-2217-4634-8408-394ea861b899.png differ diff --git a/sprites/s_node_2d_light/cd0ff460-935a-440b-af69-cb5c9c00a5e6.png b/sprites/s_node_2d_light/cd0ff460-935a-440b-af69-cb5c9c00a5e6.png deleted file mode 100644 index dfc2bf611..000000000 Binary files a/sprites/s_node_2d_light/cd0ff460-935a-440b-af69-cb5c9c00a5e6.png and /dev/null differ diff --git a/sprites/s_node_2d_light/layers/3ae6c6e4-2217-4634-8408-394ea861b899/aac630d5-be44-41e9-af0b-82e19310e3ca.png b/sprites/s_node_2d_light/layers/3ae6c6e4-2217-4634-8408-394ea861b899/aac630d5-be44-41e9-af0b-82e19310e3ca.png new file mode 100644 index 000000000..e879c2bef Binary files /dev/null and b/sprites/s_node_2d_light/layers/3ae6c6e4-2217-4634-8408-394ea861b899/aac630d5-be44-41e9-af0b-82e19310e3ca.png differ diff --git a/sprites/s_node_2d_light/layers/cd0ff460-935a-440b-af69-cb5c9c00a5e6/144ff21f-c912-4bb1-a6d6-99da2d5e4550.png b/sprites/s_node_2d_light/layers/cd0ff460-935a-440b-af69-cb5c9c00a5e6/144ff21f-c912-4bb1-a6d6-99da2d5e4550.png deleted file mode 100644 index dfc2bf611..000000000 Binary files a/sprites/s_node_2d_light/layers/cd0ff460-935a-440b-af69-cb5c9c00a5e6/144ff21f-c912-4bb1-a6d6-99da2d5e4550.png and /dev/null differ diff --git a/sprites/s_node_2d_light/s_node_2d_light.yy b/sprites/s_node_2d_light/s_node_2d_light.yy index 738f53e4a..e8dea04af 100644 --- a/sprites/s_node_2d_light/s_node_2d_light.yy +++ b/sprites/s_node_2d_light/s_node_2d_light.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"cd0ff460-935a-440b-af69-cb5c9c00a5e6","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"cd0ff460-935a-440b-af69-cb5c9c00a5e6","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"LayerId":{"name":"144ff21f-c912-4bb1-a6d6-99da2d5e4550","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","name":"cd0ff460-935a-440b-af69-cb5c9c00a5e6","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"3ae6c6e4-2217-4634-8408-394ea861b899","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"3ae6c6e4-2217-4634-8408-394ea861b899","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"LayerId":{"name":"aac630d5-be44-41e9-af0b-82e19310e3ca","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","name":"3ae6c6e4-2217-4634-8408-394ea861b899","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6c82f893-ec36-4b4e-a335-792f2d9cd463","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cd0ff460-935a-440b-af69-cb5c9c00a5e6","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e24d057f-f1d8-4e87-9e04-8cb364b6d501","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3ae6c6e4-2217-4634-8408-394ea861b899","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"144ff21f-c912-4bb1-a6d6-99da2d5e4550","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"aac630d5-be44-41e9-af0b-82e19310e3ca","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_cube/817f7759-df8f-4268-92aa-6014d53aaf86.png b/sprites/s_node_3d_cube/817f7759-df8f-4268-92aa-6014d53aaf86.png new file mode 100644 index 000000000..ff4fcfc55 Binary files /dev/null and b/sprites/s_node_3d_cube/817f7759-df8f-4268-92aa-6014d53aaf86.png differ diff --git a/sprites/s_node_3d_cube/ead5a799-951f-4a74-909c-671a3e78c807.png b/sprites/s_node_3d_cube/ead5a799-951f-4a74-909c-671a3e78c807.png deleted file mode 100644 index 383ddd9f8..000000000 Binary files a/sprites/s_node_3d_cube/ead5a799-951f-4a74-909c-671a3e78c807.png and /dev/null differ diff --git a/sprites/s_node_3d_cube/layers/817f7759-df8f-4268-92aa-6014d53aaf86/e01c371a-f1f4-4118-9361-68172103e86b.png b/sprites/s_node_3d_cube/layers/817f7759-df8f-4268-92aa-6014d53aaf86/e01c371a-f1f4-4118-9361-68172103e86b.png new file mode 100644 index 000000000..4b4b47925 Binary files /dev/null and b/sprites/s_node_3d_cube/layers/817f7759-df8f-4268-92aa-6014d53aaf86/e01c371a-f1f4-4118-9361-68172103e86b.png differ diff --git a/sprites/s_node_3d_cube/layers/ead5a799-951f-4a74-909c-671a3e78c807/f45ec24d-8a99-4d36-8422-0a76e0530ee4.png b/sprites/s_node_3d_cube/layers/ead5a799-951f-4a74-909c-671a3e78c807/f45ec24d-8a99-4d36-8422-0a76e0530ee4.png deleted file mode 100644 index 383ddd9f8..000000000 Binary files a/sprites/s_node_3d_cube/layers/ead5a799-951f-4a74-909c-671a3e78c807/f45ec24d-8a99-4d36-8422-0a76e0530ee4.png and /dev/null differ diff --git a/sprites/s_node_3d_cube/s_node_3d_cube.yy b/sprites/s_node_3d_cube/s_node_3d_cube.yy index 0fd152605..81c26da39 100644 --- a/sprites/s_node_3d_cube/s_node_3d_cube.yy +++ b/sprites/s_node_3d_cube/s_node_3d_cube.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 7, - "bbox_right": 24, - "bbox_top": 4, - "bbox_bottom": 28, + "bbox_left": 6, + "bbox_right": 25, + "bbox_top": 2, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ead5a799-951f-4a74-909c-671a3e78c807","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ead5a799-951f-4a74-909c-671a3e78c807","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"LayerId":{"name":"f45ec24d-8a99-4d36-8422-0a76e0530ee4","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","name":"ead5a799-951f-4a74-909c-671a3e78c807","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"817f7759-df8f-4268-92aa-6014d53aaf86","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"817f7759-df8f-4268-92aa-6014d53aaf86","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"LayerId":{"name":"e01c371a-f1f4-4118-9361-68172103e86b","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","name":"817f7759-df8f-4268-92aa-6014d53aaf86","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"49235830-d7f3-43fb-bcdd-bc01c361ef82","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ead5a799-951f-4a74-909c-671a3e78c807","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8ff1eaeb-afa0-4ff7-8cfb-395283a47fef","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"817f7759-df8f-4268-92aa-6014d53aaf86","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f45ec24d-8a99-4d36-8422-0a76e0530ee4","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e01c371a-f1f4-4118-9361-68172103e86b","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_cylinder/4ff81339-9c5f-44b8-871d-e5349cb5bc37.png b/sprites/s_node_3d_cylinder/4ff81339-9c5f-44b8-871d-e5349cb5bc37.png deleted file mode 100644 index 1f4b21d38..000000000 Binary files a/sprites/s_node_3d_cylinder/4ff81339-9c5f-44b8-871d-e5349cb5bc37.png and /dev/null differ diff --git a/sprites/s_node_3d_cylinder/749ff506-2ff2-4ac5-94d9-864e52171717.png b/sprites/s_node_3d_cylinder/749ff506-2ff2-4ac5-94d9-864e52171717.png new file mode 100644 index 000000000..3293d02fe Binary files /dev/null and b/sprites/s_node_3d_cylinder/749ff506-2ff2-4ac5-94d9-864e52171717.png differ diff --git a/sprites/s_node_3d_cylinder/layers/4ff81339-9c5f-44b8-871d-e5349cb5bc37/b9e0ff72-68c1-4dec-a594-9d2a5a3de248.png b/sprites/s_node_3d_cylinder/layers/4ff81339-9c5f-44b8-871d-e5349cb5bc37/b9e0ff72-68c1-4dec-a594-9d2a5a3de248.png deleted file mode 100644 index 1f4b21d38..000000000 Binary files a/sprites/s_node_3d_cylinder/layers/4ff81339-9c5f-44b8-871d-e5349cb5bc37/b9e0ff72-68c1-4dec-a594-9d2a5a3de248.png and /dev/null differ diff --git a/sprites/s_node_3d_cylinder/layers/749ff506-2ff2-4ac5-94d9-864e52171717/1d9a28e7-8819-4284-a395-456d3465166a.png b/sprites/s_node_3d_cylinder/layers/749ff506-2ff2-4ac5-94d9-864e52171717/1d9a28e7-8819-4284-a395-456d3465166a.png new file mode 100644 index 000000000..c3e4f8bf6 Binary files /dev/null and b/sprites/s_node_3d_cylinder/layers/749ff506-2ff2-4ac5-94d9-864e52171717/1d9a28e7-8819-4284-a395-456d3465166a.png differ diff --git a/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy b/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy index 582db036a..a02f90aff 100644 --- a/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy +++ b/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 6, - "bbox_right": 25, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 7, + "bbox_right": 24, + "bbox_top": 2, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"4ff81339-9c5f-44b8-871d-e5349cb5bc37","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4ff81339-9c5f-44b8-871d-e5349cb5bc37","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"LayerId":{"name":"b9e0ff72-68c1-4dec-a594-9d2a5a3de248","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","name":"4ff81339-9c5f-44b8-871d-e5349cb5bc37","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"749ff506-2ff2-4ac5-94d9-864e52171717","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"749ff506-2ff2-4ac5-94d9-864e52171717","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"LayerId":{"name":"1d9a28e7-8819-4284-a395-456d3465166a","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","name":"749ff506-2ff2-4ac5-94d9-864e52171717","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"70bb696b-e43f-49da-8a87-d51f4ac8309e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4ff81339-9c5f-44b8-871d-e5349cb5bc37","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"51be50ca-5eb0-4fc0-bb41-b2abb760ef09","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"749ff506-2ff2-4ac5-94d9-864e52171717","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b9e0ff72-68c1-4dec-a594-9d2a5a3de248","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1d9a28e7-8819-4284-a395-456d3465166a","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_obj/4e3e5faf-717c-4f34-9524-e24a1aedd31d.png b/sprites/s_node_3d_obj/4e3e5faf-717c-4f34-9524-e24a1aedd31d.png new file mode 100644 index 000000000..da2abadc6 Binary files /dev/null and b/sprites/s_node_3d_obj/4e3e5faf-717c-4f34-9524-e24a1aedd31d.png differ diff --git a/sprites/s_node_3d_obj/7ab2b97c-c188-49fb-81d2-10ff298bd338.png b/sprites/s_node_3d_obj/7ab2b97c-c188-49fb-81d2-10ff298bd338.png deleted file mode 100644 index f8d6c836f..000000000 Binary files a/sprites/s_node_3d_obj/7ab2b97c-c188-49fb-81d2-10ff298bd338.png and /dev/null differ diff --git a/sprites/s_node_3d_obj/layers/4e3e5faf-717c-4f34-9524-e24a1aedd31d/13d9d536-413e-43a5-87e0-694cf1779862.png b/sprites/s_node_3d_obj/layers/4e3e5faf-717c-4f34-9524-e24a1aedd31d/13d9d536-413e-43a5-87e0-694cf1779862.png new file mode 100644 index 000000000..e0fbdcd0d Binary files /dev/null and b/sprites/s_node_3d_obj/layers/4e3e5faf-717c-4f34-9524-e24a1aedd31d/13d9d536-413e-43a5-87e0-694cf1779862.png differ diff --git a/sprites/s_node_3d_obj/layers/7ab2b97c-c188-49fb-81d2-10ff298bd338/d76f4b26-4ece-41a5-8f2b-f31bb85b64ba.png b/sprites/s_node_3d_obj/layers/7ab2b97c-c188-49fb-81d2-10ff298bd338/d76f4b26-4ece-41a5-8f2b-f31bb85b64ba.png deleted file mode 100644 index f8d6c836f..000000000 Binary files a/sprites/s_node_3d_obj/layers/7ab2b97c-c188-49fb-81d2-10ff298bd338/d76f4b26-4ece-41a5-8f2b-f31bb85b64ba.png and /dev/null differ diff --git a/sprites/s_node_3d_obj/s_node_3d_obj.yy b/sprites/s_node_3d_obj/s_node_3d_obj.yy index 82b11ae11..3b14ca236 100644 --- a/sprites/s_node_3d_obj/s_node_3d_obj.yy +++ b/sprites/s_node_3d_obj/s_node_3d_obj.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, + "bbox_left": 5, "bbox_right": 24, - "bbox_top": 4, - "bbox_bottom": 27, + "bbox_top": 1, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"7ab2b97c-c188-49fb-81d2-10ff298bd338","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"7ab2b97c-c188-49fb-81d2-10ff298bd338","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"LayerId":{"name":"d76f4b26-4ece-41a5-8f2b-f31bb85b64ba","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","name":"7ab2b97c-c188-49fb-81d2-10ff298bd338","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4e3e5faf-717c-4f34-9524-e24a1aedd31d","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4e3e5faf-717c-4f34-9524-e24a1aedd31d","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"LayerId":{"name":"13d9d536-413e-43a5-87e0-694cf1779862","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","name":"4e3e5faf-717c-4f34-9524-e24a1aedd31d","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",}, @@ -41,10 +41,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c3d9aca4-322b-4599-982e-71d639a13a87","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7ab2b97c-c188-49fb-81d2-10ff298bd338","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9d71114c-db1d-44ea-abda-4ca932b1fa77","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4e3e5faf-717c-4f34-9524-e24a1aedd31d","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d76f4b26-4ece-41a5-8f2b-f31bb85b64ba","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"13d9d536-413e-43a5-87e0-694cf1779862","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_transform/0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b.png b/sprites/s_node_3d_transform/0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b.png new file mode 100644 index 000000000..d1c2fef18 Binary files /dev/null and b/sprites/s_node_3d_transform/0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b.png differ diff --git a/sprites/s_node_3d_transform/4cdce201-6e00-4df4-a204-53b06a53c941.png b/sprites/s_node_3d_transform/4cdce201-6e00-4df4-a204-53b06a53c941.png deleted file mode 100644 index 503e86866..000000000 Binary files a/sprites/s_node_3d_transform/4cdce201-6e00-4df4-a204-53b06a53c941.png and /dev/null differ diff --git a/sprites/s_node_3d_transform/layers/0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b/6b9e2f61-ea41-421b-8183-5ff34d5fa5e2.png b/sprites/s_node_3d_transform/layers/0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b/6b9e2f61-ea41-421b-8183-5ff34d5fa5e2.png new file mode 100644 index 000000000..5e851f4ee Binary files /dev/null and b/sprites/s_node_3d_transform/layers/0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b/6b9e2f61-ea41-421b-8183-5ff34d5fa5e2.png differ diff --git a/sprites/s_node_3d_transform/layers/4cdce201-6e00-4df4-a204-53b06a53c941/d1d3f168-e4ca-4f95-8ac9-4d888736a533.png b/sprites/s_node_3d_transform/layers/4cdce201-6e00-4df4-a204-53b06a53c941/d1d3f168-e4ca-4f95-8ac9-4d888736a533.png deleted file mode 100644 index 503e86866..000000000 Binary files a/sprites/s_node_3d_transform/layers/4cdce201-6e00-4df4-a204-53b06a53c941/d1d3f168-e4ca-4f95-8ac9-4d888736a533.png and /dev/null differ diff --git a/sprites/s_node_3d_transform/s_node_3d_transform.yy b/sprites/s_node_3d_transform/s_node_3d_transform.yy index 1e5779fa9..1a7a8c39e 100644 --- a/sprites/s_node_3d_transform/s_node_3d_transform.yy +++ b/sprites/s_node_3d_transform/s_node_3d_transform.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, + "bbox_left": 4, + "bbox_right": 27, + "bbox_top": 4, "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"4cdce201-6e00-4df4-a204-53b06a53c941","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4cdce201-6e00-4df4-a204-53b06a53c941","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"LayerId":{"name":"d1d3f168-e4ca-4f95-8ac9-4d888736a533","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","name":"4cdce201-6e00-4df4-a204-53b06a53c941","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"LayerId":{"name":"6b9e2f61-ea41-421b-8183-5ff34d5fa5e2","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","name":"0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3b9a6687-e5d9-467d-b0ec-423ab1e1d981","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4cdce201-6e00-4df4-a204-53b06a53c941","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4df03a64-9cd4-4535-a1f0-74ac8643a6a8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0d51bcd7-588c-4bb3-8eb4-9dac46d85f2b","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d1d3f168-e4ca-4f95-8ac9-4d888736a533","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"6b9e2f61-ea41-421b-8183-5ff34d5fa5e2","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_9patch/13cc7f49-b919-4721-afcc-5ce0b0f281c8.png b/sprites/s_node_9patch/13cc7f49-b919-4721-afcc-5ce0b0f281c8.png deleted file mode 100644 index c27e4c66e..000000000 Binary files a/sprites/s_node_9patch/13cc7f49-b919-4721-afcc-5ce0b0f281c8.png and /dev/null differ diff --git a/sprites/s_node_9patch/f4508e55-9387-4b8b-b73d-ed8a991de2a6.png b/sprites/s_node_9patch/f4508e55-9387-4b8b-b73d-ed8a991de2a6.png new file mode 100644 index 000000000..90688ded4 Binary files /dev/null and b/sprites/s_node_9patch/f4508e55-9387-4b8b-b73d-ed8a991de2a6.png differ diff --git a/sprites/s_node_9patch/layers/13cc7f49-b919-4721-afcc-5ce0b0f281c8/1c98e49d-f054-4fbf-8fe5-3ce0c98e4266.png b/sprites/s_node_9patch/layers/13cc7f49-b919-4721-afcc-5ce0b0f281c8/1c98e49d-f054-4fbf-8fe5-3ce0c98e4266.png deleted file mode 100644 index c27e4c66e..000000000 Binary files a/sprites/s_node_9patch/layers/13cc7f49-b919-4721-afcc-5ce0b0f281c8/1c98e49d-f054-4fbf-8fe5-3ce0c98e4266.png and /dev/null differ diff --git a/sprites/s_node_9patch/layers/f4508e55-9387-4b8b-b73d-ed8a991de2a6/294a3561-ca1a-4be6-add4-93a23138b369.png b/sprites/s_node_9patch/layers/f4508e55-9387-4b8b-b73d-ed8a991de2a6/294a3561-ca1a-4be6-add4-93a23138b369.png new file mode 100644 index 000000000..e4b7ec880 Binary files /dev/null and b/sprites/s_node_9patch/layers/f4508e55-9387-4b8b-b73d-ed8a991de2a6/294a3561-ca1a-4be6-add4-93a23138b369.png differ diff --git a/sprites/s_node_9patch/s_node_9patch.yy b/sprites/s_node_9patch/s_node_9patch.yy index 6619f8b70..a679f9c18 100644 --- a/sprites/s_node_9patch/s_node_9patch.yy +++ b/sprites/s_node_9patch/s_node_9patch.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"13cc7f49-b919-4721-afcc-5ce0b0f281c8","path":"sprites/s_node_9patch/s_node_9patch.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"13cc7f49-b919-4721-afcc-5ce0b0f281c8","path":"sprites/s_node_9patch/s_node_9patch.yy",},"LayerId":{"name":"1c98e49d-f054-4fbf-8fe5-3ce0c98e4266","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","name":"13cc7f49-b919-4721-afcc-5ce0b0f281c8","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"f4508e55-9387-4b8b-b73d-ed8a991de2a6","path":"sprites/s_node_9patch/s_node_9patch.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"f4508e55-9387-4b8b-b73d-ed8a991de2a6","path":"sprites/s_node_9patch/s_node_9patch.yy",},"LayerId":{"name":"294a3561-ca1a-4be6-add4-93a23138b369","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","name":"f4508e55-9387-4b8b-b73d-ed8a991de2a6","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",}, @@ -41,10 +41,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a3d3f805-dc41-444a-acd5-58c13d26a217","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"13cc7f49-b919-4721-afcc-5ce0b0f281c8","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f91110e2-8ec9-4d40-a4ad-736eafda1d61","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f4508e55-9387-4b8b-b73d-ed8a991de2a6","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1c98e49d-f054-4fbf-8fe5-3ce0c98e4266","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"294a3561-ca1a-4be6-add4-93a23138b369","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_BW/c64395c8-6679-4d83-89ca-07118e5caedd.png b/sprites/s_node_BW/c64395c8-6679-4d83-89ca-07118e5caedd.png deleted file mode 100644 index a418811ea..000000000 Binary files a/sprites/s_node_BW/c64395c8-6679-4d83-89ca-07118e5caedd.png and /dev/null differ diff --git a/sprites/s_node_BW/f5623e82-7fcf-4e44-823d-b6ec7154fa03.png b/sprites/s_node_BW/f5623e82-7fcf-4e44-823d-b6ec7154fa03.png new file mode 100644 index 000000000..34844f99b Binary files /dev/null and b/sprites/s_node_BW/f5623e82-7fcf-4e44-823d-b6ec7154fa03.png differ diff --git a/sprites/s_node_BW/layers/c64395c8-6679-4d83-89ca-07118e5caedd/064fa609-74c7-481e-bcf7-7f185d1fc085.png b/sprites/s_node_BW/layers/c64395c8-6679-4d83-89ca-07118e5caedd/064fa609-74c7-481e-bcf7-7f185d1fc085.png deleted file mode 100644 index a418811ea..000000000 Binary files a/sprites/s_node_BW/layers/c64395c8-6679-4d83-89ca-07118e5caedd/064fa609-74c7-481e-bcf7-7f185d1fc085.png and /dev/null differ diff --git a/sprites/s_node_BW/layers/f5623e82-7fcf-4e44-823d-b6ec7154fa03/03398292-7751-40ad-af9f-b7c45f04fad8.png b/sprites/s_node_BW/layers/f5623e82-7fcf-4e44-823d-b6ec7154fa03/03398292-7751-40ad-af9f-b7c45f04fad8.png new file mode 100644 index 000000000..292f34896 Binary files /dev/null and b/sprites/s_node_BW/layers/f5623e82-7fcf-4e44-823d-b6ec7154fa03/03398292-7751-40ad-af9f-b7c45f04fad8.png differ diff --git a/sprites/s_node_BW/s_node_BW.yy b/sprites/s_node_BW/s_node_BW.yy index 6fdde795f..82e1aab7b 100644 --- a/sprites/s_node_BW/s_node_BW.yy +++ b/sprites/s_node_BW/s_node_BW.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"c64395c8-6679-4d83-89ca-07118e5caedd","path":"sprites/s_node_BW/s_node_BW.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"c64395c8-6679-4d83-89ca-07118e5caedd","path":"sprites/s_node_BW/s_node_BW.yy",},"LayerId":{"name":"064fa609-74c7-481e-bcf7-7f185d1fc085","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","name":"c64395c8-6679-4d83-89ca-07118e5caedd","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"f5623e82-7fcf-4e44-823d-b6ec7154fa03","path":"sprites/s_node_BW/s_node_BW.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"f5623e82-7fcf-4e44-823d-b6ec7154fa03","path":"sprites/s_node_BW/s_node_BW.yy",},"LayerId":{"name":"03398292-7751-40ad-af9f-b7c45f04fad8","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","name":"f5623e82-7fcf-4e44-823d-b6ec7154fa03","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"00a1cf05-03e1-45c4-a084-a92b145378f8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c64395c8-6679-4d83-89ca-07118e5caedd","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"553a34fb-31cd-48e0-bc8b-68a696b26884","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f5623e82-7fcf-4e44-823d-b6ec7154fa03","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"064fa609-74c7-481e-bcf7-7f185d1fc085","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"03398292-7751-40ad-af9f-b7c45f04fad8","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_RGB/04892cc3-0312-41aa-9dcc-225f1dc4cd0e.png b/sprites/s_node_RGB/04892cc3-0312-41aa-9dcc-225f1dc4cd0e.png new file mode 100644 index 000000000..679ef2c94 Binary files /dev/null and b/sprites/s_node_RGB/04892cc3-0312-41aa-9dcc-225f1dc4cd0e.png differ diff --git a/sprites/s_node_RGB/2364af30-7d68-453d-b630-a2146a83c59b.png b/sprites/s_node_RGB/2364af30-7d68-453d-b630-a2146a83c59b.png deleted file mode 100644 index cfaf2534c..000000000 Binary files a/sprites/s_node_RGB/2364af30-7d68-453d-b630-a2146a83c59b.png and /dev/null differ diff --git a/sprites/s_node_RGB/layers/04892cc3-0312-41aa-9dcc-225f1dc4cd0e/e10a0741-ceb1-4ff1-ad82-147f2bf2eb69.png b/sprites/s_node_RGB/layers/04892cc3-0312-41aa-9dcc-225f1dc4cd0e/e10a0741-ceb1-4ff1-ad82-147f2bf2eb69.png new file mode 100644 index 000000000..5cb751aeb Binary files /dev/null and b/sprites/s_node_RGB/layers/04892cc3-0312-41aa-9dcc-225f1dc4cd0e/e10a0741-ceb1-4ff1-ad82-147f2bf2eb69.png differ diff --git a/sprites/s_node_RGB/layers/2364af30-7d68-453d-b630-a2146a83c59b/c12cbef4-8490-415e-9875-bb590298e14c.png b/sprites/s_node_RGB/layers/2364af30-7d68-453d-b630-a2146a83c59b/c12cbef4-8490-415e-9875-bb590298e14c.png deleted file mode 100644 index cfaf2534c..000000000 Binary files a/sprites/s_node_RGB/layers/2364af30-7d68-453d-b630-a2146a83c59b/c12cbef4-8490-415e-9875-bb590298e14c.png and /dev/null differ diff --git a/sprites/s_node_RGB/s_node_RGB.yy b/sprites/s_node_RGB/s_node_RGB.yy index eac7f2625..f7a2dd8f5 100644 --- a/sprites/s_node_RGB/s_node_RGB.yy +++ b/sprites/s_node_RGB/s_node_RGB.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"2364af30-7d68-453d-b630-a2146a83c59b","path":"sprites/s_node_RGB/s_node_RGB.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2364af30-7d68-453d-b630-a2146a83c59b","path":"sprites/s_node_RGB/s_node_RGB.yy",},"LayerId":{"name":"c12cbef4-8490-415e-9875-bb590298e14c","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","name":"2364af30-7d68-453d-b630-a2146a83c59b","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"04892cc3-0312-41aa-9dcc-225f1dc4cd0e","path":"sprites/s_node_RGB/s_node_RGB.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"04892cc3-0312-41aa-9dcc-225f1dc4cd0e","path":"sprites/s_node_RGB/s_node_RGB.yy",},"LayerId":{"name":"e10a0741-ceb1-4ff1-ad82-147f2bf2eb69","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","name":"04892cc3-0312-41aa-9dcc-225f1dc4cd0e","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9e01b9a0-7145-4b3a-a859-e287c4a9c792","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2364af30-7d68-453d-b630-a2146a83c59b","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"32671d40-3415-4bc6-b129-a3f05603abe4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"04892cc3-0312-41aa-9dcc-225f1dc4cd0e","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c12cbef4-8490-415e-9875-bb590298e14c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e10a0741-ceb1-4ff1-ad82-147f2bf2eb69","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_alpha_cut/57daba22-7b6c-4fa8-a2a6-0fd020016e74.png b/sprites/s_node_alpha_cut/57daba22-7b6c-4fa8-a2a6-0fd020016e74.png deleted file mode 100644 index 199d91981..000000000 Binary files a/sprites/s_node_alpha_cut/57daba22-7b6c-4fa8-a2a6-0fd020016e74.png and /dev/null differ diff --git a/sprites/s_node_alpha_cut/d7786e2d-b1a5-4e30-bbab-94a230655fe1.png b/sprites/s_node_alpha_cut/d7786e2d-b1a5-4e30-bbab-94a230655fe1.png new file mode 100644 index 000000000..3211bde84 Binary files /dev/null and b/sprites/s_node_alpha_cut/d7786e2d-b1a5-4e30-bbab-94a230655fe1.png differ diff --git a/sprites/s_node_alpha_cut/layers/57daba22-7b6c-4fa8-a2a6-0fd020016e74/dfdcf298-16d6-4606-9ef1-a6c70c745bd7.png b/sprites/s_node_alpha_cut/layers/57daba22-7b6c-4fa8-a2a6-0fd020016e74/dfdcf298-16d6-4606-9ef1-a6c70c745bd7.png deleted file mode 100644 index 199d91981..000000000 Binary files a/sprites/s_node_alpha_cut/layers/57daba22-7b6c-4fa8-a2a6-0fd020016e74/dfdcf298-16d6-4606-9ef1-a6c70c745bd7.png and /dev/null differ diff --git a/sprites/s_node_alpha_cut/layers/d7786e2d-b1a5-4e30-bbab-94a230655fe1/7de6f62e-3bdb-4b4a-a2db-8464be730345.png b/sprites/s_node_alpha_cut/layers/d7786e2d-b1a5-4e30-bbab-94a230655fe1/7de6f62e-3bdb-4b4a-a2db-8464be730345.png new file mode 100644 index 000000000..27d9978d0 Binary files /dev/null and b/sprites/s_node_alpha_cut/layers/d7786e2d-b1a5-4e30-bbab-94a230655fe1/7de6f62e-3bdb-4b4a-a2db-8464be730345.png differ diff --git a/sprites/s_node_alpha_cut/s_node_alpha_cut.yy b/sprites/s_node_alpha_cut/s_node_alpha_cut.yy index dd7952178..1b39530bc 100644 --- a/sprites/s_node_alpha_cut/s_node_alpha_cut.yy +++ b/sprites/s_node_alpha_cut/s_node_alpha_cut.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"57daba22-7b6c-4fa8-a2a6-0fd020016e74","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"57daba22-7b6c-4fa8-a2a6-0fd020016e74","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"LayerId":{"name":"dfdcf298-16d6-4606-9ef1-a6c70c745bd7","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","name":"57daba22-7b6c-4fa8-a2a6-0fd020016e74","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"d7786e2d-b1a5-4e30-bbab-94a230655fe1","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"d7786e2d-b1a5-4e30-bbab-94a230655fe1","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"LayerId":{"name":"7de6f62e-3bdb-4b4a-a2db-8464be730345","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","name":"d7786e2d-b1a5-4e30-bbab-94a230655fe1","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"43713f74-7b56-4b0a-9fb7-4d0dad9e3750","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"57daba22-7b6c-4fa8-a2a6-0fd020016e74","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0627e96c-fdcd-4201-9e10-49ac5dd0e3c0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d7786e2d-b1a5-4e30-bbab-94a230655fe1","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"dfdcf298-16d6-4606-9ef1-a6c70c745bd7","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7de6f62e-3bdb-4b4a-a2db-8464be730345","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_alpha_grey/245a977d-4714-41a8-a207-bceef2b3f632.png b/sprites/s_node_alpha_grey/245a977d-4714-41a8-a207-bceef2b3f632.png new file mode 100644 index 000000000..5b156d35c Binary files /dev/null and b/sprites/s_node_alpha_grey/245a977d-4714-41a8-a207-bceef2b3f632.png differ diff --git a/sprites/s_node_alpha_grey/af8c5589-91d0-40b1-bb8c-ca24b5ed64c0.png b/sprites/s_node_alpha_grey/af8c5589-91d0-40b1-bb8c-ca24b5ed64c0.png deleted file mode 100644 index 0b99d2284..000000000 Binary files a/sprites/s_node_alpha_grey/af8c5589-91d0-40b1-bb8c-ca24b5ed64c0.png and /dev/null differ diff --git a/sprites/s_node_alpha_grey/layers/245a977d-4714-41a8-a207-bceef2b3f632/63feaefc-2cd0-4138-b271-420359abdfab.png b/sprites/s_node_alpha_grey/layers/245a977d-4714-41a8-a207-bceef2b3f632/63feaefc-2cd0-4138-b271-420359abdfab.png new file mode 100644 index 000000000..9a46b810b Binary files /dev/null and b/sprites/s_node_alpha_grey/layers/245a977d-4714-41a8-a207-bceef2b3f632/63feaefc-2cd0-4138-b271-420359abdfab.png differ diff --git a/sprites/s_node_alpha_grey/layers/af8c5589-91d0-40b1-bb8c-ca24b5ed64c0/4c195bff-396a-44b4-9bd2-1358c37cdf1b.png b/sprites/s_node_alpha_grey/layers/af8c5589-91d0-40b1-bb8c-ca24b5ed64c0/4c195bff-396a-44b4-9bd2-1358c37cdf1b.png deleted file mode 100644 index 1bc776223..000000000 Binary files a/sprites/s_node_alpha_grey/layers/af8c5589-91d0-40b1-bb8c-ca24b5ed64c0/4c195bff-396a-44b4-9bd2-1358c37cdf1b.png and /dev/null differ diff --git a/sprites/s_node_alpha_grey/s_node_alpha_grey.yy b/sprites/s_node_alpha_grey/s_node_alpha_grey.yy index 02e39498d..f6a5449fc 100644 --- a/sprites/s_node_alpha_grey/s_node_alpha_grey.yy +++ b/sprites/s_node_alpha_grey/s_node_alpha_grey.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"af8c5589-91d0-40b1-bb8c-ca24b5ed64c0","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"af8c5589-91d0-40b1-bb8c-ca24b5ed64c0","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"LayerId":{"name":"4c195bff-396a-44b4-9bd2-1358c37cdf1b","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","name":"af8c5589-91d0-40b1-bb8c-ca24b5ed64c0","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"245a977d-4714-41a8-a207-bceef2b3f632","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"245a977d-4714-41a8-a207-bceef2b3f632","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"LayerId":{"name":"63feaefc-2cd0-4138-b271-420359abdfab","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","name":"245a977d-4714-41a8-a207-bceef2b3f632","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"bdc2dec2-73d7-4db8-afe3-967da3775789","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"af8c5589-91d0-40b1-bb8c-ca24b5ed64c0","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1d0496ad-f528-4bc7-88ae-75211af75bd1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"245a977d-4714-41a8-a207-bceef2b3f632","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4c195bff-396a-44b4-9bd2-1358c37cdf1b","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"63feaefc-2cd0-4138-b271-420359abdfab","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_area/14394e87-56c0-4f20-973b-b1d3355df340.png b/sprites/s_node_area/14394e87-56c0-4f20-973b-b1d3355df340.png new file mode 100644 index 000000000..b6d1a5901 Binary files /dev/null and b/sprites/s_node_area/14394e87-56c0-4f20-973b-b1d3355df340.png differ diff --git a/sprites/s_node_area/2e392e13-7cc8-408a-a7d5-e5e4c55f43f2.png b/sprites/s_node_area/2e392e13-7cc8-408a-a7d5-e5e4c55f43f2.png deleted file mode 100644 index f6a7b588c..000000000 Binary files a/sprites/s_node_area/2e392e13-7cc8-408a-a7d5-e5e4c55f43f2.png and /dev/null differ diff --git a/sprites/s_node_area/layers/14394e87-56c0-4f20-973b-b1d3355df340/369828a6-716c-48b2-9fca-82ae0b359d0e.png b/sprites/s_node_area/layers/14394e87-56c0-4f20-973b-b1d3355df340/369828a6-716c-48b2-9fca-82ae0b359d0e.png new file mode 100644 index 000000000..328faf832 Binary files /dev/null and b/sprites/s_node_area/layers/14394e87-56c0-4f20-973b-b1d3355df340/369828a6-716c-48b2-9fca-82ae0b359d0e.png differ diff --git a/sprites/s_node_area/layers/2e392e13-7cc8-408a-a7d5-e5e4c55f43f2/da8a2dd8-4c50-4318-829e-e0f5d8269292.png b/sprites/s_node_area/layers/2e392e13-7cc8-408a-a7d5-e5e4c55f43f2/da8a2dd8-4c50-4318-829e-e0f5d8269292.png deleted file mode 100644 index f6a7b588c..000000000 Binary files a/sprites/s_node_area/layers/2e392e13-7cc8-408a-a7d5-e5e4c55f43f2/da8a2dd8-4c50-4318-829e-e0f5d8269292.png and /dev/null differ diff --git a/sprites/s_node_area/s_node_area.yy b/sprites/s_node_area/s_node_area.yy index e5ccac86f..605e7b3e5 100644 --- a/sprites/s_node_area/s_node_area.yy +++ b/sprites/s_node_area/s_node_area.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"2e392e13-7cc8-408a-a7d5-e5e4c55f43f2","path":"sprites/s_node_area/s_node_area.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2e392e13-7cc8-408a-a7d5-e5e4c55f43f2","path":"sprites/s_node_area/s_node_area.yy",},"LayerId":{"name":"da8a2dd8-4c50-4318-829e-e0f5d8269292","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","name":"2e392e13-7cc8-408a-a7d5-e5e4c55f43f2","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"14394e87-56c0-4f20-973b-b1d3355df340","path":"sprites/s_node_area/s_node_area.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"14394e87-56c0-4f20-973b-b1d3355df340","path":"sprites/s_node_area/s_node_area.yy",},"LayerId":{"name":"369828a6-716c-48b2-9fca-82ae0b359d0e","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","name":"14394e87-56c0-4f20-973b-b1d3355df340","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1be264ac-493f-4a1a-a8b5-c46465d16e90","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2e392e13-7cc8-408a-a7d5-e5e4c55f43f2","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0873cd23-90cb-44aa-bb05-a277f38b9aee","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"14394e87-56c0-4f20-973b-b1d3355df340","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"da8a2dd8-4c50-4318-829e-e0f5d8269292","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"369828a6-716c-48b2-9fca-82ae0b359d0e","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_array/739d9248-8247-47f4-9330-bfb16c51eab6.png b/sprites/s_node_array/739d9248-8247-47f4-9330-bfb16c51eab6.png deleted file mode 100644 index 59b95a154..000000000 Binary files a/sprites/s_node_array/739d9248-8247-47f4-9330-bfb16c51eab6.png and /dev/null differ diff --git a/sprites/s_node_array/798e9cfc-72b9-416b-a699-f94afa97d281.png b/sprites/s_node_array/798e9cfc-72b9-416b-a699-f94afa97d281.png new file mode 100644 index 000000000..eee798fdf Binary files /dev/null and b/sprites/s_node_array/798e9cfc-72b9-416b-a699-f94afa97d281.png differ diff --git a/sprites/s_node_array/layers/739d9248-8247-47f4-9330-bfb16c51eab6/c3b8d109-f5eb-42fd-a4c6-1efb831e8bd0.png b/sprites/s_node_array/layers/739d9248-8247-47f4-9330-bfb16c51eab6/c3b8d109-f5eb-42fd-a4c6-1efb831e8bd0.png deleted file mode 100644 index 59b95a154..000000000 Binary files a/sprites/s_node_array/layers/739d9248-8247-47f4-9330-bfb16c51eab6/c3b8d109-f5eb-42fd-a4c6-1efb831e8bd0.png and /dev/null differ diff --git a/sprites/s_node_array/layers/798e9cfc-72b9-416b-a699-f94afa97d281/61db0367-6d8e-42bc-a438-800e100c8573.png b/sprites/s_node_array/layers/798e9cfc-72b9-416b-a699-f94afa97d281/61db0367-6d8e-42bc-a438-800e100c8573.png new file mode 100644 index 000000000..20dd44add Binary files /dev/null and b/sprites/s_node_array/layers/798e9cfc-72b9-416b-a699-f94afa97d281/61db0367-6d8e-42bc-a438-800e100c8573.png differ diff --git a/sprites/s_node_array/s_node_array.yy b/sprites/s_node_array/s_node_array.yy index 9c11626f9..271a82af6 100644 --- a/sprites/s_node_array/s_node_array.yy +++ b/sprites/s_node_array/s_node_array.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 9, - "bbox_bottom": 21, + "bbox_bottom": 22, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"739d9248-8247-47f4-9330-bfb16c51eab6","path":"sprites/s_node_array/s_node_array.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"739d9248-8247-47f4-9330-bfb16c51eab6","path":"sprites/s_node_array/s_node_array.yy",},"LayerId":{"name":"c3b8d109-f5eb-42fd-a4c6-1efb831e8bd0","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","name":"739d9248-8247-47f4-9330-bfb16c51eab6","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"798e9cfc-72b9-416b-a699-f94afa97d281","path":"sprites/s_node_array/s_node_array.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"798e9cfc-72b9-416b-a699-f94afa97d281","path":"sprites/s_node_array/s_node_array.yy",},"LayerId":{"name":"61db0367-6d8e-42bc-a438-800e100c8573","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","name":"798e9cfc-72b9-416b-a699-f94afa97d281","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"bc60dbfc-44a2-4660-986b-490f6b432edc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"739d9248-8247-47f4-9330-bfb16c51eab6","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"655b00e1-a38d-4022-9efb-19be2f813259","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"798e9cfc-72b9-416b-a699-f94afa97d281","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c3b8d109-f5eb-42fd-a4c6-1efb831e8bd0","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"61db0367-6d8e-42bc-a438-800e100c8573","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_array_length/43876625-3678-43e2-893e-59f2dda6d267.png b/sprites/s_node_array_length/43876625-3678-43e2-893e-59f2dda6d267.png deleted file mode 100644 index ee21695a7..000000000 Binary files a/sprites/s_node_array_length/43876625-3678-43e2-893e-59f2dda6d267.png and /dev/null differ diff --git a/sprites/s_node_array_length/e620c2b9-0360-4674-ab08-849fc0072a84.png b/sprites/s_node_array_length/e620c2b9-0360-4674-ab08-849fc0072a84.png new file mode 100644 index 000000000..d1f811030 Binary files /dev/null and b/sprites/s_node_array_length/e620c2b9-0360-4674-ab08-849fc0072a84.png differ diff --git a/sprites/s_node_array_length/layers/43876625-3678-43e2-893e-59f2dda6d267/2234cc37-178e-4eb3-9cfd-e5243cb715e1.png b/sprites/s_node_array_length/layers/43876625-3678-43e2-893e-59f2dda6d267/2234cc37-178e-4eb3-9cfd-e5243cb715e1.png deleted file mode 100644 index ee21695a7..000000000 Binary files a/sprites/s_node_array_length/layers/43876625-3678-43e2-893e-59f2dda6d267/2234cc37-178e-4eb3-9cfd-e5243cb715e1.png and /dev/null differ diff --git a/sprites/s_node_array_length/layers/e620c2b9-0360-4674-ab08-849fc0072a84/d5a3cba1-d42b-4950-9e82-13b1376b5479.png b/sprites/s_node_array_length/layers/e620c2b9-0360-4674-ab08-849fc0072a84/d5a3cba1-d42b-4950-9e82-13b1376b5479.png new file mode 100644 index 000000000..5508aff6c Binary files /dev/null and b/sprites/s_node_array_length/layers/e620c2b9-0360-4674-ab08-849fc0072a84/d5a3cba1-d42b-4950-9e82-13b1376b5479.png differ diff --git a/sprites/s_node_array_length/s_node_array_length.yy b/sprites/s_node_array_length/s_node_array_length.yy index ac4bcc442..833a8d9f0 100644 --- a/sprites/s_node_array_length/s_node_array_length.yy +++ b/sprites/s_node_array_length/s_node_array_length.yy @@ -7,9 +7,9 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 6, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 5, "bbox_bottom": 26, "HTile": false, "VTile": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"43876625-3678-43e2-893e-59f2dda6d267","path":"sprites/s_node_array_length/s_node_array_length.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"43876625-3678-43e2-893e-59f2dda6d267","path":"sprites/s_node_array_length/s_node_array_length.yy",},"LayerId":{"name":"2234cc37-178e-4eb3-9cfd-e5243cb715e1","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","name":"43876625-3678-43e2-893e-59f2dda6d267","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e620c2b9-0360-4674-ab08-849fc0072a84","path":"sprites/s_node_array_length/s_node_array_length.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e620c2b9-0360-4674-ab08-849fc0072a84","path":"sprites/s_node_array_length/s_node_array_length.yy",},"LayerId":{"name":"d5a3cba1-d42b-4950-9e82-13b1376b5479","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","name":"e620c2b9-0360-4674-ab08-849fc0072a84","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f8cb50d4-64ce-40ce-ac4d-aef3ff910028","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"43876625-3678-43e2-893e-59f2dda6d267","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f8f56d4b-f9bc-4961-b48a-6e1a80332541","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e620c2b9-0360-4674-ab08-849fc0072a84","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2234cc37-178e-4eb3-9cfd-e5243cb715e1","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d5a3cba1-d42b-4950-9e82-13b1376b5479","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_atlas/5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72.png b/sprites/s_node_atlas/5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72.png deleted file mode 100644 index 4013ff7ab..000000000 Binary files a/sprites/s_node_atlas/5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72.png and /dev/null differ diff --git a/sprites/s_node_atlas/a4131e2e-07b0-4b93-aaed-1a31be8baa30.png b/sprites/s_node_atlas/a4131e2e-07b0-4b93-aaed-1a31be8baa30.png new file mode 100644 index 000000000..9ae9ea9ac Binary files /dev/null and b/sprites/s_node_atlas/a4131e2e-07b0-4b93-aaed-1a31be8baa30.png differ diff --git a/sprites/s_node_atlas/layers/5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72/242b569a-70ee-4e86-a029-e3ac6cf28dad.png b/sprites/s_node_atlas/layers/5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72/242b569a-70ee-4e86-a029-e3ac6cf28dad.png deleted file mode 100644 index 4013ff7ab..000000000 Binary files a/sprites/s_node_atlas/layers/5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72/242b569a-70ee-4e86-a029-e3ac6cf28dad.png and /dev/null differ diff --git a/sprites/s_node_atlas/layers/a4131e2e-07b0-4b93-aaed-1a31be8baa30/3a5a7098-d647-4698-9814-30a41f4f28ec.png b/sprites/s_node_atlas/layers/a4131e2e-07b0-4b93-aaed-1a31be8baa30/3a5a7098-d647-4698-9814-30a41f4f28ec.png new file mode 100644 index 000000000..1fc183a72 Binary files /dev/null and b/sprites/s_node_atlas/layers/a4131e2e-07b0-4b93-aaed-1a31be8baa30/3a5a7098-d647-4698-9814-30a41f4f28ec.png differ diff --git a/sprites/s_node_atlas/s_node_atlas.yy b/sprites/s_node_atlas/s_node_atlas.yy index 66c9dee4d..ebe30b6e7 100644 --- a/sprites/s_node_atlas/s_node_atlas.yy +++ b/sprites/s_node_atlas/s_node_atlas.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72","path":"sprites/s_node_atlas/s_node_atlas.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72","path":"sprites/s_node_atlas/s_node_atlas.yy",},"LayerId":{"name":"242b569a-70ee-4e86-a029-e3ac6cf28dad","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","name":"5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"a4131e2e-07b0-4b93-aaed-1a31be8baa30","path":"sprites/s_node_atlas/s_node_atlas.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"a4131e2e-07b0-4b93-aaed-1a31be8baa30","path":"sprites/s_node_atlas/s_node_atlas.yy",},"LayerId":{"name":"3a5a7098-d647-4698-9814-30a41f4f28ec","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","name":"a4131e2e-07b0-4b93-aaed-1a31be8baa30","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d4e3c2b8-4b4d-46e6-81a9-7fc24c5a6185","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5cfc5bb9-a2a8-46c2-abcf-cb010cdbaf72","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1e16de10-bf3f-4bdc-843e-0f0e815951ce","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a4131e2e-07b0-4b93-aaed-1a31be8baa30","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"242b569a-70ee-4e86-a029-e3ac6cf28dad","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3a5a7098-d647-4698-9814-30a41f4f28ec","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_bevel/3e4d54a3-acc3-4626-8b9e-b36431bed8b9.png b/sprites/s_node_bevel/3e4d54a3-acc3-4626-8b9e-b36431bed8b9.png new file mode 100644 index 000000000..b7afa42df Binary files /dev/null and b/sprites/s_node_bevel/3e4d54a3-acc3-4626-8b9e-b36431bed8b9.png differ diff --git a/sprites/s_node_bevel/b9932d35-8280-4465-8a47-28ec181321a4.png b/sprites/s_node_bevel/b9932d35-8280-4465-8a47-28ec181321a4.png deleted file mode 100644 index a2dad5f6c..000000000 Binary files a/sprites/s_node_bevel/b9932d35-8280-4465-8a47-28ec181321a4.png and /dev/null differ diff --git a/sprites/s_node_bevel/layers/3e4d54a3-acc3-4626-8b9e-b36431bed8b9/4b317577-d093-4451-a959-4629e7a2dcb9.png b/sprites/s_node_bevel/layers/3e4d54a3-acc3-4626-8b9e-b36431bed8b9/4b317577-d093-4451-a959-4629e7a2dcb9.png new file mode 100644 index 000000000..6e2110cd2 Binary files /dev/null and b/sprites/s_node_bevel/layers/3e4d54a3-acc3-4626-8b9e-b36431bed8b9/4b317577-d093-4451-a959-4629e7a2dcb9.png differ diff --git a/sprites/s_node_bevel/layers/b9932d35-8280-4465-8a47-28ec181321a4/760ffb5d-8843-47c6-be9f-af7205d95feb.png b/sprites/s_node_bevel/layers/b9932d35-8280-4465-8a47-28ec181321a4/760ffb5d-8843-47c6-be9f-af7205d95feb.png deleted file mode 100644 index a2dad5f6c..000000000 Binary files a/sprites/s_node_bevel/layers/b9932d35-8280-4465-8a47-28ec181321a4/760ffb5d-8843-47c6-be9f-af7205d95feb.png and /dev/null differ diff --git a/sprites/s_node_bevel/s_node_bevel.yy b/sprites/s_node_bevel/s_node_bevel.yy index 7c5065c32..dfd7adc92 100644 --- a/sprites/s_node_bevel/s_node_bevel.yy +++ b/sprites/s_node_bevel/s_node_bevel.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 32, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b9932d35-8280-4465-8a47-28ec181321a4","path":"sprites/s_node_bevel/s_node_bevel.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b9932d35-8280-4465-8a47-28ec181321a4","path":"sprites/s_node_bevel/s_node_bevel.yy",},"LayerId":{"name":"760ffb5d-8843-47c6-be9f-af7205d95feb","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","name":"b9932d35-8280-4465-8a47-28ec181321a4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"3e4d54a3-acc3-4626-8b9e-b36431bed8b9","path":"sprites/s_node_bevel/s_node_bevel.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"3e4d54a3-acc3-4626-8b9e-b36431bed8b9","path":"sprites/s_node_bevel/s_node_bevel.yy",},"LayerId":{"name":"4b317577-d093-4451-a959-4629e7a2dcb9","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","name":"3e4d54a3-acc3-4626-8b9e-b36431bed8b9","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"67b3be2c-8a54-4fcf-8f29-d80d74a62085","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b9932d35-8280-4465-8a47-28ec181321a4","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8efd2ad3-fff7-488e-a4c2-7caba14b9d92","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3e4d54a3-acc3-4626-8b9e-b36431bed8b9","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"760ffb5d-8843-47c6-be9f-af7205d95feb","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4b317577-d093-4451-a959-4629e7a2dcb9","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_bloom/784ea4c9-eafc-48ac-bcd5-499bdb4fc892.png b/sprites/s_node_bloom/784ea4c9-eafc-48ac-bcd5-499bdb4fc892.png new file mode 100644 index 000000000..c7aeb42bf Binary files /dev/null and b/sprites/s_node_bloom/784ea4c9-eafc-48ac-bcd5-499bdb4fc892.png differ diff --git a/sprites/s_node_bloom/9e27a861-c56d-48a3-8077-7daf47935142.png b/sprites/s_node_bloom/9e27a861-c56d-48a3-8077-7daf47935142.png deleted file mode 100644 index f7b139592..000000000 Binary files a/sprites/s_node_bloom/9e27a861-c56d-48a3-8077-7daf47935142.png and /dev/null differ diff --git a/sprites/s_node_bloom/layers/784ea4c9-eafc-48ac-bcd5-499bdb4fc892/f2d9faf1-6084-43db-bdfc-f02a1e473984.png b/sprites/s_node_bloom/layers/784ea4c9-eafc-48ac-bcd5-499bdb4fc892/f2d9faf1-6084-43db-bdfc-f02a1e473984.png new file mode 100644 index 000000000..19118c96f Binary files /dev/null and b/sprites/s_node_bloom/layers/784ea4c9-eafc-48ac-bcd5-499bdb4fc892/f2d9faf1-6084-43db-bdfc-f02a1e473984.png differ diff --git a/sprites/s_node_bloom/layers/9e27a861-c56d-48a3-8077-7daf47935142/b108bc0d-e963-4cc6-87dc-c8712eb86fd3.png b/sprites/s_node_bloom/layers/9e27a861-c56d-48a3-8077-7daf47935142/b108bc0d-e963-4cc6-87dc-c8712eb86fd3.png deleted file mode 100644 index f7b139592..000000000 Binary files a/sprites/s_node_bloom/layers/9e27a861-c56d-48a3-8077-7daf47935142/b108bc0d-e963-4cc6-87dc-c8712eb86fd3.png and /dev/null differ diff --git a/sprites/s_node_bloom/s_node_bloom.yy b/sprites/s_node_bloom/s_node_bloom.yy index 52be53f66..10492ff46 100644 --- a/sprites/s_node_bloom/s_node_bloom.yy +++ b/sprites/s_node_bloom/s_node_bloom.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"9e27a861-c56d-48a3-8077-7daf47935142","path":"sprites/s_node_bloom/s_node_bloom.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"9e27a861-c56d-48a3-8077-7daf47935142","path":"sprites/s_node_bloom/s_node_bloom.yy",},"LayerId":{"name":"b108bc0d-e963-4cc6-87dc-c8712eb86fd3","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","name":"9e27a861-c56d-48a3-8077-7daf47935142","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"784ea4c9-eafc-48ac-bcd5-499bdb4fc892","path":"sprites/s_node_bloom/s_node_bloom.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"784ea4c9-eafc-48ac-bcd5-499bdb4fc892","path":"sprites/s_node_bloom/s_node_bloom.yy",},"LayerId":{"name":"f2d9faf1-6084-43db-bdfc-f02a1e473984","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","name":"784ea4c9-eafc-48ac-bcd5-499bdb4fc892","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"472e46ef-c183-4df8-8811-1d38138a3867","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9e27a861-c56d-48a3-8077-7daf47935142","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e342b5db-d6d4-4f85-8405-96c5c3388f11","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"784ea4c9-eafc-48ac-bcd5-499bdb4fc892","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b108bc0d-e963-4cc6-87dc-c8712eb86fd3","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f2d9faf1-6084-43db-bdfc-f02a1e473984","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blur/0d77bacb-3b60-43fa-9974-7111607b75fd.png b/sprites/s_node_blur/0d77bacb-3b60-43fa-9974-7111607b75fd.png new file mode 100644 index 000000000..d908254cb Binary files /dev/null and b/sprites/s_node_blur/0d77bacb-3b60-43fa-9974-7111607b75fd.png differ diff --git a/sprites/s_node_blur/d770fb7a-39c3-4008-bbfa-83602df2dff5.png b/sprites/s_node_blur/d770fb7a-39c3-4008-bbfa-83602df2dff5.png deleted file mode 100644 index 2892a6dcc..000000000 Binary files a/sprites/s_node_blur/d770fb7a-39c3-4008-bbfa-83602df2dff5.png and /dev/null differ diff --git a/sprites/s_node_blur/layers/0d77bacb-3b60-43fa-9974-7111607b75fd/a0440fe8-eda3-414a-a566-2e53b601f524.png b/sprites/s_node_blur/layers/0d77bacb-3b60-43fa-9974-7111607b75fd/a0440fe8-eda3-414a-a566-2e53b601f524.png new file mode 100644 index 000000000..0c1cbe22e Binary files /dev/null and b/sprites/s_node_blur/layers/0d77bacb-3b60-43fa-9974-7111607b75fd/a0440fe8-eda3-414a-a566-2e53b601f524.png differ diff --git a/sprites/s_node_blur/layers/d770fb7a-39c3-4008-bbfa-83602df2dff5/cdf08126-df2a-40c6-a014-e303199eab58.png b/sprites/s_node_blur/layers/d770fb7a-39c3-4008-bbfa-83602df2dff5/cdf08126-df2a-40c6-a014-e303199eab58.png deleted file mode 100644 index 2892a6dcc..000000000 Binary files a/sprites/s_node_blur/layers/d770fb7a-39c3-4008-bbfa-83602df2dff5/cdf08126-df2a-40c6-a014-e303199eab58.png and /dev/null differ diff --git a/sprites/s_node_blur/s_node_blur.yy b/sprites/s_node_blur/s_node_blur.yy index 98a334b5a..2d84527da 100644 --- a/sprites/s_node_blur/s_node_blur.yy +++ b/sprites/s_node_blur/s_node_blur.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"d770fb7a-39c3-4008-bbfa-83602df2dff5","path":"sprites/s_node_blur/s_node_blur.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"d770fb7a-39c3-4008-bbfa-83602df2dff5","path":"sprites/s_node_blur/s_node_blur.yy",},"LayerId":{"name":"cdf08126-df2a-40c6-a014-e303199eab58","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","name":"d770fb7a-39c3-4008-bbfa-83602df2dff5","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0d77bacb-3b60-43fa-9974-7111607b75fd","path":"sprites/s_node_blur/s_node_blur.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0d77bacb-3b60-43fa-9974-7111607b75fd","path":"sprites/s_node_blur/s_node_blur.yy",},"LayerId":{"name":"a0440fe8-eda3-414a-a566-2e53b601f524","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","name":"0d77bacb-3b60-43fa-9974-7111607b75fd","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ec15934f-98fd-4f24-96b3-53d59adfcbf3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d770fb7a-39c3-4008-bbfa-83602df2dff5","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f492e4ff-d205-41f2-bcb9-e59bcb3ddbf6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0d77bacb-3b60-43fa-9974-7111607b75fd","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cdf08126-df2a-40c6-a014-e303199eab58","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a0440fe8-eda3-414a-a566-2e53b601f524","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blur_contrast/3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c.png b/sprites/s_node_blur_contrast/3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c.png new file mode 100644 index 000000000..e7bf71533 Binary files /dev/null and b/sprites/s_node_blur_contrast/3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c.png differ diff --git a/sprites/s_node_blur_contrast/4fb17928-0b42-45b6-8d77-40f3a6a2a8cd.png b/sprites/s_node_blur_contrast/4fb17928-0b42-45b6-8d77-40f3a6a2a8cd.png deleted file mode 100644 index b5606dbd6..000000000 Binary files a/sprites/s_node_blur_contrast/4fb17928-0b42-45b6-8d77-40f3a6a2a8cd.png and /dev/null differ diff --git a/sprites/s_node_blur_contrast/layers/3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c/82c25cce-3ed1-4ca8-a641-8b1cae58c406.png b/sprites/s_node_blur_contrast/layers/3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c/82c25cce-3ed1-4ca8-a641-8b1cae58c406.png new file mode 100644 index 000000000..91d87fcb9 Binary files /dev/null and b/sprites/s_node_blur_contrast/layers/3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c/82c25cce-3ed1-4ca8-a641-8b1cae58c406.png differ diff --git a/sprites/s_node_blur_contrast/layers/4fb17928-0b42-45b6-8d77-40f3a6a2a8cd/7f959a60-4b6c-404c-bcae-34f6a0330e56.png b/sprites/s_node_blur_contrast/layers/4fb17928-0b42-45b6-8d77-40f3a6a2a8cd/7f959a60-4b6c-404c-bcae-34f6a0330e56.png deleted file mode 100644 index b5606dbd6..000000000 Binary files a/sprites/s_node_blur_contrast/layers/4fb17928-0b42-45b6-8d77-40f3a6a2a8cd/7f959a60-4b6c-404c-bcae-34f6a0330e56.png and /dev/null differ diff --git a/sprites/s_node_blur_contrast/s_node_blur_contrast.yy b/sprites/s_node_blur_contrast/s_node_blur_contrast.yy index 30f3ae55c..07a5fc49c 100644 --- a/sprites/s_node_blur_contrast/s_node_blur_contrast.yy +++ b/sprites/s_node_blur_contrast/s_node_blur_contrast.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"4fb17928-0b42-45b6-8d77-40f3a6a2a8cd","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4fb17928-0b42-45b6-8d77-40f3a6a2a8cd","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"LayerId":{"name":"7f959a60-4b6c-404c-bcae-34f6a0330e56","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","name":"4fb17928-0b42-45b6-8d77-40f3a6a2a8cd","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"LayerId":{"name":"82c25cce-3ed1-4ca8-a641-8b1cae58c406","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","name":"3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1207a82e-f392-4de5-b6c0-3c90dae8e35a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4fb17928-0b42-45b6-8d77-40f3a6a2a8cd","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9818ffe9-5a24-402d-ba72-77ac7de185ad","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3c8e59e6-a3a4-4a9d-ab9d-8a69f99c358c","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7f959a60-4b6c-404c-bcae-34f6a0330e56","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"82c25cce-3ed1-4ca8-a641-8b1cae58c406","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blur_directional/6a3d526e-7667-4e8a-bdc3-c2cc49b098c6.png b/sprites/s_node_blur_directional/fd70f6a8-5e46-4415-ad15-150c8a6ebce3.png similarity index 100% rename from sprites/s_node_blur_directional/6a3d526e-7667-4e8a-bdc3-c2cc49b098c6.png rename to sprites/s_node_blur_directional/fd70f6a8-5e46-4415-ad15-150c8a6ebce3.png diff --git a/sprites/s_node_blur_directional/layers/6a3d526e-7667-4e8a-bdc3-c2cc49b098c6/7431d440-f3d3-4cf0-8708-6d26a16610af.png b/sprites/s_node_blur_directional/layers/fd70f6a8-5e46-4415-ad15-150c8a6ebce3/b138a3b9-ad83-4fc4-9f12-b9fde592056c.png similarity index 100% rename from sprites/s_node_blur_directional/layers/6a3d526e-7667-4e8a-bdc3-c2cc49b098c6/7431d440-f3d3-4cf0-8708-6d26a16610af.png rename to sprites/s_node_blur_directional/layers/fd70f6a8-5e46-4415-ad15-150c8a6ebce3/b138a3b9-ad83-4fc4-9f12-b9fde592056c.png diff --git a/sprites/s_node_blur_directional/s_node_blur_directional.yy b/sprites/s_node_blur_directional/s_node_blur_directional.yy index 972a34ccf..479fca37b 100644 --- a/sprites/s_node_blur_directional/s_node_blur_directional.yy +++ b/sprites/s_node_blur_directional/s_node_blur_directional.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"6a3d526e-7667-4e8a-bdc3-c2cc49b098c6","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"6a3d526e-7667-4e8a-bdc3-c2cc49b098c6","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"LayerId":{"name":"7431d440-f3d3-4cf0-8708-6d26a16610af","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","name":"6a3d526e-7667-4e8a-bdc3-c2cc49b098c6","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"fd70f6a8-5e46-4415-ad15-150c8a6ebce3","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fd70f6a8-5e46-4415-ad15-150c8a6ebce3","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"LayerId":{"name":"b138a3b9-ad83-4fc4-9f12-b9fde592056c","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","name":"fd70f6a8-5e46-4415-ad15-150c8a6ebce3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0f45eaa6-9597-4ab2-90d6-b0b2fcd4446f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6a3d526e-7667-4e8a-bdc3-c2cc49b098c6","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1d47c26c-c2e7-471f-b25b-115d73f744d8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd70f6a8-5e46-4415-ad15-150c8a6ebce3","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7431d440-f3d3-4cf0-8708-6d26a16610af","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b138a3b9-ad83-4fc4-9f12-b9fde592056c","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_border/17c5ebdb-9729-4950-8328-db4eca876424.png b/sprites/s_node_border/17c5ebdb-9729-4950-8328-db4eca876424.png deleted file mode 100644 index e12c6d4af..000000000 Binary files a/sprites/s_node_border/17c5ebdb-9729-4950-8328-db4eca876424.png and /dev/null differ diff --git a/sprites/s_node_border/e78932c4-0cf7-4d34-9062-da9450204e28.png b/sprites/s_node_border/e78932c4-0cf7-4d34-9062-da9450204e28.png new file mode 100644 index 000000000..d4b0ca818 Binary files /dev/null and b/sprites/s_node_border/e78932c4-0cf7-4d34-9062-da9450204e28.png differ diff --git a/sprites/s_node_border/layers/17c5ebdb-9729-4950-8328-db4eca876424/cedb4a6d-668a-4304-aa37-0131143e4e97.png b/sprites/s_node_border/layers/17c5ebdb-9729-4950-8328-db4eca876424/cedb4a6d-668a-4304-aa37-0131143e4e97.png deleted file mode 100644 index e12c6d4af..000000000 Binary files a/sprites/s_node_border/layers/17c5ebdb-9729-4950-8328-db4eca876424/cedb4a6d-668a-4304-aa37-0131143e4e97.png and /dev/null differ diff --git a/sprites/s_node_border/layers/e78932c4-0cf7-4d34-9062-da9450204e28/3f6d602d-bf0f-4016-937c-5fe2ccf8c8a1.png b/sprites/s_node_border/layers/e78932c4-0cf7-4d34-9062-da9450204e28/3f6d602d-bf0f-4016-937c-5fe2ccf8c8a1.png new file mode 100644 index 000000000..e412e5ff4 Binary files /dev/null and b/sprites/s_node_border/layers/e78932c4-0cf7-4d34-9062-da9450204e28/3f6d602d-bf0f-4016-937c-5fe2ccf8c8a1.png differ diff --git a/sprites/s_node_border/s_node_border.yy b/sprites/s_node_border/s_node_border.yy index aeb00a12f..bdc6bb436 100644 --- a/sprites/s_node_border/s_node_border.yy +++ b/sprites/s_node_border/s_node_border.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"17c5ebdb-9729-4950-8328-db4eca876424","path":"sprites/s_node_border/s_node_border.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"17c5ebdb-9729-4950-8328-db4eca876424","path":"sprites/s_node_border/s_node_border.yy",},"LayerId":{"name":"cedb4a6d-668a-4304-aa37-0131143e4e97","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","name":"17c5ebdb-9729-4950-8328-db4eca876424","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e78932c4-0cf7-4d34-9062-da9450204e28","path":"sprites/s_node_border/s_node_border.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e78932c4-0cf7-4d34-9062-da9450204e28","path":"sprites/s_node_border/s_node_border.yy",},"LayerId":{"name":"3f6d602d-bf0f-4016-937c-5fe2ccf8c8a1","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","name":"e78932c4-0cf7-4d34-9062-da9450204e28","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5289b466-8c9f-4101-808f-b50b6aba427d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"17c5ebdb-9729-4950-8328-db4eca876424","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2213dc5b-91d3-4b51-9f9e-9a73da72dfe5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e78932c4-0cf7-4d34-9062-da9450204e28","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cedb4a6d-668a-4304-aa37-0131143e4e97","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3f6d602d-bf0f-4016-937c-5fe2ccf8c8a1","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_canvas/0e0d6552-4b48-40ec-8fab-de0aeadfecee.png b/sprites/s_node_canvas/0e0d6552-4b48-40ec-8fab-de0aeadfecee.png deleted file mode 100644 index d13b1337a..000000000 Binary files a/sprites/s_node_canvas/0e0d6552-4b48-40ec-8fab-de0aeadfecee.png and /dev/null differ diff --git a/sprites/s_node_canvas/85c2fd74-7ff9-4050-85d2-a4e5a086e8e7.png b/sprites/s_node_canvas/85c2fd74-7ff9-4050-85d2-a4e5a086e8e7.png new file mode 100644 index 000000000..259b3081a Binary files /dev/null and b/sprites/s_node_canvas/85c2fd74-7ff9-4050-85d2-a4e5a086e8e7.png differ diff --git a/sprites/s_node_canvas/layers/0e0d6552-4b48-40ec-8fab-de0aeadfecee/56f3cf5e-3024-491c-8d7f-dd946ccbf5d5.png b/sprites/s_node_canvas/layers/0e0d6552-4b48-40ec-8fab-de0aeadfecee/56f3cf5e-3024-491c-8d7f-dd946ccbf5d5.png deleted file mode 100644 index d13b1337a..000000000 Binary files a/sprites/s_node_canvas/layers/0e0d6552-4b48-40ec-8fab-de0aeadfecee/56f3cf5e-3024-491c-8d7f-dd946ccbf5d5.png and /dev/null differ diff --git a/sprites/s_node_canvas/layers/85c2fd74-7ff9-4050-85d2-a4e5a086e8e7/32306793-adb1-4a60-96e7-ef971ce7b07a.png b/sprites/s_node_canvas/layers/85c2fd74-7ff9-4050-85d2-a4e5a086e8e7/32306793-adb1-4a60-96e7-ef971ce7b07a.png new file mode 100644 index 000000000..eef1957c0 Binary files /dev/null and b/sprites/s_node_canvas/layers/85c2fd74-7ff9-4050-85d2-a4e5a086e8e7/32306793-adb1-4a60-96e7-ef971ce7b07a.png differ diff --git a/sprites/s_node_canvas/s_node_canvas.yy b/sprites/s_node_canvas/s_node_canvas.yy index 7593d89b1..11314ca96 100644 --- a/sprites/s_node_canvas/s_node_canvas.yy +++ b/sprites/s_node_canvas/s_node_canvas.yy @@ -7,9 +7,9 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, + "bbox_left": 0, "bbox_right": 30, - "bbox_top": 2, + "bbox_top": 0, "bbox_bottom": 30, "HTile": false, "VTile": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"0e0d6552-4b48-40ec-8fab-de0aeadfecee","path":"sprites/s_node_canvas/s_node_canvas.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0e0d6552-4b48-40ec-8fab-de0aeadfecee","path":"sprites/s_node_canvas/s_node_canvas.yy",},"LayerId":{"name":"56f3cf5e-3024-491c-8d7f-dd946ccbf5d5","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","name":"0e0d6552-4b48-40ec-8fab-de0aeadfecee","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"85c2fd74-7ff9-4050-85d2-a4e5a086e8e7","path":"sprites/s_node_canvas/s_node_canvas.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"85c2fd74-7ff9-4050-85d2-a4e5a086e8e7","path":"sprites/s_node_canvas/s_node_canvas.yy",},"LayerId":{"name":"32306793-adb1-4a60-96e7-ef971ce7b07a","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","name":"85c2fd74-7ff9-4050-85d2-a4e5a086e8e7","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"12e4ef0e-a815-4c0f-88ae-a7fea53beb17","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e0d6552-4b48-40ec-8fab-de0aeadfecee","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"385f3c6d-e307-4ee4-b939-8b9c5339e66e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"85c2fd74-7ff9-4050-85d2-a4e5a086e8e7","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"56f3cf5e-3024-491c-8d7f-dd946ccbf5d5","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"32306793-adb1-4a60-96e7-ef971ce7b07a","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_character/0c572d70-89a8-46c2-ad12-b7d9a1748dab.png b/sprites/s_node_character/0c572d70-89a8-46c2-ad12-b7d9a1748dab.png deleted file mode 100644 index e9e1c3af4..000000000 Binary files a/sprites/s_node_character/0c572d70-89a8-46c2-ad12-b7d9a1748dab.png and /dev/null differ diff --git a/sprites/s_node_character/9a186c65-6590-4dd3-bc0c-3e5c8c8d080e.png b/sprites/s_node_character/9a186c65-6590-4dd3-bc0c-3e5c8c8d080e.png new file mode 100644 index 000000000..7c3b4534c Binary files /dev/null and b/sprites/s_node_character/9a186c65-6590-4dd3-bc0c-3e5c8c8d080e.png differ diff --git a/sprites/s_node_character/layers/0c572d70-89a8-46c2-ad12-b7d9a1748dab/7b22ee43-f031-4d2c-a571-4ecebcfcebec.png b/sprites/s_node_character/layers/0c572d70-89a8-46c2-ad12-b7d9a1748dab/7b22ee43-f031-4d2c-a571-4ecebcfcebec.png deleted file mode 100644 index e9e1c3af4..000000000 Binary files a/sprites/s_node_character/layers/0c572d70-89a8-46c2-ad12-b7d9a1748dab/7b22ee43-f031-4d2c-a571-4ecebcfcebec.png and /dev/null differ diff --git a/sprites/s_node_character/layers/9a186c65-6590-4dd3-bc0c-3e5c8c8d080e/b064b9ce-c1f1-46b5-a6f6-17c00f98c4b3.png b/sprites/s_node_character/layers/9a186c65-6590-4dd3-bc0c-3e5c8c8d080e/b064b9ce-c1f1-46b5-a6f6-17c00f98c4b3.png new file mode 100644 index 000000000..70ac121af Binary files /dev/null and b/sprites/s_node_character/layers/9a186c65-6590-4dd3-bc0c-3e5c8c8d080e/b064b9ce-c1f1-46b5-a6f6-17c00f98c4b3.png differ diff --git a/sprites/s_node_character/s_node_character.yy b/sprites/s_node_character/s_node_character.yy index 19a628ab3..e1f8aa693 100644 --- a/sprites/s_node_character/s_node_character.yy +++ b/sprites/s_node_character/s_node_character.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 8, - "bbox_right": 23, - "bbox_top": 6, - "bbox_bottom": 25, + "bbox_left": 3, + "bbox_right": 28, + "bbox_top": 9, + "bbox_bottom": 22, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"0c572d70-89a8-46c2-ad12-b7d9a1748dab","path":"sprites/s_node_character/s_node_character.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0c572d70-89a8-46c2-ad12-b7d9a1748dab","path":"sprites/s_node_character/s_node_character.yy",},"LayerId":{"name":"7b22ee43-f031-4d2c-a571-4ecebcfcebec","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","name":"0c572d70-89a8-46c2-ad12-b7d9a1748dab","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"9a186c65-6590-4dd3-bc0c-3e5c8c8d080e","path":"sprites/s_node_character/s_node_character.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"9a186c65-6590-4dd3-bc0c-3e5c8c8d080e","path":"sprites/s_node_character/s_node_character.yy",},"LayerId":{"name":"b064b9ce-c1f1-46b5-a6f6-17c00f98c4b3","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","name":"9a186c65-6590-4dd3-bc0c-3e5c8c8d080e","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0fee7659-2c12-4014-a0e1-b778220e0805","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0c572d70-89a8-46c2-ad12-b7d9a1748dab","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"24ae3792-63b9-4dda-9c9f-c7e9c3c3a7ba","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9a186c65-6590-4dd3-bc0c-3e5c8c8d080e","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7b22ee43-f031-4d2c-a571-4ecebcfcebec","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b064b9ce-c1f1-46b5-a6f6-17c00f98c4b3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_checker/7ca9ec7c-605b-4356-84a9-6bf0714fcc34.png b/sprites/s_node_checker/7ca9ec7c-605b-4356-84a9-6bf0714fcc34.png new file mode 100644 index 000000000..8ed3f9b39 Binary files /dev/null and b/sprites/s_node_checker/7ca9ec7c-605b-4356-84a9-6bf0714fcc34.png differ diff --git a/sprites/s_node_checker/fc0eb684-4ab9-481c-879e-8ff26215db20.png b/sprites/s_node_checker/fc0eb684-4ab9-481c-879e-8ff26215db20.png deleted file mode 100644 index 45e697bf9..000000000 Binary files a/sprites/s_node_checker/fc0eb684-4ab9-481c-879e-8ff26215db20.png and /dev/null differ diff --git a/sprites/s_node_checker/layers/7ca9ec7c-605b-4356-84a9-6bf0714fcc34/895753e1-3273-47f2-8565-48f3008e9256.png b/sprites/s_node_checker/layers/7ca9ec7c-605b-4356-84a9-6bf0714fcc34/895753e1-3273-47f2-8565-48f3008e9256.png new file mode 100644 index 000000000..abd2bd9cd Binary files /dev/null and b/sprites/s_node_checker/layers/7ca9ec7c-605b-4356-84a9-6bf0714fcc34/895753e1-3273-47f2-8565-48f3008e9256.png differ diff --git a/sprites/s_node_checker/layers/fc0eb684-4ab9-481c-879e-8ff26215db20/c15931bc-64ab-416d-bcb0-a7717660cac0.png b/sprites/s_node_checker/layers/fc0eb684-4ab9-481c-879e-8ff26215db20/c15931bc-64ab-416d-bcb0-a7717660cac0.png deleted file mode 100644 index 45e697bf9..000000000 Binary files a/sprites/s_node_checker/layers/fc0eb684-4ab9-481c-879e-8ff26215db20/c15931bc-64ab-416d-bcb0-a7717660cac0.png and /dev/null differ diff --git a/sprites/s_node_checker/s_node_checker.yy b/sprites/s_node_checker/s_node_checker.yy index 76185b06f..67706dfc9 100644 --- a/sprites/s_node_checker/s_node_checker.yy +++ b/sprites/s_node_checker/s_node_checker.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"fc0eb684-4ab9-481c-879e-8ff26215db20","path":"sprites/s_node_checker/s_node_checker.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"fc0eb684-4ab9-481c-879e-8ff26215db20","path":"sprites/s_node_checker/s_node_checker.yy",},"LayerId":{"name":"c15931bc-64ab-416d-bcb0-a7717660cac0","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","name":"fc0eb684-4ab9-481c-879e-8ff26215db20","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"7ca9ec7c-605b-4356-84a9-6bf0714fcc34","path":"sprites/s_node_checker/s_node_checker.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"7ca9ec7c-605b-4356-84a9-6bf0714fcc34","path":"sprites/s_node_checker/s_node_checker.yy",},"LayerId":{"name":"895753e1-3273-47f2-8565-48f3008e9256","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","name":"7ca9ec7c-605b-4356-84a9-6bf0714fcc34","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"effb3faf-74ce-402a-9841-ff28dc611c0f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fc0eb684-4ab9-481c-879e-8ff26215db20","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4fe07a44-7eff-4e24-98e3-21b5ce9ab55c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7ca9ec7c-605b-4356-84a9-6bf0714fcc34","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c15931bc-64ab-416d-bcb0-a7717660cac0","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"895753e1-3273-47f2-8565-48f3008e9256","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color/c56dbce5-e893-4e27-8a02-df54672f458b.png b/sprites/s_node_color/c56dbce5-e893-4e27-8a02-df54672f458b.png new file mode 100644 index 000000000..de52fb333 Binary files /dev/null and b/sprites/s_node_color/c56dbce5-e893-4e27-8a02-df54672f458b.png differ diff --git a/sprites/s_node_color/layers/c56dbce5-e893-4e27-8a02-df54672f458b/c11f84d5-6c59-4d26-8c5c-fdb125196b6e.png b/sprites/s_node_color/layers/c56dbce5-e893-4e27-8a02-df54672f458b/c11f84d5-6c59-4d26-8c5c-fdb125196b6e.png new file mode 100644 index 000000000..c25234cec Binary files /dev/null and b/sprites/s_node_color/layers/c56dbce5-e893-4e27-8a02-df54672f458b/c11f84d5-6c59-4d26-8c5c-fdb125196b6e.png differ diff --git a/sprites/s_node_lerp/s_node_lerp.yy b/sprites/s_node_color/s_node_color.yy similarity index 57% rename from sprites/s_node_lerp/s_node_lerp.yy rename to sprites/s_node_color/s_node_color.yy index 780fbf9d9..da3ad2193 100644 --- a/sprites/s_node_lerp/s_node_lerp.yy +++ b/sprites/s_node_color/s_node_color.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 12, - "bbox_bottom": 20, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 9, + "bbox_bottom": 23, "HTile": false, "VTile": false, "For3D": false, @@ -24,12 +24,12 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"84b3be0a-c8e0-41e1-a927-3d603ca0b519","path":"sprites/s_node_lerp/s_node_lerp.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"84b3be0a-c8e0-41e1-a927-3d603ca0b519","path":"sprites/s_node_lerp/s_node_lerp.yy",},"LayerId":{"name":"752a7efe-e330-48b4-a04b-65ea0abe9f81","path":"sprites/s_node_lerp/s_node_lerp.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_lerp","path":"sprites/s_node_lerp/s_node_lerp.yy",},"resourceVersion":"1.0","name":"84b3be0a-c8e0-41e1-a927-3d603ca0b519","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"c56dbce5-e893-4e27-8a02-df54672f458b","path":"sprites/s_node_color/s_node_color.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"c56dbce5-e893-4e27-8a02-df54672f458b","path":"sprites/s_node_color/s_node_color.yy",},"LayerId":{"name":"c11f84d5-6c59-4d26-8c5c-fdb125196b6e","path":"sprites/s_node_color/s_node_color.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color","path":"sprites/s_node_color/s_node_color.yy",},"resourceVersion":"1.0","name":"c56dbce5-e893-4e27-8a02-df54672f458b","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { - "spriteId": {"name":"s_node_lerp","path":"sprites/s_node_lerp/s_node_lerp.yy",}, + "spriteId": {"name":"s_node_color","path":"sprites/s_node_color/s_node_color.yy",}, "timeUnits": 1, "playback": 1, "playbackSpeed": 30.0, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1352e346-7193-4926-81e7-aa8ba84edc5f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"84b3be0a-c8e0-41e1-a927-3d603ca0b519","path":"sprites/s_node_lerp/s_node_lerp.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f63508ef-cd97-4320-88ae-a7114fd21a8e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c56dbce5-e893-4e27-8a02-df54672f458b","path":"sprites/s_node_color/s_node_color.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,14 +58,14 @@ "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"s_node_lerp","path":"sprites/s_node_lerp/s_node_lerp.yy",}, + "parent": {"name":"s_node_color","path":"sprites/s_node_color/s_node_color.yy",}, "resourceVersion": "1.3", - "name": "s_node_lerp", + "name": "s_node_color", "tags": [], "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"752a7efe-e330-48b4-a04b-65ea0abe9f81","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c11f84d5-6c59-4d26-8c5c-fdb125196b6e","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { @@ -73,7 +73,7 @@ "path": "folders/nodes/icons.yy", }, "resourceVersion": "1.0", - "name": "s_node_lerp", + "name": "s_node_color", "tags": [], "resourceType": "GMSprite", } \ No newline at end of file diff --git a/sprites/s_node_color_adjust/89553a4f-aca0-457a-a65b-ee08836f1343.png b/sprites/s_node_color_adjust/89553a4f-aca0-457a-a65b-ee08836f1343.png deleted file mode 100644 index adc3f76de..000000000 Binary files a/sprites/s_node_color_adjust/89553a4f-aca0-457a-a65b-ee08836f1343.png and /dev/null differ diff --git a/sprites/s_node_color_adjust/f0b1ce68-cd9b-444a-93b7-23c77241fba1.png b/sprites/s_node_color_adjust/f0b1ce68-cd9b-444a-93b7-23c77241fba1.png new file mode 100644 index 000000000..06137744e Binary files /dev/null and b/sprites/s_node_color_adjust/f0b1ce68-cd9b-444a-93b7-23c77241fba1.png differ diff --git a/sprites/s_node_color_adjust/layers/89553a4f-aca0-457a-a65b-ee08836f1343/bd1d948a-e679-4300-8153-4b09f50bb533.png b/sprites/s_node_color_adjust/layers/89553a4f-aca0-457a-a65b-ee08836f1343/bd1d948a-e679-4300-8153-4b09f50bb533.png deleted file mode 100644 index adc3f76de..000000000 Binary files a/sprites/s_node_color_adjust/layers/89553a4f-aca0-457a-a65b-ee08836f1343/bd1d948a-e679-4300-8153-4b09f50bb533.png and /dev/null differ diff --git a/sprites/s_node_color_adjust/layers/f0b1ce68-cd9b-444a-93b7-23c77241fba1/c4a7ae65-cc1e-4545-9604-b006041cf018.png b/sprites/s_node_color_adjust/layers/f0b1ce68-cd9b-444a-93b7-23c77241fba1/c4a7ae65-cc1e-4545-9604-b006041cf018.png new file mode 100644 index 000000000..62816d7b2 Binary files /dev/null and b/sprites/s_node_color_adjust/layers/f0b1ce68-cd9b-444a-93b7-23c77241fba1/c4a7ae65-cc1e-4545-9604-b006041cf018.png differ diff --git a/sprites/s_node_color_adjust/s_node_color_adjust.yy b/sprites/s_node_color_adjust/s_node_color_adjust.yy index 1ec6445dc..4946a66fd 100644 --- a/sprites/s_node_color_adjust/s_node_color_adjust.yy +++ b/sprites/s_node_color_adjust/s_node_color_adjust.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"89553a4f-aca0-457a-a65b-ee08836f1343","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"89553a4f-aca0-457a-a65b-ee08836f1343","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"LayerId":{"name":"bd1d948a-e679-4300-8153-4b09f50bb533","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","name":"89553a4f-aca0-457a-a65b-ee08836f1343","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"f0b1ce68-cd9b-444a-93b7-23c77241fba1","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"f0b1ce68-cd9b-444a-93b7-23c77241fba1","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"LayerId":{"name":"c4a7ae65-cc1e-4545-9604-b006041cf018","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","name":"f0b1ce68-cd9b-444a-93b7-23c77241fba1","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9e688a21-c5f8-4ffc-93e8-7eda749ec5b6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"89553a4f-aca0-457a-a65b-ee08836f1343","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"09b1b837-d1e7-49bf-a414-f72a8239859d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f0b1ce68-cd9b-444a-93b7-23c77241fba1","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bd1d948a-e679-4300-8153-4b09f50bb533","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c4a7ae65-cc1e-4545-9604-b006041cf018","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_data/98c3de1f-d047-4a04-a461-630d9bbc14dd.png b/sprites/s_node_color_data/98c3de1f-d047-4a04-a461-630d9bbc14dd.png new file mode 100644 index 000000000..e79eddb91 Binary files /dev/null and b/sprites/s_node_color_data/98c3de1f-d047-4a04-a461-630d9bbc14dd.png differ diff --git a/sprites/s_node_color_data/c4580d55-8591-49bd-b892-c50a49c4f00f.png b/sprites/s_node_color_data/c4580d55-8591-49bd-b892-c50a49c4f00f.png deleted file mode 100644 index d07bf97e2..000000000 Binary files a/sprites/s_node_color_data/c4580d55-8591-49bd-b892-c50a49c4f00f.png and /dev/null differ diff --git a/sprites/s_node_color_data/layers/98c3de1f-d047-4a04-a461-630d9bbc14dd/27e96fde-dee3-44f3-96c9-13a1fbf57b93.png b/sprites/s_node_color_data/layers/98c3de1f-d047-4a04-a461-630d9bbc14dd/27e96fde-dee3-44f3-96c9-13a1fbf57b93.png new file mode 100644 index 000000000..ea9b6f669 Binary files /dev/null and b/sprites/s_node_color_data/layers/98c3de1f-d047-4a04-a461-630d9bbc14dd/27e96fde-dee3-44f3-96c9-13a1fbf57b93.png differ diff --git a/sprites/s_node_color_data/layers/c4580d55-8591-49bd-b892-c50a49c4f00f/07adcca3-c7b1-4a01-94a2-a7b828eadc72.png b/sprites/s_node_color_data/layers/c4580d55-8591-49bd-b892-c50a49c4f00f/07adcca3-c7b1-4a01-94a2-a7b828eadc72.png deleted file mode 100644 index d07bf97e2..000000000 Binary files a/sprites/s_node_color_data/layers/c4580d55-8591-49bd-b892-c50a49c4f00f/07adcca3-c7b1-4a01-94a2-a7b828eadc72.png and /dev/null differ diff --git a/sprites/s_node_color_data/s_node_color_data.yy b/sprites/s_node_color_data/s_node_color_data.yy index a63d7fcfb..a492498fa 100644 --- a/sprites/s_node_color_data/s_node_color_data.yy +++ b/sprites/s_node_color_data/s_node_color_data.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 8, - "bbox_bottom": 23, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"c4580d55-8591-49bd-b892-c50a49c4f00f","path":"sprites/s_node_color_data/s_node_color_data.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"c4580d55-8591-49bd-b892-c50a49c4f00f","path":"sprites/s_node_color_data/s_node_color_data.yy",},"LayerId":{"name":"07adcca3-c7b1-4a01-94a2-a7b828eadc72","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","name":"c4580d55-8591-49bd-b892-c50a49c4f00f","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"98c3de1f-d047-4a04-a461-630d9bbc14dd","path":"sprites/s_node_color_data/s_node_color_data.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"98c3de1f-d047-4a04-a461-630d9bbc14dd","path":"sprites/s_node_color_data/s_node_color_data.yy",},"LayerId":{"name":"27e96fde-dee3-44f3-96c9-13a1fbf57b93","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","name":"98c3de1f-d047-4a04-a461-630d9bbc14dd","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d597e6c3-443c-4773-87d8-43a99a97dcb0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c4580d55-8591-49bd-b892-c50a49c4f00f","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2510f0c4-1781-4cc1-9e1c-d289a039184d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"98c3de1f-d047-4a04-a461-630d9bbc14dd","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"07adcca3-c7b1-4a01-94a2-a7b828eadc72","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"27e96fde-dee3-44f3-96c9-13a1fbf57b93","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_from_hsv/883a48e8-413e-4126-816a-c21b06db7536.png b/sprites/s_node_color_from_hsv/883a48e8-413e-4126-816a-c21b06db7536.png deleted file mode 100644 index d996b8d6b..000000000 Binary files a/sprites/s_node_color_from_hsv/883a48e8-413e-4126-816a-c21b06db7536.png and /dev/null differ diff --git a/sprites/s_node_color_from_hsv/ec1d3c8e-0229-499c-8c14-158d05aa1d77.png b/sprites/s_node_color_from_hsv/ec1d3c8e-0229-499c-8c14-158d05aa1d77.png new file mode 100644 index 000000000..a91da9203 Binary files /dev/null and b/sprites/s_node_color_from_hsv/ec1d3c8e-0229-499c-8c14-158d05aa1d77.png differ diff --git a/sprites/s_node_color_from_hsv/layers/883a48e8-413e-4126-816a-c21b06db7536/63df0f58-b77d-4c1e-b950-7932332e4c05.png b/sprites/s_node_color_from_hsv/layers/883a48e8-413e-4126-816a-c21b06db7536/63df0f58-b77d-4c1e-b950-7932332e4c05.png deleted file mode 100644 index d996b8d6b..000000000 Binary files a/sprites/s_node_color_from_hsv/layers/883a48e8-413e-4126-816a-c21b06db7536/63df0f58-b77d-4c1e-b950-7932332e4c05.png and /dev/null differ diff --git a/sprites/s_node_color_from_hsv/layers/ec1d3c8e-0229-499c-8c14-158d05aa1d77/2441be46-3dde-4494-b262-e15b129da3be.png b/sprites/s_node_color_from_hsv/layers/ec1d3c8e-0229-499c-8c14-158d05aa1d77/2441be46-3dde-4494-b262-e15b129da3be.png new file mode 100644 index 000000000..6fd539eb5 Binary files /dev/null and b/sprites/s_node_color_from_hsv/layers/ec1d3c8e-0229-499c-8c14-158d05aa1d77/2441be46-3dde-4494-b262-e15b129da3be.png differ diff --git a/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy b/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy index 10dfa156f..cafca3448 100644 --- a/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy +++ b/sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 28, - "bbox_top": 0, - "bbox_bottom": 30, + "bbox_left": 3, + "bbox_right": 29, + "bbox_top": 10, + "bbox_bottom": 20, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"883a48e8-413e-4126-816a-c21b06db7536","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"883a48e8-413e-4126-816a-c21b06db7536","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"LayerId":{"name":"63df0f58-b77d-4c1e-b950-7932332e4c05","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","name":"883a48e8-413e-4126-816a-c21b06db7536","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ec1d3c8e-0229-499c-8c14-158d05aa1d77","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ec1d3c8e-0229-499c-8c14-158d05aa1d77","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"LayerId":{"name":"2441be46-3dde-4494-b262-e15b129da3be","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","name":"ec1d3c8e-0229-499c-8c14-158d05aa1d77","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ee8a5098-5977-4bd4-b129-6771546badac","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"883a48e8-413e-4126-816a-c21b06db7536","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d1461700-2afe-4ae2-8486-d6e01e7f6f23","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ec1d3c8e-0229-499c-8c14-158d05aa1d77","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"63df0f58-b77d-4c1e-b950-7932332e4c05","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2441be46-3dde-4494-b262-e15b129da3be","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_from_rgb/0939dd76-12cc-467c-a0bd-0dcd4badc44d.png b/sprites/s_node_color_from_rgb/0939dd76-12cc-467c-a0bd-0dcd4badc44d.png new file mode 100644 index 000000000..86325cc3c Binary files /dev/null and b/sprites/s_node_color_from_rgb/0939dd76-12cc-467c-a0bd-0dcd4badc44d.png differ diff --git a/sprites/s_node_color_from_rgb/f8f40d8c-841b-4fff-9db7-fe032d4d31b9.png b/sprites/s_node_color_from_rgb/f8f40d8c-841b-4fff-9db7-fe032d4d31b9.png deleted file mode 100644 index bff0543ee..000000000 Binary files a/sprites/s_node_color_from_rgb/f8f40d8c-841b-4fff-9db7-fe032d4d31b9.png and /dev/null differ diff --git a/sprites/s_node_color_from_rgb/layers/0939dd76-12cc-467c-a0bd-0dcd4badc44d/efcaa5af-d0e2-4f77-805a-12464d8e590b.png b/sprites/s_node_color_from_rgb/layers/0939dd76-12cc-467c-a0bd-0dcd4badc44d/efcaa5af-d0e2-4f77-805a-12464d8e590b.png new file mode 100644 index 000000000..e52441e4d Binary files /dev/null and b/sprites/s_node_color_from_rgb/layers/0939dd76-12cc-467c-a0bd-0dcd4badc44d/efcaa5af-d0e2-4f77-805a-12464d8e590b.png differ diff --git a/sprites/s_node_color_from_rgb/layers/f8f40d8c-841b-4fff-9db7-fe032d4d31b9/5853fb92-e32f-44d6-be6a-0015d22713e1.png b/sprites/s_node_color_from_rgb/layers/f8f40d8c-841b-4fff-9db7-fe032d4d31b9/5853fb92-e32f-44d6-be6a-0015d22713e1.png deleted file mode 100644 index bff0543ee..000000000 Binary files a/sprites/s_node_color_from_rgb/layers/f8f40d8c-841b-4fff-9db7-fe032d4d31b9/5853fb92-e32f-44d6-be6a-0015d22713e1.png and /dev/null differ diff --git a/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy b/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy index 9b14e82b2..2ab96fbb9 100644 --- a/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy +++ b/sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 28, - "bbox_top": 0, - "bbox_bottom": 30, + "bbox_left": 3, + "bbox_right": 29, + "bbox_top": 10, + "bbox_bottom": 20, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"f8f40d8c-841b-4fff-9db7-fe032d4d31b9","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"f8f40d8c-841b-4fff-9db7-fe032d4d31b9","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"LayerId":{"name":"5853fb92-e32f-44d6-be6a-0015d22713e1","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","name":"f8f40d8c-841b-4fff-9db7-fe032d4d31b9","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0939dd76-12cc-467c-a0bd-0dcd4badc44d","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0939dd76-12cc-467c-a0bd-0dcd4badc44d","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"LayerId":{"name":"efcaa5af-d0e2-4f77-805a-12464d8e590b","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","name":"0939dd76-12cc-467c-a0bd-0dcd4badc44d","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"34e97ec9-0c49-41be-ab94-c7e9fec75395","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f8f40d8c-841b-4fff-9db7-fe032d4d31b9","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c3d8cdd5-64e5-460b-9aa4-05327809378d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0939dd76-12cc-467c-a0bd-0dcd4badc44d","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5853fb92-e32f-44d6-be6a-0015d22713e1","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"efcaa5af-d0e2-4f77-805a-12464d8e590b","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_out/8a5e265c-a088-4792-bd25-c2c092e27333.png b/sprites/s_node_color_out/8a5e265c-a088-4792-bd25-c2c092e27333.png new file mode 100644 index 000000000..e6dcd651b Binary files /dev/null and b/sprites/s_node_color_out/8a5e265c-a088-4792-bd25-c2c092e27333.png differ diff --git a/sprites/s_node_color_out/b9653798-5819-4a39-be52-4522ec961dc5.png b/sprites/s_node_color_out/b9653798-5819-4a39-be52-4522ec961dc5.png deleted file mode 100644 index f1e75837e..000000000 Binary files a/sprites/s_node_color_out/b9653798-5819-4a39-be52-4522ec961dc5.png and /dev/null differ diff --git a/sprites/s_node_color_out/layers/8a5e265c-a088-4792-bd25-c2c092e27333/13f34692-7850-462a-b2cd-131491b948fa.png b/sprites/s_node_color_out/layers/8a5e265c-a088-4792-bd25-c2c092e27333/13f34692-7850-462a-b2cd-131491b948fa.png new file mode 100644 index 000000000..a04820c2c Binary files /dev/null and b/sprites/s_node_color_out/layers/8a5e265c-a088-4792-bd25-c2c092e27333/13f34692-7850-462a-b2cd-131491b948fa.png differ diff --git a/sprites/s_node_color_out/layers/b9653798-5819-4a39-be52-4522ec961dc5/ea0f450d-c322-4fc4-a1ab-a5ae65dd98db.png b/sprites/s_node_color_out/layers/b9653798-5819-4a39-be52-4522ec961dc5/ea0f450d-c322-4fc4-a1ab-a5ae65dd98db.png deleted file mode 100644 index f1e75837e..000000000 Binary files a/sprites/s_node_color_out/layers/b9653798-5819-4a39-be52-4522ec961dc5/ea0f450d-c322-4fc4-a1ab-a5ae65dd98db.png and /dev/null differ diff --git a/sprites/s_node_color_out/s_node_color_out.yy b/sprites/s_node_color_out/s_node_color_out.yy index 8295e70b2..857c3ae60 100644 --- a/sprites/s_node_color_out/s_node_color_out.yy +++ b/sprites/s_node_color_out/s_node_color_out.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 9, - "bbox_bottom": 21, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b9653798-5819-4a39-be52-4522ec961dc5","path":"sprites/s_node_color_out/s_node_color_out.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b9653798-5819-4a39-be52-4522ec961dc5","path":"sprites/s_node_color_out/s_node_color_out.yy",},"LayerId":{"name":"ea0f450d-c322-4fc4-a1ab-a5ae65dd98db","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","name":"b9653798-5819-4a39-be52-4522ec961dc5","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"8a5e265c-a088-4792-bd25-c2c092e27333","path":"sprites/s_node_color_out/s_node_color_out.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"8a5e265c-a088-4792-bd25-c2c092e27333","path":"sprites/s_node_color_out/s_node_color_out.yy",},"LayerId":{"name":"13f34692-7850-462a-b2cd-131491b948fa","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","name":"8a5e265c-a088-4792-bd25-c2c092e27333","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"64ca1c93-24c3-459f-a4fc-90883c7b3e47","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b9653798-5819-4a39-be52-4522ec961dc5","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"bce8f269-362e-4977-98f1-ed687158fcdf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8a5e265c-a088-4792-bd25-c2c092e27333","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ea0f450d-c322-4fc4-a1ab-a5ae65dd98db","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"13f34692-7850-462a-b2cd-131491b948fa","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_remove/0578ed4d-5792-4cde-91e3-640fe1147917.png b/sprites/s_node_color_remove/0578ed4d-5792-4cde-91e3-640fe1147917.png deleted file mode 100644 index 7af26ad53..000000000 Binary files a/sprites/s_node_color_remove/0578ed4d-5792-4cde-91e3-640fe1147917.png and /dev/null differ diff --git a/sprites/s_node_color_remove/57f1c1c6-04b1-4655-8df3-d53643d28fd9.png b/sprites/s_node_color_remove/57f1c1c6-04b1-4655-8df3-d53643d28fd9.png new file mode 100644 index 000000000..d465d69c1 Binary files /dev/null and b/sprites/s_node_color_remove/57f1c1c6-04b1-4655-8df3-d53643d28fd9.png differ diff --git a/sprites/s_node_color_remove/layers/0578ed4d-5792-4cde-91e3-640fe1147917/22146c23-b006-424b-9c48-f34daf46cd2d.png b/sprites/s_node_color_remove/layers/0578ed4d-5792-4cde-91e3-640fe1147917/22146c23-b006-424b-9c48-f34daf46cd2d.png deleted file mode 100644 index 7af26ad53..000000000 Binary files a/sprites/s_node_color_remove/layers/0578ed4d-5792-4cde-91e3-640fe1147917/22146c23-b006-424b-9c48-f34daf46cd2d.png and /dev/null differ diff --git a/sprites/s_node_color_remove/layers/57f1c1c6-04b1-4655-8df3-d53643d28fd9/f5a8b13f-5ad0-450b-92d9-c78704d80a9d.png b/sprites/s_node_color_remove/layers/57f1c1c6-04b1-4655-8df3-d53643d28fd9/f5a8b13f-5ad0-450b-92d9-c78704d80a9d.png new file mode 100644 index 000000000..2bab3a6b5 Binary files /dev/null and b/sprites/s_node_color_remove/layers/57f1c1c6-04b1-4655-8df3-d53643d28fd9/f5a8b13f-5ad0-450b-92d9-c78704d80a9d.png differ diff --git a/sprites/s_node_color_remove/s_node_color_remove.yy b/sprites/s_node_color_remove/s_node_color_remove.yy index d158c3557..ade7f698f 100644 --- a/sprites/s_node_color_remove/s_node_color_remove.yy +++ b/sprites/s_node_color_remove/s_node_color_remove.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"0578ed4d-5792-4cde-91e3-640fe1147917","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0578ed4d-5792-4cde-91e3-640fe1147917","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"LayerId":{"name":"22146c23-b006-424b-9c48-f34daf46cd2d","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","name":"0578ed4d-5792-4cde-91e3-640fe1147917","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"57f1c1c6-04b1-4655-8df3-d53643d28fd9","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"57f1c1c6-04b1-4655-8df3-d53643d28fd9","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"LayerId":{"name":"f5a8b13f-5ad0-450b-92d9-c78704d80a9d","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","name":"57f1c1c6-04b1-4655-8df3-d53643d28fd9","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6e3680d7-4e9a-4920-84d4-e8957cca26a1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0578ed4d-5792-4cde-91e3-640fe1147917","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"59d3ec24-2fa8-4169-bf5a-6b26e4c08bbe","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"57f1c1c6-04b1-4655-8df3-d53643d28fd9","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"22146c23-b006-424b-9c48-f34daf46cd2d","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f5a8b13f-5ad0-450b-92d9-c78704d80a9d","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_replace/0e9d658d-b167-46e9-a87f-c7b54c80ba78.png b/sprites/s_node_color_replace/0e9d658d-b167-46e9-a87f-c7b54c80ba78.png new file mode 100644 index 000000000..f819a108a Binary files /dev/null and b/sprites/s_node_color_replace/0e9d658d-b167-46e9-a87f-c7b54c80ba78.png differ diff --git a/sprites/s_node_color_replace/ce2843db-1b19-4ee4-92c7-4cf7c8a65291.png b/sprites/s_node_color_replace/ce2843db-1b19-4ee4-92c7-4cf7c8a65291.png deleted file mode 100644 index 67bb1645a..000000000 Binary files a/sprites/s_node_color_replace/ce2843db-1b19-4ee4-92c7-4cf7c8a65291.png and /dev/null differ diff --git a/sprites/s_node_color_replace/layers/0e9d658d-b167-46e9-a87f-c7b54c80ba78/bdd9a4d5-1e99-4c88-b777-d4c1727ccfca.png b/sprites/s_node_color_replace/layers/0e9d658d-b167-46e9-a87f-c7b54c80ba78/bdd9a4d5-1e99-4c88-b777-d4c1727ccfca.png new file mode 100644 index 000000000..08a82dc44 Binary files /dev/null and b/sprites/s_node_color_replace/layers/0e9d658d-b167-46e9-a87f-c7b54c80ba78/bdd9a4d5-1e99-4c88-b777-d4c1727ccfca.png differ diff --git a/sprites/s_node_color_replace/layers/ce2843db-1b19-4ee4-92c7-4cf7c8a65291/5d2e7938-4885-48b5-adf5-fd8d2af013b9.png b/sprites/s_node_color_replace/layers/ce2843db-1b19-4ee4-92c7-4cf7c8a65291/5d2e7938-4885-48b5-adf5-fd8d2af013b9.png deleted file mode 100644 index 67bb1645a..000000000 Binary files a/sprites/s_node_color_replace/layers/ce2843db-1b19-4ee4-92c7-4cf7c8a65291/5d2e7938-4885-48b5-adf5-fd8d2af013b9.png and /dev/null differ diff --git a/sprites/s_node_color_replace/s_node_color_replace.yy b/sprites/s_node_color_replace/s_node_color_replace.yy index fb93cdf55..ab24b0164 100644 --- a/sprites/s_node_color_replace/s_node_color_replace.yy +++ b/sprites/s_node_color_replace/s_node_color_replace.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ce2843db-1b19-4ee4-92c7-4cf7c8a65291","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ce2843db-1b19-4ee4-92c7-4cf7c8a65291","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"LayerId":{"name":"5d2e7938-4885-48b5-adf5-fd8d2af013b9","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","name":"ce2843db-1b19-4ee4-92c7-4cf7c8a65291","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0e9d658d-b167-46e9-a87f-c7b54c80ba78","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0e9d658d-b167-46e9-a87f-c7b54c80ba78","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"LayerId":{"name":"bdd9a4d5-1e99-4c88-b777-d4c1727ccfca","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","name":"0e9d658d-b167-46e9-a87f-c7b54c80ba78","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8103f756-0ea2-4759-afd6-45cee23e37ef","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ce2843db-1b19-4ee4-92c7-4cf7c8a65291","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9a6707a8-41fd-4d38-a768-ac1d73ee4b9e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e9d658d-b167-46e9-a87f-c7b54c80ba78","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5d2e7938-4885-48b5-adf5-fd8d2af013b9","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bdd9a4d5-1e99-4c88-b777-d4c1727ccfca","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_colorize/41e0f58c-befe-47e3-97ad-be583fc1c7ec.png b/sprites/s_node_colorize/41e0f58c-befe-47e3-97ad-be583fc1c7ec.png deleted file mode 100644 index 7b9bded13..000000000 Binary files a/sprites/s_node_colorize/41e0f58c-befe-47e3-97ad-be583fc1c7ec.png and /dev/null differ diff --git a/sprites/s_node_colorize/67298217-c6f6-4b87-84c8-1442d248592f.png b/sprites/s_node_colorize/67298217-c6f6-4b87-84c8-1442d248592f.png new file mode 100644 index 000000000..0a798cd1f Binary files /dev/null and b/sprites/s_node_colorize/67298217-c6f6-4b87-84c8-1442d248592f.png differ diff --git a/sprites/s_node_colorize/layers/41e0f58c-befe-47e3-97ad-be583fc1c7ec/158e6454-8653-4965-85db-9b703cc18f03.png b/sprites/s_node_colorize/layers/41e0f58c-befe-47e3-97ad-be583fc1c7ec/158e6454-8653-4965-85db-9b703cc18f03.png deleted file mode 100644 index 7b9bded13..000000000 Binary files a/sprites/s_node_colorize/layers/41e0f58c-befe-47e3-97ad-be583fc1c7ec/158e6454-8653-4965-85db-9b703cc18f03.png and /dev/null differ diff --git a/sprites/s_node_colorize/layers/67298217-c6f6-4b87-84c8-1442d248592f/ce50049b-657f-4ef3-ad98-dc1543612552.png b/sprites/s_node_colorize/layers/67298217-c6f6-4b87-84c8-1442d248592f/ce50049b-657f-4ef3-ad98-dc1543612552.png new file mode 100644 index 000000000..20ea670d9 Binary files /dev/null and b/sprites/s_node_colorize/layers/67298217-c6f6-4b87-84c8-1442d248592f/ce50049b-657f-4ef3-ad98-dc1543612552.png differ diff --git a/sprites/s_node_colorize/s_node_colorize.yy b/sprites/s_node_colorize/s_node_colorize.yy index 58be6c36d..229dd2316 100644 --- a/sprites/s_node_colorize/s_node_colorize.yy +++ b/sprites/s_node_colorize/s_node_colorize.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"41e0f58c-befe-47e3-97ad-be583fc1c7ec","path":"sprites/s_node_colorize/s_node_colorize.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"41e0f58c-befe-47e3-97ad-be583fc1c7ec","path":"sprites/s_node_colorize/s_node_colorize.yy",},"LayerId":{"name":"158e6454-8653-4965-85db-9b703cc18f03","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","name":"41e0f58c-befe-47e3-97ad-be583fc1c7ec","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"67298217-c6f6-4b87-84c8-1442d248592f","path":"sprites/s_node_colorize/s_node_colorize.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"67298217-c6f6-4b87-84c8-1442d248592f","path":"sprites/s_node_colorize/s_node_colorize.yy",},"LayerId":{"name":"ce50049b-657f-4ef3-ad98-dc1543612552","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","name":"67298217-c6f6-4b87-84c8-1442d248592f","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"129b0e12-c5bb-4248-8ba4-5126a6a9aa0c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"41e0f58c-befe-47e3-97ad-be583fc1c7ec","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"01fea613-4832-4d3c-b8cb-e0d291515bdd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"67298217-c6f6-4b87-84c8-1442d248592f","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"158e6454-8653-4965-85db-9b703cc18f03","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ce50049b-657f-4ef3-ad98-dc1543612552","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_compose/44652714-cdff-4d72-986c-1a3823c385b8.png b/sprites/s_node_compose/44652714-cdff-4d72-986c-1a3823c385b8.png deleted file mode 100644 index 03d7590d1..000000000 Binary files a/sprites/s_node_compose/44652714-cdff-4d72-986c-1a3823c385b8.png and /dev/null differ diff --git a/sprites/s_node_compose/cff1fe10-67a7-4dcc-9629-34a3be5ccae9.png b/sprites/s_node_compose/cff1fe10-67a7-4dcc-9629-34a3be5ccae9.png new file mode 100644 index 000000000..915b27a77 Binary files /dev/null and b/sprites/s_node_compose/cff1fe10-67a7-4dcc-9629-34a3be5ccae9.png differ diff --git a/sprites/s_node_compose/layers/44652714-cdff-4d72-986c-1a3823c385b8/d84dc044-b624-4f5c-83ab-93e46835825c.png b/sprites/s_node_compose/layers/44652714-cdff-4d72-986c-1a3823c385b8/d84dc044-b624-4f5c-83ab-93e46835825c.png deleted file mode 100644 index 03d7590d1..000000000 Binary files a/sprites/s_node_compose/layers/44652714-cdff-4d72-986c-1a3823c385b8/d84dc044-b624-4f5c-83ab-93e46835825c.png and /dev/null differ diff --git a/sprites/s_node_compose/layers/cff1fe10-67a7-4dcc-9629-34a3be5ccae9/8ab032d2-1f09-47d9-a37f-dab8ce436ce5.png b/sprites/s_node_compose/layers/cff1fe10-67a7-4dcc-9629-34a3be5ccae9/8ab032d2-1f09-47d9-a37f-dab8ce436ce5.png new file mode 100644 index 000000000..508339707 Binary files /dev/null and b/sprites/s_node_compose/layers/cff1fe10-67a7-4dcc-9629-34a3be5ccae9/8ab032d2-1f09-47d9-a37f-dab8ce436ce5.png differ diff --git a/sprites/s_node_compose/s_node_compose.yy b/sprites/s_node_compose/s_node_compose.yy index 450c75ad9..839047f92 100644 --- a/sprites/s_node_compose/s_node_compose.yy +++ b/sprites/s_node_compose/s_node_compose.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"44652714-cdff-4d72-986c-1a3823c385b8","path":"sprites/s_node_compose/s_node_compose.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"44652714-cdff-4d72-986c-1a3823c385b8","path":"sprites/s_node_compose/s_node_compose.yy",},"LayerId":{"name":"d84dc044-b624-4f5c-83ab-93e46835825c","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","name":"44652714-cdff-4d72-986c-1a3823c385b8","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"cff1fe10-67a7-4dcc-9629-34a3be5ccae9","path":"sprites/s_node_compose/s_node_compose.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"cff1fe10-67a7-4dcc-9629-34a3be5ccae9","path":"sprites/s_node_compose/s_node_compose.yy",},"LayerId":{"name":"8ab032d2-1f09-47d9-a37f-dab8ce436ce5","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","name":"cff1fe10-67a7-4dcc-9629-34a3be5ccae9","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"88643454-7814-4429-a70c-3df7782248cc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"44652714-cdff-4d72-986c-1a3823c385b8","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6e270d6b-dd8c-4629-b568-a6d95ea212d3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cff1fe10-67a7-4dcc-9629-34a3be5ccae9","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d84dc044-b624-4f5c-83ab-93e46835825c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8ab032d2-1f09-47d9-a37f-dab8ce436ce5","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_condition/bc1e58c1-59ae-4abe-a71d-09ad06da3982.png b/sprites/s_node_condition/bc1e58c1-59ae-4abe-a71d-09ad06da3982.png new file mode 100644 index 000000000..21b2562a3 Binary files /dev/null and b/sprites/s_node_condition/bc1e58c1-59ae-4abe-a71d-09ad06da3982.png differ diff --git a/sprites/s_node_condition/layers/bc1e58c1-59ae-4abe-a71d-09ad06da3982/8bfb3b5e-1961-4d44-a901-abd4030411e3.png b/sprites/s_node_condition/layers/bc1e58c1-59ae-4abe-a71d-09ad06da3982/8bfb3b5e-1961-4d44-a901-abd4030411e3.png new file mode 100644 index 000000000..6240aca60 Binary files /dev/null and b/sprites/s_node_condition/layers/bc1e58c1-59ae-4abe-a71d-09ad06da3982/8bfb3b5e-1961-4d44-a901-abd4030411e3.png differ diff --git a/sprites/s_node_surface_data/s_node_surface_data.yy b/sprites/s_node_condition/s_node_condition.yy similarity index 55% rename from sprites/s_node_surface_data/s_node_surface_data.yy rename to sprites/s_node_condition/s_node_condition.yy index 7d883bfc2..851961258 100644 --- a/sprites/s_node_surface_data/s_node_surface_data.yy +++ b/sprites/s_node_condition/s_node_condition.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 2, - "bbox_bottom": 30, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, @@ -24,12 +24,12 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"3ea9987c-4a6d-4283-bf4e-0d2f3265c600","path":"sprites/s_node_surface_data/s_node_surface_data.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3ea9987c-4a6d-4283-bf4e-0d2f3265c600","path":"sprites/s_node_surface_data/s_node_surface_data.yy",},"LayerId":{"name":"ac35f8ca-edfd-4e47-92c1-8b2e988eaf86","path":"sprites/s_node_surface_data/s_node_surface_data.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_surface_data","path":"sprites/s_node_surface_data/s_node_surface_data.yy",},"resourceVersion":"1.0","name":"3ea9987c-4a6d-4283-bf4e-0d2f3265c600","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"bc1e58c1-59ae-4abe-a71d-09ad06da3982","path":"sprites/s_node_condition/s_node_condition.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"bc1e58c1-59ae-4abe-a71d-09ad06da3982","path":"sprites/s_node_condition/s_node_condition.yy",},"LayerId":{"name":"8bfb3b5e-1961-4d44-a901-abd4030411e3","path":"sprites/s_node_condition/s_node_condition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_condition","path":"sprites/s_node_condition/s_node_condition.yy",},"resourceVersion":"1.0","name":"bc1e58c1-59ae-4abe-a71d-09ad06da3982","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { - "spriteId": {"name":"s_node_surface_data","path":"sprites/s_node_surface_data/s_node_surface_data.yy",}, + "spriteId": {"name":"s_node_condition","path":"sprites/s_node_condition/s_node_condition.yy",}, "timeUnits": 1, "playback": 1, "playbackSpeed": 30.0, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4e0c7643-b312-46e8-bc39-bd9ad06f4a61","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3ea9987c-4a6d-4283-bf4e-0d2f3265c600","path":"sprites/s_node_surface_data/s_node_surface_data.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"54a3a76c-f69c-42b7-8589-0e2a37d06c78","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bc1e58c1-59ae-4abe-a71d-09ad06da3982","path":"sprites/s_node_condition/s_node_condition.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,14 +58,14 @@ "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"s_node_surface_data","path":"sprites/s_node_surface_data/s_node_surface_data.yy",}, + "parent": {"name":"s_node_condition","path":"sprites/s_node_condition/s_node_condition.yy",}, "resourceVersion": "1.3", - "name": "s_node_surface_data", + "name": "s_node_condition", "tags": [], "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ac35f8ca-edfd-4e47-92c1-8b2e988eaf86","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8bfb3b5e-1961-4d44-a901-abd4030411e3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { @@ -73,7 +73,7 @@ "path": "folders/nodes/icons.yy", }, "resourceVersion": "1.0", - "name": "s_node_surface_data", + "name": "s_node_condition", "tags": [], "resourceType": "GMSprite", } \ No newline at end of file diff --git a/sprites/s_node_corner/06312883-2ea9-4390-8951-884396db2672.png b/sprites/s_node_corner/06312883-2ea9-4390-8951-884396db2672.png new file mode 100644 index 000000000..00512817e Binary files /dev/null and b/sprites/s_node_corner/06312883-2ea9-4390-8951-884396db2672.png differ diff --git a/sprites/s_node_corner/bc547c10-e194-41fd-aa36-9a95b707e2fd.png b/sprites/s_node_corner/bc547c10-e194-41fd-aa36-9a95b707e2fd.png deleted file mode 100644 index de097cc56..000000000 Binary files a/sprites/s_node_corner/bc547c10-e194-41fd-aa36-9a95b707e2fd.png and /dev/null differ diff --git a/sprites/s_node_corner/layers/06312883-2ea9-4390-8951-884396db2672/843205f4-8a99-46ec-9652-23fe75ffd4d5.png b/sprites/s_node_corner/layers/06312883-2ea9-4390-8951-884396db2672/843205f4-8a99-46ec-9652-23fe75ffd4d5.png new file mode 100644 index 000000000..f352acbc0 Binary files /dev/null and b/sprites/s_node_corner/layers/06312883-2ea9-4390-8951-884396db2672/843205f4-8a99-46ec-9652-23fe75ffd4d5.png differ diff --git a/sprites/s_node_corner/layers/bc547c10-e194-41fd-aa36-9a95b707e2fd/de3ead4b-2b5d-4587-b209-242999c9bc0c.png b/sprites/s_node_corner/layers/bc547c10-e194-41fd-aa36-9a95b707e2fd/de3ead4b-2b5d-4587-b209-242999c9bc0c.png deleted file mode 100644 index de097cc56..000000000 Binary files a/sprites/s_node_corner/layers/bc547c10-e194-41fd-aa36-9a95b707e2fd/de3ead4b-2b5d-4587-b209-242999c9bc0c.png and /dev/null differ diff --git a/sprites/s_node_corner/s_node_corner.yy b/sprites/s_node_corner/s_node_corner.yy index dc4543143..a945ecbf9 100644 --- a/sprites/s_node_corner/s_node_corner.yy +++ b/sprites/s_node_corner/s_node_corner.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 28, - "bbox_top": 3, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"bc547c10-e194-41fd-aa36-9a95b707e2fd","path":"sprites/s_node_corner/s_node_corner.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"bc547c10-e194-41fd-aa36-9a95b707e2fd","path":"sprites/s_node_corner/s_node_corner.yy",},"LayerId":{"name":"de3ead4b-2b5d-4587-b209-242999c9bc0c","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","name":"bc547c10-e194-41fd-aa36-9a95b707e2fd","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"06312883-2ea9-4390-8951-884396db2672","path":"sprites/s_node_corner/s_node_corner.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"06312883-2ea9-4390-8951-884396db2672","path":"sprites/s_node_corner/s_node_corner.yy",},"LayerId":{"name":"843205f4-8a99-46ec-9652-23fe75ffd4d5","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","name":"06312883-2ea9-4390-8951-884396db2672","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fe1737e8-72c0-49f6-9ce3-17b75f15ebf6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bc547c10-e194-41fd-aa36-9a95b707e2fd","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"359cec6b-4f16-4bdf-b928-84dd9c143a6c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"06312883-2ea9-4390-8951-884396db2672","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"de3ead4b-2b5d-4587-b209-242999c9bc0c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"843205f4-8a99-46ec-9652-23fe75ffd4d5","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_counter/4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e.png b/sprites/s_node_counter/4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e.png deleted file mode 100644 index 788cd35bd..000000000 Binary files a/sprites/s_node_counter/4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e.png and /dev/null differ diff --git a/sprites/s_node_counter/6f420b65-7177-447d-aafd-33560537a5e1.png b/sprites/s_node_counter/6f420b65-7177-447d-aafd-33560537a5e1.png new file mode 100644 index 000000000..5506b780c Binary files /dev/null and b/sprites/s_node_counter/6f420b65-7177-447d-aafd-33560537a5e1.png differ diff --git a/sprites/s_node_counter/layers/4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e/0b6240ac-b107-4864-9c09-541bd8d3ca16.png b/sprites/s_node_counter/layers/4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e/0b6240ac-b107-4864-9c09-541bd8d3ca16.png deleted file mode 100644 index 788cd35bd..000000000 Binary files a/sprites/s_node_counter/layers/4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e/0b6240ac-b107-4864-9c09-541bd8d3ca16.png and /dev/null differ diff --git a/sprites/s_node_counter/layers/6f420b65-7177-447d-aafd-33560537a5e1/21f0ec8f-201e-4955-ab2e-f263a8bebe09.png b/sprites/s_node_counter/layers/6f420b65-7177-447d-aafd-33560537a5e1/21f0ec8f-201e-4955-ab2e-f263a8bebe09.png new file mode 100644 index 000000000..4a02a01ec Binary files /dev/null and b/sprites/s_node_counter/layers/6f420b65-7177-447d-aafd-33560537a5e1/21f0ec8f-201e-4955-ab2e-f263a8bebe09.png differ diff --git a/sprites/s_node_counter/s_node_counter.yy b/sprites/s_node_counter/s_node_counter.yy index ab83b5957..6d0c8cdf2 100644 --- a/sprites/s_node_counter/s_node_counter.yy +++ b/sprites/s_node_counter/s_node_counter.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, + "bbox_left": 5, "bbox_right": 27, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_top": 3, + "bbox_bottom": 28, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e","path":"sprites/s_node_counter/s_node_counter.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e","path":"sprites/s_node_counter/s_node_counter.yy",},"LayerId":{"name":"0b6240ac-b107-4864-9c09-541bd8d3ca16","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","name":"4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6f420b65-7177-447d-aafd-33560537a5e1","path":"sprites/s_node_counter/s_node_counter.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6f420b65-7177-447d-aafd-33560537a5e1","path":"sprites/s_node_counter/s_node_counter.yy",},"LayerId":{"name":"21f0ec8f-201e-4955-ab2e-f263a8bebe09","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","name":"6f420b65-7177-447d-aafd-33560537a5e1","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6b2b7b59-1e97-4818-ae36-8d4b51b1ee4e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4aedd4dd-9145-4c53-9c2f-ab1e445f3c7e","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b21ff79c-3256-4f19-8051-f9484622ed05","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6f420b65-7177-447d-aafd-33560537a5e1","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0b6240ac-b107-4864-9c09-541bd8d3ca16","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"21f0ec8f-201e-4955-ab2e-f263a8bebe09","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_crop/4396d5f7-b70e-4607-8249-04cbbf941514.png b/sprites/s_node_crop/4396d5f7-b70e-4607-8249-04cbbf941514.png new file mode 100644 index 000000000..71c7fa016 Binary files /dev/null and b/sprites/s_node_crop/4396d5f7-b70e-4607-8249-04cbbf941514.png differ diff --git a/sprites/s_node_crop/647a4218-62e7-4aa4-a2be-dbb9a48af928.png b/sprites/s_node_crop/647a4218-62e7-4aa4-a2be-dbb9a48af928.png deleted file mode 100644 index c9c6f0c27..000000000 Binary files a/sprites/s_node_crop/647a4218-62e7-4aa4-a2be-dbb9a48af928.png and /dev/null differ diff --git a/sprites/s_node_crop/layers/4396d5f7-b70e-4607-8249-04cbbf941514/bf805559-3537-42f7-98c1-1606958df977.png b/sprites/s_node_crop/layers/4396d5f7-b70e-4607-8249-04cbbf941514/bf805559-3537-42f7-98c1-1606958df977.png new file mode 100644 index 000000000..00e3765dc Binary files /dev/null and b/sprites/s_node_crop/layers/4396d5f7-b70e-4607-8249-04cbbf941514/bf805559-3537-42f7-98c1-1606958df977.png differ diff --git a/sprites/s_node_crop/layers/647a4218-62e7-4aa4-a2be-dbb9a48af928/f607bb0c-533b-4ebb-94fe-1d5d156c357b.png b/sprites/s_node_crop/layers/647a4218-62e7-4aa4-a2be-dbb9a48af928/f607bb0c-533b-4ebb-94fe-1d5d156c357b.png deleted file mode 100644 index c9c6f0c27..000000000 Binary files a/sprites/s_node_crop/layers/647a4218-62e7-4aa4-a2be-dbb9a48af928/f607bb0c-533b-4ebb-94fe-1d5d156c357b.png and /dev/null differ diff --git a/sprites/s_node_crop/s_node_crop.yy b/sprites/s_node_crop/s_node_crop.yy index 68e340faa..9a266e8e5 100644 --- a/sprites/s_node_crop/s_node_crop.yy +++ b/sprites/s_node_crop/s_node_crop.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"647a4218-62e7-4aa4-a2be-dbb9a48af928","path":"sprites/s_node_crop/s_node_crop.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"647a4218-62e7-4aa4-a2be-dbb9a48af928","path":"sprites/s_node_crop/s_node_crop.yy",},"LayerId":{"name":"f607bb0c-533b-4ebb-94fe-1d5d156c357b","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","name":"647a4218-62e7-4aa4-a2be-dbb9a48af928","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4396d5f7-b70e-4607-8249-04cbbf941514","path":"sprites/s_node_crop/s_node_crop.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4396d5f7-b70e-4607-8249-04cbbf941514","path":"sprites/s_node_crop/s_node_crop.yy",},"LayerId":{"name":"bf805559-3537-42f7-98c1-1606958df977","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","name":"4396d5f7-b70e-4607-8249-04cbbf941514","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"04e2bd3d-03b2-4f33-89eb-803a7b60b4ee","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"647a4218-62e7-4aa4-a2be-dbb9a48af928","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c97c0f01-5de3-4bdd-9680-08728fb689e9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4396d5f7-b70e-4607-8249-04cbbf941514","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f607bb0c-533b-4ebb-94fe-1d5d156c357b","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bf805559-3537-42f7-98c1-1606958df977","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_curve/2332863d-83b7-4b1a-9da1-01b9d2f4ea1f.png b/sprites/s_node_curve/2332863d-83b7-4b1a-9da1-01b9d2f4ea1f.png new file mode 100644 index 000000000..f3c3bf1ec Binary files /dev/null and b/sprites/s_node_curve/2332863d-83b7-4b1a-9da1-01b9d2f4ea1f.png differ diff --git a/sprites/s_node_curve/f3852685-465e-4642-bf6d-2202df586539.png b/sprites/s_node_curve/f3852685-465e-4642-bf6d-2202df586539.png deleted file mode 100644 index 7121fba42..000000000 Binary files a/sprites/s_node_curve/f3852685-465e-4642-bf6d-2202df586539.png and /dev/null differ diff --git a/sprites/s_node_curve/layers/2332863d-83b7-4b1a-9da1-01b9d2f4ea1f/3e890825-de29-4f42-96b1-4f9a353bfeac.png b/sprites/s_node_curve/layers/2332863d-83b7-4b1a-9da1-01b9d2f4ea1f/3e890825-de29-4f42-96b1-4f9a353bfeac.png new file mode 100644 index 000000000..5c77af789 Binary files /dev/null and b/sprites/s_node_curve/layers/2332863d-83b7-4b1a-9da1-01b9d2f4ea1f/3e890825-de29-4f42-96b1-4f9a353bfeac.png differ diff --git a/sprites/s_node_curve/layers/f3852685-465e-4642-bf6d-2202df586539/730e65de-7be9-44f9-a8f8-41f4065dfad0.png b/sprites/s_node_curve/layers/f3852685-465e-4642-bf6d-2202df586539/730e65de-7be9-44f9-a8f8-41f4065dfad0.png deleted file mode 100644 index 7121fba42..000000000 Binary files a/sprites/s_node_curve/layers/f3852685-465e-4642-bf6d-2202df586539/730e65de-7be9-44f9-a8f8-41f4065dfad0.png and /dev/null differ diff --git a/sprites/s_node_curve/s_node_curve.yy b/sprites/s_node_curve/s_node_curve.yy index ed507ca89..8158ca275 100644 --- a/sprites/s_node_curve/s_node_curve.yy +++ b/sprites/s_node_curve/s_node_curve.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"f3852685-465e-4642-bf6d-2202df586539","path":"sprites/s_node_curve/s_node_curve.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"f3852685-465e-4642-bf6d-2202df586539","path":"sprites/s_node_curve/s_node_curve.yy",},"LayerId":{"name":"730e65de-7be9-44f9-a8f8-41f4065dfad0","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","name":"f3852685-465e-4642-bf6d-2202df586539","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"2332863d-83b7-4b1a-9da1-01b9d2f4ea1f","path":"sprites/s_node_curve/s_node_curve.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"2332863d-83b7-4b1a-9da1-01b9d2f4ea1f","path":"sprites/s_node_curve/s_node_curve.yy",},"LayerId":{"name":"3e890825-de29-4f42-96b1-4f9a353bfeac","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","name":"2332863d-83b7-4b1a-9da1-01b9d2f4ea1f","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e495295b-5af8-4169-8c14-46e4e68ba0fa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f3852685-465e-4642-bf6d-2202df586539","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"62349e9e-4ca0-4973-bd36-42c457c940c2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2332863d-83b7-4b1a-9da1-01b9d2f4ea1f","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"730e65de-7be9-44f9-a8f8-41f4065dfad0","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3e890825-de29-4f42-96b1-4f9a353bfeac","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_decorner/9baec348-80fe-4801-bb5c-d5834fdbb2d1.png b/sprites/s_node_decorner/a3141fb1-f731-4a2a-bba4-0b743fc0e7e7.png similarity index 100% rename from sprites/s_node_decorner/9baec348-80fe-4801-bb5c-d5834fdbb2d1.png rename to sprites/s_node_decorner/a3141fb1-f731-4a2a-bba4-0b743fc0e7e7.png diff --git a/sprites/s_node_decorner/layers/9baec348-80fe-4801-bb5c-d5834fdbb2d1/b8991cc7-cfab-441c-8c45-c1ec60d3d5f7.png b/sprites/s_node_decorner/layers/a3141fb1-f731-4a2a-bba4-0b743fc0e7e7/20f2a4b2-8e2e-4265-82c5-227353703ac0.png similarity index 100% rename from sprites/s_node_decorner/layers/9baec348-80fe-4801-bb5c-d5834fdbb2d1/b8991cc7-cfab-441c-8c45-c1ec60d3d5f7.png rename to sprites/s_node_decorner/layers/a3141fb1-f731-4a2a-bba4-0b743fc0e7e7/20f2a4b2-8e2e-4265-82c5-227353703ac0.png diff --git a/sprites/s_node_decorner/s_node_decorner.yy b/sprites/s_node_decorner/s_node_decorner.yy index ba12934c4..eb7a4607c 100644 --- a/sprites/s_node_decorner/s_node_decorner.yy +++ b/sprites/s_node_decorner/s_node_decorner.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"9baec348-80fe-4801-bb5c-d5834fdbb2d1","path":"sprites/s_node_decorner/s_node_decorner.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"9baec348-80fe-4801-bb5c-d5834fdbb2d1","path":"sprites/s_node_decorner/s_node_decorner.yy",},"LayerId":{"name":"b8991cc7-cfab-441c-8c45-c1ec60d3d5f7","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","name":"9baec348-80fe-4801-bb5c-d5834fdbb2d1","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"a3141fb1-f731-4a2a-bba4-0b743fc0e7e7","path":"sprites/s_node_decorner/s_node_decorner.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"a3141fb1-f731-4a2a-bba4-0b743fc0e7e7","path":"sprites/s_node_decorner/s_node_decorner.yy",},"LayerId":{"name":"20f2a4b2-8e2e-4265-82c5-227353703ac0","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","name":"a3141fb1-f731-4a2a-bba4-0b743fc0e7e7","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d21bb05a-19c3-460a-8667-226f340e3968","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9baec348-80fe-4801-bb5c-d5834fdbb2d1","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"05fc08be-03dd-4660-b450-ca369307c657","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a3141fb1-f731-4a2a-bba4-0b743fc0e7e7","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b8991cc7-cfab-441c-8c45-c1ec60d3d5f7","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"20f2a4b2-8e2e-4265-82c5-227353703ac0","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_destray/ae6316c8-97fc-4e3b-a65b-58e65cfb043c.png b/sprites/s_node_destray/126b9fe6-194f-4118-98d0-715878e9d60e.png similarity index 100% rename from sprites/s_node_destray/ae6316c8-97fc-4e3b-a65b-58e65cfb043c.png rename to sprites/s_node_destray/126b9fe6-194f-4118-98d0-715878e9d60e.png diff --git a/sprites/s_node_destray/layers/ae6316c8-97fc-4e3b-a65b-58e65cfb043c/0e52e8b2-c779-4b50-a4b0-bc4cbbb531fd.png b/sprites/s_node_destray/layers/126b9fe6-194f-4118-98d0-715878e9d60e/3d63800b-bc66-42a1-90a8-75c52edcc5c3.png similarity index 100% rename from sprites/s_node_destray/layers/ae6316c8-97fc-4e3b-a65b-58e65cfb043c/0e52e8b2-c779-4b50-a4b0-bc4cbbb531fd.png rename to sprites/s_node_destray/layers/126b9fe6-194f-4118-98d0-715878e9d60e/3d63800b-bc66-42a1-90a8-75c52edcc5c3.png diff --git a/sprites/s_node_destray/s_node_destray.yy b/sprites/s_node_destray/s_node_destray.yy index 0e307cc94..32eb97b4d 100644 --- a/sprites/s_node_destray/s_node_destray.yy +++ b/sprites/s_node_destray/s_node_destray.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ae6316c8-97fc-4e3b-a65b-58e65cfb043c","path":"sprites/s_node_destray/s_node_destray.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ae6316c8-97fc-4e3b-a65b-58e65cfb043c","path":"sprites/s_node_destray/s_node_destray.yy",},"LayerId":{"name":"0e52e8b2-c779-4b50-a4b0-bc4cbbb531fd","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","name":"ae6316c8-97fc-4e3b-a65b-58e65cfb043c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"126b9fe6-194f-4118-98d0-715878e9d60e","path":"sprites/s_node_destray/s_node_destray.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"126b9fe6-194f-4118-98d0-715878e9d60e","path":"sprites/s_node_destray/s_node_destray.yy",},"LayerId":{"name":"3d63800b-bc66-42a1-90a8-75c52edcc5c3","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","name":"126b9fe6-194f-4118-98d0-715878e9d60e","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9cd1334f-9f69-4bad-821c-87566d57594d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ae6316c8-97fc-4e3b-a65b-58e65cfb043c","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"71b12d6b-702f-4598-8f1e-baf447356652","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"126b9fe6-194f-4118-98d0-715878e9d60e","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0e52e8b2-c779-4b50-a4b0-bc4cbbb531fd","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3d63800b-bc66-42a1-90a8-75c52edcc5c3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_dilate/b37835e2-c88e-4b11-aa7d-54d39e87385f.png b/sprites/s_node_dilate/b37835e2-c88e-4b11-aa7d-54d39e87385f.png deleted file mode 100644 index 657990665..000000000 Binary files a/sprites/s_node_dilate/b37835e2-c88e-4b11-aa7d-54d39e87385f.png and /dev/null differ diff --git a/sprites/s_node_dilate/e973c397-327a-4b27-94a8-27809abae136.png b/sprites/s_node_dilate/e973c397-327a-4b27-94a8-27809abae136.png new file mode 100644 index 000000000..188fcb7a0 Binary files /dev/null and b/sprites/s_node_dilate/e973c397-327a-4b27-94a8-27809abae136.png differ diff --git a/sprites/s_node_dilate/layers/b37835e2-c88e-4b11-aa7d-54d39e87385f/6ea57d99-04c0-4dd7-b77a-1e3e39fdab60.png b/sprites/s_node_dilate/layers/b37835e2-c88e-4b11-aa7d-54d39e87385f/6ea57d99-04c0-4dd7-b77a-1e3e39fdab60.png deleted file mode 100644 index 657990665..000000000 Binary files a/sprites/s_node_dilate/layers/b37835e2-c88e-4b11-aa7d-54d39e87385f/6ea57d99-04c0-4dd7-b77a-1e3e39fdab60.png and /dev/null differ diff --git a/sprites/s_node_dilate/layers/e973c397-327a-4b27-94a8-27809abae136/cdfcafc0-bc1d-4818-835f-cc1aa228cca3.png b/sprites/s_node_dilate/layers/e973c397-327a-4b27-94a8-27809abae136/cdfcafc0-bc1d-4818-835f-cc1aa228cca3.png new file mode 100644 index 000000000..28686eb12 Binary files /dev/null and b/sprites/s_node_dilate/layers/e973c397-327a-4b27-94a8-27809abae136/cdfcafc0-bc1d-4818-835f-cc1aa228cca3.png differ diff --git a/sprites/s_node_dilate/s_node_dilate.yy b/sprites/s_node_dilate/s_node_dilate.yy index f22a2da11..0bda1c7dd 100644 --- a/sprites/s_node_dilate/s_node_dilate.yy +++ b/sprites/s_node_dilate/s_node_dilate.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b37835e2-c88e-4b11-aa7d-54d39e87385f","path":"sprites/s_node_dilate/s_node_dilate.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b37835e2-c88e-4b11-aa7d-54d39e87385f","path":"sprites/s_node_dilate/s_node_dilate.yy",},"LayerId":{"name":"6ea57d99-04c0-4dd7-b77a-1e3e39fdab60","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","name":"b37835e2-c88e-4b11-aa7d-54d39e87385f","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e973c397-327a-4b27-94a8-27809abae136","path":"sprites/s_node_dilate/s_node_dilate.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e973c397-327a-4b27-94a8-27809abae136","path":"sprites/s_node_dilate/s_node_dilate.yy",},"LayerId":{"name":"cdfcafc0-bc1d-4818-835f-cc1aa228cca3","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","name":"e973c397-327a-4b27-94a8-27809abae136","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b10e93fb-830a-41d1-bf43-fc1604f46bfd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b37835e2-c88e-4b11-aa7d-54d39e87385f","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"96c84f4e-9ff1-44d5-9211-b43d46a33cb3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e973c397-327a-4b27-94a8-27809abae136","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"6ea57d99-04c0-4dd7-b77a-1e3e39fdab60","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cdfcafc0-bc1d-4818-835f-cc1aa228cca3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_displace/02c8ef0f-29cb-4aac-96a9-457789f28c0c.png b/sprites/s_node_displace/02c8ef0f-29cb-4aac-96a9-457789f28c0c.png new file mode 100644 index 000000000..8a8c2b88c Binary files /dev/null and b/sprites/s_node_displace/02c8ef0f-29cb-4aac-96a9-457789f28c0c.png differ diff --git a/sprites/s_node_displace/86a737f8-9339-4a8c-9371-64dcd7b2cf70.png b/sprites/s_node_displace/86a737f8-9339-4a8c-9371-64dcd7b2cf70.png deleted file mode 100644 index 09a87a441..000000000 Binary files a/sprites/s_node_displace/86a737f8-9339-4a8c-9371-64dcd7b2cf70.png and /dev/null differ diff --git a/sprites/s_node_displace/layers/02c8ef0f-29cb-4aac-96a9-457789f28c0c/8e821ebe-7e71-4856-ac18-19f92809436d.png b/sprites/s_node_displace/layers/02c8ef0f-29cb-4aac-96a9-457789f28c0c/8e821ebe-7e71-4856-ac18-19f92809436d.png new file mode 100644 index 000000000..6f428292b Binary files /dev/null and b/sprites/s_node_displace/layers/02c8ef0f-29cb-4aac-96a9-457789f28c0c/8e821ebe-7e71-4856-ac18-19f92809436d.png differ diff --git a/sprites/s_node_displace/layers/86a737f8-9339-4a8c-9371-64dcd7b2cf70/370831ad-5153-431b-8c04-c4315c057ac2.png b/sprites/s_node_displace/layers/86a737f8-9339-4a8c-9371-64dcd7b2cf70/370831ad-5153-431b-8c04-c4315c057ac2.png deleted file mode 100644 index 09a87a441..000000000 Binary files a/sprites/s_node_displace/layers/86a737f8-9339-4a8c-9371-64dcd7b2cf70/370831ad-5153-431b-8c04-c4315c057ac2.png and /dev/null differ diff --git a/sprites/s_node_displace/s_node_displace.yy b/sprites/s_node_displace/s_node_displace.yy index c793b8909..67364db33 100644 --- a/sprites/s_node_displace/s_node_displace.yy +++ b/sprites/s_node_displace/s_node_displace.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"86a737f8-9339-4a8c-9371-64dcd7b2cf70","path":"sprites/s_node_displace/s_node_displace.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"86a737f8-9339-4a8c-9371-64dcd7b2cf70","path":"sprites/s_node_displace/s_node_displace.yy",},"LayerId":{"name":"370831ad-5153-431b-8c04-c4315c057ac2","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","name":"86a737f8-9339-4a8c-9371-64dcd7b2cf70","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"02c8ef0f-29cb-4aac-96a9-457789f28c0c","path":"sprites/s_node_displace/s_node_displace.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"02c8ef0f-29cb-4aac-96a9-457789f28c0c","path":"sprites/s_node_displace/s_node_displace.yy",},"LayerId":{"name":"8e821ebe-7e71-4856-ac18-19f92809436d","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","name":"02c8ef0f-29cb-4aac-96a9-457789f28c0c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5e9da006-6775-43c2-abef-7d02f8fc1a97","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"86a737f8-9339-4a8c-9371-64dcd7b2cf70","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c937b5a8-e9a4-45b3-b9ea-92972fef6e95","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"02c8ef0f-29cb-4aac-96a9-457789f28c0c","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"370831ad-5153-431b-8c04-c4315c057ac2","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8e821ebe-7e71-4856-ac18-19f92809436d","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_dithering/ccc83679-573d-4291-a844-2c80ca1eb457.png b/sprites/s_node_dithering/ccc83679-573d-4291-a844-2c80ca1eb457.png deleted file mode 100644 index a501d779f..000000000 Binary files a/sprites/s_node_dithering/ccc83679-573d-4291-a844-2c80ca1eb457.png and /dev/null differ diff --git a/sprites/s_node_dithering/e39b3ffe-cc1e-4720-b819-335ccc03bcb2.png b/sprites/s_node_dithering/e39b3ffe-cc1e-4720-b819-335ccc03bcb2.png new file mode 100644 index 000000000..022acd8c2 Binary files /dev/null and b/sprites/s_node_dithering/e39b3ffe-cc1e-4720-b819-335ccc03bcb2.png differ diff --git a/sprites/s_node_dithering/layers/ccc83679-573d-4291-a844-2c80ca1eb457/6a825215-b888-472b-a465-c57b9961561c.png b/sprites/s_node_dithering/layers/ccc83679-573d-4291-a844-2c80ca1eb457/6a825215-b888-472b-a465-c57b9961561c.png deleted file mode 100644 index a501d779f..000000000 Binary files a/sprites/s_node_dithering/layers/ccc83679-573d-4291-a844-2c80ca1eb457/6a825215-b888-472b-a465-c57b9961561c.png and /dev/null differ diff --git a/sprites/s_node_dithering/layers/e39b3ffe-cc1e-4720-b819-335ccc03bcb2/ba63987d-aff4-48d2-81ab-65d5e13bdf09.png b/sprites/s_node_dithering/layers/e39b3ffe-cc1e-4720-b819-335ccc03bcb2/ba63987d-aff4-48d2-81ab-65d5e13bdf09.png new file mode 100644 index 000000000..4cb8f4b0b Binary files /dev/null and b/sprites/s_node_dithering/layers/e39b3ffe-cc1e-4720-b819-335ccc03bcb2/ba63987d-aff4-48d2-81ab-65d5e13bdf09.png differ diff --git a/sprites/s_node_dithering/s_node_dithering.yy b/sprites/s_node_dithering/s_node_dithering.yy index f0c0f2c23..77b25d6fd 100644 --- a/sprites/s_node_dithering/s_node_dithering.yy +++ b/sprites/s_node_dithering/s_node_dithering.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ccc83679-573d-4291-a844-2c80ca1eb457","path":"sprites/s_node_dithering/s_node_dithering.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ccc83679-573d-4291-a844-2c80ca1eb457","path":"sprites/s_node_dithering/s_node_dithering.yy",},"LayerId":{"name":"6a825215-b888-472b-a465-c57b9961561c","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","name":"ccc83679-573d-4291-a844-2c80ca1eb457","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e39b3ffe-cc1e-4720-b819-335ccc03bcb2","path":"sprites/s_node_dithering/s_node_dithering.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e39b3ffe-cc1e-4720-b819-335ccc03bcb2","path":"sprites/s_node_dithering/s_node_dithering.yy",},"LayerId":{"name":"ba63987d-aff4-48d2-81ab-65d5e13bdf09","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","name":"e39b3ffe-cc1e-4720-b819-335ccc03bcb2","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"881e597c-f869-4f4e-a6b2-5c60385e5635","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ccc83679-573d-4291-a844-2c80ca1eb457","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7695518c-83f6-4f78-801c-3a3bda8584a0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e39b3ffe-cc1e-4720-b819-335ccc03bcb2","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"6a825215-b888-472b-a465-c57b9961561c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ba63987d-aff4-48d2-81ab-65d5e13bdf09","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_erode/026af3fa-a86d-4037-8bf8-1c99a44abc7f.png b/sprites/s_node_erode/026af3fa-a86d-4037-8bf8-1c99a44abc7f.png new file mode 100644 index 000000000..46ec9a0c9 Binary files /dev/null and b/sprites/s_node_erode/026af3fa-a86d-4037-8bf8-1c99a44abc7f.png differ diff --git a/sprites/s_node_erode/a95e6a7c-8ce2-4407-a9c4-d26b0c17081c.png b/sprites/s_node_erode/a95e6a7c-8ce2-4407-a9c4-d26b0c17081c.png deleted file mode 100644 index ea926fb36..000000000 Binary files a/sprites/s_node_erode/a95e6a7c-8ce2-4407-a9c4-d26b0c17081c.png and /dev/null differ diff --git a/sprites/s_node_erode/layers/026af3fa-a86d-4037-8bf8-1c99a44abc7f/bae8fbd2-3e46-4d9a-9b87-66456f232599.png b/sprites/s_node_erode/layers/026af3fa-a86d-4037-8bf8-1c99a44abc7f/bae8fbd2-3e46-4d9a-9b87-66456f232599.png new file mode 100644 index 000000000..26fa68c29 Binary files /dev/null and b/sprites/s_node_erode/layers/026af3fa-a86d-4037-8bf8-1c99a44abc7f/bae8fbd2-3e46-4d9a-9b87-66456f232599.png differ diff --git a/sprites/s_node_erode/layers/a95e6a7c-8ce2-4407-a9c4-d26b0c17081c/98787e67-987b-4348-9e12-cd1e90782be5.png b/sprites/s_node_erode/layers/a95e6a7c-8ce2-4407-a9c4-d26b0c17081c/98787e67-987b-4348-9e12-cd1e90782be5.png deleted file mode 100644 index ea926fb36..000000000 Binary files a/sprites/s_node_erode/layers/a95e6a7c-8ce2-4407-a9c4-d26b0c17081c/98787e67-987b-4348-9e12-cd1e90782be5.png and /dev/null differ diff --git a/sprites/s_node_erode/s_node_erode.yy b/sprites/s_node_erode/s_node_erode.yy index 3aa34459f..04ec1a919 100644 --- a/sprites/s_node_erode/s_node_erode.yy +++ b/sprites/s_node_erode/s_node_erode.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"a95e6a7c-8ce2-4407-a9c4-d26b0c17081c","path":"sprites/s_node_erode/s_node_erode.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"a95e6a7c-8ce2-4407-a9c4-d26b0c17081c","path":"sprites/s_node_erode/s_node_erode.yy",},"LayerId":{"name":"98787e67-987b-4348-9e12-cd1e90782be5","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","name":"a95e6a7c-8ce2-4407-a9c4-d26b0c17081c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"026af3fa-a86d-4037-8bf8-1c99a44abc7f","path":"sprites/s_node_erode/s_node_erode.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"026af3fa-a86d-4037-8bf8-1c99a44abc7f","path":"sprites/s_node_erode/s_node_erode.yy",},"LayerId":{"name":"bae8fbd2-3e46-4d9a-9b87-66456f232599","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","name":"026af3fa-a86d-4037-8bf8-1c99a44abc7f","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f50d04dc-08c8-422b-bcc9-46574dd6d20a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a95e6a7c-8ce2-4407-a9c4-d26b0c17081c","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4cbc9ffd-424c-4c67-9aa3-e750c179d7ed","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"026af3fa-a86d-4037-8bf8-1c99a44abc7f","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"98787e67-987b-4348-9e12-cd1e90782be5","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bae8fbd2-3e46-4d9a-9b87-66456f232599","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_export/6b1728ca-0aba-4bec-864a-520b1528c695.png b/sprites/s_node_export/6b1728ca-0aba-4bec-864a-520b1528c695.png new file mode 100644 index 000000000..2704b05a8 Binary files /dev/null and b/sprites/s_node_export/6b1728ca-0aba-4bec-864a-520b1528c695.png differ diff --git a/sprites/s_node_export/7f43b138-db07-494a-85ea-e81278d3cebd.png b/sprites/s_node_export/7f43b138-db07-494a-85ea-e81278d3cebd.png deleted file mode 100644 index 1e86fc2d6..000000000 Binary files a/sprites/s_node_export/7f43b138-db07-494a-85ea-e81278d3cebd.png and /dev/null differ diff --git a/sprites/s_node_export/layers/6b1728ca-0aba-4bec-864a-520b1528c695/64309d21-b1d4-491e-a1bb-123e75fc1bac.png b/sprites/s_node_export/layers/6b1728ca-0aba-4bec-864a-520b1528c695/64309d21-b1d4-491e-a1bb-123e75fc1bac.png new file mode 100644 index 000000000..f3be5a36c Binary files /dev/null and b/sprites/s_node_export/layers/6b1728ca-0aba-4bec-864a-520b1528c695/64309d21-b1d4-491e-a1bb-123e75fc1bac.png differ diff --git a/sprites/s_node_export/layers/7f43b138-db07-494a-85ea-e81278d3cebd/58ca2586-31a6-489b-bd9e-2961bd4f8fc5.png b/sprites/s_node_export/layers/7f43b138-db07-494a-85ea-e81278d3cebd/58ca2586-31a6-489b-bd9e-2961bd4f8fc5.png deleted file mode 100644 index 1e86fc2d6..000000000 Binary files a/sprites/s_node_export/layers/7f43b138-db07-494a-85ea-e81278d3cebd/58ca2586-31a6-489b-bd9e-2961bd4f8fc5.png and /dev/null differ diff --git a/sprites/s_node_export/s_node_export.yy b/sprites/s_node_export/s_node_export.yy index 91f42aa96..499e7c8ad 100644 --- a/sprites/s_node_export/s_node_export.yy +++ b/sprites/s_node_export/s_node_export.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 2, - "bbox_bottom": 28, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 1, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"7f43b138-db07-494a-85ea-e81278d3cebd","path":"sprites/s_node_export/s_node_export.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"7f43b138-db07-494a-85ea-e81278d3cebd","path":"sprites/s_node_export/s_node_export.yy",},"LayerId":{"name":"58ca2586-31a6-489b-bd9e-2961bd4f8fc5","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","name":"7f43b138-db07-494a-85ea-e81278d3cebd","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b1728ca-0aba-4bec-864a-520b1528c695","path":"sprites/s_node_export/s_node_export.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b1728ca-0aba-4bec-864a-520b1528c695","path":"sprites/s_node_export/s_node_export.yy",},"LayerId":{"name":"64309d21-b1d4-491e-a1bb-123e75fc1bac","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","name":"6b1728ca-0aba-4bec-864a-520b1528c695","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5186362e-9e5b-46eb-a6b2-3bb43b48481a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7f43b138-db07-494a-85ea-e81278d3cebd","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"64a0c781-946f-4cb4-84da-0be06a7891c8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b1728ca-0aba-4bec-864a-520b1528c695","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"58ca2586-31a6-489b-bd9e-2961bd4f8fc5","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"64309d21-b1d4-491e-a1bb-123e75fc1bac","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_export_gif/634dd5dd-92a1-49c3-94e5-604d9145d5e1.png b/sprites/s_node_export_gif/634dd5dd-92a1-49c3-94e5-604d9145d5e1.png deleted file mode 100644 index 5bc8b5c17..000000000 Binary files a/sprites/s_node_export_gif/634dd5dd-92a1-49c3-94e5-604d9145d5e1.png and /dev/null differ diff --git a/sprites/s_node_export_gif/layers/634dd5dd-92a1-49c3-94e5-604d9145d5e1/f4b82eff-c847-436d-9a1c-654821e478d9.png b/sprites/s_node_export_gif/layers/634dd5dd-92a1-49c3-94e5-604d9145d5e1/f4b82eff-c847-436d-9a1c-654821e478d9.png deleted file mode 100644 index 5bc8b5c17..000000000 Binary files a/sprites/s_node_export_gif/layers/634dd5dd-92a1-49c3-94e5-604d9145d5e1/f4b82eff-c847-436d-9a1c-654821e478d9.png and /dev/null differ diff --git a/sprites/s_node_frame/1529ed44-36f9-4576-b380-86ecfe91cd96.png b/sprites/s_node_frame/1529ed44-36f9-4576-b380-86ecfe91cd96.png deleted file mode 100644 index 504016c4f..000000000 Binary files a/sprites/s_node_frame/1529ed44-36f9-4576-b380-86ecfe91cd96.png and /dev/null differ diff --git a/sprites/s_node_frame/817275da-960c-4d16-a4cc-1f3518c7a840.png b/sprites/s_node_frame/817275da-960c-4d16-a4cc-1f3518c7a840.png new file mode 100644 index 000000000..9a7825036 Binary files /dev/null and b/sprites/s_node_frame/817275da-960c-4d16-a4cc-1f3518c7a840.png differ diff --git a/sprites/s_node_frame/layers/1529ed44-36f9-4576-b380-86ecfe91cd96/ae344590-63bb-4513-80a3-10ca89dc4f0d.png b/sprites/s_node_frame/layers/1529ed44-36f9-4576-b380-86ecfe91cd96/ae344590-63bb-4513-80a3-10ca89dc4f0d.png deleted file mode 100644 index 79d671ccf..000000000 Binary files a/sprites/s_node_frame/layers/1529ed44-36f9-4576-b380-86ecfe91cd96/ae344590-63bb-4513-80a3-10ca89dc4f0d.png and /dev/null differ diff --git a/sprites/s_node_frame/layers/817275da-960c-4d16-a4cc-1f3518c7a840/7b51076a-7dea-4e8e-97a8-59f5af40c383.png b/sprites/s_node_frame/layers/817275da-960c-4d16-a4cc-1f3518c7a840/7b51076a-7dea-4e8e-97a8-59f5af40c383.png new file mode 100644 index 000000000..5dfd8da4a Binary files /dev/null and b/sprites/s_node_frame/layers/817275da-960c-4d16-a4cc-1f3518c7a840/7b51076a-7dea-4e8e-97a8-59f5af40c383.png differ diff --git a/sprites/s_node_frame/s_node_frame.yy b/sprites/s_node_frame/s_node_frame.yy index ccb82b45e..8b55a19cc 100644 --- a/sprites/s_node_frame/s_node_frame.yy +++ b/sprites/s_node_frame/s_node_frame.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"1529ed44-36f9-4576-b380-86ecfe91cd96","path":"sprites/s_node_frame/s_node_frame.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"1529ed44-36f9-4576-b380-86ecfe91cd96","path":"sprites/s_node_frame/s_node_frame.yy",},"LayerId":{"name":"ae344590-63bb-4513-80a3-10ca89dc4f0d","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","name":"1529ed44-36f9-4576-b380-86ecfe91cd96","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"817275da-960c-4d16-a4cc-1f3518c7a840","path":"sprites/s_node_frame/s_node_frame.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"817275da-960c-4d16-a4cc-1f3518c7a840","path":"sprites/s_node_frame/s_node_frame.yy",},"LayerId":{"name":"7b51076a-7dea-4e8e-97a8-59f5af40c383","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","name":"817275da-960c-4d16-a4cc-1f3518c7a840","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9af59ad4-3376-4703-a376-8f0eb5836d14","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1529ed44-36f9-4576-b380-86ecfe91cd96","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"55db0d64-319f-453f-9333-d9880b1e2226","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"817275da-960c-4d16-a4cc-1f3518c7a840","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ae344590-63bb-4513-80a3-10ca89dc4f0d","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7b51076a-7dea-4e8e-97a8-59f5af40c383","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_glow/4d90ab28-2256-40ee-8db0-9441795745ec.png b/sprites/s_node_glow/4d90ab28-2256-40ee-8db0-9441795745ec.png new file mode 100644 index 000000000..8363e4691 Binary files /dev/null and b/sprites/s_node_glow/4d90ab28-2256-40ee-8db0-9441795745ec.png differ diff --git a/sprites/s_node_glow/4edea91b-4c74-471b-80da-33a82ca188f5.png b/sprites/s_node_glow/4edea91b-4c74-471b-80da-33a82ca188f5.png deleted file mode 100644 index 145edce00..000000000 Binary files a/sprites/s_node_glow/4edea91b-4c74-471b-80da-33a82ca188f5.png and /dev/null differ diff --git a/sprites/s_node_glow/layers/4d90ab28-2256-40ee-8db0-9441795745ec/cc2eae5c-a771-411a-97bc-d08cb2c0ba60.png b/sprites/s_node_glow/layers/4d90ab28-2256-40ee-8db0-9441795745ec/cc2eae5c-a771-411a-97bc-d08cb2c0ba60.png new file mode 100644 index 000000000..22b3dad4b Binary files /dev/null and b/sprites/s_node_glow/layers/4d90ab28-2256-40ee-8db0-9441795745ec/cc2eae5c-a771-411a-97bc-d08cb2c0ba60.png differ diff --git a/sprites/s_node_glow/layers/4edea91b-4c74-471b-80da-33a82ca188f5/79c3b1e6-ded6-4716-b92e-e6e869166615.png b/sprites/s_node_glow/layers/4edea91b-4c74-471b-80da-33a82ca188f5/79c3b1e6-ded6-4716-b92e-e6e869166615.png deleted file mode 100644 index 1e9d617a3..000000000 Binary files a/sprites/s_node_glow/layers/4edea91b-4c74-471b-80da-33a82ca188f5/79c3b1e6-ded6-4716-b92e-e6e869166615.png and /dev/null differ diff --git a/sprites/s_node_glow/s_node_glow.yy b/sprites/s_node_glow/s_node_glow.yy index f1f4b1585..d9d09b3e5 100644 --- a/sprites/s_node_glow/s_node_glow.yy +++ b/sprites/s_node_glow/s_node_glow.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"4edea91b-4c74-471b-80da-33a82ca188f5","path":"sprites/s_node_glow/s_node_glow.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4edea91b-4c74-471b-80da-33a82ca188f5","path":"sprites/s_node_glow/s_node_glow.yy",},"LayerId":{"name":"79c3b1e6-ded6-4716-b92e-e6e869166615","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","name":"4edea91b-4c74-471b-80da-33a82ca188f5","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4d90ab28-2256-40ee-8db0-9441795745ec","path":"sprites/s_node_glow/s_node_glow.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4d90ab28-2256-40ee-8db0-9441795745ec","path":"sprites/s_node_glow/s_node_glow.yy",},"LayerId":{"name":"cc2eae5c-a771-411a-97bc-d08cb2c0ba60","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","name":"4d90ab28-2256-40ee-8db0-9441795745ec","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2c129a77-cb5c-4798-9f90-50b54b691dbd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4edea91b-4c74-471b-80da-33a82ca188f5","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3f725de8-b716-4bbf-8b62-e078c95e48b1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4d90ab28-2256-40ee-8db0-9441795745ec","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"79c3b1e6-ded6-4716-b92e-e6e869166615","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cc2eae5c-a771-411a-97bc-d08cb2c0ba60","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_gradient/4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d.png b/sprites/s_node_gradient/4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d.png deleted file mode 100644 index e4e11327d..000000000 Binary files a/sprites/s_node_gradient/4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d.png and /dev/null differ diff --git a/sprites/s_node_gradient/9219e365-bcfd-47e6-aba5-a41f17b56c11.png b/sprites/s_node_gradient/9219e365-bcfd-47e6-aba5-a41f17b56c11.png new file mode 100644 index 000000000..7e0febe96 Binary files /dev/null and b/sprites/s_node_gradient/9219e365-bcfd-47e6-aba5-a41f17b56c11.png differ diff --git a/sprites/s_node_gradient/layers/4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d/b3efb201-f060-4948-ac02-06fb1db1b2b8.png b/sprites/s_node_gradient/layers/4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d/b3efb201-f060-4948-ac02-06fb1db1b2b8.png deleted file mode 100644 index e4e11327d..000000000 Binary files a/sprites/s_node_gradient/layers/4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d/b3efb201-f060-4948-ac02-06fb1db1b2b8.png and /dev/null differ diff --git a/sprites/s_node_gradient/layers/9219e365-bcfd-47e6-aba5-a41f17b56c11/0dc61e3d-1d0b-4d31-8578-d2fbc021f80a.png b/sprites/s_node_gradient/layers/9219e365-bcfd-47e6-aba5-a41f17b56c11/0dc61e3d-1d0b-4d31-8578-d2fbc021f80a.png new file mode 100644 index 000000000..c8758a802 Binary files /dev/null and b/sprites/s_node_gradient/layers/9219e365-bcfd-47e6-aba5-a41f17b56c11/0dc61e3d-1d0b-4d31-8578-d2fbc021f80a.png differ diff --git a/sprites/s_node_gradient/s_node_gradient.yy b/sprites/s_node_gradient/s_node_gradient.yy index f9c0ff791..075d5aedf 100644 --- a/sprites/s_node_gradient/s_node_gradient.yy +++ b/sprites/s_node_gradient/s_node_gradient.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d","path":"sprites/s_node_gradient/s_node_gradient.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d","path":"sprites/s_node_gradient/s_node_gradient.yy",},"LayerId":{"name":"b3efb201-f060-4948-ac02-06fb1db1b2b8","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","name":"4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"9219e365-bcfd-47e6-aba5-a41f17b56c11","path":"sprites/s_node_gradient/s_node_gradient.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"9219e365-bcfd-47e6-aba5-a41f17b56c11","path":"sprites/s_node_gradient/s_node_gradient.yy",},"LayerId":{"name":"0dc61e3d-1d0b-4d31-8578-d2fbc021f80a","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","name":"9219e365-bcfd-47e6-aba5-a41f17b56c11","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"749534cd-82a1-4a0e-8df8-1561dae4a0d0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4108b36d-a4cd-4a1a-9df8-a7dc4e3f4d1d","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"41cf371c-010e-4662-8486-fb8da2db0278","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9219e365-bcfd-47e6-aba5-a41f17b56c11","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b3efb201-f060-4948-ac02-06fb1db1b2b8","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0dc61e3d-1d0b-4d31-8578-d2fbc021f80a","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_gradient_out/4c7d4478-6a82-4281-b2eb-d60e4d377d9e.png b/sprites/s_node_gradient_out/4c7d4478-6a82-4281-b2eb-d60e4d377d9e.png new file mode 100644 index 000000000..fc1eae63b Binary files /dev/null and b/sprites/s_node_gradient_out/4c7d4478-6a82-4281-b2eb-d60e4d377d9e.png differ diff --git a/sprites/s_node_gradient_out/bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3.png b/sprites/s_node_gradient_out/bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3.png deleted file mode 100644 index 4819778aa..000000000 Binary files a/sprites/s_node_gradient_out/bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3.png and /dev/null differ diff --git a/sprites/s_node_gradient_out/layers/4c7d4478-6a82-4281-b2eb-d60e4d377d9e/d3672a0d-693b-49d2-ab22-3da1b30e7254.png b/sprites/s_node_gradient_out/layers/4c7d4478-6a82-4281-b2eb-d60e4d377d9e/d3672a0d-693b-49d2-ab22-3da1b30e7254.png new file mode 100644 index 000000000..f8ea79808 Binary files /dev/null and b/sprites/s_node_gradient_out/layers/4c7d4478-6a82-4281-b2eb-d60e4d377d9e/d3672a0d-693b-49d2-ab22-3da1b30e7254.png differ diff --git a/sprites/s_node_gradient_out/layers/bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3/cbada00f-4df4-4c0c-87b4-3db86b65c4cd.png b/sprites/s_node_gradient_out/layers/bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3/cbada00f-4df4-4c0c-87b4-3db86b65c4cd.png deleted file mode 100644 index 4819778aa..000000000 Binary files a/sprites/s_node_gradient_out/layers/bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3/cbada00f-4df4-4c0c-87b4-3db86b65c4cd.png and /dev/null differ diff --git a/sprites/s_node_gradient_out/s_node_gradient_out.yy b/sprites/s_node_gradient_out/s_node_gradient_out.yy index 8dc8b09eb..693d8e440 100644 --- a/sprites/s_node_gradient_out/s_node_gradient_out.yy +++ b/sprites/s_node_gradient_out/s_node_gradient_out.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 9, - "bbox_bottom": 21, + "bbox_bottom": 22, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"LayerId":{"name":"cbada00f-4df4-4c0c-87b4-3db86b65c4cd","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","name":"bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4c7d4478-6a82-4281-b2eb-d60e4d377d9e","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4c7d4478-6a82-4281-b2eb-d60e4d377d9e","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"LayerId":{"name":"d3672a0d-693b-49d2-ab22-3da1b30e7254","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","name":"4c7d4478-6a82-4281-b2eb-d60e4d377d9e","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"45717c3c-610b-4fbf-af16-be779259e06b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bf2b71cb-9a4d-47a8-a9d1-44e4ca3fe4a3","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6941a3e1-5578-4640-a6be-83afc6658fd0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4c7d4478-6a82-4281-b2eb-d60e4d377d9e","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cbada00f-4df4-4c0c-87b4-3db86b65c4cd","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d3672a0d-693b-49d2-ab22-3da1b30e7254","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_grey_alpha/82ae4205-d36c-4ad0-9871-6a7132e3509d.png b/sprites/s_node_grey_alpha/82ae4205-d36c-4ad0-9871-6a7132e3509d.png deleted file mode 100644 index bca5fa045..000000000 Binary files a/sprites/s_node_grey_alpha/82ae4205-d36c-4ad0-9871-6a7132e3509d.png and /dev/null differ diff --git a/sprites/s_node_grey_alpha/901e3d9d-0277-4e64-99b1-dfc1f46ebeeb.png b/sprites/s_node_grey_alpha/901e3d9d-0277-4e64-99b1-dfc1f46ebeeb.png new file mode 100644 index 000000000..7a8b43a66 Binary files /dev/null and b/sprites/s_node_grey_alpha/901e3d9d-0277-4e64-99b1-dfc1f46ebeeb.png differ diff --git a/sprites/s_node_grey_alpha/layers/82ae4205-d36c-4ad0-9871-6a7132e3509d/486a1206-26e6-4f77-98ff-3c47ecec188f.png b/sprites/s_node_grey_alpha/layers/82ae4205-d36c-4ad0-9871-6a7132e3509d/486a1206-26e6-4f77-98ff-3c47ecec188f.png deleted file mode 100644 index 2d6e1e175..000000000 Binary files a/sprites/s_node_grey_alpha/layers/82ae4205-d36c-4ad0-9871-6a7132e3509d/486a1206-26e6-4f77-98ff-3c47ecec188f.png and /dev/null differ diff --git a/sprites/s_node_grey_alpha/layers/901e3d9d-0277-4e64-99b1-dfc1f46ebeeb/0f27aedf-3ce7-4777-8f01-dce559db6ab7.png b/sprites/s_node_grey_alpha/layers/901e3d9d-0277-4e64-99b1-dfc1f46ebeeb/0f27aedf-3ce7-4777-8f01-dce559db6ab7.png new file mode 100644 index 000000000..9a52e9d52 Binary files /dev/null and b/sprites/s_node_grey_alpha/layers/901e3d9d-0277-4e64-99b1-dfc1f46ebeeb/0f27aedf-3ce7-4777-8f01-dce559db6ab7.png differ diff --git a/sprites/s_node_grey_alpha/s_node_grey_alpha.yy b/sprites/s_node_grey_alpha/s_node_grey_alpha.yy index 9b98bfb02..c685b4a89 100644 --- a/sprites/s_node_grey_alpha/s_node_grey_alpha.yy +++ b/sprites/s_node_grey_alpha/s_node_grey_alpha.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"82ae4205-d36c-4ad0-9871-6a7132e3509d","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"82ae4205-d36c-4ad0-9871-6a7132e3509d","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"LayerId":{"name":"486a1206-26e6-4f77-98ff-3c47ecec188f","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","name":"82ae4205-d36c-4ad0-9871-6a7132e3509d","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"901e3d9d-0277-4e64-99b1-dfc1f46ebeeb","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"901e3d9d-0277-4e64-99b1-dfc1f46ebeeb","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"LayerId":{"name":"0f27aedf-3ce7-4777-8f01-dce559db6ab7","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","name":"901e3d9d-0277-4e64-99b1-dfc1f46ebeeb","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"da4e643b-aaf5-49b7-84e4-65573a0bb7d5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"82ae4205-d36c-4ad0-9871-6a7132e3509d","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b175af1d-babe-4729-addb-542ddd6e3ca7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"901e3d9d-0277-4e64-99b1-dfc1f46ebeeb","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"486a1206-26e6-4f77-98ff-3c47ecec188f","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0f27aedf-3ce7-4777-8f01-dce559db6ab7","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_greyscale/2144b37d-7aa7-45de-be0f-81ab17968265.png b/sprites/s_node_greyscale/2144b37d-7aa7-45de-be0f-81ab17968265.png deleted file mode 100644 index a28f3c703..000000000 Binary files a/sprites/s_node_greyscale/2144b37d-7aa7-45de-be0f-81ab17968265.png and /dev/null differ diff --git a/sprites/s_node_greyscale/7254a736-4c00-4b82-b851-12238db85582.png b/sprites/s_node_greyscale/7254a736-4c00-4b82-b851-12238db85582.png new file mode 100644 index 000000000..987215945 Binary files /dev/null and b/sprites/s_node_greyscale/7254a736-4c00-4b82-b851-12238db85582.png differ diff --git a/sprites/s_node_greyscale/layers/2144b37d-7aa7-45de-be0f-81ab17968265/f87ce287-61a3-4049-8bc1-e24fdd521b46.png b/sprites/s_node_greyscale/layers/2144b37d-7aa7-45de-be0f-81ab17968265/f87ce287-61a3-4049-8bc1-e24fdd521b46.png deleted file mode 100644 index a28f3c703..000000000 Binary files a/sprites/s_node_greyscale/layers/2144b37d-7aa7-45de-be0f-81ab17968265/f87ce287-61a3-4049-8bc1-e24fdd521b46.png and /dev/null differ diff --git a/sprites/s_node_greyscale/layers/7254a736-4c00-4b82-b851-12238db85582/6856528e-cc0d-42fa-9af1-a896e29d227d.png b/sprites/s_node_greyscale/layers/7254a736-4c00-4b82-b851-12238db85582/6856528e-cc0d-42fa-9af1-a896e29d227d.png new file mode 100644 index 000000000..038943245 Binary files /dev/null and b/sprites/s_node_greyscale/layers/7254a736-4c00-4b82-b851-12238db85582/6856528e-cc0d-42fa-9af1-a896e29d227d.png differ diff --git a/sprites/s_node_greyscale/s_node_greyscale.yy b/sprites/s_node_greyscale/s_node_greyscale.yy index 97725c551..d7f0d3c5d 100644 --- a/sprites/s_node_greyscale/s_node_greyscale.yy +++ b/sprites/s_node_greyscale/s_node_greyscale.yy @@ -7,14 +7,14 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, - "width": 32, + "width": 33, "height": 32, "textureGroupId": { "name": "Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"2144b37d-7aa7-45de-be0f-81ab17968265","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2144b37d-7aa7-45de-be0f-81ab17968265","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"LayerId":{"name":"f87ce287-61a3-4049-8bc1-e24fdd521b46","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","name":"2144b37d-7aa7-45de-be0f-81ab17968265","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"7254a736-4c00-4b82-b851-12238db85582","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"7254a736-4c00-4b82-b851-12238db85582","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"LayerId":{"name":"6856528e-cc0d-42fa-9af1-a896e29d227d","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","name":"7254a736-4c00-4b82-b851-12238db85582","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ebee80aa-f645-46e1-9fcf-df84f8844a4d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2144b37d-7aa7-45de-be0f-81ab17968265","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"03c836c0-ec06-4b3f-bab2-8bf0f31fd671","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7254a736-4c00-4b82-b851-12238db85582","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f87ce287-61a3-4049-8bc1-e24fdd521b46","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"6856528e-cc0d-42fa-9af1-a896e29d227d","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_grid/2fb978da-2e1b-4fee-8051-ab7584715e55.png b/sprites/s_node_grid/2fb978da-2e1b-4fee-8051-ab7584715e55.png new file mode 100644 index 000000000..bb42d8a74 Binary files /dev/null and b/sprites/s_node_grid/2fb978da-2e1b-4fee-8051-ab7584715e55.png differ diff --git a/sprites/s_node_grid/8b598738-8571-41d1-8a88-5f96963a0ff0.png b/sprites/s_node_grid/8b598738-8571-41d1-8a88-5f96963a0ff0.png deleted file mode 100644 index 2b8b2e050..000000000 Binary files a/sprites/s_node_grid/8b598738-8571-41d1-8a88-5f96963a0ff0.png and /dev/null differ diff --git a/sprites/s_node_grid/layers/2fb978da-2e1b-4fee-8051-ab7584715e55/8676522e-cf1e-42d7-9427-b0bbbc718753.png b/sprites/s_node_grid/layers/2fb978da-2e1b-4fee-8051-ab7584715e55/8676522e-cf1e-42d7-9427-b0bbbc718753.png new file mode 100644 index 000000000..6b790c38e Binary files /dev/null and b/sprites/s_node_grid/layers/2fb978da-2e1b-4fee-8051-ab7584715e55/8676522e-cf1e-42d7-9427-b0bbbc718753.png differ diff --git a/sprites/s_node_grid/layers/8b598738-8571-41d1-8a88-5f96963a0ff0/0437d486-f16a-42a4-b114-8ce77e85f242.png b/sprites/s_node_grid/layers/8b598738-8571-41d1-8a88-5f96963a0ff0/0437d486-f16a-42a4-b114-8ce77e85f242.png deleted file mode 100644 index 2b8b2e050..000000000 Binary files a/sprites/s_node_grid/layers/8b598738-8571-41d1-8a88-5f96963a0ff0/0437d486-f16a-42a4-b114-8ce77e85f242.png and /dev/null differ diff --git a/sprites/s_node_grid/s_node_grid.yy b/sprites/s_node_grid/s_node_grid.yy index 860556a5a..b0071c7fb 100644 --- a/sprites/s_node_grid/s_node_grid.yy +++ b/sprites/s_node_grid/s_node_grid.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"8b598738-8571-41d1-8a88-5f96963a0ff0","path":"sprites/s_node_grid/s_node_grid.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"8b598738-8571-41d1-8a88-5f96963a0ff0","path":"sprites/s_node_grid/s_node_grid.yy",},"LayerId":{"name":"0437d486-f16a-42a4-b114-8ce77e85f242","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","name":"8b598738-8571-41d1-8a88-5f96963a0ff0","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"2fb978da-2e1b-4fee-8051-ab7584715e55","path":"sprites/s_node_grid/s_node_grid.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"2fb978da-2e1b-4fee-8051-ab7584715e55","path":"sprites/s_node_grid/s_node_grid.yy",},"LayerId":{"name":"8676522e-cf1e-42d7-9427-b0bbbc718753","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","name":"2fb978da-2e1b-4fee-8051-ab7584715e55","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3f3d3ab3-6fed-4742-9154-27b028e6cf26","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8b598738-8571-41d1-8a88-5f96963a0ff0","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"65555d1c-e7b9-4b71-8911-35034b6568fb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2fb978da-2e1b-4fee-8051-ab7584715e55","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0437d486-f16a-42a4-b114-8ce77e85f242","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8676522e-cf1e-42d7-9427-b0bbbc718753","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_grid_noise/ac87f390-f834-4460-b5b4-0272600bebf3.png b/sprites/s_node_grid_noise/ac87f390-f834-4460-b5b4-0272600bebf3.png new file mode 100644 index 000000000..498034a41 Binary files /dev/null and b/sprites/s_node_grid_noise/ac87f390-f834-4460-b5b4-0272600bebf3.png differ diff --git a/sprites/s_node_grid_noise/c0cc7b10-a50f-4364-8718-10906afaeae7.png b/sprites/s_node_grid_noise/c0cc7b10-a50f-4364-8718-10906afaeae7.png deleted file mode 100644 index b9ed20354..000000000 Binary files a/sprites/s_node_grid_noise/c0cc7b10-a50f-4364-8718-10906afaeae7.png and /dev/null differ diff --git a/sprites/s_node_grid_noise/layers/ac87f390-f834-4460-b5b4-0272600bebf3/55bcc1f5-2239-4b47-8257-cba3dab2f3db.png b/sprites/s_node_grid_noise/layers/ac87f390-f834-4460-b5b4-0272600bebf3/55bcc1f5-2239-4b47-8257-cba3dab2f3db.png new file mode 100644 index 000000000..e3a69b98f Binary files /dev/null and b/sprites/s_node_grid_noise/layers/ac87f390-f834-4460-b5b4-0272600bebf3/55bcc1f5-2239-4b47-8257-cba3dab2f3db.png differ diff --git a/sprites/s_node_grid_noise/layers/c0cc7b10-a50f-4364-8718-10906afaeae7/a798a92b-2a48-4094-a956-178412b1cd8b.png b/sprites/s_node_grid_noise/layers/c0cc7b10-a50f-4364-8718-10906afaeae7/a798a92b-2a48-4094-a956-178412b1cd8b.png deleted file mode 100644 index b9ed20354..000000000 Binary files a/sprites/s_node_grid_noise/layers/c0cc7b10-a50f-4364-8718-10906afaeae7/a798a92b-2a48-4094-a956-178412b1cd8b.png and /dev/null differ diff --git a/sprites/s_node_grid_noise/s_node_grid_noise.yy b/sprites/s_node_grid_noise/s_node_grid_noise.yy index 52105e5d4..9725210be 100644 --- a/sprites/s_node_grid_noise/s_node_grid_noise.yy +++ b/sprites/s_node_grid_noise/s_node_grid_noise.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"c0cc7b10-a50f-4364-8718-10906afaeae7","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"c0cc7b10-a50f-4364-8718-10906afaeae7","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"LayerId":{"name":"a798a92b-2a48-4094-a956-178412b1cd8b","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","name":"c0cc7b10-a50f-4364-8718-10906afaeae7","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ac87f390-f834-4460-b5b4-0272600bebf3","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ac87f390-f834-4460-b5b4-0272600bebf3","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"LayerId":{"name":"55bcc1f5-2239-4b47-8257-cba3dab2f3db","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","name":"ac87f390-f834-4460-b5b4-0272600bebf3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c783d18d-02cd-484d-975c-45e04d3c5cb5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c0cc7b10-a50f-4364-8718-10906afaeae7","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a034c723-6c89-4011-b032-411fe0176345","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ac87f390-f834-4460-b5b4-0272600bebf3","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a798a92b-2a48-4094-a956-178412b1cd8b","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"55bcc1f5-2239-4b47-8257-cba3dab2f3db","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image/1d04f596-e268-4948-ae8a-6325627a3856.png b/sprites/s_node_image/1d04f596-e268-4948-ae8a-6325627a3856.png deleted file mode 100644 index 545d75ebd..000000000 Binary files a/sprites/s_node_image/1d04f596-e268-4948-ae8a-6325627a3856.png and /dev/null differ diff --git a/sprites/s_node_image/4caa6041-4a2a-483d-8dbb-43574a6a5b5b.png b/sprites/s_node_image/4caa6041-4a2a-483d-8dbb-43574a6a5b5b.png new file mode 100644 index 000000000..de722558a Binary files /dev/null and b/sprites/s_node_image/4caa6041-4a2a-483d-8dbb-43574a6a5b5b.png differ diff --git a/sprites/s_node_image/layers/1d04f596-e268-4948-ae8a-6325627a3856/997fddeb-0a8f-4cfc-961b-87cb5680c12d.png b/sprites/s_node_image/layers/1d04f596-e268-4948-ae8a-6325627a3856/997fddeb-0a8f-4cfc-961b-87cb5680c12d.png deleted file mode 100644 index 545d75ebd..000000000 Binary files a/sprites/s_node_image/layers/1d04f596-e268-4948-ae8a-6325627a3856/997fddeb-0a8f-4cfc-961b-87cb5680c12d.png and /dev/null differ diff --git a/sprites/s_node_image/layers/4caa6041-4a2a-483d-8dbb-43574a6a5b5b/282a337b-ee53-4b95-9dfa-345230742a13.png b/sprites/s_node_image/layers/4caa6041-4a2a-483d-8dbb-43574a6a5b5b/282a337b-ee53-4b95-9dfa-345230742a13.png new file mode 100644 index 000000000..f93381960 Binary files /dev/null and b/sprites/s_node_image/layers/4caa6041-4a2a-483d-8dbb-43574a6a5b5b/282a337b-ee53-4b95-9dfa-345230742a13.png differ diff --git a/sprites/s_node_image/s_node_image.yy b/sprites/s_node_image/s_node_image.yy index b787876c1..3508b25e7 100644 --- a/sprites/s_node_image/s_node_image.yy +++ b/sprites/s_node_image/s_node_image.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"1d04f596-e268-4948-ae8a-6325627a3856","path":"sprites/s_node_image/s_node_image.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"1d04f596-e268-4948-ae8a-6325627a3856","path":"sprites/s_node_image/s_node_image.yy",},"LayerId":{"name":"997fddeb-0a8f-4cfc-961b-87cb5680c12d","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","name":"1d04f596-e268-4948-ae8a-6325627a3856","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4caa6041-4a2a-483d-8dbb-43574a6a5b5b","path":"sprites/s_node_image/s_node_image.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4caa6041-4a2a-483d-8dbb-43574a6a5b5b","path":"sprites/s_node_image/s_node_image.yy",},"LayerId":{"name":"282a337b-ee53-4b95-9dfa-345230742a13","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","name":"4caa6041-4a2a-483d-8dbb-43574a6a5b5b","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5471d024-514c-4ec2-b82f-257a9a16d526","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1d04f596-e268-4948-ae8a-6325627a3856","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6f406489-8705-4a00-a586-f534eaa4e9f9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4caa6041-4a2a-483d-8dbb-43574a6a5b5b","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"997fddeb-0a8f-4cfc-961b-87cb5680c12d","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"282a337b-ee53-4b95-9dfa-345230742a13","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_animation/794b2434-ed81-4189-9f9d-ac9dfd244d5a.png b/sprites/s_node_image_animation/794b2434-ed81-4189-9f9d-ac9dfd244d5a.png new file mode 100644 index 000000000..c0539af8b Binary files /dev/null and b/sprites/s_node_image_animation/794b2434-ed81-4189-9f9d-ac9dfd244d5a.png differ diff --git a/sprites/s_node_image_animation/850d78e9-5f79-4817-9e6e-0b8768b9e705.png b/sprites/s_node_image_animation/850d78e9-5f79-4817-9e6e-0b8768b9e705.png deleted file mode 100644 index 490b8da46..000000000 Binary files a/sprites/s_node_image_animation/850d78e9-5f79-4817-9e6e-0b8768b9e705.png and /dev/null differ diff --git a/sprites/s_node_image_animation/layers/794b2434-ed81-4189-9f9d-ac9dfd244d5a/94ae18a2-3efd-4433-90ec-fe0bd40b78c4.png b/sprites/s_node_image_animation/layers/794b2434-ed81-4189-9f9d-ac9dfd244d5a/94ae18a2-3efd-4433-90ec-fe0bd40b78c4.png new file mode 100644 index 000000000..d0e18c013 Binary files /dev/null and b/sprites/s_node_image_animation/layers/794b2434-ed81-4189-9f9d-ac9dfd244d5a/94ae18a2-3efd-4433-90ec-fe0bd40b78c4.png differ diff --git a/sprites/s_node_image_animation/layers/850d78e9-5f79-4817-9e6e-0b8768b9e705/2135ef49-b324-4a22-af3d-bfd66ffd8e39.png b/sprites/s_node_image_animation/layers/850d78e9-5f79-4817-9e6e-0b8768b9e705/2135ef49-b324-4a22-af3d-bfd66ffd8e39.png deleted file mode 100644 index 490b8da46..000000000 Binary files a/sprites/s_node_image_animation/layers/850d78e9-5f79-4817-9e6e-0b8768b9e705/2135ef49-b324-4a22-af3d-bfd66ffd8e39.png and /dev/null differ diff --git a/sprites/s_node_image_animation/s_node_image_animation.yy b/sprites/s_node_image_animation/s_node_image_animation.yy index 00c09abf6..588419819 100644 --- a/sprites/s_node_image_animation/s_node_image_animation.yy +++ b/sprites/s_node_image_animation/s_node_image_animation.yy @@ -9,7 +9,7 @@ "swfPrecision": 2.525, "bbox_left": 0, "bbox_right": 31, - "bbox_top": 9, + "bbox_top": 7, "bbox_bottom": 24, "HTile": false, "VTile": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"850d78e9-5f79-4817-9e6e-0b8768b9e705","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"850d78e9-5f79-4817-9e6e-0b8768b9e705","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"LayerId":{"name":"2135ef49-b324-4a22-af3d-bfd66ffd8e39","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","name":"850d78e9-5f79-4817-9e6e-0b8768b9e705","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"794b2434-ed81-4189-9f9d-ac9dfd244d5a","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"794b2434-ed81-4189-9f9d-ac9dfd244d5a","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"LayerId":{"name":"94ae18a2-3efd-4433-90ec-fe0bd40b78c4","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","name":"794b2434-ed81-4189-9f9d-ac9dfd244d5a","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"50b972c8-275d-4c97-ad69-ca82f12899c4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"850d78e9-5f79-4817-9e6e-0b8768b9e705","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8b0a080b-883f-45a3-b388-4571dbc6b4d8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"794b2434-ed81-4189-9f9d-ac9dfd244d5a","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2135ef49-b324-4a22-af3d-bfd66ffd8e39","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"94ae18a2-3efd-4433-90ec-fe0bd40b78c4","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_copy/812b12d7-b425-4de2-93a6-f1289108cbd0.png b/sprites/s_node_image_copy/812b12d7-b425-4de2-93a6-f1289108cbd0.png new file mode 100644 index 000000000..2a26890b9 Binary files /dev/null and b/sprites/s_node_image_copy/812b12d7-b425-4de2-93a6-f1289108cbd0.png differ diff --git a/sprites/s_node_image_copy/layers/812b12d7-b425-4de2-93a6-f1289108cbd0/bb6c5fc2-5abe-4b21-81b4-72a8f1f01656.png b/sprites/s_node_image_copy/layers/812b12d7-b425-4de2-93a6-f1289108cbd0/bb6c5fc2-5abe-4b21-81b4-72a8f1f01656.png new file mode 100644 index 000000000..fd3d59644 Binary files /dev/null and b/sprites/s_node_image_copy/layers/812b12d7-b425-4de2-93a6-f1289108cbd0/bb6c5fc2-5abe-4b21-81b4-72a8f1f01656.png differ diff --git a/sprites/s_node_export_gif/s_node_export_gif.yy b/sprites/s_node_image_copy/s_node_image_copy.yy similarity index 63% rename from sprites/s_node_export_gif/s_node_export_gif.yy rename to sprites/s_node_image_copy/s_node_image_copy.yy index b0e324e59..6dad328c8 100644 --- a/sprites/s_node_export_gif/s_node_export_gif.yy +++ b/sprites/s_node_image_copy/s_node_image_copy.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 2, - "bbox_bottom": 28, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,12 +24,12 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"634dd5dd-92a1-49c3-94e5-604d9145d5e1","path":"sprites/s_node_export_gif/s_node_export_gif.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"634dd5dd-92a1-49c3-94e5-604d9145d5e1","path":"sprites/s_node_export_gif/s_node_export_gif.yy",},"LayerId":{"name":"f4b82eff-c847-436d-9a1c-654821e478d9","path":"sprites/s_node_export_gif/s_node_export_gif.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_export_gif","path":"sprites/s_node_export_gif/s_node_export_gif.yy",},"resourceVersion":"1.0","name":"634dd5dd-92a1-49c3-94e5-604d9145d5e1","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"812b12d7-b425-4de2-93a6-f1289108cbd0","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"812b12d7-b425-4de2-93a6-f1289108cbd0","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"LayerId":{"name":"bb6c5fc2-5abe-4b21-81b4-72a8f1f01656","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image_copy","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"resourceVersion":"1.0","name":"812b12d7-b425-4de2-93a6-f1289108cbd0","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { - "spriteId": {"name":"s_node_export_gif","path":"sprites/s_node_export_gif/s_node_export_gif.yy",}, + "spriteId": {"name":"s_node_image_copy","path":"sprites/s_node_image_copy/s_node_image_copy.yy",}, "timeUnits": 1, "playback": 1, "playbackSpeed": 30.0, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"16a873dd-4cca-4c4a-9bc4-ee65bfd0d7f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"634dd5dd-92a1-49c3-94e5-604d9145d5e1","path":"sprites/s_node_export_gif/s_node_export_gif.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"44f635e2-bae0-4cf0-992d-6ff464aed875","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"812b12d7-b425-4de2-93a6-f1289108cbd0","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,14 +58,14 @@ "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"s_node_export_gif","path":"sprites/s_node_export_gif/s_node_export_gif.yy",}, + "parent": {"name":"s_node_image_copy","path":"sprites/s_node_image_copy/s_node_image_copy.yy",}, "resourceVersion": "1.3", - "name": "s_node_export_gif", + "name": "s_node_image_copy", "tags": [], "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f4b82eff-c847-436d-9a1c-654821e478d9","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bb6c5fc2-5abe-4b21-81b4-72a8f1f01656","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { @@ -73,7 +73,7 @@ "path": "folders/nodes/icons.yy", }, "resourceVersion": "1.0", - "name": "s_node_export_gif", + "name": "s_node_image_copy", "tags": [], "resourceType": "GMSprite", } \ No newline at end of file diff --git a/sprites/s_node_image_gif/380f7d9c-c764-4703-9894-d2b37558c185.png b/sprites/s_node_image_gif/380f7d9c-c764-4703-9894-d2b37558c185.png deleted file mode 100644 index a271aedfb..000000000 Binary files a/sprites/s_node_image_gif/380f7d9c-c764-4703-9894-d2b37558c185.png and /dev/null differ diff --git a/sprites/s_node_image_gif/78fa0797-37fb-4aed-86d6-37a16f5f489e.png b/sprites/s_node_image_gif/78fa0797-37fb-4aed-86d6-37a16f5f489e.png new file mode 100644 index 000000000..2a26890b9 Binary files /dev/null and b/sprites/s_node_image_gif/78fa0797-37fb-4aed-86d6-37a16f5f489e.png differ diff --git a/sprites/s_node_image_gif/layers/380f7d9c-c764-4703-9894-d2b37558c185/76618b1a-a0c4-472b-9d5f-27453561f21e.png b/sprites/s_node_image_gif/layers/380f7d9c-c764-4703-9894-d2b37558c185/76618b1a-a0c4-472b-9d5f-27453561f21e.png deleted file mode 100644 index a271aedfb..000000000 Binary files a/sprites/s_node_image_gif/layers/380f7d9c-c764-4703-9894-d2b37558c185/76618b1a-a0c4-472b-9d5f-27453561f21e.png and /dev/null differ diff --git a/sprites/s_node_image_gif/layers/78fa0797-37fb-4aed-86d6-37a16f5f489e/fc5210d5-eca3-4611-97d4-191f19e7df3b.png b/sprites/s_node_image_gif/layers/78fa0797-37fb-4aed-86d6-37a16f5f489e/fc5210d5-eca3-4611-97d4-191f19e7df3b.png new file mode 100644 index 000000000..fd3d59644 Binary files /dev/null and b/sprites/s_node_image_gif/layers/78fa0797-37fb-4aed-86d6-37a16f5f489e/fc5210d5-eca3-4611-97d4-191f19e7df3b.png differ diff --git a/sprites/s_node_image_gif/s_node_image_gif.yy b/sprites/s_node_image_gif/s_node_image_gif.yy index e0536c1ce..22f178263 100644 --- a/sprites/s_node_image_gif/s_node_image_gif.yy +++ b/sprites/s_node_image_gif/s_node_image_gif.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"380f7d9c-c764-4703-9894-d2b37558c185","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"380f7d9c-c764-4703-9894-d2b37558c185","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"LayerId":{"name":"76618b1a-a0c4-472b-9d5f-27453561f21e","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","name":"380f7d9c-c764-4703-9894-d2b37558c185","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"78fa0797-37fb-4aed-86d6-37a16f5f489e","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"78fa0797-37fb-4aed-86d6-37a16f5f489e","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"LayerId":{"name":"fc5210d5-eca3-4611-97d4-191f19e7df3b","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","name":"78fa0797-37fb-4aed-86d6-37a16f5f489e","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8cbddef3-2989-49d3-ae20-8fa689885437","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"380f7d9c-c764-4703-9894-d2b37558c185","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ebb1790c-87c0-4ebd-96ef-42a9ccd5646a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"78fa0797-37fb-4aed-86d6-37a16f5f489e","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"76618b1a-a0c4-472b-9d5f-27453561f21e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fc5210d5-eca3-4611-97d4-191f19e7df3b","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_sequence/3d662810-bfe4-43e6-b480-00a8c584be3c.png b/sprites/s_node_image_sequence/3d662810-bfe4-43e6-b480-00a8c584be3c.png deleted file mode 100644 index 98781a717..000000000 Binary files a/sprites/s_node_image_sequence/3d662810-bfe4-43e6-b480-00a8c584be3c.png and /dev/null differ diff --git a/sprites/s_node_image_sequence/fd1a8fd7-6764-47c5-b0a1-0394df396191.png b/sprites/s_node_image_sequence/fd1a8fd7-6764-47c5-b0a1-0394df396191.png new file mode 100644 index 000000000..c1773a340 Binary files /dev/null and b/sprites/s_node_image_sequence/fd1a8fd7-6764-47c5-b0a1-0394df396191.png differ diff --git a/sprites/s_node_image_sequence/layers/3d662810-bfe4-43e6-b480-00a8c584be3c/715b834d-aeb3-4659-9c66-e67802faff5c.png b/sprites/s_node_image_sequence/layers/3d662810-bfe4-43e6-b480-00a8c584be3c/715b834d-aeb3-4659-9c66-e67802faff5c.png deleted file mode 100644 index 98781a717..000000000 Binary files a/sprites/s_node_image_sequence/layers/3d662810-bfe4-43e6-b480-00a8c584be3c/715b834d-aeb3-4659-9c66-e67802faff5c.png and /dev/null differ diff --git a/sprites/s_node_image_sequence/layers/fd1a8fd7-6764-47c5-b0a1-0394df396191/44661fa2-ce9b-4961-9dc4-7bda7a225686.png b/sprites/s_node_image_sequence/layers/fd1a8fd7-6764-47c5-b0a1-0394df396191/44661fa2-ce9b-4961-9dc4-7bda7a225686.png new file mode 100644 index 000000000..eac5c7be6 Binary files /dev/null and b/sprites/s_node_image_sequence/layers/fd1a8fd7-6764-47c5-b0a1-0394df396191/44661fa2-ce9b-4961-9dc4-7bda7a225686.png differ diff --git a/sprites/s_node_image_sequence/s_node_image_sequence.yy b/sprites/s_node_image_sequence/s_node_image_sequence.yy index d15d4e254..0bf3e7746 100644 --- a/sprites/s_node_image_sequence/s_node_image_sequence.yy +++ b/sprites/s_node_image_sequence/s_node_image_sequence.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"3d662810-bfe4-43e6-b480-00a8c584be3c","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3d662810-bfe4-43e6-b480-00a8c584be3c","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"LayerId":{"name":"715b834d-aeb3-4659-9c66-e67802faff5c","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","name":"3d662810-bfe4-43e6-b480-00a8c584be3c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"fd1a8fd7-6764-47c5-b0a1-0394df396191","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fd1a8fd7-6764-47c5-b0a1-0394df396191","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"LayerId":{"name":"44661fa2-ce9b-4961-9dc4-7bda7a225686","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","name":"fd1a8fd7-6764-47c5-b0a1-0394df396191","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"45b8ae7f-5f93-48b3-ba8e-97a11cdbb909","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3d662810-bfe4-43e6-b480-00a8c584be3c","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"eb753000-baa9-4d8e-8434-019d79785a54","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd1a8fd7-6764-47c5-b0a1-0394df396191","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"715b834d-aeb3-4659-9c66-e67802faff5c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"44661fa2-ce9b-4961-9dc4-7bda7a225686","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_sequence_to_anim/25d475b0-d600-4b7d-a3bc-7838c6ded536.png b/sprites/s_node_image_sequence_to_anim/25d475b0-d600-4b7d-a3bc-7838c6ded536.png deleted file mode 100644 index 5c09820e5..000000000 Binary files a/sprites/s_node_image_sequence_to_anim/25d475b0-d600-4b7d-a3bc-7838c6ded536.png and /dev/null differ diff --git a/sprites/s_node_image_sequence_to_anim/89b0e1ad-9951-465d-be4e-b47108fb99ef.png b/sprites/s_node_image_sequence_to_anim/89b0e1ad-9951-465d-be4e-b47108fb99ef.png new file mode 100644 index 000000000..9334574eb Binary files /dev/null and b/sprites/s_node_image_sequence_to_anim/89b0e1ad-9951-465d-be4e-b47108fb99ef.png differ diff --git a/sprites/s_node_image_sequence_to_anim/layers/25d475b0-d600-4b7d-a3bc-7838c6ded536/3a76ef66-de39-42c2-90fa-078b78ac4b39.png b/sprites/s_node_image_sequence_to_anim/layers/25d475b0-d600-4b7d-a3bc-7838c6ded536/3a76ef66-de39-42c2-90fa-078b78ac4b39.png deleted file mode 100644 index 5c09820e5..000000000 Binary files a/sprites/s_node_image_sequence_to_anim/layers/25d475b0-d600-4b7d-a3bc-7838c6ded536/3a76ef66-de39-42c2-90fa-078b78ac4b39.png and /dev/null differ diff --git a/sprites/s_node_image_sequence_to_anim/layers/89b0e1ad-9951-465d-be4e-b47108fb99ef/872844e8-6375-4d78-b311-a96acf148ada.png b/sprites/s_node_image_sequence_to_anim/layers/89b0e1ad-9951-465d-be4e-b47108fb99ef/872844e8-6375-4d78-b311-a96acf148ada.png new file mode 100644 index 000000000..3f9d73c0d Binary files /dev/null and b/sprites/s_node_image_sequence_to_anim/layers/89b0e1ad-9951-465d-be4e-b47108fb99ef/872844e8-6375-4d78-b311-a96acf148ada.png differ diff --git a/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy b/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy index 797f33e08..b7056315e 100644 --- a/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy +++ b/sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy @@ -9,8 +9,8 @@ "swfPrecision": 2.525, "bbox_left": 0, "bbox_right": 31, - "bbox_top": 5, - "bbox_bottom": 24, + "bbox_top": 6, + "bbox_bottom": 21, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"25d475b0-d600-4b7d-a3bc-7838c6ded536","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"25d475b0-d600-4b7d-a3bc-7838c6ded536","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"LayerId":{"name":"3a76ef66-de39-42c2-90fa-078b78ac4b39","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"resourceVersion":"1.0","name":"25d475b0-d600-4b7d-a3bc-7838c6ded536","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"89b0e1ad-9951-465d-be4e-b47108fb99ef","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"89b0e1ad-9951-465d-be4e-b47108fb99ef","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"LayerId":{"name":"872844e8-6375-4d78-b311-a96acf148ada","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"resourceVersion":"1.0","name":"89b0e1ad-9951-465d-be4e-b47108fb99ef","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"170bab41-580b-4c52-b272-bf89f3f379f8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"25d475b0-d600-4b7d-a3bc-7838c6ded536","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"69c99289-ea23-41a1-98ff-e507ecddbbd5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"89b0e1ad-9951-465d-be4e-b47108fb99ef","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3a76ef66-de39-42c2-90fa-078b78ac4b39","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"872844e8-6375-4d78-b311-a96acf148ada","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_sheet/3f1f8d3e-ac24-4e16-b2a5-36628e86202e.png b/sprites/s_node_image_sheet/3f1f8d3e-ac24-4e16-b2a5-36628e86202e.png deleted file mode 100644 index df17038a3..000000000 Binary files a/sprites/s_node_image_sheet/3f1f8d3e-ac24-4e16-b2a5-36628e86202e.png and /dev/null differ diff --git a/sprites/s_node_image_sheet/aed0c17a-2ccf-49c6-b5b3-36106de767a6.png b/sprites/s_node_image_sheet/aed0c17a-2ccf-49c6-b5b3-36106de767a6.png new file mode 100644 index 000000000..b97eecd67 Binary files /dev/null and b/sprites/s_node_image_sheet/aed0c17a-2ccf-49c6-b5b3-36106de767a6.png differ diff --git a/sprites/s_node_image_sheet/layers/3f1f8d3e-ac24-4e16-b2a5-36628e86202e/1c8800dc-465f-4621-b089-d4702aad2d92.png b/sprites/s_node_image_sheet/layers/3f1f8d3e-ac24-4e16-b2a5-36628e86202e/1c8800dc-465f-4621-b089-d4702aad2d92.png deleted file mode 100644 index df17038a3..000000000 Binary files a/sprites/s_node_image_sheet/layers/3f1f8d3e-ac24-4e16-b2a5-36628e86202e/1c8800dc-465f-4621-b089-d4702aad2d92.png and /dev/null differ diff --git a/sprites/s_node_image_sheet/layers/aed0c17a-2ccf-49c6-b5b3-36106de767a6/5eb3cf14-4459-40ee-894c-e67f375f885e.png b/sprites/s_node_image_sheet/layers/aed0c17a-2ccf-49c6-b5b3-36106de767a6/5eb3cf14-4459-40ee-894c-e67f375f885e.png new file mode 100644 index 000000000..22e600ed9 Binary files /dev/null and b/sprites/s_node_image_sheet/layers/aed0c17a-2ccf-49c6-b5b3-36106de767a6/5eb3cf14-4459-40ee-894c-e67f375f885e.png differ diff --git a/sprites/s_node_image_sheet/s_node_image_sheet.yy b/sprites/s_node_image_sheet/s_node_image_sheet.yy index 8dbf1092d..987f6daec 100644 --- a/sprites/s_node_image_sheet/s_node_image_sheet.yy +++ b/sprites/s_node_image_sheet/s_node_image_sheet.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"3f1f8d3e-ac24-4e16-b2a5-36628e86202e","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3f1f8d3e-ac24-4e16-b2a5-36628e86202e","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"LayerId":{"name":"1c8800dc-465f-4621-b089-d4702aad2d92","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","name":"3f1f8d3e-ac24-4e16-b2a5-36628e86202e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"aed0c17a-2ccf-49c6-b5b3-36106de767a6","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"aed0c17a-2ccf-49c6-b5b3-36106de767a6","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"LayerId":{"name":"5eb3cf14-4459-40ee-894c-e67f375f885e","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","name":"aed0c17a-2ccf-49c6-b5b3-36106de767a6","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d419cad1-ca59-4353-a5b8-adee3405fe19","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3f1f8d3e-ac24-4e16-b2a5-36628e86202e","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"184195cc-83b9-4245-9e72-692af121c700","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aed0c17a-2ccf-49c6-b5b3-36106de767a6","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1c8800dc-465f-4621-b089-d4702aad2d92","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5eb3cf14-4459-40ee-894c-e67f375f885e","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_input/b6916a82-bf6f-4058-8477-4ccf22465b40.png b/sprites/s_node_input/b6916a82-bf6f-4058-8477-4ccf22465b40.png deleted file mode 100644 index a88f288b0..000000000 Binary files a/sprites/s_node_input/b6916a82-bf6f-4058-8477-4ccf22465b40.png and /dev/null differ diff --git a/sprites/s_node_input/f53edd45-7ac8-4f38-aadf-295f5d8983a5.png b/sprites/s_node_input/f53edd45-7ac8-4f38-aadf-295f5d8983a5.png new file mode 100644 index 000000000..9711c6389 Binary files /dev/null and b/sprites/s_node_input/f53edd45-7ac8-4f38-aadf-295f5d8983a5.png differ diff --git a/sprites/s_node_input/layers/b6916a82-bf6f-4058-8477-4ccf22465b40/4c6020f1-3ce7-4d72-85c0-0cc8f25bbd65.png b/sprites/s_node_input/layers/b6916a82-bf6f-4058-8477-4ccf22465b40/4c6020f1-3ce7-4d72-85c0-0cc8f25bbd65.png deleted file mode 100644 index a88f288b0..000000000 Binary files a/sprites/s_node_input/layers/b6916a82-bf6f-4058-8477-4ccf22465b40/4c6020f1-3ce7-4d72-85c0-0cc8f25bbd65.png and /dev/null differ diff --git a/sprites/s_node_input/layers/f53edd45-7ac8-4f38-aadf-295f5d8983a5/1d28fd8e-c788-4d7f-8603-1a8d0b06ae7a.png b/sprites/s_node_input/layers/f53edd45-7ac8-4f38-aadf-295f5d8983a5/1d28fd8e-c788-4d7f-8603-1a8d0b06ae7a.png new file mode 100644 index 000000000..c668df15e Binary files /dev/null and b/sprites/s_node_input/layers/f53edd45-7ac8-4f38-aadf-295f5d8983a5/1d28fd8e-c788-4d7f-8603-1a8d0b06ae7a.png differ diff --git a/sprites/s_node_input/s_node_input.yy b/sprites/s_node_input/s_node_input.yy index b4395a2f9..c63ea4b66 100644 --- a/sprites/s_node_input/s_node_input.yy +++ b/sprites/s_node_input/s_node_input.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 8, - "bbox_bottom": 22, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b6916a82-bf6f-4058-8477-4ccf22465b40","path":"sprites/s_node_input/s_node_input.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b6916a82-bf6f-4058-8477-4ccf22465b40","path":"sprites/s_node_input/s_node_input.yy",},"LayerId":{"name":"4c6020f1-3ce7-4d72-85c0-0cc8f25bbd65","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","name":"b6916a82-bf6f-4058-8477-4ccf22465b40","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"f53edd45-7ac8-4f38-aadf-295f5d8983a5","path":"sprites/s_node_input/s_node_input.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"f53edd45-7ac8-4f38-aadf-295f5d8983a5","path":"sprites/s_node_input/s_node_input.yy",},"LayerId":{"name":"1d28fd8e-c788-4d7f-8603-1a8d0b06ae7a","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","name":"f53edd45-7ac8-4f38-aadf-295f5d8983a5","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a51b0470-58c4-4b2a-9756-d96c3df4369f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b6916a82-bf6f-4058-8477-4ccf22465b40","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"931d47af-769f-44a1-998b-bcb9029f001d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f53edd45-7ac8-4f38-aadf-295f5d8983a5","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4c6020f1-3ce7-4d72-85c0-0cc8f25bbd65","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1d28fd8e-c788-4d7f-8603-1a8d0b06ae7a","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_invert/46294cc6-5120-4dd8-941c-1d98b77ccc4b.png b/sprites/s_node_invert/46294cc6-5120-4dd8-941c-1d98b77ccc4b.png new file mode 100644 index 000000000..5a229d004 Binary files /dev/null and b/sprites/s_node_invert/46294cc6-5120-4dd8-941c-1d98b77ccc4b.png differ diff --git a/sprites/s_node_invert/95994b4d-607b-4cc3-9cf9-bb94f649c2f4.png b/sprites/s_node_invert/95994b4d-607b-4cc3-9cf9-bb94f649c2f4.png deleted file mode 100644 index 6184ecc4e..000000000 Binary files a/sprites/s_node_invert/95994b4d-607b-4cc3-9cf9-bb94f649c2f4.png and /dev/null differ diff --git a/sprites/s_node_invert/layers/46294cc6-5120-4dd8-941c-1d98b77ccc4b/3d2f5ece-a3e4-473d-8f29-fc20ee9a5b74.png b/sprites/s_node_invert/layers/46294cc6-5120-4dd8-941c-1d98b77ccc4b/3d2f5ece-a3e4-473d-8f29-fc20ee9a5b74.png new file mode 100644 index 000000000..9dca3ade3 Binary files /dev/null and b/sprites/s_node_invert/layers/46294cc6-5120-4dd8-941c-1d98b77ccc4b/3d2f5ece-a3e4-473d-8f29-fc20ee9a5b74.png differ diff --git a/sprites/s_node_invert/layers/95994b4d-607b-4cc3-9cf9-bb94f649c2f4/b85793c9-d664-4912-a5a2-d5d3eb092452.png b/sprites/s_node_invert/layers/95994b4d-607b-4cc3-9cf9-bb94f649c2f4/b85793c9-d664-4912-a5a2-d5d3eb092452.png deleted file mode 100644 index 6184ecc4e..000000000 Binary files a/sprites/s_node_invert/layers/95994b4d-607b-4cc3-9cf9-bb94f649c2f4/b85793c9-d664-4912-a5a2-d5d3eb092452.png and /dev/null differ diff --git a/sprites/s_node_invert/s_node_invert.yy b/sprites/s_node_invert/s_node_invert.yy index 8c4668269..87ee09e84 100644 --- a/sprites/s_node_invert/s_node_invert.yy +++ b/sprites/s_node_invert/s_node_invert.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"95994b4d-607b-4cc3-9cf9-bb94f649c2f4","path":"sprites/s_node_invert/s_node_invert.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"95994b4d-607b-4cc3-9cf9-bb94f649c2f4","path":"sprites/s_node_invert/s_node_invert.yy",},"LayerId":{"name":"b85793c9-d664-4912-a5a2-d5d3eb092452","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_invert","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","name":"95994b4d-607b-4cc3-9cf9-bb94f649c2f4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"46294cc6-5120-4dd8-941c-1d98b77ccc4b","path":"sprites/s_node_invert/s_node_invert.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"46294cc6-5120-4dd8-941c-1d98b77ccc4b","path":"sprites/s_node_invert/s_node_invert.yy",},"LayerId":{"name":"3d2f5ece-a3e4-473d-8f29-fc20ee9a5b74","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_invert","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","name":"46294cc6-5120-4dd8-941c-1d98b77ccc4b","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_invert","path":"sprites/s_node_invert/s_node_invert.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9aeeffbe-230a-4365-8a18-67e23aa379d6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"95994b4d-607b-4cc3-9cf9-bb94f649c2f4","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"43dcdd52-0276-4734-adaf-466a7935a186","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"46294cc6-5120-4dd8-941c-1d98b77ccc4b","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b85793c9-d664-4912-a5a2-d5d3eb092452","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3d2f5ece-a3e4-473d-8f29-fc20ee9a5b74","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_iterator_index/9c935885-5e7b-46b0-8fae-a95f454e3581.png b/sprites/s_node_iterator_index/9c935885-5e7b-46b0-8fae-a95f454e3581.png new file mode 100644 index 000000000..9e50cc12f Binary files /dev/null and b/sprites/s_node_iterator_index/9c935885-5e7b-46b0-8fae-a95f454e3581.png differ diff --git a/sprites/s_node_iterator_index/layers/9c935885-5e7b-46b0-8fae-a95f454e3581/9c4638b4-b0b7-4d5d-b44e-e1fa1c5f1234.png b/sprites/s_node_iterator_index/layers/9c935885-5e7b-46b0-8fae-a95f454e3581/9c4638b4-b0b7-4d5d-b44e-e1fa1c5f1234.png new file mode 100644 index 000000000..57f78b18a Binary files /dev/null and b/sprites/s_node_iterator_index/layers/9c935885-5e7b-46b0-8fae-a95f454e3581/9c4638b4-b0b7-4d5d-b44e-e1fa1c5f1234.png differ diff --git a/sprites/s_node_particle_sampler/s_node_particle_sampler.yy b/sprites/s_node_iterator_index/s_node_iterator_index.yy similarity index 54% rename from sprites/s_node_particle_sampler/s_node_particle_sampler.yy rename to sprites/s_node_iterator_index/s_node_iterator_index.yy index 04e4fb92e..5b8fd5365 100644 --- a/sprites/s_node_particle_sampler/s_node_particle_sampler.yy +++ b/sprites/s_node_iterator_index/s_node_iterator_index.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 1, + "bbox_right": 31, + "bbox_top": 1, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,12 +24,12 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"83042262-b96c-4c26-a814-87a06902618c","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"83042262-b96c-4c26-a814-87a06902618c","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",},"LayerId":{"name":"a061899d-85be-47e1-8e98-79e6768349bd","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_particle_sampler","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",},"resourceVersion":"1.0","name":"83042262-b96c-4c26-a814-87a06902618c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"9c935885-5e7b-46b0-8fae-a95f454e3581","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"9c935885-5e7b-46b0-8fae-a95f454e3581","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"LayerId":{"name":"9c4638b4-b0b7-4d5d-b44e-e1fa1c5f1234","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_iterator_index","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"resourceVersion":"1.0","name":"9c935885-5e7b-46b0-8fae-a95f454e3581","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { - "spriteId": {"name":"s_node_particle_sampler","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",}, + "spriteId": {"name":"s_node_iterator_index","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",}, "timeUnits": 1, "playback": 1, "playbackSpeed": 30.0, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"47db32ec-44c9-4d88-b2f6-a9ff4fb09665","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"83042262-b96c-4c26-a814-87a06902618c","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e7d92357-0700-496c-bcf0-7092d67fc7cf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9c935885-5e7b-46b0-8fae-a95f454e3581","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,14 +58,14 @@ "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"s_node_particle_sampler","path":"sprites/s_node_particle_sampler/s_node_particle_sampler.yy",}, + "parent": {"name":"s_node_iterator_index","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",}, "resourceVersion": "1.3", - "name": "s_node_particle_sampler", + "name": "s_node_iterator_index", "tags": [], "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a061899d-85be-47e1-8e98-79e6768349bd","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9c4638b4-b0b7-4d5d-b44e-e1fa1c5f1234","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { @@ -73,7 +73,7 @@ "path": "folders/nodes/icons.yy", }, "resourceVersion": "1.0", - "name": "s_node_particle_sampler", + "name": "s_node_iterator_index", "tags": [], "resourceType": "GMSprite", } \ No newline at end of file diff --git a/sprites/s_node_lerp/84b3be0a-c8e0-41e1-a927-3d603ca0b519.png b/sprites/s_node_lerp/84b3be0a-c8e0-41e1-a927-3d603ca0b519.png deleted file mode 100644 index eae98a033..000000000 Binary files a/sprites/s_node_lerp/84b3be0a-c8e0-41e1-a927-3d603ca0b519.png and /dev/null differ diff --git a/sprites/s_node_lerp/layers/84b3be0a-c8e0-41e1-a927-3d603ca0b519/752a7efe-e330-48b4-a04b-65ea0abe9f81.png b/sprites/s_node_lerp/layers/84b3be0a-c8e0-41e1-a927-3d603ca0b519/752a7efe-e330-48b4-a04b-65ea0abe9f81.png deleted file mode 100644 index eae98a033..000000000 Binary files a/sprites/s_node_lerp/layers/84b3be0a-c8e0-41e1-a927-3d603ca0b519/752a7efe-e330-48b4-a04b-65ea0abe9f81.png and /dev/null differ diff --git a/sprites/s_node_level/6361c420-ee05-4d61-aab4-938da89f7240.png b/sprites/s_node_level/6361c420-ee05-4d61-aab4-938da89f7240.png new file mode 100644 index 000000000..7bb199b88 Binary files /dev/null and b/sprites/s_node_level/6361c420-ee05-4d61-aab4-938da89f7240.png differ diff --git a/sprites/s_node_level/f3f10b9c-72ea-4b6e-8f41-dd616557966e.png b/sprites/s_node_level/f3f10b9c-72ea-4b6e-8f41-dd616557966e.png deleted file mode 100644 index abc984cbc..000000000 Binary files a/sprites/s_node_level/f3f10b9c-72ea-4b6e-8f41-dd616557966e.png and /dev/null differ diff --git a/sprites/s_node_level/layers/6361c420-ee05-4d61-aab4-938da89f7240/aab75bbd-985d-4729-9a43-f5b9dc8bdc2e.png b/sprites/s_node_level/layers/6361c420-ee05-4d61-aab4-938da89f7240/aab75bbd-985d-4729-9a43-f5b9dc8bdc2e.png new file mode 100644 index 000000000..a189f0d1e Binary files /dev/null and b/sprites/s_node_level/layers/6361c420-ee05-4d61-aab4-938da89f7240/aab75bbd-985d-4729-9a43-f5b9dc8bdc2e.png differ diff --git a/sprites/s_node_level/layers/f3f10b9c-72ea-4b6e-8f41-dd616557966e/dc36f91a-4c19-4f03-a6f3-d1e2e19ebd6b.png b/sprites/s_node_level/layers/f3f10b9c-72ea-4b6e-8f41-dd616557966e/dc36f91a-4c19-4f03-a6f3-d1e2e19ebd6b.png deleted file mode 100644 index abc984cbc..000000000 Binary files a/sprites/s_node_level/layers/f3f10b9c-72ea-4b6e-8f41-dd616557966e/dc36f91a-4c19-4f03-a6f3-d1e2e19ebd6b.png and /dev/null differ diff --git a/sprites/s_node_level/s_node_level.yy b/sprites/s_node_level/s_node_level.yy index d33ce82db..b3fe7a057 100644 --- a/sprites/s_node_level/s_node_level.yy +++ b/sprites/s_node_level/s_node_level.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 6, - "bbox_bottom": 28, + "bbox_left": 1, + "bbox_right": 30, + "bbox_top": 2, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"f3f10b9c-72ea-4b6e-8f41-dd616557966e","path":"sprites/s_node_level/s_node_level.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"f3f10b9c-72ea-4b6e-8f41-dd616557966e","path":"sprites/s_node_level/s_node_level.yy",},"LayerId":{"name":"dc36f91a-4c19-4f03-a6f3-d1e2e19ebd6b","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","name":"f3f10b9c-72ea-4b6e-8f41-dd616557966e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6361c420-ee05-4d61-aab4-938da89f7240","path":"sprites/s_node_level/s_node_level.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6361c420-ee05-4d61-aab4-938da89f7240","path":"sprites/s_node_level/s_node_level.yy",},"LayerId":{"name":"aab75bbd-985d-4729-9a43-f5b9dc8bdc2e","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","name":"6361c420-ee05-4d61-aab4-938da89f7240","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"df619996-6995-4217-8b85-8fcd24e7958e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f3f10b9c-72ea-4b6e-8f41-dd616557966e","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"77de102a-6e62-4be0-905a-6bfc6f7fc0a9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6361c420-ee05-4d61-aab4-938da89f7240","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"dc36f91a-4c19-4f03-a6f3-d1e2e19ebd6b","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"aab75bbd-985d-4729-9a43-f5b9dc8bdc2e","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_level_selector/92ee0319-b42e-4999-9658-20e18d5f31c3.png b/sprites/s_node_level_selector/92ee0319-b42e-4999-9658-20e18d5f31c3.png new file mode 100644 index 000000000..a1b677f9f Binary files /dev/null and b/sprites/s_node_level_selector/92ee0319-b42e-4999-9658-20e18d5f31c3.png differ diff --git a/sprites/s_node_level_selector/aa2adb94-7364-4dec-9eaf-3956b623e6d8.png b/sprites/s_node_level_selector/aa2adb94-7364-4dec-9eaf-3956b623e6d8.png deleted file mode 100644 index 667703a69..000000000 Binary files a/sprites/s_node_level_selector/aa2adb94-7364-4dec-9eaf-3956b623e6d8.png and /dev/null differ diff --git a/sprites/s_node_level_selector/layers/92ee0319-b42e-4999-9658-20e18d5f31c3/3bd8447d-e164-4cf9-bd73-3aeeebb5b042.png b/sprites/s_node_level_selector/layers/92ee0319-b42e-4999-9658-20e18d5f31c3/3bd8447d-e164-4cf9-bd73-3aeeebb5b042.png new file mode 100644 index 000000000..a6cf7db11 Binary files /dev/null and b/sprites/s_node_level_selector/layers/92ee0319-b42e-4999-9658-20e18d5f31c3/3bd8447d-e164-4cf9-bd73-3aeeebb5b042.png differ diff --git a/sprites/s_node_level_selector/layers/aa2adb94-7364-4dec-9eaf-3956b623e6d8/be46f914-6d9b-4b17-8f11-17f6272e581e.png b/sprites/s_node_level_selector/layers/aa2adb94-7364-4dec-9eaf-3956b623e6d8/be46f914-6d9b-4b17-8f11-17f6272e581e.png deleted file mode 100644 index 667703a69..000000000 Binary files a/sprites/s_node_level_selector/layers/aa2adb94-7364-4dec-9eaf-3956b623e6d8/be46f914-6d9b-4b17-8f11-17f6272e581e.png and /dev/null differ diff --git a/sprites/s_node_level_selector/s_node_level_selector.yy b/sprites/s_node_level_selector/s_node_level_selector.yy index 5ed248651..1e6f51b65 100644 --- a/sprites/s_node_level_selector/s_node_level_selector.yy +++ b/sprites/s_node_level_selector/s_node_level_selector.yy @@ -9,8 +9,8 @@ "swfPrecision": 2.525, "bbox_left": 2, "bbox_right": 29, - "bbox_top": 11, - "bbox_bottom": 29, + "bbox_top": 10, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"aa2adb94-7364-4dec-9eaf-3956b623e6d8","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"aa2adb94-7364-4dec-9eaf-3956b623e6d8","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"LayerId":{"name":"be46f914-6d9b-4b17-8f11-17f6272e581e","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","name":"aa2adb94-7364-4dec-9eaf-3956b623e6d8","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"92ee0319-b42e-4999-9658-20e18d5f31c3","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"92ee0319-b42e-4999-9658-20e18d5f31c3","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"LayerId":{"name":"3bd8447d-e164-4cf9-bd73-3aeeebb5b042","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","name":"92ee0319-b42e-4999-9658-20e18d5f31c3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e8e37d4d-1f85-4bdd-b14e-ba061d5fed2c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aa2adb94-7364-4dec-9eaf-3956b623e6d8","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"cc668eaf-629f-4510-96ad-8280b68adcf9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"92ee0319-b42e-4999-9658-20e18d5f31c3","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"be46f914-6d9b-4b17-8f11-17f6272e581e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3bd8447d-e164-4cf9-bd73-3aeeebb5b042","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_line/0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c.png b/sprites/s_node_line/0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c.png new file mode 100644 index 000000000..1506fb45e Binary files /dev/null and b/sprites/s_node_line/0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c.png differ diff --git a/sprites/s_node_line/f6da9245-99f2-4efd-ba8f-769bd49f4287.png b/sprites/s_node_line/f6da9245-99f2-4efd-ba8f-769bd49f4287.png deleted file mode 100644 index 2a418c24f..000000000 Binary files a/sprites/s_node_line/f6da9245-99f2-4efd-ba8f-769bd49f4287.png and /dev/null differ diff --git a/sprites/s_node_line/layers/0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c/fa500cb9-b5b6-4999-a8fe-d74467d9bcc3.png b/sprites/s_node_line/layers/0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c/fa500cb9-b5b6-4999-a8fe-d74467d9bcc3.png new file mode 100644 index 000000000..4dffee7a4 Binary files /dev/null and b/sprites/s_node_line/layers/0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c/fa500cb9-b5b6-4999-a8fe-d74467d9bcc3.png differ diff --git a/sprites/s_node_line/layers/f6da9245-99f2-4efd-ba8f-769bd49f4287/ac3e09e8-afa6-422c-95f9-cd3813daf773.png b/sprites/s_node_line/layers/f6da9245-99f2-4efd-ba8f-769bd49f4287/ac3e09e8-afa6-422c-95f9-cd3813daf773.png deleted file mode 100644 index 2a418c24f..000000000 Binary files a/sprites/s_node_line/layers/f6da9245-99f2-4efd-ba8f-769bd49f4287/ac3e09e8-afa6-422c-95f9-cd3813daf773.png and /dev/null differ diff --git a/sprites/s_node_line/s_node_line.yy b/sprites/s_node_line/s_node_line.yy index 0362b61dc..1b3c5783f 100644 --- a/sprites/s_node_line/s_node_line.yy +++ b/sprites/s_node_line/s_node_line.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 14, - "bbox_bottom": 18, + "bbox_left": 3, + "bbox_right": 28, + "bbox_top": 3, + "bbox_bottom": 28, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"f6da9245-99f2-4efd-ba8f-769bd49f4287","path":"sprites/s_node_line/s_node_line.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"f6da9245-99f2-4efd-ba8f-769bd49f4287","path":"sprites/s_node_line/s_node_line.yy",},"LayerId":{"name":"ac3e09e8-afa6-422c-95f9-cd3813daf773","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","name":"f6da9245-99f2-4efd-ba8f-769bd49f4287","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c","path":"sprites/s_node_line/s_node_line.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c","path":"sprites/s_node_line/s_node_line.yy",},"LayerId":{"name":"fa500cb9-b5b6-4999-a8fe-d74467d9bcc3","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","name":"0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"928289b6-ef82-4f78-b775-454bb1289001","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f6da9245-99f2-4efd-ba8f-769bd49f4287","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3b0928df-f7e6-4286-84cc-d11217646e61","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0c6a7430-a7ea-4c08-bdad-3fd58bf1be9c","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ac3e09e8-afa6-422c-95f9-cd3813daf773","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fa500cb9-b5b6-4999-a8fe-d74467d9bcc3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_math/26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13.png b/sprites/s_node_math/26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13.png new file mode 100644 index 000000000..b88f1631e Binary files /dev/null and b/sprites/s_node_math/26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13.png differ diff --git a/sprites/s_node_math/dde10842-0639-4113-952f-b6afe107346a.png b/sprites/s_node_math/dde10842-0639-4113-952f-b6afe107346a.png deleted file mode 100644 index da3743aed..000000000 Binary files a/sprites/s_node_math/dde10842-0639-4113-952f-b6afe107346a.png and /dev/null differ diff --git a/sprites/s_node_math/layers/26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13/d24479c8-8a0d-4324-9581-c34f94c9e472.png b/sprites/s_node_math/layers/26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13/d24479c8-8a0d-4324-9581-c34f94c9e472.png new file mode 100644 index 000000000..f56d0cab2 Binary files /dev/null and b/sprites/s_node_math/layers/26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13/d24479c8-8a0d-4324-9581-c34f94c9e472.png differ diff --git a/sprites/s_node_math/layers/dde10842-0639-4113-952f-b6afe107346a/c01dcb8a-1a77-436e-ade8-cf49ed4e7ccb.png b/sprites/s_node_math/layers/dde10842-0639-4113-952f-b6afe107346a/c01dcb8a-1a77-436e-ade8-cf49ed4e7ccb.png deleted file mode 100644 index da3743aed..000000000 Binary files a/sprites/s_node_math/layers/dde10842-0639-4113-952f-b6afe107346a/c01dcb8a-1a77-436e-ade8-cf49ed4e7ccb.png and /dev/null differ diff --git a/sprites/s_node_math/s_node_math.yy b/sprites/s_node_math/s_node_math.yy index 7d3696e28..c8c9959ab 100644 --- a/sprites/s_node_math/s_node_math.yy +++ b/sprites/s_node_math/s_node_math.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, + "bbox_left": 2, "bbox_right": 29, "bbox_top": 1, - "bbox_bottom": 30, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"dde10842-0639-4113-952f-b6afe107346a","path":"sprites/s_node_math/s_node_math.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"dde10842-0639-4113-952f-b6afe107346a","path":"sprites/s_node_math/s_node_math.yy",},"LayerId":{"name":"c01dcb8a-1a77-436e-ade8-cf49ed4e7ccb","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_math","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","name":"dde10842-0639-4113-952f-b6afe107346a","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13","path":"sprites/s_node_math/s_node_math.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13","path":"sprites/s_node_math/s_node_math.yy",},"LayerId":{"name":"d24479c8-8a0d-4324-9581-c34f94c9e472","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_math","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","name":"26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_math","path":"sprites/s_node_math/s_node_math.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"80b38ca8-f3b9-4b89-8bff-e5e44bd6ef9c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dde10842-0639-4113-952f-b6afe107346a","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9657d175-b7ed-4188-9651-a9cd383d4038","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"26e63fe0-a1c5-49e4-bc21-a1ebbcd0ca13","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c01dcb8a-1a77-436e-ade8-cf49ed4e7ccb","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d24479c8-8a0d-4324-9581-c34f94c9e472","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_mirror/149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c.png b/sprites/s_node_mirror/149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c.png new file mode 100644 index 000000000..6bfa31daf Binary files /dev/null and b/sprites/s_node_mirror/149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c.png differ diff --git a/sprites/s_node_mirror/290909d8-6986-494f-90b9-e2286ccfcd6a.png b/sprites/s_node_mirror/290909d8-6986-494f-90b9-e2286ccfcd6a.png deleted file mode 100644 index dd3f8d5c2..000000000 Binary files a/sprites/s_node_mirror/290909d8-6986-494f-90b9-e2286ccfcd6a.png and /dev/null differ diff --git a/sprites/s_node_mirror/layers/149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c/a78f1fd4-2190-42a1-9164-71a6a9d1ea28.png b/sprites/s_node_mirror/layers/149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c/a78f1fd4-2190-42a1-9164-71a6a9d1ea28.png new file mode 100644 index 000000000..e9b596e3d Binary files /dev/null and b/sprites/s_node_mirror/layers/149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c/a78f1fd4-2190-42a1-9164-71a6a9d1ea28.png differ diff --git a/sprites/s_node_mirror/layers/290909d8-6986-494f-90b9-e2286ccfcd6a/5d0c0e5e-d5a2-4c57-b363-773508bacdbe.png b/sprites/s_node_mirror/layers/290909d8-6986-494f-90b9-e2286ccfcd6a/5d0c0e5e-d5a2-4c57-b363-773508bacdbe.png deleted file mode 100644 index 8dbad7223..000000000 Binary files a/sprites/s_node_mirror/layers/290909d8-6986-494f-90b9-e2286ccfcd6a/5d0c0e5e-d5a2-4c57-b363-773508bacdbe.png and /dev/null differ diff --git a/sprites/s_node_mirror/s_node_mirror.yy b/sprites/s_node_mirror/s_node_mirror.yy index a8b14d1ab..6331415ee 100644 --- a/sprites/s_node_mirror/s_node_mirror.yy +++ b/sprites/s_node_mirror/s_node_mirror.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 27, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 1, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"290909d8-6986-494f-90b9-e2286ccfcd6a","path":"sprites/s_node_mirror/s_node_mirror.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"290909d8-6986-494f-90b9-e2286ccfcd6a","path":"sprites/s_node_mirror/s_node_mirror.yy",},"LayerId":{"name":"5d0c0e5e-d5a2-4c57-b363-773508bacdbe","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","name":"290909d8-6986-494f-90b9-e2286ccfcd6a","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c","path":"sprites/s_node_mirror/s_node_mirror.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c","path":"sprites/s_node_mirror/s_node_mirror.yy",},"LayerId":{"name":"a78f1fd4-2190-42a1-9164-71a6a9d1ea28","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","name":"149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"eb9ea8e3-2376-4da8-ab9b-4ec4c13af6de","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"290909d8-6986-494f-90b9-e2286ccfcd6a","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5e54d45f-b320-411f-bfdf-8710a30ccbb6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"149eb1b7-d6cf-4f9f-b858-c7cfcd2e691c","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5d0c0e5e-d5a2-4c57-b363-773508bacdbe","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a78f1fd4-2190-42a1-9164-71a6a9d1ea28","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_noise_aniso/5fa67660-848a-4ae5-a5b2-2a4a4e90633e.png b/sprites/s_node_noise_aniso/5fa67660-848a-4ae5-a5b2-2a4a4e90633e.png deleted file mode 100644 index fe61890fb..000000000 Binary files a/sprites/s_node_noise_aniso/5fa67660-848a-4ae5-a5b2-2a4a4e90633e.png and /dev/null differ diff --git a/sprites/s_node_noise_aniso/e96e6fd9-85e7-4cce-a69c-e46fb43f7326.png b/sprites/s_node_noise_aniso/e96e6fd9-85e7-4cce-a69c-e46fb43f7326.png new file mode 100644 index 000000000..95a766e1a Binary files /dev/null and b/sprites/s_node_noise_aniso/e96e6fd9-85e7-4cce-a69c-e46fb43f7326.png differ diff --git a/sprites/s_node_noise_aniso/layers/5fa67660-848a-4ae5-a5b2-2a4a4e90633e/ebc78c1c-985a-4c61-a647-7a4dd98ed3a6.png b/sprites/s_node_noise_aniso/layers/5fa67660-848a-4ae5-a5b2-2a4a4e90633e/ebc78c1c-985a-4c61-a647-7a4dd98ed3a6.png deleted file mode 100644 index fe61890fb..000000000 Binary files a/sprites/s_node_noise_aniso/layers/5fa67660-848a-4ae5-a5b2-2a4a4e90633e/ebc78c1c-985a-4c61-a647-7a4dd98ed3a6.png and /dev/null differ diff --git a/sprites/s_node_noise_aniso/layers/e96e6fd9-85e7-4cce-a69c-e46fb43f7326/98e30ccf-7d93-4706-97b9-21a4958fe2a0.png b/sprites/s_node_noise_aniso/layers/e96e6fd9-85e7-4cce-a69c-e46fb43f7326/98e30ccf-7d93-4706-97b9-21a4958fe2a0.png new file mode 100644 index 000000000..3eb90d01c Binary files /dev/null and b/sprites/s_node_noise_aniso/layers/e96e6fd9-85e7-4cce-a69c-e46fb43f7326/98e30ccf-7d93-4706-97b9-21a4958fe2a0.png differ diff --git a/sprites/s_node_noise_aniso/s_node_noise_aniso.yy b/sprites/s_node_noise_aniso/s_node_noise_aniso.yy index 947e1c8f1..e3e85205f 100644 --- a/sprites/s_node_noise_aniso/s_node_noise_aniso.yy +++ b/sprites/s_node_noise_aniso/s_node_noise_aniso.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"5fa67660-848a-4ae5-a5b2-2a4a4e90633e","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"5fa67660-848a-4ae5-a5b2-2a4a4e90633e","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"LayerId":{"name":"ebc78c1c-985a-4c61-a647-7a4dd98ed3a6","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","name":"5fa67660-848a-4ae5-a5b2-2a4a4e90633e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e96e6fd9-85e7-4cce-a69c-e46fb43f7326","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e96e6fd9-85e7-4cce-a69c-e46fb43f7326","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"LayerId":{"name":"98e30ccf-7d93-4706-97b9-21a4958fe2a0","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","name":"e96e6fd9-85e7-4cce-a69c-e46fb43f7326","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d96ea639-c82a-46ba-9ed2-c1a3782724c6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5fa67660-848a-4ae5-a5b2-2a4a4e90633e","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fa8d9ff7-970f-4661-bac7-160bbde78436","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e96e6fd9-85e7-4cce-a69c-e46fb43f7326","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ebc78c1c-985a-4c61-a647-7a4dd98ed3a6","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"98e30ccf-7d93-4706-97b9-21a4958fe2a0","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_noise_cell/07ea85ed-0a4e-4692-8001-290bd6fc0390.png b/sprites/s_node_noise_cell/07ea85ed-0a4e-4692-8001-290bd6fc0390.png deleted file mode 100644 index ac1e86c91..000000000 Binary files a/sprites/s_node_noise_cell/07ea85ed-0a4e-4692-8001-290bd6fc0390.png and /dev/null differ diff --git a/sprites/s_node_noise_cell/4d22964e-d56e-4f78-a412-86a601a511b0.png b/sprites/s_node_noise_cell/4d22964e-d56e-4f78-a412-86a601a511b0.png new file mode 100644 index 000000000..dc378f061 Binary files /dev/null and b/sprites/s_node_noise_cell/4d22964e-d56e-4f78-a412-86a601a511b0.png differ diff --git a/sprites/s_node_noise_cell/layers/07ea85ed-0a4e-4692-8001-290bd6fc0390/7b4b6d88-bcdb-4710-9729-633790f19cf4.png b/sprites/s_node_noise_cell/layers/07ea85ed-0a4e-4692-8001-290bd6fc0390/7b4b6d88-bcdb-4710-9729-633790f19cf4.png deleted file mode 100644 index ac1e86c91..000000000 Binary files a/sprites/s_node_noise_cell/layers/07ea85ed-0a4e-4692-8001-290bd6fc0390/7b4b6d88-bcdb-4710-9729-633790f19cf4.png and /dev/null differ diff --git a/sprites/s_node_noise_cell/layers/4d22964e-d56e-4f78-a412-86a601a511b0/453a3dc2-da99-4444-acac-248b8229b148.png b/sprites/s_node_noise_cell/layers/4d22964e-d56e-4f78-a412-86a601a511b0/453a3dc2-da99-4444-acac-248b8229b148.png new file mode 100644 index 000000000..eb9af8ceb Binary files /dev/null and b/sprites/s_node_noise_cell/layers/4d22964e-d56e-4f78-a412-86a601a511b0/453a3dc2-da99-4444-acac-248b8229b148.png differ diff --git a/sprites/s_node_noise_cell/s_node_noise_cell.yy b/sprites/s_node_noise_cell/s_node_noise_cell.yy index 93463c24f..3f32ef167 100644 --- a/sprites/s_node_noise_cell/s_node_noise_cell.yy +++ b/sprites/s_node_noise_cell/s_node_noise_cell.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"07ea85ed-0a4e-4692-8001-290bd6fc0390","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"07ea85ed-0a4e-4692-8001-290bd6fc0390","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"LayerId":{"name":"7b4b6d88-bcdb-4710-9729-633790f19cf4","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","name":"07ea85ed-0a4e-4692-8001-290bd6fc0390","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4d22964e-d56e-4f78-a412-86a601a511b0","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4d22964e-d56e-4f78-a412-86a601a511b0","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"LayerId":{"name":"453a3dc2-da99-4444-acac-248b8229b148","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","name":"4d22964e-d56e-4f78-a412-86a601a511b0","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",}, @@ -41,10 +41,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"bbc527c1-1ed7-4db8-93d1-146ea0d23dbb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"07ea85ed-0a4e-4692-8001-290bd6fc0390","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f2f2f179-878e-4501-9a59-1a4a4ce7f928","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4d22964e-d56e-4f78-a412-86a601a511b0","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7b4b6d88-bcdb-4710-9729-633790f19cf4","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"453a3dc2-da99-4444-acac-248b8229b148","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_noise_perlin/107d5fb1-db22-47f6-b88c-ca3d3537365c.png b/sprites/s_node_noise_perlin/107d5fb1-db22-47f6-b88c-ca3d3537365c.png deleted file mode 100644 index 08d9d2865..000000000 Binary files a/sprites/s_node_noise_perlin/107d5fb1-db22-47f6-b88c-ca3d3537365c.png and /dev/null differ diff --git a/sprites/s_node_noise_perlin/bb1ce0c4-f63e-495a-8f41-2d23f72a5418.png b/sprites/s_node_noise_perlin/bb1ce0c4-f63e-495a-8f41-2d23f72a5418.png new file mode 100644 index 000000000..4fd32ab22 Binary files /dev/null and b/sprites/s_node_noise_perlin/bb1ce0c4-f63e-495a-8f41-2d23f72a5418.png differ diff --git a/sprites/s_node_noise_perlin/layers/107d5fb1-db22-47f6-b88c-ca3d3537365c/53a91a16-2bc2-4d44-a1dc-8d6364da2bd7.png b/sprites/s_node_noise_perlin/layers/107d5fb1-db22-47f6-b88c-ca3d3537365c/53a91a16-2bc2-4d44-a1dc-8d6364da2bd7.png deleted file mode 100644 index 08d9d2865..000000000 Binary files a/sprites/s_node_noise_perlin/layers/107d5fb1-db22-47f6-b88c-ca3d3537365c/53a91a16-2bc2-4d44-a1dc-8d6364da2bd7.png and /dev/null differ diff --git a/sprites/s_node_noise_perlin/layers/bb1ce0c4-f63e-495a-8f41-2d23f72a5418/721e0dc5-c55a-458e-a1ae-e8c30bbe9044.png b/sprites/s_node_noise_perlin/layers/bb1ce0c4-f63e-495a-8f41-2d23f72a5418/721e0dc5-c55a-458e-a1ae-e8c30bbe9044.png new file mode 100644 index 000000000..f0a9d60da Binary files /dev/null and b/sprites/s_node_noise_perlin/layers/bb1ce0c4-f63e-495a-8f41-2d23f72a5418/721e0dc5-c55a-458e-a1ae-e8c30bbe9044.png 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 11e735fa5..57477cee6 100644 --- a/sprites/s_node_noise_perlin/s_node_noise_perlin.yy +++ b/sprites/s_node_noise_perlin/s_node_noise_perlin.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"107d5fb1-db22-47f6-b88c-ca3d3537365c","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"107d5fb1-db22-47f6-b88c-ca3d3537365c","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"LayerId":{"name":"53a91a16-2bc2-4d44-a1dc-8d6364da2bd7","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","name":"107d5fb1-db22-47f6-b88c-ca3d3537365c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"bb1ce0c4-f63e-495a-8f41-2d23f72a5418","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"bb1ce0c4-f63e-495a-8f41-2d23f72a5418","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"LayerId":{"name":"721e0dc5-c55a-458e-a1ae-e8c30bbe9044","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","name":"bb1ce0c4-f63e-495a-8f41-2d23f72a5418","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8847f160-9690-48db-bfe0-e24c0c501e39","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"107d5fb1-db22-47f6-b88c-ca3d3537365c","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"44d4096f-0ba1-4b4f-95cc-cd7cf8c4edfc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bb1ce0c4-f63e-495a-8f41-2d23f72a5418","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"53a91a16-2bc2-4d44-a1dc-8d6364da2bd7","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"721e0dc5-c55a-458e-a1ae-e8c30bbe9044","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_normal/032591cd-5bf9-4108-85de-288a6e420e77.png b/sprites/s_node_normal/032591cd-5bf9-4108-85de-288a6e420e77.png deleted file mode 100644 index 749151985..000000000 Binary files a/sprites/s_node_normal/032591cd-5bf9-4108-85de-288a6e420e77.png and /dev/null differ diff --git a/sprites/s_node_normal/ad134b70-ae5a-4384-a779-ded4e7dbd785.png b/sprites/s_node_normal/ad134b70-ae5a-4384-a779-ded4e7dbd785.png new file mode 100644 index 000000000..96ba5a185 Binary files /dev/null and b/sprites/s_node_normal/ad134b70-ae5a-4384-a779-ded4e7dbd785.png differ diff --git a/sprites/s_node_normal/layers/032591cd-5bf9-4108-85de-288a6e420e77/c014ccd4-cdf9-41d0-8437-42a54e2cde6d.png b/sprites/s_node_normal/layers/032591cd-5bf9-4108-85de-288a6e420e77/c014ccd4-cdf9-41d0-8437-42a54e2cde6d.png deleted file mode 100644 index 749151985..000000000 Binary files a/sprites/s_node_normal/layers/032591cd-5bf9-4108-85de-288a6e420e77/c014ccd4-cdf9-41d0-8437-42a54e2cde6d.png and /dev/null differ diff --git a/sprites/s_node_normal/layers/ad134b70-ae5a-4384-a779-ded4e7dbd785/566c8f76-0e4a-4b23-b6f4-961798b29537.png b/sprites/s_node_normal/layers/ad134b70-ae5a-4384-a779-ded4e7dbd785/566c8f76-0e4a-4b23-b6f4-961798b29537.png new file mode 100644 index 000000000..9acee1088 Binary files /dev/null and b/sprites/s_node_normal/layers/ad134b70-ae5a-4384-a779-ded4e7dbd785/566c8f76-0e4a-4b23-b6f4-961798b29537.png differ diff --git a/sprites/s_node_normal/s_node_normal.yy b/sprites/s_node_normal/s_node_normal.yy index 36dadeba3..10927fbf4 100644 --- a/sprites/s_node_normal/s_node_normal.yy +++ b/sprites/s_node_normal/s_node_normal.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 32, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"032591cd-5bf9-4108-85de-288a6e420e77","path":"sprites/s_node_normal/s_node_normal.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"032591cd-5bf9-4108-85de-288a6e420e77","path":"sprites/s_node_normal/s_node_normal.yy",},"LayerId":{"name":"c014ccd4-cdf9-41d0-8437-42a54e2cde6d","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_normal","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","name":"032591cd-5bf9-4108-85de-288a6e420e77","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ad134b70-ae5a-4384-a779-ded4e7dbd785","path":"sprites/s_node_normal/s_node_normal.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ad134b70-ae5a-4384-a779-ded4e7dbd785","path":"sprites/s_node_normal/s_node_normal.yy",},"LayerId":{"name":"566c8f76-0e4a-4b23-b6f4-961798b29537","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_normal","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","name":"ad134b70-ae5a-4384-a779-ded4e7dbd785","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_normal","path":"sprites/s_node_normal/s_node_normal.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"82b23011-f18f-4f73-a0e2-4871f70533e0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"032591cd-5bf9-4108-85de-288a6e420e77","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d55afc2f-fd5a-43bc-af08-d3b213ab54f1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ad134b70-ae5a-4384-a779-ded4e7dbd785","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c014ccd4-cdf9-41d0-8437-42a54e2cde6d","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"566c8f76-0e4a-4b23-b6f4-961798b29537","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_normal_light/97d13445-a35c-44b0-a227-708c59c92d84.png b/sprites/s_node_normal_light/97d13445-a35c-44b0-a227-708c59c92d84.png deleted file mode 100644 index 61f016565..000000000 Binary files a/sprites/s_node_normal_light/97d13445-a35c-44b0-a227-708c59c92d84.png and /dev/null differ diff --git a/sprites/s_node_normal_light/d56722f2-6ec3-4b15-9db6-4eb81a3de1c3.png b/sprites/s_node_normal_light/d56722f2-6ec3-4b15-9db6-4eb81a3de1c3.png new file mode 100644 index 000000000..e531ea781 Binary files /dev/null and b/sprites/s_node_normal_light/d56722f2-6ec3-4b15-9db6-4eb81a3de1c3.png differ diff --git a/sprites/s_node_normal_light/layers/97d13445-a35c-44b0-a227-708c59c92d84/f1c73f8f-f2a8-40ac-bfb2-2fb47ef0a0f0.png b/sprites/s_node_normal_light/layers/97d13445-a35c-44b0-a227-708c59c92d84/f1c73f8f-f2a8-40ac-bfb2-2fb47ef0a0f0.png deleted file mode 100644 index 61f016565..000000000 Binary files a/sprites/s_node_normal_light/layers/97d13445-a35c-44b0-a227-708c59c92d84/f1c73f8f-f2a8-40ac-bfb2-2fb47ef0a0f0.png and /dev/null differ diff --git a/sprites/s_node_normal_light/layers/d56722f2-6ec3-4b15-9db6-4eb81a3de1c3/1453844e-00f7-4965-a8d9-ad71f34e400b.png b/sprites/s_node_normal_light/layers/d56722f2-6ec3-4b15-9db6-4eb81a3de1c3/1453844e-00f7-4965-a8d9-ad71f34e400b.png new file mode 100644 index 000000000..3286a41aa Binary files /dev/null and b/sprites/s_node_normal_light/layers/d56722f2-6ec3-4b15-9db6-4eb81a3de1c3/1453844e-00f7-4965-a8d9-ad71f34e400b.png differ diff --git a/sprites/s_node_normal_light/s_node_normal_light.yy b/sprites/s_node_normal_light/s_node_normal_light.yy index 08bca872c..1cf857871 100644 --- a/sprites/s_node_normal_light/s_node_normal_light.yy +++ b/sprites/s_node_normal_light/s_node_normal_light.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 32, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"97d13445-a35c-44b0-a227-708c59c92d84","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"97d13445-a35c-44b0-a227-708c59c92d84","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"LayerId":{"name":"f1c73f8f-f2a8-40ac-bfb2-2fb47ef0a0f0","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","name":"97d13445-a35c-44b0-a227-708c59c92d84","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"d56722f2-6ec3-4b15-9db6-4eb81a3de1c3","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"d56722f2-6ec3-4b15-9db6-4eb81a3de1c3","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"LayerId":{"name":"1453844e-00f7-4965-a8d9-ad71f34e400b","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","name":"d56722f2-6ec3-4b15-9db6-4eb81a3de1c3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"aaea28e8-e1fb-41ba-861b-075916cc9cec","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"97d13445-a35c-44b0-a227-708c59c92d84","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"152a0d9d-2aa2-4d7c-b405-a2fc641c48d2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d56722f2-6ec3-4b15-9db6-4eb81a3de1c3","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f1c73f8f-f2a8-40ac-bfb2-2fb47ef0a0f0","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1453844e-00f7-4965-a8d9-ad71f34e400b","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_number/49e62b82-14ae-4636-a318-6f323e92db86.png b/sprites/s_node_number/49e62b82-14ae-4636-a318-6f323e92db86.png new file mode 100644 index 000000000..f15bd27c6 Binary files /dev/null and b/sprites/s_node_number/49e62b82-14ae-4636-a318-6f323e92db86.png differ diff --git a/sprites/s_node_number/f1902eaa-815c-4f59-b436-4fa015eb0def.png b/sprites/s_node_number/f1902eaa-815c-4f59-b436-4fa015eb0def.png deleted file mode 100644 index 583b0e89c..000000000 Binary files a/sprites/s_node_number/f1902eaa-815c-4f59-b436-4fa015eb0def.png and /dev/null differ diff --git a/sprites/s_node_number/layers/49e62b82-14ae-4636-a318-6f323e92db86/32ed2852-5a4c-4862-8c75-a2b67263b709.png b/sprites/s_node_number/layers/49e62b82-14ae-4636-a318-6f323e92db86/32ed2852-5a4c-4862-8c75-a2b67263b709.png new file mode 100644 index 000000000..b3cf943d6 Binary files /dev/null and b/sprites/s_node_number/layers/49e62b82-14ae-4636-a318-6f323e92db86/32ed2852-5a4c-4862-8c75-a2b67263b709.png differ diff --git a/sprites/s_node_number/layers/f1902eaa-815c-4f59-b436-4fa015eb0def/c3b3af2b-b51c-4f59-9024-e7559b2e495e.png b/sprites/s_node_number/layers/f1902eaa-815c-4f59-b436-4fa015eb0def/c3b3af2b-b51c-4f59-9024-e7559b2e495e.png deleted file mode 100644 index 583b0e89c..000000000 Binary files a/sprites/s_node_number/layers/f1902eaa-815c-4f59-b436-4fa015eb0def/c3b3af2b-b51c-4f59-9024-e7559b2e495e.png and /dev/null differ diff --git a/sprites/s_node_number/s_node_number.yy b/sprites/s_node_number/s_node_number.yy index c914b9066..fe94d2e76 100644 --- a/sprites/s_node_number/s_node_number.yy +++ b/sprites/s_node_number/s_node_number.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 12, - "bbox_right": 21, - "bbox_top": 9, - "bbox_bottom": 23, + "bbox_left": 6, + "bbox_right": 26, + "bbox_top": 11, + "bbox_bottom": 20, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"f1902eaa-815c-4f59-b436-4fa015eb0def","path":"sprites/s_node_number/s_node_number.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"f1902eaa-815c-4f59-b436-4fa015eb0def","path":"sprites/s_node_number/s_node_number.yy",},"LayerId":{"name":"c3b3af2b-b51c-4f59-9024-e7559b2e495e","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","name":"f1902eaa-815c-4f59-b436-4fa015eb0def","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"49e62b82-14ae-4636-a318-6f323e92db86","path":"sprites/s_node_number/s_node_number.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"49e62b82-14ae-4636-a318-6f323e92db86","path":"sprites/s_node_number/s_node_number.yy",},"LayerId":{"name":"32ed2852-5a4c-4862-8c75-a2b67263b709","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","name":"49e62b82-14ae-4636-a318-6f323e92db86","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c4b9867d-a9d3-49bb-9591-111b727b5f5e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f1902eaa-815c-4f59-b436-4fa015eb0def","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c11392d2-9e8b-4d6e-b205-5d14318ab615","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"49e62b82-14ae-4636-a318-6f323e92db86","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c3b3af2b-b51c-4f59-9024-e7559b2e495e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"32ed2852-5a4c-4862-8c75-a2b67263b709","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_output/2bdfe93d-37e3-4190-8ad0-06d173f7fd8a.png b/sprites/s_node_output/2bdfe93d-37e3-4190-8ad0-06d173f7fd8a.png new file mode 100644 index 000000000..1a6e20fd8 Binary files /dev/null and b/sprites/s_node_output/2bdfe93d-37e3-4190-8ad0-06d173f7fd8a.png differ diff --git a/sprites/s_node_output/a723b2d8-4be6-4c70-9f25-3d678cf48b53.png b/sprites/s_node_output/a723b2d8-4be6-4c70-9f25-3d678cf48b53.png deleted file mode 100644 index e46e14b5c..000000000 Binary files a/sprites/s_node_output/a723b2d8-4be6-4c70-9f25-3d678cf48b53.png and /dev/null differ diff --git a/sprites/s_node_output/layers/2bdfe93d-37e3-4190-8ad0-06d173f7fd8a/ab0012d6-788f-4efd-91f8-838a4e80b381.png b/sprites/s_node_output/layers/2bdfe93d-37e3-4190-8ad0-06d173f7fd8a/ab0012d6-788f-4efd-91f8-838a4e80b381.png new file mode 100644 index 000000000..01d15ef86 Binary files /dev/null and b/sprites/s_node_output/layers/2bdfe93d-37e3-4190-8ad0-06d173f7fd8a/ab0012d6-788f-4efd-91f8-838a4e80b381.png differ diff --git a/sprites/s_node_output/layers/a723b2d8-4be6-4c70-9f25-3d678cf48b53/9677f413-b859-441e-a925-f0d826daae96.png b/sprites/s_node_output/layers/a723b2d8-4be6-4c70-9f25-3d678cf48b53/9677f413-b859-441e-a925-f0d826daae96.png deleted file mode 100644 index e46e14b5c..000000000 Binary files a/sprites/s_node_output/layers/a723b2d8-4be6-4c70-9f25-3d678cf48b53/9677f413-b859-441e-a925-f0d826daae96.png and /dev/null differ diff --git a/sprites/s_node_output/s_node_output.yy b/sprites/s_node_output/s_node_output.yy index 7ac17b45c..fd39b6318 100644 --- a/sprites/s_node_output/s_node_output.yy +++ b/sprites/s_node_output/s_node_output.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 8, - "bbox_bottom": 22, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"a723b2d8-4be6-4c70-9f25-3d678cf48b53","path":"sprites/s_node_output/s_node_output.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"a723b2d8-4be6-4c70-9f25-3d678cf48b53","path":"sprites/s_node_output/s_node_output.yy",},"LayerId":{"name":"9677f413-b859-441e-a925-f0d826daae96","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","name":"a723b2d8-4be6-4c70-9f25-3d678cf48b53","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"2bdfe93d-37e3-4190-8ad0-06d173f7fd8a","path":"sprites/s_node_output/s_node_output.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"2bdfe93d-37e3-4190-8ad0-06d173f7fd8a","path":"sprites/s_node_output/s_node_output.yy",},"LayerId":{"name":"ab0012d6-788f-4efd-91f8-838a4e80b381","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","name":"2bdfe93d-37e3-4190-8ad0-06d173f7fd8a","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",}, @@ -41,10 +41,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"008bb78e-5edb-4f38-ae8a-21f7ad1419ec","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a723b2d8-4be6-4c70-9f25-3d678cf48b53","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6b4492a9-18ca-4bcc-bf80-e5bbfdeff460","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2bdfe93d-37e3-4190-8ad0-06d173f7fd8a","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9677f413-b859-441e-a925-f0d826daae96","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ab0012d6-788f-4efd-91f8-838a4e80b381","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_padding/01dd18e4-52d0-4b35-9aa1-a86ffb8440ae.png b/sprites/s_node_padding/01dd18e4-52d0-4b35-9aa1-a86ffb8440ae.png deleted file mode 100644 index 8d8461ff2..000000000 Binary files a/sprites/s_node_padding/01dd18e4-52d0-4b35-9aa1-a86ffb8440ae.png and /dev/null differ diff --git a/sprites/s_node_padding/1aed1deb-98af-44af-b21f-f82ae3f85e81.png b/sprites/s_node_padding/1aed1deb-98af-44af-b21f-f82ae3f85e81.png new file mode 100644 index 000000000..0246671f1 Binary files /dev/null and b/sprites/s_node_padding/1aed1deb-98af-44af-b21f-f82ae3f85e81.png differ diff --git a/sprites/s_node_padding/layers/01dd18e4-52d0-4b35-9aa1-a86ffb8440ae/105f7a16-0a6a-4ffe-b758-325a2157d048.png b/sprites/s_node_padding/layers/01dd18e4-52d0-4b35-9aa1-a86ffb8440ae/105f7a16-0a6a-4ffe-b758-325a2157d048.png deleted file mode 100644 index 8d8461ff2..000000000 Binary files a/sprites/s_node_padding/layers/01dd18e4-52d0-4b35-9aa1-a86ffb8440ae/105f7a16-0a6a-4ffe-b758-325a2157d048.png and /dev/null differ diff --git a/sprites/s_node_padding/layers/1aed1deb-98af-44af-b21f-f82ae3f85e81/56c0cf15-e4e2-4f80-ae20-3e74dfea6dc3.png b/sprites/s_node_padding/layers/1aed1deb-98af-44af-b21f-f82ae3f85e81/56c0cf15-e4e2-4f80-ae20-3e74dfea6dc3.png new file mode 100644 index 000000000..0dca4bbee Binary files /dev/null and b/sprites/s_node_padding/layers/1aed1deb-98af-44af-b21f-f82ae3f85e81/56c0cf15-e4e2-4f80-ae20-3e74dfea6dc3.png differ diff --git a/sprites/s_node_padding/s_node_padding.yy b/sprites/s_node_padding/s_node_padding.yy index c5726a09c..b81ed32d4 100644 --- a/sprites/s_node_padding/s_node_padding.yy +++ b/sprites/s_node_padding/s_node_padding.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"01dd18e4-52d0-4b35-9aa1-a86ffb8440ae","path":"sprites/s_node_padding/s_node_padding.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"01dd18e4-52d0-4b35-9aa1-a86ffb8440ae","path":"sprites/s_node_padding/s_node_padding.yy",},"LayerId":{"name":"105f7a16-0a6a-4ffe-b758-325a2157d048","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","name":"01dd18e4-52d0-4b35-9aa1-a86ffb8440ae","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"1aed1deb-98af-44af-b21f-f82ae3f85e81","path":"sprites/s_node_padding/s_node_padding.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1aed1deb-98af-44af-b21f-f82ae3f85e81","path":"sprites/s_node_padding/s_node_padding.yy",},"LayerId":{"name":"56c0cf15-e4e2-4f80-ae20-3e74dfea6dc3","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","name":"1aed1deb-98af-44af-b21f-f82ae3f85e81","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5e6c5f45-f8aa-418c-a189-a3923154eeba","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"01dd18e4-52d0-4b35-9aa1-a86ffb8440ae","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1ef2a596-9468-48a5-954c-f715c041376c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1aed1deb-98af-44af-b21f-f82ae3f85e81","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"105f7a16-0a6a-4ffe-b758-325a2157d048","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"56c0cf15-e4e2-4f80-ae20-3e74dfea6dc3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_palette/d4cc6177-9bf1-4d45-8289-f0b682ff4985.png b/sprites/s_node_palette/d4cc6177-9bf1-4d45-8289-f0b682ff4985.png new file mode 100644 index 000000000..82e625a87 Binary files /dev/null and b/sprites/s_node_palette/d4cc6177-9bf1-4d45-8289-f0b682ff4985.png differ diff --git a/sprites/s_node_palette/f34eb35d-93e1-4d60-9338-f67b32a36e6f.png b/sprites/s_node_palette/f34eb35d-93e1-4d60-9338-f67b32a36e6f.png deleted file mode 100644 index 28cae8b5a..000000000 Binary files a/sprites/s_node_palette/f34eb35d-93e1-4d60-9338-f67b32a36e6f.png and /dev/null differ diff --git a/sprites/s_node_palette/layers/d4cc6177-9bf1-4d45-8289-f0b682ff4985/af444b31-a123-48f5-a56b-e525597e1d64.png b/sprites/s_node_palette/layers/d4cc6177-9bf1-4d45-8289-f0b682ff4985/af444b31-a123-48f5-a56b-e525597e1d64.png new file mode 100644 index 000000000..54d47e4c4 Binary files /dev/null and b/sprites/s_node_palette/layers/d4cc6177-9bf1-4d45-8289-f0b682ff4985/af444b31-a123-48f5-a56b-e525597e1d64.png differ diff --git a/sprites/s_node_palette/layers/f34eb35d-93e1-4d60-9338-f67b32a36e6f/f548506b-80ae-4432-ae60-855bf275f41c.png b/sprites/s_node_palette/layers/f34eb35d-93e1-4d60-9338-f67b32a36e6f/f548506b-80ae-4432-ae60-855bf275f41c.png deleted file mode 100644 index 28cae8b5a..000000000 Binary files a/sprites/s_node_palette/layers/f34eb35d-93e1-4d60-9338-f67b32a36e6f/f548506b-80ae-4432-ae60-855bf275f41c.png and /dev/null differ diff --git a/sprites/s_node_palette/s_node_palette.yy b/sprites/s_node_palette/s_node_palette.yy index 752304d01..a0030b576 100644 --- a/sprites/s_node_palette/s_node_palette.yy +++ b/sprites/s_node_palette/s_node_palette.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 9, - "bbox_bottom": 21, + "bbox_bottom": 23, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"f34eb35d-93e1-4d60-9338-f67b32a36e6f","path":"sprites/s_node_palette/s_node_palette.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"f34eb35d-93e1-4d60-9338-f67b32a36e6f","path":"sprites/s_node_palette/s_node_palette.yy",},"LayerId":{"name":"f548506b-80ae-4432-ae60-855bf275f41c","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_palette","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","name":"f34eb35d-93e1-4d60-9338-f67b32a36e6f","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"d4cc6177-9bf1-4d45-8289-f0b682ff4985","path":"sprites/s_node_palette/s_node_palette.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"d4cc6177-9bf1-4d45-8289-f0b682ff4985","path":"sprites/s_node_palette/s_node_palette.yy",},"LayerId":{"name":"af444b31-a123-48f5-a56b-e525597e1d64","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_palette","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","name":"d4cc6177-9bf1-4d45-8289-f0b682ff4985","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_palette","path":"sprites/s_node_palette/s_node_palette.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a98d534d-b709-40ee-816b-22b012699ea8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f34eb35d-93e1-4d60-9338-f67b32a36e6f","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4de39f8a-2506-4d30-8392-af359107b226","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d4cc6177-9bf1-4d45-8289-f0b682ff4985","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f548506b-80ae-4432-ae60-855bf275f41c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"af444b31-a123-48f5-a56b-e525597e1d64","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_particle/ac7a3457-c51c-4696-906e-9903a108ea04.png b/sprites/s_node_particle/ac7a3457-c51c-4696-906e-9903a108ea04.png deleted file mode 100644 index c57b18fd3..000000000 Binary files a/sprites/s_node_particle/ac7a3457-c51c-4696-906e-9903a108ea04.png and /dev/null differ diff --git a/sprites/s_node_particle/b760c014-b265-4ad0-bc8f-f7432dd5467f.png b/sprites/s_node_particle/b760c014-b265-4ad0-bc8f-f7432dd5467f.png new file mode 100644 index 000000000..76583463e Binary files /dev/null and b/sprites/s_node_particle/b760c014-b265-4ad0-bc8f-f7432dd5467f.png differ diff --git a/sprites/s_node_particle/layers/ac7a3457-c51c-4696-906e-9903a108ea04/b196e7d4-5a7b-41e0-8971-9f3c53327eb0.png b/sprites/s_node_particle/layers/ac7a3457-c51c-4696-906e-9903a108ea04/b196e7d4-5a7b-41e0-8971-9f3c53327eb0.png deleted file mode 100644 index c57b18fd3..000000000 Binary files a/sprites/s_node_particle/layers/ac7a3457-c51c-4696-906e-9903a108ea04/b196e7d4-5a7b-41e0-8971-9f3c53327eb0.png and /dev/null differ diff --git a/sprites/s_node_particle/layers/b760c014-b265-4ad0-bc8f-f7432dd5467f/7600d6a6-12b2-4106-9039-17e3fae77fa6.png b/sprites/s_node_particle/layers/b760c014-b265-4ad0-bc8f-f7432dd5467f/7600d6a6-12b2-4106-9039-17e3fae77fa6.png new file mode 100644 index 000000000..d05f8381f Binary files /dev/null and b/sprites/s_node_particle/layers/b760c014-b265-4ad0-bc8f-f7432dd5467f/7600d6a6-12b2-4106-9039-17e3fae77fa6.png differ diff --git a/sprites/s_node_particle/s_node_particle.yy b/sprites/s_node_particle/s_node_particle.yy index 2df7e6e10..fc10d2c85 100644 --- a/sprites/s_node_particle/s_node_particle.yy +++ b/sprites/s_node_particle/s_node_particle.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 29, + "bbox_left": 2, + "bbox_right": 30, "bbox_top": 2, - "bbox_bottom": 29, + "bbox_bottom": 28, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ac7a3457-c51c-4696-906e-9903a108ea04","path":"sprites/s_node_particle/s_node_particle.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ac7a3457-c51c-4696-906e-9903a108ea04","path":"sprites/s_node_particle/s_node_particle.yy",},"LayerId":{"name":"b196e7d4-5a7b-41e0-8971-9f3c53327eb0","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_particle","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","name":"ac7a3457-c51c-4696-906e-9903a108ea04","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"b760c014-b265-4ad0-bc8f-f7432dd5467f","path":"sprites/s_node_particle/s_node_particle.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"b760c014-b265-4ad0-bc8f-f7432dd5467f","path":"sprites/s_node_particle/s_node_particle.yy",},"LayerId":{"name":"7600d6a6-12b2-4106-9039-17e3fae77fa6","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_particle","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","name":"b760c014-b265-4ad0-bc8f-f7432dd5467f","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_particle","path":"sprites/s_node_particle/s_node_particle.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5617edcb-32f9-48a9-9caa-995ce4cbdc57","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ac7a3457-c51c-4696-906e-9903a108ea04","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"866c16c5-b18d-40f9-ba6b-e373366b6867","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b760c014-b265-4ad0-bc8f-f7432dd5467f","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b196e7d4-5a7b-41e0-8971-9f3c53327eb0","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7600d6a6-12b2-4106-9039-17e3fae77fa6","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_particle_effector/688d2a5b-8264-4f7c-bf2d-b67d578f1814.png b/sprites/s_node_particle_effector/688d2a5b-8264-4f7c-bf2d-b67d578f1814.png deleted file mode 100644 index 6c44bb81b..000000000 Binary files a/sprites/s_node_particle_effector/688d2a5b-8264-4f7c-bf2d-b67d578f1814.png and /dev/null differ diff --git a/sprites/s_node_particle_effector/a08ed88c-8763-4778-a20f-588746cb1bab.png b/sprites/s_node_particle_effector/a08ed88c-8763-4778-a20f-588746cb1bab.png new file mode 100644 index 000000000..e9983e7a4 Binary files /dev/null and b/sprites/s_node_particle_effector/a08ed88c-8763-4778-a20f-588746cb1bab.png differ diff --git a/sprites/s_node_particle_effector/layers/688d2a5b-8264-4f7c-bf2d-b67d578f1814/c2f63df4-d229-4d48-82bf-00e64389bc3f.png b/sprites/s_node_particle_effector/layers/688d2a5b-8264-4f7c-bf2d-b67d578f1814/c2f63df4-d229-4d48-82bf-00e64389bc3f.png deleted file mode 100644 index 6c44bb81b..000000000 Binary files a/sprites/s_node_particle_effector/layers/688d2a5b-8264-4f7c-bf2d-b67d578f1814/c2f63df4-d229-4d48-82bf-00e64389bc3f.png and /dev/null differ diff --git a/sprites/s_node_particle_effector/layers/a08ed88c-8763-4778-a20f-588746cb1bab/fb13ec59-a4d0-482a-b2d1-f3b3a4bdeba9.png b/sprites/s_node_particle_effector/layers/a08ed88c-8763-4778-a20f-588746cb1bab/fb13ec59-a4d0-482a-b2d1-f3b3a4bdeba9.png new file mode 100644 index 000000000..f0e08cfa1 Binary files /dev/null and b/sprites/s_node_particle_effector/layers/a08ed88c-8763-4778-a20f-588746cb1bab/fb13ec59-a4d0-482a-b2d1-f3b3a4bdeba9.png differ diff --git a/sprites/s_node_particle_effector/s_node_particle_effector.yy b/sprites/s_node_particle_effector/s_node_particle_effector.yy index 260b0de9c..f8ac618cf 100644 --- a/sprites/s_node_particle_effector/s_node_particle_effector.yy +++ b/sprites/s_node_particle_effector/s_node_particle_effector.yy @@ -8,9 +8,9 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 2, - "bbox_right": 26, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_right": 29, + "bbox_top": 3, + "bbox_bottom": 28, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"688d2a5b-8264-4f7c-bf2d-b67d578f1814","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"688d2a5b-8264-4f7c-bf2d-b67d578f1814","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"LayerId":{"name":"c2f63df4-d229-4d48-82bf-00e64389bc3f","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","name":"688d2a5b-8264-4f7c-bf2d-b67d578f1814","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"a08ed88c-8763-4778-a20f-588746cb1bab","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"a08ed88c-8763-4778-a20f-588746cb1bab","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"LayerId":{"name":"fb13ec59-a4d0-482a-b2d1-f3b3a4bdeba9","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","name":"a08ed88c-8763-4778-a20f-588746cb1bab","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5fa75b82-be1d-4ac2-812e-eba4d6c015da","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"688d2a5b-8264-4f7c-bf2d-b67d578f1814","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7d679d4d-41be-493c-9ece-ef10672e6973","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a08ed88c-8763-4778-a20f-588746cb1bab","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c2f63df4-d229-4d48-82bf-00e64389bc3f","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fb13ec59-a4d0-482a-b2d1-f3b3a4bdeba9","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_particle_sampler/83042262-b96c-4c26-a814-87a06902618c.png b/sprites/s_node_particle_sampler/83042262-b96c-4c26-a814-87a06902618c.png deleted file mode 100644 index b71a6da81..000000000 Binary files a/sprites/s_node_particle_sampler/83042262-b96c-4c26-a814-87a06902618c.png and /dev/null differ diff --git a/sprites/s_node_particle_sampler/layers/83042262-b96c-4c26-a814-87a06902618c/a061899d-85be-47e1-8e98-79e6768349bd.png b/sprites/s_node_particle_sampler/layers/83042262-b96c-4c26-a814-87a06902618c/a061899d-85be-47e1-8e98-79e6768349bd.png deleted file mode 100644 index b71a6da81..000000000 Binary files a/sprites/s_node_particle_sampler/layers/83042262-b96c-4c26-a814-87a06902618c/a061899d-85be-47e1-8e98-79e6768349bd.png and /dev/null differ diff --git a/sprites/s_node_path/487b7cf2-30f2-4c7a-8f06-a601a6d56984.png b/sprites/s_node_path/487b7cf2-30f2-4c7a-8f06-a601a6d56984.png new file mode 100644 index 000000000..c2573e5f1 Binary files /dev/null and b/sprites/s_node_path/487b7cf2-30f2-4c7a-8f06-a601a6d56984.png differ diff --git a/sprites/s_node_path/db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c.png b/sprites/s_node_path/db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c.png deleted file mode 100644 index 5f54154ee..000000000 Binary files a/sprites/s_node_path/db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c.png and /dev/null differ diff --git a/sprites/s_node_path/layers/487b7cf2-30f2-4c7a-8f06-a601a6d56984/e3353c6e-aa16-4965-a54c-46138ff15255.png b/sprites/s_node_path/layers/487b7cf2-30f2-4c7a-8f06-a601a6d56984/e3353c6e-aa16-4965-a54c-46138ff15255.png new file mode 100644 index 000000000..d2b5b5ce5 Binary files /dev/null and b/sprites/s_node_path/layers/487b7cf2-30f2-4c7a-8f06-a601a6d56984/e3353c6e-aa16-4965-a54c-46138ff15255.png differ diff --git a/sprites/s_node_path/layers/db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c/3a8dcdbe-da26-4eda-9492-e6a32678e731.png b/sprites/s_node_path/layers/db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c/3a8dcdbe-da26-4eda-9492-e6a32678e731.png deleted file mode 100644 index 5f54154ee..000000000 Binary files a/sprites/s_node_path/layers/db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c/3a8dcdbe-da26-4eda-9492-e6a32678e731.png and /dev/null differ diff --git a/sprites/s_node_path/s_node_path.yy b/sprites/s_node_path/s_node_path.yy index dec3bff2f..b7d2b7354 100644 --- a/sprites/s_node_path/s_node_path.yy +++ b/sprites/s_node_path/s_node_path.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, + "bbox_left": 1, + "bbox_right": 30, "bbox_top": 1, - "bbox_bottom": 29, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c","path":"sprites/s_node_path/s_node_path.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c","path":"sprites/s_node_path/s_node_path.yy",},"LayerId":{"name":"3a8dcdbe-da26-4eda-9492-e6a32678e731","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","name":"db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"487b7cf2-30f2-4c7a-8f06-a601a6d56984","path":"sprites/s_node_path/s_node_path.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"487b7cf2-30f2-4c7a-8f06-a601a6d56984","path":"sprites/s_node_path/s_node_path.yy",},"LayerId":{"name":"e3353c6e-aa16-4965-a54c-46138ff15255","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","name":"487b7cf2-30f2-4c7a-8f06-a601a6d56984","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"408c1565-d575-4776-bc2c-09712cc8623e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"db5ccb7e-d83e-47fb-8e46-b2ea06f71f7c","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e3de3afa-6322-437e-90eb-0ae49195d12d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"487b7cf2-30f2-4c7a-8f06-a601a6d56984","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3a8dcdbe-da26-4eda-9492-e6a32678e731","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e3353c6e-aa16-4965-a54c-46138ff15255","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_pin/4ee168d1-5e2a-4d62-99fc-399419dfd415.png b/sprites/s_node_pin/4ee168d1-5e2a-4d62-99fc-399419dfd415.png new file mode 100644 index 000000000..1ca1d2354 Binary files /dev/null and b/sprites/s_node_pin/4ee168d1-5e2a-4d62-99fc-399419dfd415.png differ diff --git a/sprites/s_node_pin/a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40.png b/sprites/s_node_pin/a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40.png deleted file mode 100644 index 9ac9ef777..000000000 Binary files a/sprites/s_node_pin/a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40.png and /dev/null differ diff --git a/sprites/s_node_pin/layers/4ee168d1-5e2a-4d62-99fc-399419dfd415/237ac66d-3eb1-4e43-a693-5905a262f164.png b/sprites/s_node_pin/layers/4ee168d1-5e2a-4d62-99fc-399419dfd415/237ac66d-3eb1-4e43-a693-5905a262f164.png new file mode 100644 index 000000000..1d3f61a76 Binary files /dev/null and b/sprites/s_node_pin/layers/4ee168d1-5e2a-4d62-99fc-399419dfd415/237ac66d-3eb1-4e43-a693-5905a262f164.png differ diff --git a/sprites/s_node_pin/layers/a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40/e177c19a-9205-43ef-81be-8128193ae6ae.png b/sprites/s_node_pin/layers/a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40/e177c19a-9205-43ef-81be-8128193ae6ae.png deleted file mode 100644 index 9ac9ef777..000000000 Binary files a/sprites/s_node_pin/layers/a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40/e177c19a-9205-43ef-81be-8128193ae6ae.png and /dev/null differ diff --git a/sprites/s_node_pin/s_node_pin.yy b/sprites/s_node_pin/s_node_pin.yy index 5e1902559..fc4802850 100644 --- a/sprites/s_node_pin/s_node_pin.yy +++ b/sprites/s_node_pin/s_node_pin.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 9, - "bbox_right": 22, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 9, - "bbox_bottom": 23, + "bbox_bottom": 22, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40","path":"sprites/s_node_pin/s_node_pin.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40","path":"sprites/s_node_pin/s_node_pin.yy",},"LayerId":{"name":"e177c19a-9205-43ef-81be-8128193ae6ae","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","name":"a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4ee168d1-5e2a-4d62-99fc-399419dfd415","path":"sprites/s_node_pin/s_node_pin.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4ee168d1-5e2a-4d62-99fc-399419dfd415","path":"sprites/s_node_pin/s_node_pin.yy",},"LayerId":{"name":"237ac66d-3eb1-4e43-a693-5905a262f164","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","name":"4ee168d1-5e2a-4d62-99fc-399419dfd415","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"117bc36e-f5b5-4707-bfde-6ee7cf41fbe9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a8ca8a38-97a4-44d2-9bc2-ca0b7edfed40","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"355a85ed-ae41-4118-8523-6a023f42adf5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4ee168d1-5e2a-4d62-99fc-399419dfd415","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e177c19a-9205-43ef-81be-8128193ae6ae","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"237ac66d-3eb1-4e43-a693-5905a262f164","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_pixel_cloud/50aa9e0a-4597-4759-be8c-aea0dfc294f6.png b/sprites/s_node_pixel_cloud/50aa9e0a-4597-4759-be8c-aea0dfc294f6.png deleted file mode 100644 index 719c281bc..000000000 Binary files a/sprites/s_node_pixel_cloud/50aa9e0a-4597-4759-be8c-aea0dfc294f6.png and /dev/null differ diff --git a/sprites/s_node_pixel_cloud/959c24a2-28e7-46bb-beb6-b90d192ca0af.png b/sprites/s_node_pixel_cloud/959c24a2-28e7-46bb-beb6-b90d192ca0af.png new file mode 100644 index 000000000..447766274 Binary files /dev/null and b/sprites/s_node_pixel_cloud/959c24a2-28e7-46bb-beb6-b90d192ca0af.png differ diff --git a/sprites/s_node_pixel_cloud/layers/50aa9e0a-4597-4759-be8c-aea0dfc294f6/510fcb08-c7a7-45d8-a16a-11ddc2105fea.png b/sprites/s_node_pixel_cloud/layers/50aa9e0a-4597-4759-be8c-aea0dfc294f6/510fcb08-c7a7-45d8-a16a-11ddc2105fea.png deleted file mode 100644 index 719c281bc..000000000 Binary files a/sprites/s_node_pixel_cloud/layers/50aa9e0a-4597-4759-be8c-aea0dfc294f6/510fcb08-c7a7-45d8-a16a-11ddc2105fea.png and /dev/null differ diff --git a/sprites/s_node_pixel_cloud/layers/959c24a2-28e7-46bb-beb6-b90d192ca0af/560155e4-4360-47d0-b270-54e7a85b3e08.png b/sprites/s_node_pixel_cloud/layers/959c24a2-28e7-46bb-beb6-b90d192ca0af/560155e4-4360-47d0-b270-54e7a85b3e08.png new file mode 100644 index 000000000..9eb851543 Binary files /dev/null and b/sprites/s_node_pixel_cloud/layers/959c24a2-28e7-46bb-beb6-b90d192ca0af/560155e4-4360-47d0-b270-54e7a85b3e08.png differ diff --git a/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy b/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy index 12a4f3f0c..e6de8c2cd 100644 --- a/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy +++ b/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"50aa9e0a-4597-4759-be8c-aea0dfc294f6","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"50aa9e0a-4597-4759-be8c-aea0dfc294f6","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"LayerId":{"name":"510fcb08-c7a7-45d8-a16a-11ddc2105fea","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","name":"50aa9e0a-4597-4759-be8c-aea0dfc294f6","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"959c24a2-28e7-46bb-beb6-b90d192ca0af","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"959c24a2-28e7-46bb-beb6-b90d192ca0af","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"LayerId":{"name":"560155e4-4360-47d0-b270-54e7a85b3e08","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","name":"959c24a2-28e7-46bb-beb6-b90d192ca0af","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",}, @@ -41,10 +41,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f15ff1e5-a53c-4c00-8da2-ec5ef0de1206","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"50aa9e0a-4597-4759-be8c-aea0dfc294f6","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b2377048-d29b-4af0-9933-4edd2bfec267","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"959c24a2-28e7-46bb-beb6-b90d192ca0af","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"510fcb08-c7a7-45d8-a16a-11ddc2105fea","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"560155e4-4360-47d0-b270-54e7a85b3e08","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_polar/866de0ec-b51f-4e37-83c2-9aa31abdf013.png b/sprites/s_node_polar/866de0ec-b51f-4e37-83c2-9aa31abdf013.png new file mode 100644 index 000000000..60f79d719 Binary files /dev/null and b/sprites/s_node_polar/866de0ec-b51f-4e37-83c2-9aa31abdf013.png differ diff --git a/sprites/s_node_polar/cfe19179-eaf4-4524-b842-875616bbd42b.png b/sprites/s_node_polar/cfe19179-eaf4-4524-b842-875616bbd42b.png deleted file mode 100644 index b92717d57..000000000 Binary files a/sprites/s_node_polar/cfe19179-eaf4-4524-b842-875616bbd42b.png and /dev/null differ diff --git a/sprites/s_node_polar/layers/866de0ec-b51f-4e37-83c2-9aa31abdf013/104ed12a-27e7-4054-9a6c-3579baf7361c.png b/sprites/s_node_polar/layers/866de0ec-b51f-4e37-83c2-9aa31abdf013/104ed12a-27e7-4054-9a6c-3579baf7361c.png new file mode 100644 index 000000000..b4344d566 Binary files /dev/null and b/sprites/s_node_polar/layers/866de0ec-b51f-4e37-83c2-9aa31abdf013/104ed12a-27e7-4054-9a6c-3579baf7361c.png differ diff --git a/sprites/s_node_polar/layers/cfe19179-eaf4-4524-b842-875616bbd42b/614ad428-34c5-4326-9437-961a46bbef3b.png b/sprites/s_node_polar/layers/cfe19179-eaf4-4524-b842-875616bbd42b/614ad428-34c5-4326-9437-961a46bbef3b.png deleted file mode 100644 index b92717d57..000000000 Binary files a/sprites/s_node_polar/layers/cfe19179-eaf4-4524-b842-875616bbd42b/614ad428-34c5-4326-9437-961a46bbef3b.png and /dev/null differ diff --git a/sprites/s_node_polar/s_node_polar.yy b/sprites/s_node_polar/s_node_polar.yy index ce0715eea..444726498 100644 --- a/sprites/s_node_polar/s_node_polar.yy +++ b/sprites/s_node_polar/s_node_polar.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"cfe19179-eaf4-4524-b842-875616bbd42b","path":"sprites/s_node_polar/s_node_polar.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"cfe19179-eaf4-4524-b842-875616bbd42b","path":"sprites/s_node_polar/s_node_polar.yy",},"LayerId":{"name":"614ad428-34c5-4326-9437-961a46bbef3b","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","name":"cfe19179-eaf4-4524-b842-875616bbd42b","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"866de0ec-b51f-4e37-83c2-9aa31abdf013","path":"sprites/s_node_polar/s_node_polar.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"866de0ec-b51f-4e37-83c2-9aa31abdf013","path":"sprites/s_node_polar/s_node_polar.yy",},"LayerId":{"name":"104ed12a-27e7-4054-9a6c-3579baf7361c","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","name":"866de0ec-b51f-4e37-83c2-9aa31abdf013","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"245c54c0-d9d0-4d42-b65c-28445592d58b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cfe19179-eaf4-4524-b842-875616bbd42b","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"86a3e92e-7bbc-49c1-b818-157e422b9660","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"866de0ec-b51f-4e37-83c2-9aa31abdf013","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"614ad428-34c5-4326-9437-961a46bbef3b","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"104ed12a-27e7-4054-9a6c-3579baf7361c","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_posterize/41a7718b-8420-457e-b227-ccabd3e4ce26.png b/sprites/s_node_posterize/41a7718b-8420-457e-b227-ccabd3e4ce26.png deleted file mode 100644 index 9c8d03ac2..000000000 Binary files a/sprites/s_node_posterize/41a7718b-8420-457e-b227-ccabd3e4ce26.png and /dev/null differ diff --git a/sprites/s_node_posterize/ca282a52-9555-402b-af18-40c04bcb0cc6.png b/sprites/s_node_posterize/ca282a52-9555-402b-af18-40c04bcb0cc6.png new file mode 100644 index 000000000..2ea9ec499 Binary files /dev/null and b/sprites/s_node_posterize/ca282a52-9555-402b-af18-40c04bcb0cc6.png differ diff --git a/sprites/s_node_posterize/layers/41a7718b-8420-457e-b227-ccabd3e4ce26/df6dbf49-81c2-4e16-98d5-30f3ccac746e.png b/sprites/s_node_posterize/layers/41a7718b-8420-457e-b227-ccabd3e4ce26/df6dbf49-81c2-4e16-98d5-30f3ccac746e.png deleted file mode 100644 index 9c8d03ac2..000000000 Binary files a/sprites/s_node_posterize/layers/41a7718b-8420-457e-b227-ccabd3e4ce26/df6dbf49-81c2-4e16-98d5-30f3ccac746e.png and /dev/null differ diff --git a/sprites/s_node_posterize/layers/ca282a52-9555-402b-af18-40c04bcb0cc6/2e1e7c5f-b424-4902-aa8d-8ea2aaf0490a.png b/sprites/s_node_posterize/layers/ca282a52-9555-402b-af18-40c04bcb0cc6/2e1e7c5f-b424-4902-aa8d-8ea2aaf0490a.png new file mode 100644 index 000000000..3bba8cf36 Binary files /dev/null and b/sprites/s_node_posterize/layers/ca282a52-9555-402b-af18-40c04bcb0cc6/2e1e7c5f-b424-4902-aa8d-8ea2aaf0490a.png differ diff --git a/sprites/s_node_posterize/s_node_posterize.yy b/sprites/s_node_posterize/s_node_posterize.yy index 3720248db..147df0446 100644 --- a/sprites/s_node_posterize/s_node_posterize.yy +++ b/sprites/s_node_posterize/s_node_posterize.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"41a7718b-8420-457e-b227-ccabd3e4ce26","path":"sprites/s_node_posterize/s_node_posterize.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"41a7718b-8420-457e-b227-ccabd3e4ce26","path":"sprites/s_node_posterize/s_node_posterize.yy",},"LayerId":{"name":"df6dbf49-81c2-4e16-98d5-30f3ccac746e","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","name":"41a7718b-8420-457e-b227-ccabd3e4ce26","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ca282a52-9555-402b-af18-40c04bcb0cc6","path":"sprites/s_node_posterize/s_node_posterize.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ca282a52-9555-402b-af18-40c04bcb0cc6","path":"sprites/s_node_posterize/s_node_posterize.yy",},"LayerId":{"name":"2e1e7c5f-b424-4902-aa8d-8ea2aaf0490a","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","name":"ca282a52-9555-402b-af18-40c04bcb0cc6","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"504bc2fe-ecab-421c-91c5-b8092750039f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"41a7718b-8420-457e-b227-ccabd3e4ce26","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"164c67d4-6317-4b8d-b1ff-e8e4a99550e2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ca282a52-9555-402b-af18-40c04bcb0cc6","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"df6dbf49-81c2-4e16-98d5-30f3ccac746e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2e1e7c5f-b424-4902-aa8d-8ea2aaf0490a","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_sampler/12437ff7-6cd4-44f9-93ff-837160fdf9ba.png b/sprites/s_node_sampler/12437ff7-6cd4-44f9-93ff-837160fdf9ba.png new file mode 100644 index 000000000..ed22337be Binary files /dev/null and b/sprites/s_node_sampler/12437ff7-6cd4-44f9-93ff-837160fdf9ba.png differ diff --git a/sprites/s_node_sampler/202845fe-e4b3-4494-aedd-834449d94705.png b/sprites/s_node_sampler/202845fe-e4b3-4494-aedd-834449d94705.png deleted file mode 100644 index cdf26751e..000000000 Binary files a/sprites/s_node_sampler/202845fe-e4b3-4494-aedd-834449d94705.png and /dev/null differ diff --git a/sprites/s_node_sampler/layers/12437ff7-6cd4-44f9-93ff-837160fdf9ba/148ceed7-e614-42f4-8625-1ae061efcb07.png b/sprites/s_node_sampler/layers/12437ff7-6cd4-44f9-93ff-837160fdf9ba/148ceed7-e614-42f4-8625-1ae061efcb07.png new file mode 100644 index 000000000..b83adbb0a Binary files /dev/null and b/sprites/s_node_sampler/layers/12437ff7-6cd4-44f9-93ff-837160fdf9ba/148ceed7-e614-42f4-8625-1ae061efcb07.png differ diff --git a/sprites/s_node_sampler/layers/202845fe-e4b3-4494-aedd-834449d94705/79dd1cef-3f05-457c-b74a-fe1eaac292c2.png b/sprites/s_node_sampler/layers/202845fe-e4b3-4494-aedd-834449d94705/79dd1cef-3f05-457c-b74a-fe1eaac292c2.png deleted file mode 100644 index cdf26751e..000000000 Binary files a/sprites/s_node_sampler/layers/202845fe-e4b3-4494-aedd-834449d94705/79dd1cef-3f05-457c-b74a-fe1eaac292c2.png and /dev/null differ diff --git a/sprites/s_node_sampler/s_node_sampler.yy b/sprites/s_node_sampler/s_node_sampler.yy index 2ac1a0e79..a6abb2a93 100644 --- a/sprites/s_node_sampler/s_node_sampler.yy +++ b/sprites/s_node_sampler/s_node_sampler.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 27, - "bbox_top": 4, - "bbox_bottom": 27, + "bbox_left": 3, + "bbox_right": 28, + "bbox_top": 3, + "bbox_bottom": 28, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"202845fe-e4b3-4494-aedd-834449d94705","path":"sprites/s_node_sampler/s_node_sampler.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"202845fe-e4b3-4494-aedd-834449d94705","path":"sprites/s_node_sampler/s_node_sampler.yy",},"LayerId":{"name":"79dd1cef-3f05-457c-b74a-fe1eaac292c2","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","name":"202845fe-e4b3-4494-aedd-834449d94705","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"12437ff7-6cd4-44f9-93ff-837160fdf9ba","path":"sprites/s_node_sampler/s_node_sampler.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"12437ff7-6cd4-44f9-93ff-837160fdf9ba","path":"sprites/s_node_sampler/s_node_sampler.yy",},"LayerId":{"name":"148ceed7-e614-42f4-8625-1ae061efcb07","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","name":"12437ff7-6cd4-44f9-93ff-837160fdf9ba","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"528cc855-865b-45ef-9057-f0c12fca476d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"202845fe-e4b3-4494-aedd-834449d94705","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"54c43d1d-195f-45cf-bb2b-e52415b2e3c8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"12437ff7-6cd4-44f9-93ff-837160fdf9ba","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"79dd1cef-3f05-457c-b74a-fe1eaac292c2","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"148ceed7-e614-42f4-8625-1ae061efcb07","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_scale/5d26e0e7-55b0-4a8d-85d8-a37f51d525e9.png b/sprites/s_node_scale/5d26e0e7-55b0-4a8d-85d8-a37f51d525e9.png deleted file mode 100644 index d43ea4f1b..000000000 Binary files a/sprites/s_node_scale/5d26e0e7-55b0-4a8d-85d8-a37f51d525e9.png and /dev/null differ diff --git a/sprites/s_node_scale/97c1b1ee-8f43-4ecf-a592-3f89b04913e8.png b/sprites/s_node_scale/97c1b1ee-8f43-4ecf-a592-3f89b04913e8.png new file mode 100644 index 000000000..65765433d Binary files /dev/null and b/sprites/s_node_scale/97c1b1ee-8f43-4ecf-a592-3f89b04913e8.png differ diff --git a/sprites/s_node_scale/layers/5d26e0e7-55b0-4a8d-85d8-a37f51d525e9/7e20b63e-358d-43a6-9700-644cd9bae428.png b/sprites/s_node_scale/layers/5d26e0e7-55b0-4a8d-85d8-a37f51d525e9/7e20b63e-358d-43a6-9700-644cd9bae428.png deleted file mode 100644 index d43ea4f1b..000000000 Binary files a/sprites/s_node_scale/layers/5d26e0e7-55b0-4a8d-85d8-a37f51d525e9/7e20b63e-358d-43a6-9700-644cd9bae428.png and /dev/null differ diff --git a/sprites/s_node_scale/layers/97c1b1ee-8f43-4ecf-a592-3f89b04913e8/128774c2-223c-42e9-9351-e2c6b5f6d695.png b/sprites/s_node_scale/layers/97c1b1ee-8f43-4ecf-a592-3f89b04913e8/128774c2-223c-42e9-9351-e2c6b5f6d695.png new file mode 100644 index 000000000..1234c3450 Binary files /dev/null and b/sprites/s_node_scale/layers/97c1b1ee-8f43-4ecf-a592-3f89b04913e8/128774c2-223c-42e9-9351-e2c6b5f6d695.png differ diff --git a/sprites/s_node_scale/s_node_scale.yy b/sprites/s_node_scale/s_node_scale.yy index b737bd188..829f98060 100644 --- a/sprites/s_node_scale/s_node_scale.yy +++ b/sprites/s_node_scale/s_node_scale.yy @@ -7,9 +7,9 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, "bbox_bottom": 31, "HTile": false, "VTile": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"5d26e0e7-55b0-4a8d-85d8-a37f51d525e9","path":"sprites/s_node_scale/s_node_scale.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"5d26e0e7-55b0-4a8d-85d8-a37f51d525e9","path":"sprites/s_node_scale/s_node_scale.yy",},"LayerId":{"name":"7e20b63e-358d-43a6-9700-644cd9bae428","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","name":"5d26e0e7-55b0-4a8d-85d8-a37f51d525e9","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"97c1b1ee-8f43-4ecf-a592-3f89b04913e8","path":"sprites/s_node_scale/s_node_scale.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"97c1b1ee-8f43-4ecf-a592-3f89b04913e8","path":"sprites/s_node_scale/s_node_scale.yy",},"LayerId":{"name":"128774c2-223c-42e9-9351-e2c6b5f6d695","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","name":"97c1b1ee-8f43-4ecf-a592-3f89b04913e8","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b3cfa559-3bca-48f1-bfb2-1a3432c955f6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5d26e0e7-55b0-4a8d-85d8-a37f51d525e9","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b145c474-b9ef-46c2-9505-58810b62d5a7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"97c1b1ee-8f43-4ecf-a592-3f89b04913e8","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7e20b63e-358d-43a6-9700-644cd9bae428","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"128774c2-223c-42e9-9351-e2c6b5f6d695","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_scale_algo/7c1009a4-0f3a-4535-8b3d-6e40f168eeb6.png b/sprites/s_node_scale_algo/7c1009a4-0f3a-4535-8b3d-6e40f168eeb6.png deleted file mode 100644 index 38b01ba5d..000000000 Binary files a/sprites/s_node_scale_algo/7c1009a4-0f3a-4535-8b3d-6e40f168eeb6.png and /dev/null differ diff --git a/sprites/s_node_scale_algo/a28bb2e8-9efd-4206-8ded-95dd8d6ac22f.png b/sprites/s_node_scale_algo/a28bb2e8-9efd-4206-8ded-95dd8d6ac22f.png new file mode 100644 index 000000000..56ab5ca96 Binary files /dev/null and b/sprites/s_node_scale_algo/a28bb2e8-9efd-4206-8ded-95dd8d6ac22f.png differ diff --git a/sprites/s_node_scale_algo/layers/7c1009a4-0f3a-4535-8b3d-6e40f168eeb6/4f8989f4-4619-44a9-b3ef-d20422dcfbeb.png b/sprites/s_node_scale_algo/layers/7c1009a4-0f3a-4535-8b3d-6e40f168eeb6/4f8989f4-4619-44a9-b3ef-d20422dcfbeb.png deleted file mode 100644 index 38b01ba5d..000000000 Binary files a/sprites/s_node_scale_algo/layers/7c1009a4-0f3a-4535-8b3d-6e40f168eeb6/4f8989f4-4619-44a9-b3ef-d20422dcfbeb.png and /dev/null differ diff --git a/sprites/s_node_scale_algo/layers/a28bb2e8-9efd-4206-8ded-95dd8d6ac22f/5b4b40c3-68bd-4fcd-919a-cac09cf52b70.png b/sprites/s_node_scale_algo/layers/a28bb2e8-9efd-4206-8ded-95dd8d6ac22f/5b4b40c3-68bd-4fcd-919a-cac09cf52b70.png new file mode 100644 index 000000000..d163f08ac Binary files /dev/null and b/sprites/s_node_scale_algo/layers/a28bb2e8-9efd-4206-8ded-95dd8d6ac22f/5b4b40c3-68bd-4fcd-919a-cac09cf52b70.png differ diff --git a/sprites/s_node_scale_algo/s_node_scale_algo.yy b/sprites/s_node_scale_algo/s_node_scale_algo.yy index 41fbecff9..7db37ef5b 100644 --- a/sprites/s_node_scale_algo/s_node_scale_algo.yy +++ b/sprites/s_node_scale_algo/s_node_scale_algo.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"7c1009a4-0f3a-4535-8b3d-6e40f168eeb6","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"7c1009a4-0f3a-4535-8b3d-6e40f168eeb6","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"LayerId":{"name":"4f8989f4-4619-44a9-b3ef-d20422dcfbeb","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","name":"7c1009a4-0f3a-4535-8b3d-6e40f168eeb6","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"a28bb2e8-9efd-4206-8ded-95dd8d6ac22f","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"a28bb2e8-9efd-4206-8ded-95dd8d6ac22f","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"LayerId":{"name":"5b4b40c3-68bd-4fcd-919a-cac09cf52b70","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","name":"a28bb2e8-9efd-4206-8ded-95dd8d6ac22f","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e03d16e0-d9e4-43ab-89cd-2b9786a8f2d9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7c1009a4-0f3a-4535-8b3d-6e40f168eeb6","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1737e188-d862-4104-b141-31df2868f378","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a28bb2e8-9efd-4206-8ded-95dd8d6ac22f","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4f8989f4-4619-44a9-b3ef-d20422dcfbeb","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5b4b40c3-68bd-4fcd-919a-cac09cf52b70","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_scatter/0db2b11a-fbb2-4f7a-abed-ded013bb8a84.png b/sprites/s_node_scatter/0db2b11a-fbb2-4f7a-abed-ded013bb8a84.png deleted file mode 100644 index eb7712011..000000000 Binary files a/sprites/s_node_scatter/0db2b11a-fbb2-4f7a-abed-ded013bb8a84.png and /dev/null differ diff --git a/sprites/s_node_scatter/4830df9c-20df-4952-af76-a93df321db6c.png b/sprites/s_node_scatter/4830df9c-20df-4952-af76-a93df321db6c.png new file mode 100644 index 000000000..974c08ce7 Binary files /dev/null and b/sprites/s_node_scatter/4830df9c-20df-4952-af76-a93df321db6c.png differ diff --git a/sprites/s_node_scatter/layers/0db2b11a-fbb2-4f7a-abed-ded013bb8a84/ceabbda2-462f-43a1-8c56-a56f407bfd69.png b/sprites/s_node_scatter/layers/0db2b11a-fbb2-4f7a-abed-ded013bb8a84/ceabbda2-462f-43a1-8c56-a56f407bfd69.png deleted file mode 100644 index eb7712011..000000000 Binary files a/sprites/s_node_scatter/layers/0db2b11a-fbb2-4f7a-abed-ded013bb8a84/ceabbda2-462f-43a1-8c56-a56f407bfd69.png and /dev/null differ diff --git a/sprites/s_node_scatter/layers/4830df9c-20df-4952-af76-a93df321db6c/3023a362-08a1-4f88-bbdb-b55e0f49c564.png b/sprites/s_node_scatter/layers/4830df9c-20df-4952-af76-a93df321db6c/3023a362-08a1-4f88-bbdb-b55e0f49c564.png new file mode 100644 index 000000000..2a0abe5ce Binary files /dev/null and b/sprites/s_node_scatter/layers/4830df9c-20df-4952-af76-a93df321db6c/3023a362-08a1-4f88-bbdb-b55e0f49c564.png differ diff --git a/sprites/s_node_scatter/s_node_scatter.yy b/sprites/s_node_scatter/s_node_scatter.yy index 019b70069..eb4735ac8 100644 --- a/sprites/s_node_scatter/s_node_scatter.yy +++ b/sprites/s_node_scatter/s_node_scatter.yy @@ -9,8 +9,8 @@ "swfPrecision": 2.525, "bbox_left": 3, "bbox_right": 28, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_top": 2, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"0db2b11a-fbb2-4f7a-abed-ded013bb8a84","path":"sprites/s_node_scatter/s_node_scatter.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0db2b11a-fbb2-4f7a-abed-ded013bb8a84","path":"sprites/s_node_scatter/s_node_scatter.yy",},"LayerId":{"name":"ceabbda2-462f-43a1-8c56-a56f407bfd69","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","name":"0db2b11a-fbb2-4f7a-abed-ded013bb8a84","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"4830df9c-20df-4952-af76-a93df321db6c","path":"sprites/s_node_scatter/s_node_scatter.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"4830df9c-20df-4952-af76-a93df321db6c","path":"sprites/s_node_scatter/s_node_scatter.yy",},"LayerId":{"name":"3023a362-08a1-4f88-bbdb-b55e0f49c564","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","name":"4830df9c-20df-4952-af76-a93df321db6c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b974a010-84ba-4a48-a31b-a964ccf5289c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0db2b11a-fbb2-4f7a-abed-ded013bb8a84","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"10325b0b-5f65-47ac-985e-0f18663d91e6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4830df9c-20df-4952-af76-a93df321db6c","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ceabbda2-462f-43a1-8c56-a56f407bfd69","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3023a362-08a1-4f88-bbdb-b55e0f49c564","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_sepearte_shape/d817dead-429c-47ac-a203-d6f93c673f88.png b/sprites/s_node_sepearte_shape/d817dead-429c-47ac-a203-d6f93c673f88.png deleted file mode 100644 index 9a6778654..000000000 Binary files a/sprites/s_node_sepearte_shape/d817dead-429c-47ac-a203-d6f93c673f88.png and /dev/null differ diff --git a/sprites/s_node_sepearte_shape/d83edf43-440d-4c65-89d2-7549eb43cc14.png b/sprites/s_node_sepearte_shape/d83edf43-440d-4c65-89d2-7549eb43cc14.png new file mode 100644 index 000000000..b1faa576d Binary files /dev/null and b/sprites/s_node_sepearte_shape/d83edf43-440d-4c65-89d2-7549eb43cc14.png differ diff --git a/sprites/s_node_sepearte_shape/layers/d817dead-429c-47ac-a203-d6f93c673f88/388ce78e-c09e-4272-898c-5cad53905480.png b/sprites/s_node_sepearte_shape/layers/d817dead-429c-47ac-a203-d6f93c673f88/388ce78e-c09e-4272-898c-5cad53905480.png deleted file mode 100644 index 9a6778654..000000000 Binary files a/sprites/s_node_sepearte_shape/layers/d817dead-429c-47ac-a203-d6f93c673f88/388ce78e-c09e-4272-898c-5cad53905480.png and /dev/null differ diff --git a/sprites/s_node_sepearte_shape/layers/d83edf43-440d-4c65-89d2-7549eb43cc14/e415b3ba-58a7-4001-9918-33ca0e394b36.png b/sprites/s_node_sepearte_shape/layers/d83edf43-440d-4c65-89d2-7549eb43cc14/e415b3ba-58a7-4001-9918-33ca0e394b36.png new file mode 100644 index 000000000..aaa33c4a2 Binary files /dev/null and b/sprites/s_node_sepearte_shape/layers/d83edf43-440d-4c65-89d2-7549eb43cc14/e415b3ba-58a7-4001-9918-33ca0e394b36.png differ diff --git a/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy b/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy index 033641d97..728baf64d 100644 --- a/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy +++ b/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 29, - "bbox_top": 3, - "bbox_bottom": 29, + "bbox_left": 1, + "bbox_right": 31, + "bbox_top": 1, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"d817dead-429c-47ac-a203-d6f93c673f88","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"d817dead-429c-47ac-a203-d6f93c673f88","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"LayerId":{"name":"388ce78e-c09e-4272-898c-5cad53905480","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","name":"d817dead-429c-47ac-a203-d6f93c673f88","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"d83edf43-440d-4c65-89d2-7549eb43cc14","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"d83edf43-440d-4c65-89d2-7549eb43cc14","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"LayerId":{"name":"e415b3ba-58a7-4001-9918-33ca0e394b36","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","name":"d83edf43-440d-4c65-89d2-7549eb43cc14","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"37e379ed-6c4d-4ec6-8ae4-7716b4f6b897","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d817dead-429c-47ac-a203-d6f93c673f88","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"376952b4-b073-45a4-97c8-eefe9da391b2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d83edf43-440d-4c65-89d2-7549eb43cc14","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"388ce78e-c09e-4272-898c-5cad53905480","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e415b3ba-58a7-4001-9918-33ca0e394b36","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_shadow/112855b2-bd8a-4165-a1a2-5dd3420b4f7d.png b/sprites/s_node_shadow/112855b2-bd8a-4165-a1a2-5dd3420b4f7d.png new file mode 100644 index 000000000..6d2ad2092 Binary files /dev/null and b/sprites/s_node_shadow/112855b2-bd8a-4165-a1a2-5dd3420b4f7d.png differ diff --git a/sprites/s_node_shadow/2c31794c-2170-4fac-bb23-63e4914df5ea.png b/sprites/s_node_shadow/2c31794c-2170-4fac-bb23-63e4914df5ea.png deleted file mode 100644 index aac551328..000000000 Binary files a/sprites/s_node_shadow/2c31794c-2170-4fac-bb23-63e4914df5ea.png and /dev/null differ diff --git a/sprites/s_node_shadow/layers/112855b2-bd8a-4165-a1a2-5dd3420b4f7d/a3651263-34b6-4012-9b72-27fb2bff1f7f.png b/sprites/s_node_shadow/layers/112855b2-bd8a-4165-a1a2-5dd3420b4f7d/a3651263-34b6-4012-9b72-27fb2bff1f7f.png new file mode 100644 index 000000000..3999024f2 Binary files /dev/null and b/sprites/s_node_shadow/layers/112855b2-bd8a-4165-a1a2-5dd3420b4f7d/a3651263-34b6-4012-9b72-27fb2bff1f7f.png differ diff --git a/sprites/s_node_shadow/layers/2c31794c-2170-4fac-bb23-63e4914df5ea/c4bd74bf-ba35-42b1-8b05-460449075e78.png b/sprites/s_node_shadow/layers/2c31794c-2170-4fac-bb23-63e4914df5ea/c4bd74bf-ba35-42b1-8b05-460449075e78.png deleted file mode 100644 index b1c2990ba..000000000 Binary files a/sprites/s_node_shadow/layers/2c31794c-2170-4fac-bb23-63e4914df5ea/c4bd74bf-ba35-42b1-8b05-460449075e78.png and /dev/null differ diff --git a/sprites/s_node_shadow/s_node_shadow.yy b/sprites/s_node_shadow/s_node_shadow.yy index 38cee7b1e..af5dc5f7c 100644 --- a/sprites/s_node_shadow/s_node_shadow.yy +++ b/sprites/s_node_shadow/s_node_shadow.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 5, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 2, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"2c31794c-2170-4fac-bb23-63e4914df5ea","path":"sprites/s_node_shadow/s_node_shadow.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2c31794c-2170-4fac-bb23-63e4914df5ea","path":"sprites/s_node_shadow/s_node_shadow.yy",},"LayerId":{"name":"c4bd74bf-ba35-42b1-8b05-460449075e78","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","name":"2c31794c-2170-4fac-bb23-63e4914df5ea","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"112855b2-bd8a-4165-a1a2-5dd3420b4f7d","path":"sprites/s_node_shadow/s_node_shadow.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"112855b2-bd8a-4165-a1a2-5dd3420b4f7d","path":"sprites/s_node_shadow/s_node_shadow.yy",},"LayerId":{"name":"a3651263-34b6-4012-9b72-27fb2bff1f7f","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","name":"112855b2-bd8a-4165-a1a2-5dd3420b4f7d","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ebdea088-226a-4c14-8f21-105fcb297c29","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2c31794c-2170-4fac-bb23-63e4914df5ea","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7440aab3-519e-45bd-bb9e-2f40a9ffb553","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"112855b2-bd8a-4165-a1a2-5dd3420b4f7d","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c4bd74bf-ba35-42b1-8b05-460449075e78","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a3651263-34b6-4012-9b72-27fb2bff1f7f","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_shape/dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac.png b/sprites/s_node_shape/dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac.png new file mode 100644 index 000000000..7e4d52153 Binary files /dev/null and b/sprites/s_node_shape/dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac.png differ diff --git a/sprites/s_node_shape/fd1477ff-d899-44a5-81de-795560779c39.png b/sprites/s_node_shape/fd1477ff-d899-44a5-81de-795560779c39.png deleted file mode 100644 index de427b107..000000000 Binary files a/sprites/s_node_shape/fd1477ff-d899-44a5-81de-795560779c39.png and /dev/null differ diff --git a/sprites/s_node_shape/layers/dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac/5059ec1d-a6c7-4711-9658-8a866b34fe54.png b/sprites/s_node_shape/layers/dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac/5059ec1d-a6c7-4711-9658-8a866b34fe54.png new file mode 100644 index 000000000..41d20f2e1 Binary files /dev/null and b/sprites/s_node_shape/layers/dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac/5059ec1d-a6c7-4711-9658-8a866b34fe54.png differ diff --git a/sprites/s_node_shape/layers/fd1477ff-d899-44a5-81de-795560779c39/ddfed5b4-6312-45f1-8feb-f088a2e0f8bb.png b/sprites/s_node_shape/layers/fd1477ff-d899-44a5-81de-795560779c39/ddfed5b4-6312-45f1-8feb-f088a2e0f8bb.png deleted file mode 100644 index de427b107..000000000 Binary files a/sprites/s_node_shape/layers/fd1477ff-d899-44a5-81de-795560779c39/ddfed5b4-6312-45f1-8feb-f088a2e0f8bb.png and /dev/null differ diff --git a/sprites/s_node_shape/s_node_shape.yy b/sprites/s_node_shape/s_node_shape.yy index cbf0cba81..54d6cc073 100644 --- a/sprites/s_node_shape/s_node_shape.yy +++ b/sprites/s_node_shape/s_node_shape.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 29, - "bbox_top": 4, - "bbox_bottom": 28, + "bbox_left": 0, + "bbox_right": 30, + "bbox_top": 0, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"fd1477ff-d899-44a5-81de-795560779c39","path":"sprites/s_node_shape/s_node_shape.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"fd1477ff-d899-44a5-81de-795560779c39","path":"sprites/s_node_shape/s_node_shape.yy",},"LayerId":{"name":"ddfed5b4-6312-45f1-8feb-f088a2e0f8bb","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","name":"fd1477ff-d899-44a5-81de-795560779c39","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac","path":"sprites/s_node_shape/s_node_shape.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac","path":"sprites/s_node_shape/s_node_shape.yy",},"LayerId":{"name":"5059ec1d-a6c7-4711-9658-8a866b34fe54","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","name":"dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7f08c23c-85d1-4f23-b319-7a21c18f6e82","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd1477ff-d899-44a5-81de-795560779c39","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1a65c298-cdb0-4969-92d3-61a65eb1b24b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dc3e3261-dd59-4b77-8ffb-e16e7ebfe1ac","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ddfed5b4-6312-45f1-8feb-f088a2e0f8bb","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5059ec1d-a6c7-4711-9658-8a866b34fe54","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_solid/6818238b-5bcf-418b-bbe6-e042bc43bc2d.png b/sprites/s_node_solid/6818238b-5bcf-418b-bbe6-e042bc43bc2d.png new file mode 100644 index 000000000..450025ca4 Binary files /dev/null and b/sprites/s_node_solid/6818238b-5bcf-418b-bbe6-e042bc43bc2d.png differ diff --git a/sprites/s_node_solid/71cfd9da-cd10-45be-90d3-740a884ac80f.png b/sprites/s_node_solid/71cfd9da-cd10-45be-90d3-740a884ac80f.png deleted file mode 100644 index 5dfdfae14..000000000 Binary files a/sprites/s_node_solid/71cfd9da-cd10-45be-90d3-740a884ac80f.png and /dev/null differ diff --git a/sprites/s_node_solid/layers/6818238b-5bcf-418b-bbe6-e042bc43bc2d/1fd2d1a5-c100-4d54-8c31-8882565129d9.png b/sprites/s_node_solid/layers/6818238b-5bcf-418b-bbe6-e042bc43bc2d/1fd2d1a5-c100-4d54-8c31-8882565129d9.png new file mode 100644 index 000000000..ed6c60867 Binary files /dev/null and b/sprites/s_node_solid/layers/6818238b-5bcf-418b-bbe6-e042bc43bc2d/1fd2d1a5-c100-4d54-8c31-8882565129d9.png differ diff --git a/sprites/s_node_solid/layers/71cfd9da-cd10-45be-90d3-740a884ac80f/e1ad5936-b5e6-41bb-9777-326b73df1482.png b/sprites/s_node_solid/layers/71cfd9da-cd10-45be-90d3-740a884ac80f/e1ad5936-b5e6-41bb-9777-326b73df1482.png deleted file mode 100644 index 5dfdfae14..000000000 Binary files a/sprites/s_node_solid/layers/71cfd9da-cd10-45be-90d3-740a884ac80f/e1ad5936-b5e6-41bb-9777-326b73df1482.png and /dev/null differ diff --git a/sprites/s_node_solid/s_node_solid.yy b/sprites/s_node_solid/s_node_solid.yy index 0b7d60dd6..21d1c0c7c 100644 --- a/sprites/s_node_solid/s_node_solid.yy +++ b/sprites/s_node_solid/s_node_solid.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"71cfd9da-cd10-45be-90d3-740a884ac80f","path":"sprites/s_node_solid/s_node_solid.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"71cfd9da-cd10-45be-90d3-740a884ac80f","path":"sprites/s_node_solid/s_node_solid.yy",},"LayerId":{"name":"e1ad5936-b5e6-41bb-9777-326b73df1482","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_solid","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","name":"71cfd9da-cd10-45be-90d3-740a884ac80f","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6818238b-5bcf-418b-bbe6-e042bc43bc2d","path":"sprites/s_node_solid/s_node_solid.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6818238b-5bcf-418b-bbe6-e042bc43bc2d","path":"sprites/s_node_solid/s_node_solid.yy",},"LayerId":{"name":"1fd2d1a5-c100-4d54-8c31-8882565129d9","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_solid","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","name":"6818238b-5bcf-418b-bbe6-e042bc43bc2d","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_solid","path":"sprites/s_node_solid/s_node_solid.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6cd83796-7285-46bc-82c2-f734acd3ceab","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"71cfd9da-cd10-45be-90d3-740a884ac80f","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"270a828d-bdfa-429b-9e10-af2741dcc8d2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6818238b-5bcf-418b-bbe6-e042bc43bc2d","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e1ad5936-b5e6-41bb-9777-326b73df1482","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1fd2d1a5-c100-4d54-8c31-8882565129d9","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_sprite_sheet/1477601e-2eec-4456-ad8c-c2340b5c38df.png b/sprites/s_node_sprite_sheet/1477601e-2eec-4456-ad8c-c2340b5c38df.png new file mode 100644 index 000000000..f807d1a01 Binary files /dev/null and b/sprites/s_node_sprite_sheet/1477601e-2eec-4456-ad8c-c2340b5c38df.png differ diff --git a/sprites/s_node_sprite_sheet/b11da35e-c92e-4890-b334-d07a6867f5de.png b/sprites/s_node_sprite_sheet/b11da35e-c92e-4890-b334-d07a6867f5de.png deleted file mode 100644 index e4349220b..000000000 Binary files a/sprites/s_node_sprite_sheet/b11da35e-c92e-4890-b334-d07a6867f5de.png and /dev/null differ diff --git a/sprites/s_node_sprite_sheet/layers/1477601e-2eec-4456-ad8c-c2340b5c38df/205435f9-b496-4781-bc8b-7b90909e4dac.png b/sprites/s_node_sprite_sheet/layers/1477601e-2eec-4456-ad8c-c2340b5c38df/205435f9-b496-4781-bc8b-7b90909e4dac.png new file mode 100644 index 000000000..506ac7ec4 Binary files /dev/null and b/sprites/s_node_sprite_sheet/layers/1477601e-2eec-4456-ad8c-c2340b5c38df/205435f9-b496-4781-bc8b-7b90909e4dac.png differ diff --git a/sprites/s_node_sprite_sheet/layers/b11da35e-c92e-4890-b334-d07a6867f5de/8eaf12c6-95aa-437c-93dd-bee204e0ea9c.png b/sprites/s_node_sprite_sheet/layers/b11da35e-c92e-4890-b334-d07a6867f5de/8eaf12c6-95aa-437c-93dd-bee204e0ea9c.png deleted file mode 100644 index e4349220b..000000000 Binary files a/sprites/s_node_sprite_sheet/layers/b11da35e-c92e-4890-b334-d07a6867f5de/8eaf12c6-95aa-437c-93dd-bee204e0ea9c.png and /dev/null differ diff --git a/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy b/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy index 16b9eb6f6..396e0a935 100644 --- a/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy +++ b/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b11da35e-c92e-4890-b334-d07a6867f5de","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b11da35e-c92e-4890-b334-d07a6867f5de","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"LayerId":{"name":"8eaf12c6-95aa-437c-93dd-bee204e0ea9c","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","name":"b11da35e-c92e-4890-b334-d07a6867f5de","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"1477601e-2eec-4456-ad8c-c2340b5c38df","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1477601e-2eec-4456-ad8c-c2340b5c38df","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"LayerId":{"name":"205435f9-b496-4781-bc8b-7b90909e4dac","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","name":"1477601e-2eec-4456-ad8c-c2340b5c38df","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ed50df54-2ee7-4f87-bd44-3065b76429b8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b11da35e-c92e-4890-b334-d07a6867f5de","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ca2782c7-0926-4e77-8718-0605e86c2416","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1477601e-2eec-4456-ad8c-c2340b5c38df","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8eaf12c6-95aa-437c-93dd-bee204e0ea9c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"205435f9-b496-4781-bc8b-7b90909e4dac","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_stack/6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3.png b/sprites/s_node_stack/6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3.png new file mode 100644 index 000000000..fcc55ea49 Binary files /dev/null and b/sprites/s_node_stack/6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3.png differ diff --git a/sprites/s_node_stack/cf8b271f-f44f-4c73-8046-ef6d2f115eac.png b/sprites/s_node_stack/cf8b271f-f44f-4c73-8046-ef6d2f115eac.png deleted file mode 100644 index bf7fddfe5..000000000 Binary files a/sprites/s_node_stack/cf8b271f-f44f-4c73-8046-ef6d2f115eac.png and /dev/null differ diff --git a/sprites/s_node_stack/layers/6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3/44618814-b6e0-4783-98e8-3db4ccefb6e0.png b/sprites/s_node_stack/layers/6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3/44618814-b6e0-4783-98e8-3db4ccefb6e0.png new file mode 100644 index 000000000..11a8d4bd9 Binary files /dev/null and b/sprites/s_node_stack/layers/6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3/44618814-b6e0-4783-98e8-3db4ccefb6e0.png differ diff --git a/sprites/s_node_stack/layers/cf8b271f-f44f-4c73-8046-ef6d2f115eac/3553bb7f-6435-4fdb-988e-47f049a27a90.png b/sprites/s_node_stack/layers/cf8b271f-f44f-4c73-8046-ef6d2f115eac/3553bb7f-6435-4fdb-988e-47f049a27a90.png deleted file mode 100644 index bf7fddfe5..000000000 Binary files a/sprites/s_node_stack/layers/cf8b271f-f44f-4c73-8046-ef6d2f115eac/3553bb7f-6435-4fdb-988e-47f049a27a90.png and /dev/null differ diff --git a/sprites/s_node_stack/s_node_stack.yy b/sprites/s_node_stack/s_node_stack.yy index 44e9f203a..7605d1591 100644 --- a/sprites/s_node_stack/s_node_stack.yy +++ b/sprites/s_node_stack/s_node_stack.yy @@ -7,15 +7,15 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 26, + "bbox_left": 8, + "bbox_right": 23, "bbox_top": 1, - "bbox_bottom": 30, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, "width": 32, - "height": 32, + "height": 33, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"cf8b271f-f44f-4c73-8046-ef6d2f115eac","path":"sprites/s_node_stack/s_node_stack.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"cf8b271f-f44f-4c73-8046-ef6d2f115eac","path":"sprites/s_node_stack/s_node_stack.yy",},"LayerId":{"name":"3553bb7f-6435-4fdb-988e-47f049a27a90","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","name":"cf8b271f-f44f-4c73-8046-ef6d2f115eac","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3","path":"sprites/s_node_stack/s_node_stack.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3","path":"sprites/s_node_stack/s_node_stack.yy",},"LayerId":{"name":"44618814-b6e0-4783-98e8-3db4ccefb6e0","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","name":"6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"804de6d2-142f-4003-ad62-38b8b45c1904","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cf8b271f-f44f-4c73-8046-ef6d2f115eac","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c27ebca0-c22c-418e-ac0d-9d00ac01104e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6e5bfe18-108f-4e7c-97f0-63af1e7f9cc3","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3553bb7f-6435-4fdb-988e-47f049a27a90","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"44618814-b6e0-4783-98e8-3db4ccefb6e0","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_stripe/6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3.png b/sprites/s_node_stripe/6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3.png new file mode 100644 index 000000000..00e20d7e6 Binary files /dev/null and b/sprites/s_node_stripe/6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3.png differ diff --git a/sprites/s_node_stripe/dba9cba4-7e41-4513-a295-cc23634a86e9.png b/sprites/s_node_stripe/dba9cba4-7e41-4513-a295-cc23634a86e9.png deleted file mode 100644 index 6f05cd1d2..000000000 Binary files a/sprites/s_node_stripe/dba9cba4-7e41-4513-a295-cc23634a86e9.png and /dev/null differ diff --git a/sprites/s_node_stripe/layers/6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3/cb2e5e49-7746-47c5-889e-65373cbc4c30.png b/sprites/s_node_stripe/layers/6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3/cb2e5e49-7746-47c5-889e-65373cbc4c30.png new file mode 100644 index 000000000..596bb3522 Binary files /dev/null and b/sprites/s_node_stripe/layers/6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3/cb2e5e49-7746-47c5-889e-65373cbc4c30.png differ diff --git a/sprites/s_node_stripe/layers/dba9cba4-7e41-4513-a295-cc23634a86e9/00e977ce-5c00-4b57-97de-3f9e21801663.png b/sprites/s_node_stripe/layers/dba9cba4-7e41-4513-a295-cc23634a86e9/00e977ce-5c00-4b57-97de-3f9e21801663.png deleted file mode 100644 index 6f05cd1d2..000000000 Binary files a/sprites/s_node_stripe/layers/dba9cba4-7e41-4513-a295-cc23634a86e9/00e977ce-5c00-4b57-97de-3f9e21801663.png and /dev/null differ diff --git a/sprites/s_node_stripe/s_node_stripe.yy b/sprites/s_node_stripe/s_node_stripe.yy index e91cc7c28..17d3765a6 100644 --- a/sprites/s_node_stripe/s_node_stripe.yy +++ b/sprites/s_node_stripe/s_node_stripe.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"dba9cba4-7e41-4513-a295-cc23634a86e9","path":"sprites/s_node_stripe/s_node_stripe.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"dba9cba4-7e41-4513-a295-cc23634a86e9","path":"sprites/s_node_stripe/s_node_stripe.yy",},"LayerId":{"name":"00e977ce-5c00-4b57-97de-3f9e21801663","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","name":"dba9cba4-7e41-4513-a295-cc23634a86e9","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3","path":"sprites/s_node_stripe/s_node_stripe.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3","path":"sprites/s_node_stripe/s_node_stripe.yy",},"LayerId":{"name":"cb2e5e49-7746-47c5-889e-65373cbc4c30","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","name":"6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9f6b5f81-d808-48fd-9cb2-5736c30f9a87","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dba9cba4-7e41-4513-a295-cc23634a86e9","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"888e82ca-089e-4366-a0a3-3e99c0899fbd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6d50bbeb-c9b2-49ff-a382-54f0fc8c89e3","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"00e977ce-5c00-4b57-97de-3f9e21801663","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cb2e5e49-7746-47c5-889e-65373cbc4c30","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_surface_data/3ea9987c-4a6d-4283-bf4e-0d2f3265c600.png b/sprites/s_node_surface_data/3ea9987c-4a6d-4283-bf4e-0d2f3265c600.png deleted file mode 100644 index 6c122ce2e..000000000 Binary files a/sprites/s_node_surface_data/3ea9987c-4a6d-4283-bf4e-0d2f3265c600.png and /dev/null differ diff --git a/sprites/s_node_surface_data/layers/3ea9987c-4a6d-4283-bf4e-0d2f3265c600/ac35f8ca-edfd-4e47-92c1-8b2e988eaf86.png b/sprites/s_node_surface_data/layers/3ea9987c-4a6d-4283-bf4e-0d2f3265c600/ac35f8ca-edfd-4e47-92c1-8b2e988eaf86.png deleted file mode 100644 index 6c122ce2e..000000000 Binary files a/sprites/s_node_surface_data/layers/3ea9987c-4a6d-4283-bf4e-0d2f3265c600/ac35f8ca-edfd-4e47-92c1-8b2e988eaf86.png and /dev/null differ diff --git a/sprites/s_node_text/50d29e97-3613-466d-ba99-72ddf5e7f44c.png b/sprites/s_node_text/50d29e97-3613-466d-ba99-72ddf5e7f44c.png deleted file mode 100644 index a851b656c..000000000 Binary files a/sprites/s_node_text/50d29e97-3613-466d-ba99-72ddf5e7f44c.png and /dev/null differ diff --git a/sprites/s_node_text/ebbaa377-23c1-4f8a-a177-983bc39155f9.png b/sprites/s_node_text/ebbaa377-23c1-4f8a-a177-983bc39155f9.png new file mode 100644 index 000000000..412139f0e Binary files /dev/null and b/sprites/s_node_text/ebbaa377-23c1-4f8a-a177-983bc39155f9.png differ diff --git a/sprites/s_node_text/layers/50d29e97-3613-466d-ba99-72ddf5e7f44c/970fcdc4-20a7-4b71-91b2-0c5dc677737c.png b/sprites/s_node_text/layers/50d29e97-3613-466d-ba99-72ddf5e7f44c/970fcdc4-20a7-4b71-91b2-0c5dc677737c.png deleted file mode 100644 index a851b656c..000000000 Binary files a/sprites/s_node_text/layers/50d29e97-3613-466d-ba99-72ddf5e7f44c/970fcdc4-20a7-4b71-91b2-0c5dc677737c.png and /dev/null differ diff --git a/sprites/s_node_text/layers/ebbaa377-23c1-4f8a-a177-983bc39155f9/9ac7f4d8-2695-4a72-b07b-6d4253167c48.png b/sprites/s_node_text/layers/ebbaa377-23c1-4f8a-a177-983bc39155f9/9ac7f4d8-2695-4a72-b07b-6d4253167c48.png new file mode 100644 index 000000000..487616499 Binary files /dev/null and b/sprites/s_node_text/layers/ebbaa377-23c1-4f8a-a177-983bc39155f9/9ac7f4d8-2695-4a72-b07b-6d4253167c48.png differ diff --git a/sprites/s_node_text/s_node_text.yy b/sprites/s_node_text/s_node_text.yy index 8f614c402..ccc709c22 100644 --- a/sprites/s_node_text/s_node_text.yy +++ b/sprites/s_node_text/s_node_text.yy @@ -8,9 +8,9 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 2, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 28, + "bbox_right": 28, + "bbox_top": 9, + "bbox_bottom": 22, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"50d29e97-3613-466d-ba99-72ddf5e7f44c","path":"sprites/s_node_text/s_node_text.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"50d29e97-3613-466d-ba99-72ddf5e7f44c","path":"sprites/s_node_text/s_node_text.yy",},"LayerId":{"name":"970fcdc4-20a7-4b71-91b2-0c5dc677737c","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","name":"50d29e97-3613-466d-ba99-72ddf5e7f44c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ebbaa377-23c1-4f8a-a177-983bc39155f9","path":"sprites/s_node_text/s_node_text.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ebbaa377-23c1-4f8a-a177-983bc39155f9","path":"sprites/s_node_text/s_node_text.yy",},"LayerId":{"name":"9ac7f4d8-2695-4a72-b07b-6d4253167c48","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","name":"ebbaa377-23c1-4f8a-a177-983bc39155f9","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9dfb4e4d-6a0e-44e4-8ce9-939b51ceb806","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"50d29e97-3613-466d-ba99-72ddf5e7f44c","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4e21492d-3d31-4fcb-a0de-2386f3414692","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ebbaa377-23c1-4f8a-a177-983bc39155f9","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"970fcdc4-20a7-4b71-91b2-0c5dc677737c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9ac7f4d8-2695-4a72-b07b-6d4253167c48","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_texture_map/3ac0a289-0f47-4467-ad72-d86cf93dbc20.png b/sprites/s_node_texture_map/3ac0a289-0f47-4467-ad72-d86cf93dbc20.png new file mode 100644 index 000000000..a0782ba22 Binary files /dev/null and b/sprites/s_node_texture_map/3ac0a289-0f47-4467-ad72-d86cf93dbc20.png differ diff --git a/sprites/s_node_texture_map/645421e3-5cd7-4742-bfb2-bffaf7939142.png b/sprites/s_node_texture_map/645421e3-5cd7-4742-bfb2-bffaf7939142.png deleted file mode 100644 index 03c4a0f0b..000000000 Binary files a/sprites/s_node_texture_map/645421e3-5cd7-4742-bfb2-bffaf7939142.png and /dev/null differ diff --git a/sprites/s_node_texture_map/layers/3ac0a289-0f47-4467-ad72-d86cf93dbc20/7d061379-3a12-4933-ae46-7834fffe2f1d.png b/sprites/s_node_texture_map/layers/3ac0a289-0f47-4467-ad72-d86cf93dbc20/7d061379-3a12-4933-ae46-7834fffe2f1d.png new file mode 100644 index 000000000..6056908a8 Binary files /dev/null and b/sprites/s_node_texture_map/layers/3ac0a289-0f47-4467-ad72-d86cf93dbc20/7d061379-3a12-4933-ae46-7834fffe2f1d.png differ diff --git a/sprites/s_node_texture_map/layers/645421e3-5cd7-4742-bfb2-bffaf7939142/8d12cfd1-58ca-4bc6-89c7-a73c2bce0b28.png b/sprites/s_node_texture_map/layers/645421e3-5cd7-4742-bfb2-bffaf7939142/8d12cfd1-58ca-4bc6-89c7-a73c2bce0b28.png deleted file mode 100644 index 03c4a0f0b..000000000 Binary files a/sprites/s_node_texture_map/layers/645421e3-5cd7-4742-bfb2-bffaf7939142/8d12cfd1-58ca-4bc6-89c7-a73c2bce0b28.png and /dev/null differ diff --git a/sprites/s_node_texture_map/s_node_texture_map.yy b/sprites/s_node_texture_map/s_node_texture_map.yy index ea32e3e81..20cd3d874 100644 --- a/sprites/s_node_texture_map/s_node_texture_map.yy +++ b/sprites/s_node_texture_map/s_node_texture_map.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"645421e3-5cd7-4742-bfb2-bffaf7939142","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"645421e3-5cd7-4742-bfb2-bffaf7939142","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"LayerId":{"name":"8d12cfd1-58ca-4bc6-89c7-a73c2bce0b28","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","name":"645421e3-5cd7-4742-bfb2-bffaf7939142","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"3ac0a289-0f47-4467-ad72-d86cf93dbc20","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"3ac0a289-0f47-4467-ad72-d86cf93dbc20","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"LayerId":{"name":"7d061379-3a12-4933-ae46-7834fffe2f1d","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","name":"3ac0a289-0f47-4467-ad72-d86cf93dbc20","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"04cafd18-7206-41db-af98-89d27cdb75fd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"645421e3-5cd7-4742-bfb2-bffaf7939142","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"557e4dad-de48-4ef5-92b0-2a97a905f04b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3ac0a289-0f47-4467-ad72-d86cf93dbc20","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8d12cfd1-58ca-4bc6-89c7-a73c2bce0b28","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7d061379-3a12-4933-ae46-7834fffe2f1d","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_time_map/b25a0d86-d4d4-4d08-9598-68d8823e015d.png b/sprites/s_node_time_map/b25a0d86-d4d4-4d08-9598-68d8823e015d.png deleted file mode 100644 index d70ecf74c..000000000 Binary files a/sprites/s_node_time_map/b25a0d86-d4d4-4d08-9598-68d8823e015d.png and /dev/null differ diff --git a/sprites/s_node_time_map/c0f2e09f-624a-422f-916b-084caa45419f.png b/sprites/s_node_time_map/c0f2e09f-624a-422f-916b-084caa45419f.png new file mode 100644 index 000000000..d54fff274 Binary files /dev/null and b/sprites/s_node_time_map/c0f2e09f-624a-422f-916b-084caa45419f.png differ diff --git a/sprites/s_node_time_map/layers/b25a0d86-d4d4-4d08-9598-68d8823e015d/e863e007-5da9-4f30-bc69-3f618ead06c2.png b/sprites/s_node_time_map/layers/b25a0d86-d4d4-4d08-9598-68d8823e015d/e863e007-5da9-4f30-bc69-3f618ead06c2.png deleted file mode 100644 index d70ecf74c..000000000 Binary files a/sprites/s_node_time_map/layers/b25a0d86-d4d4-4d08-9598-68d8823e015d/e863e007-5da9-4f30-bc69-3f618ead06c2.png and /dev/null differ diff --git a/sprites/s_node_time_map/layers/c0f2e09f-624a-422f-916b-084caa45419f/45e1cc77-407c-401b-bdd3-e2175933c30b.png b/sprites/s_node_time_map/layers/c0f2e09f-624a-422f-916b-084caa45419f/45e1cc77-407c-401b-bdd3-e2175933c30b.png new file mode 100644 index 000000000..a9bcaef91 Binary files /dev/null and b/sprites/s_node_time_map/layers/c0f2e09f-624a-422f-916b-084caa45419f/45e1cc77-407c-401b-bdd3-e2175933c30b.png differ diff --git a/sprites/s_node_time_map/s_node_time_map.yy b/sprites/s_node_time_map/s_node_time_map.yy index 1d68f1906..fa1595f60 100644 --- a/sprites/s_node_time_map/s_node_time_map.yy +++ b/sprites/s_node_time_map/s_node_time_map.yy @@ -7,9 +7,9 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 26, - "bbox_top": 2, + "bbox_left": 4, + "bbox_right": 27, + "bbox_top": 1, "bbox_bottom": 30, "HTile": false, "VTile": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b25a0d86-d4d4-4d08-9598-68d8823e015d","path":"sprites/s_node_time_map/s_node_time_map.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b25a0d86-d4d4-4d08-9598-68d8823e015d","path":"sprites/s_node_time_map/s_node_time_map.yy",},"LayerId":{"name":"e863e007-5da9-4f30-bc69-3f618ead06c2","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","name":"b25a0d86-d4d4-4d08-9598-68d8823e015d","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"c0f2e09f-624a-422f-916b-084caa45419f","path":"sprites/s_node_time_map/s_node_time_map.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"c0f2e09f-624a-422f-916b-084caa45419f","path":"sprites/s_node_time_map/s_node_time_map.yy",},"LayerId":{"name":"45e1cc77-407c-401b-bdd3-e2175933c30b","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","name":"c0f2e09f-624a-422f-916b-084caa45419f","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6ad8bb62-3173-46e7-b573-4a08ce37aeee","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b25a0d86-d4d4-4d08-9598-68d8823e015d","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0d0e387d-89ea-4788-87f0-3751f679878f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c0f2e09f-624a-422f-916b-084caa45419f","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e863e007-5da9-4f30-bc69-3f618ead06c2","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"45e1cc77-407c-401b-bdd3-e2175933c30b","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_timeline_preview/1822b5aa-1a9e-4856-ac5d-091254dbcb80.png b/sprites/s_node_timeline_preview/1822b5aa-1a9e-4856-ac5d-091254dbcb80.png deleted file mode 100644 index 9df1d67f7..000000000 Binary files a/sprites/s_node_timeline_preview/1822b5aa-1a9e-4856-ac5d-091254dbcb80.png and /dev/null differ diff --git a/sprites/s_node_timeline_preview/dca7e04f-2a49-48a1-8b0b-815634b9b2d2.png b/sprites/s_node_timeline_preview/dca7e04f-2a49-48a1-8b0b-815634b9b2d2.png new file mode 100644 index 000000000..a94da3e38 Binary files /dev/null and b/sprites/s_node_timeline_preview/dca7e04f-2a49-48a1-8b0b-815634b9b2d2.png differ diff --git a/sprites/s_node_timeline_preview/layers/1822b5aa-1a9e-4856-ac5d-091254dbcb80/9d4734fe-da0e-43e3-b8aa-f7037fa744c8.png b/sprites/s_node_timeline_preview/layers/1822b5aa-1a9e-4856-ac5d-091254dbcb80/9d4734fe-da0e-43e3-b8aa-f7037fa744c8.png deleted file mode 100644 index 9df1d67f7..000000000 Binary files a/sprites/s_node_timeline_preview/layers/1822b5aa-1a9e-4856-ac5d-091254dbcb80/9d4734fe-da0e-43e3-b8aa-f7037fa744c8.png and /dev/null differ diff --git a/sprites/s_node_timeline_preview/layers/dca7e04f-2a49-48a1-8b0b-815634b9b2d2/3a088e27-139e-4235-9531-e674281ac1d8.png b/sprites/s_node_timeline_preview/layers/dca7e04f-2a49-48a1-8b0b-815634b9b2d2/3a088e27-139e-4235-9531-e674281ac1d8.png new file mode 100644 index 000000000..34c556fa5 Binary files /dev/null and b/sprites/s_node_timeline_preview/layers/dca7e04f-2a49-48a1-8b0b-815634b9b2d2/3a088e27-139e-4235-9531-e674281ac1d8.png differ diff --git a/sprites/s_node_timeline_preview/s_node_timeline_preview.yy b/sprites/s_node_timeline_preview/s_node_timeline_preview.yy index 16de33cfa..05464e644 100644 --- a/sprites/s_node_timeline_preview/s_node_timeline_preview.yy +++ b/sprites/s_node_timeline_preview/s_node_timeline_preview.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 8, - "bbox_bottom": 21, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 5, + "bbox_bottom": 26, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"1822b5aa-1a9e-4856-ac5d-091254dbcb80","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"1822b5aa-1a9e-4856-ac5d-091254dbcb80","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"LayerId":{"name":"9d4734fe-da0e-43e3-b8aa-f7037fa744c8","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","name":"1822b5aa-1a9e-4856-ac5d-091254dbcb80","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"dca7e04f-2a49-48a1-8b0b-815634b9b2d2","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"dca7e04f-2a49-48a1-8b0b-815634b9b2d2","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"LayerId":{"name":"3a088e27-139e-4235-9531-e674281ac1d8","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","name":"dca7e04f-2a49-48a1-8b0b-815634b9b2d2","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"66642bd4-3d58-456c-b84c-648d8e12d038","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1822b5aa-1a9e-4856-ac5d-091254dbcb80","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c4b648a4-b298-4c9e-90da-9390d83d9361","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dca7e04f-2a49-48a1-8b0b-815634b9b2d2","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9d4734fe-da0e-43e3-b8aa-f7037fa744c8","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3a088e27-139e-4235-9531-e674281ac1d8","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_trail/2ed86cb7-ca15-4d5f-a69e-8d601edca6c4.png b/sprites/s_node_trail/2ed86cb7-ca15-4d5f-a69e-8d601edca6c4.png deleted file mode 100644 index bd4b698df..000000000 Binary files a/sprites/s_node_trail/2ed86cb7-ca15-4d5f-a69e-8d601edca6c4.png and /dev/null differ diff --git a/sprites/s_node_trail/45a5d3c3-2803-4343-b9c1-40a94369df93.png b/sprites/s_node_trail/45a5d3c3-2803-4343-b9c1-40a94369df93.png new file mode 100644 index 000000000..51d2574ad Binary files /dev/null and b/sprites/s_node_trail/45a5d3c3-2803-4343-b9c1-40a94369df93.png differ diff --git a/sprites/s_node_trail/layers/2ed86cb7-ca15-4d5f-a69e-8d601edca6c4/715d1b8a-1f10-4696-8fd3-29724887a269.png b/sprites/s_node_trail/layers/2ed86cb7-ca15-4d5f-a69e-8d601edca6c4/715d1b8a-1f10-4696-8fd3-29724887a269.png deleted file mode 100644 index bd4b698df..000000000 Binary files a/sprites/s_node_trail/layers/2ed86cb7-ca15-4d5f-a69e-8d601edca6c4/715d1b8a-1f10-4696-8fd3-29724887a269.png and /dev/null differ diff --git a/sprites/s_node_trail/layers/45a5d3c3-2803-4343-b9c1-40a94369df93/4c5039d6-d355-4f39-9feb-80417948d4c6.png b/sprites/s_node_trail/layers/45a5d3c3-2803-4343-b9c1-40a94369df93/4c5039d6-d355-4f39-9feb-80417948d4c6.png new file mode 100644 index 000000000..2dab93e2f Binary files /dev/null and b/sprites/s_node_trail/layers/45a5d3c3-2803-4343-b9c1-40a94369df93/4c5039d6-d355-4f39-9feb-80417948d4c6.png differ diff --git a/sprites/s_node_trail/s_node_trail.yy b/sprites/s_node_trail/s_node_trail.yy index 28d0ab4c5..70c986b30 100644 --- a/sprites/s_node_trail/s_node_trail.yy +++ b/sprites/s_node_trail/s_node_trail.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"2ed86cb7-ca15-4d5f-a69e-8d601edca6c4","path":"sprites/s_node_trail/s_node_trail.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2ed86cb7-ca15-4d5f-a69e-8d601edca6c4","path":"sprites/s_node_trail/s_node_trail.yy",},"LayerId":{"name":"715d1b8a-1f10-4696-8fd3-29724887a269","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","name":"2ed86cb7-ca15-4d5f-a69e-8d601edca6c4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"45a5d3c3-2803-4343-b9c1-40a94369df93","path":"sprites/s_node_trail/s_node_trail.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"45a5d3c3-2803-4343-b9c1-40a94369df93","path":"sprites/s_node_trail/s_node_trail.yy",},"LayerId":{"name":"4c5039d6-d355-4f39-9feb-80417948d4c6","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","name":"45a5d3c3-2803-4343-b9c1-40a94369df93","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"442ba6ec-cf00-4e4f-893b-8775a3d5d898","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2ed86cb7-ca15-4d5f-a69e-8d601edca6c4","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4ea28c0a-a39a-405b-873e-c1a7763e8250","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"45a5d3c3-2803-4343-b9c1-40a94369df93","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"715d1b8a-1f10-4696-8fd3-29724887a269","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4c5039d6-d355-4f39-9feb-80417948d4c6","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_transform/27f09a9f-1c54-46f9-95de-05b10585dee8.png b/sprites/s_node_transform/27f09a9f-1c54-46f9-95de-05b10585dee8.png deleted file mode 100644 index 6b9d6c97f..000000000 Binary files a/sprites/s_node_transform/27f09a9f-1c54-46f9-95de-05b10585dee8.png and /dev/null differ diff --git a/sprites/s_node_transform/c325b938-70f6-4e47-bb44-e7e286d52d62.png b/sprites/s_node_transform/c325b938-70f6-4e47-bb44-e7e286d52d62.png new file mode 100644 index 000000000..74edf73d9 Binary files /dev/null and b/sprites/s_node_transform/c325b938-70f6-4e47-bb44-e7e286d52d62.png differ diff --git a/sprites/s_node_transform/layers/27f09a9f-1c54-46f9-95de-05b10585dee8/21461137-3e82-49b2-a907-d84087926964.png b/sprites/s_node_transform/layers/27f09a9f-1c54-46f9-95de-05b10585dee8/21461137-3e82-49b2-a907-d84087926964.png deleted file mode 100644 index 6b9d6c97f..000000000 Binary files a/sprites/s_node_transform/layers/27f09a9f-1c54-46f9-95de-05b10585dee8/21461137-3e82-49b2-a907-d84087926964.png and /dev/null differ diff --git a/sprites/s_node_transform/layers/c325b938-70f6-4e47-bb44-e7e286d52d62/9f1f037f-3fbd-4120-b680-ecce33249548.png b/sprites/s_node_transform/layers/c325b938-70f6-4e47-bb44-e7e286d52d62/9f1f037f-3fbd-4120-b680-ecce33249548.png new file mode 100644 index 000000000..391beafa6 Binary files /dev/null and b/sprites/s_node_transform/layers/c325b938-70f6-4e47-bb44-e7e286d52d62/9f1f037f-3fbd-4120-b680-ecce33249548.png differ diff --git a/sprites/s_node_transform/s_node_transform.yy b/sprites/s_node_transform/s_node_transform.yy index 76e07c2c0..9a2226f47 100644 --- a/sprites/s_node_transform/s_node_transform.yy +++ b/sprites/s_node_transform/s_node_transform.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"27f09a9f-1c54-46f9-95de-05b10585dee8","path":"sprites/s_node_transform/s_node_transform.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"27f09a9f-1c54-46f9-95de-05b10585dee8","path":"sprites/s_node_transform/s_node_transform.yy",},"LayerId":{"name":"21461137-3e82-49b2-a907-d84087926964","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","name":"27f09a9f-1c54-46f9-95de-05b10585dee8","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"c325b938-70f6-4e47-bb44-e7e286d52d62","path":"sprites/s_node_transform/s_node_transform.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"c325b938-70f6-4e47-bb44-e7e286d52d62","path":"sprites/s_node_transform/s_node_transform.yy",},"LayerId":{"name":"9f1f037f-3fbd-4120-b680-ecce33249548","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","name":"c325b938-70f6-4e47-bb44-e7e286d52d62","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fd0c7729-a4ae-4263-870e-b21b10a9b65e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"27f09a9f-1c54-46f9-95de-05b10585dee8","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4a6947e2-9513-4b48-884b-153dcb508bd3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c325b938-70f6-4e47-bb44-e7e286d52d62","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"21461137-3e82-49b2-a907-d84087926964","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9f1f037f-3fbd-4120-b680-ecce33249548","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_transform_single/bb3ee968-e107-4804-95e2-d478a3e71bc1.png b/sprites/s_node_transform_single/bb3ee968-e107-4804-95e2-d478a3e71bc1.png deleted file mode 100644 index f9e3255ce..000000000 Binary files a/sprites/s_node_transform_single/bb3ee968-e107-4804-95e2-d478a3e71bc1.png and /dev/null differ diff --git a/sprites/s_node_transform_single/layers/bb3ee968-e107-4804-95e2-d478a3e71bc1/4e8687ef-467c-459b-8525-7b8a1eba4f7f.png b/sprites/s_node_transform_single/layers/bb3ee968-e107-4804-95e2-d478a3e71bc1/4e8687ef-467c-459b-8525-7b8a1eba4f7f.png deleted file mode 100644 index f9e3255ce..000000000 Binary files a/sprites/s_node_transform_single/layers/bb3ee968-e107-4804-95e2-d478a3e71bc1/4e8687ef-467c-459b-8525-7b8a1eba4f7f.png and /dev/null differ diff --git a/sprites/s_node_transform_single/s_node_transform_single.yy b/sprites/s_node_transform_single/s_node_transform_single.yy deleted file mode 100644 index c4ceeea04..000000000 --- a/sprites/s_node_transform_single/s_node_transform_single.yy +++ /dev/null @@ -1,79 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 4, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 29, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"bb3ee968-e107-4804-95e2-d478a3e71bc1","path":"sprites/s_node_transform_single/s_node_transform_single.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"bb3ee968-e107-4804-95e2-d478a3e71bc1","path":"sprites/s_node_transform_single/s_node_transform_single.yy",},"LayerId":{"name":"4e8687ef-467c-459b-8525-7b8a1eba4f7f","path":"sprites/s_node_transform_single/s_node_transform_single.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_transform_single","path":"sprites/s_node_transform_single/s_node_transform_single.yy",},"resourceVersion":"1.0","name":"bb3ee968-e107-4804-95e2-d478a3e71bc1","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_node_transform_single","path":"sprites/s_node_transform_single/s_node_transform_single.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d8648e80-592d-4c6e-8e9c-f12fae4a2065","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bb3ee968-e107-4804-95e2-d478a3e71bc1","path":"sprites/s_node_transform_single/s_node_transform_single.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, - ], - "visibleRange": {"x":0.0,"y":0.0,}, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_node_transform_single","path":"sprites/s_node_transform_single/s_node_transform_single.yy",}, - "resourceVersion": "1.3", - "name": "s_node_transform_single", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4e8687ef-467c-459b-8525-7b8a1eba4f7f","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "icons", - "path": "folders/nodes/icons.yy", - }, - "resourceVersion": "1.0", - "name": "s_node_transform_single", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/sprites/s_node_twirl/0488c8b8-e1cc-46e5-9f4b-b095b3e10642.png b/sprites/s_node_twirl/0488c8b8-e1cc-46e5-9f4b-b095b3e10642.png new file mode 100644 index 000000000..bf588dc9a Binary files /dev/null and b/sprites/s_node_twirl/0488c8b8-e1cc-46e5-9f4b-b095b3e10642.png differ diff --git a/sprites/s_node_twirl/2cd544b2-6735-425b-af9f-a3230585345d.png b/sprites/s_node_twirl/2cd544b2-6735-425b-af9f-a3230585345d.png deleted file mode 100644 index 7cbe945bd..000000000 Binary files a/sprites/s_node_twirl/2cd544b2-6735-425b-af9f-a3230585345d.png and /dev/null differ diff --git a/sprites/s_node_twirl/layers/0488c8b8-e1cc-46e5-9f4b-b095b3e10642/0bdf70c2-1856-4ec5-954d-585aece4418f.png b/sprites/s_node_twirl/layers/0488c8b8-e1cc-46e5-9f4b-b095b3e10642/0bdf70c2-1856-4ec5-954d-585aece4418f.png new file mode 100644 index 000000000..9cf16dc6a Binary files /dev/null and b/sprites/s_node_twirl/layers/0488c8b8-e1cc-46e5-9f4b-b095b3e10642/0bdf70c2-1856-4ec5-954d-585aece4418f.png differ diff --git a/sprites/s_node_twirl/layers/2cd544b2-6735-425b-af9f-a3230585345d/361c3512-8111-47da-a5ab-a53e5b3f515e.png b/sprites/s_node_twirl/layers/2cd544b2-6735-425b-af9f-a3230585345d/361c3512-8111-47da-a5ab-a53e5b3f515e.png deleted file mode 100644 index 7cbe945bd..000000000 Binary files a/sprites/s_node_twirl/layers/2cd544b2-6735-425b-af9f-a3230585345d/361c3512-8111-47da-a5ab-a53e5b3f515e.png and /dev/null differ diff --git a/sprites/s_node_twirl/s_node_twirl.yy b/sprites/s_node_twirl/s_node_twirl.yy index a70932389..9373c733e 100644 --- a/sprites/s_node_twirl/s_node_twirl.yy +++ b/sprites/s_node_twirl/s_node_twirl.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"2cd544b2-6735-425b-af9f-a3230585345d","path":"sprites/s_node_twirl/s_node_twirl.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2cd544b2-6735-425b-af9f-a3230585345d","path":"sprites/s_node_twirl/s_node_twirl.yy",},"LayerId":{"name":"361c3512-8111-47da-a5ab-a53e5b3f515e","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","name":"2cd544b2-6735-425b-af9f-a3230585345d","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0488c8b8-e1cc-46e5-9f4b-b095b3e10642","path":"sprites/s_node_twirl/s_node_twirl.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0488c8b8-e1cc-46e5-9f4b-b095b3e10642","path":"sprites/s_node_twirl/s_node_twirl.yy",},"LayerId":{"name":"0bdf70c2-1856-4ec5-954d-585aece4418f","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","name":"0488c8b8-e1cc-46e5-9f4b-b095b3e10642","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d2da649e-1c10-4f8b-9168-a70be19c6229","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2cd544b2-6735-425b-af9f-a3230585345d","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c30b539f-0d64-4b72-a3ff-22a5077d63c0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0488c8b8-e1cc-46e5-9f4b-b095b3e10642","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"361c3512-8111-47da-a5ab-a53e5b3f515e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0bdf70c2-1856-4ec5-954d-585aece4418f","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_unicode/15177910-cdd9-4de9-bcbf-9f3d52c79d91.png b/sprites/s_node_unicode/15177910-cdd9-4de9-bcbf-9f3d52c79d91.png new file mode 100644 index 000000000..32eb87a90 Binary files /dev/null and b/sprites/s_node_unicode/15177910-cdd9-4de9-bcbf-9f3d52c79d91.png differ diff --git a/sprites/s_node_unicode/3787408d-a630-4b6f-8e6d-3a3b9edbeb3e.png b/sprites/s_node_unicode/3787408d-a630-4b6f-8e6d-3a3b9edbeb3e.png deleted file mode 100644 index 94cce4e9f..000000000 Binary files a/sprites/s_node_unicode/3787408d-a630-4b6f-8e6d-3a3b9edbeb3e.png and /dev/null differ diff --git a/sprites/s_node_unicode/layers/15177910-cdd9-4de9-bcbf-9f3d52c79d91/568ab5b3-b6df-4ec5-b376-9ca9450418f9.png b/sprites/s_node_unicode/layers/15177910-cdd9-4de9-bcbf-9f3d52c79d91/568ab5b3-b6df-4ec5-b376-9ca9450418f9.png new file mode 100644 index 000000000..ff864edbd Binary files /dev/null and b/sprites/s_node_unicode/layers/15177910-cdd9-4de9-bcbf-9f3d52c79d91/568ab5b3-b6df-4ec5-b376-9ca9450418f9.png differ diff --git a/sprites/s_node_unicode/layers/3787408d-a630-4b6f-8e6d-3a3b9edbeb3e/741aaefa-82f0-42ed-9461-3185b4f496db.png b/sprites/s_node_unicode/layers/3787408d-a630-4b6f-8e6d-3a3b9edbeb3e/741aaefa-82f0-42ed-9461-3185b4f496db.png deleted file mode 100644 index 94cce4e9f..000000000 Binary files a/sprites/s_node_unicode/layers/3787408d-a630-4b6f-8e6d-3a3b9edbeb3e/741aaefa-82f0-42ed-9461-3185b4f496db.png and /dev/null differ diff --git a/sprites/s_node_unicode/s_node_unicode.yy b/sprites/s_node_unicode/s_node_unicode.yy index 1c5c68203..901795820 100644 --- a/sprites/s_node_unicode/s_node_unicode.yy +++ b/sprites/s_node_unicode/s_node_unicode.yy @@ -9,8 +9,8 @@ "swfPrecision": 2.525, "bbox_left": 3, "bbox_right": 28, - "bbox_top": 7, - "bbox_bottom": 25, + "bbox_top": 9, + "bbox_bottom": 22, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"3787408d-a630-4b6f-8e6d-3a3b9edbeb3e","path":"sprites/s_node_unicode/s_node_unicode.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3787408d-a630-4b6f-8e6d-3a3b9edbeb3e","path":"sprites/s_node_unicode/s_node_unicode.yy",},"LayerId":{"name":"741aaefa-82f0-42ed-9461-3185b4f496db","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","name":"3787408d-a630-4b6f-8e6d-3a3b9edbeb3e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"15177910-cdd9-4de9-bcbf-9f3d52c79d91","path":"sprites/s_node_unicode/s_node_unicode.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"15177910-cdd9-4de9-bcbf-9f3d52c79d91","path":"sprites/s_node_unicode/s_node_unicode.yy",},"LayerId":{"name":"568ab5b3-b6df-4ec5-b376-9ca9450418f9","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","name":"15177910-cdd9-4de9-bcbf-9f3d52c79d91","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9c2a0ac6-97ea-4e35-8441-f1d4235279fa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3787408d-a630-4b6f-8e6d-3a3b9edbeb3e","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f1df76aa-a366-4201-bacb-48364b017ade","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"15177910-cdd9-4de9-bcbf-9f3d52c79d91","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"741aaefa-82f0-42ed-9461-3185b4f496db","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"568ab5b3-b6df-4ec5-b376-9ca9450418f9","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec2/1f1e1480-54cb-4661-bc14-175787559561.png b/sprites/s_node_vec2/1f1e1480-54cb-4661-bc14-175787559561.png deleted file mode 100644 index fd8b34a2a..000000000 Binary files a/sprites/s_node_vec2/1f1e1480-54cb-4661-bc14-175787559561.png and /dev/null differ diff --git a/sprites/s_node_vec2/f5ada959-254a-4f50-8f09-78ad9a00af3e.png b/sprites/s_node_vec2/f5ada959-254a-4f50-8f09-78ad9a00af3e.png new file mode 100644 index 000000000..27f610115 Binary files /dev/null and b/sprites/s_node_vec2/f5ada959-254a-4f50-8f09-78ad9a00af3e.png differ diff --git a/sprites/s_node_vec2/layers/1f1e1480-54cb-4661-bc14-175787559561/01aa95f3-c7de-4980-b2b6-890c6643065a.png b/sprites/s_node_vec2/layers/1f1e1480-54cb-4661-bc14-175787559561/01aa95f3-c7de-4980-b2b6-890c6643065a.png deleted file mode 100644 index fd8b34a2a..000000000 Binary files a/sprites/s_node_vec2/layers/1f1e1480-54cb-4661-bc14-175787559561/01aa95f3-c7de-4980-b2b6-890c6643065a.png and /dev/null differ diff --git a/sprites/s_node_vec2/layers/f5ada959-254a-4f50-8f09-78ad9a00af3e/1e0d3c98-b63a-49af-b03d-65f4746769f0.png b/sprites/s_node_vec2/layers/f5ada959-254a-4f50-8f09-78ad9a00af3e/1e0d3c98-b63a-49af-b03d-65f4746769f0.png new file mode 100644 index 000000000..d200b1e37 Binary files /dev/null and b/sprites/s_node_vec2/layers/f5ada959-254a-4f50-8f09-78ad9a00af3e/1e0d3c98-b63a-49af-b03d-65f4746769f0.png differ diff --git a/sprites/s_node_vec2/s_node_vec2.yy b/sprites/s_node_vec2/s_node_vec2.yy index dc6ed7e60..f9a8c888e 100644 --- a/sprites/s_node_vec2/s_node_vec2.yy +++ b/sprites/s_node_vec2/s_node_vec2.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 27, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 1, + "bbox_right": 29, + "bbox_top": 11, + "bbox_bottom": 20, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"1f1e1480-54cb-4661-bc14-175787559561","path":"sprites/s_node_vec2/s_node_vec2.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"1f1e1480-54cb-4661-bc14-175787559561","path":"sprites/s_node_vec2/s_node_vec2.yy",},"LayerId":{"name":"01aa95f3-c7de-4980-b2b6-890c6643065a","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","name":"1f1e1480-54cb-4661-bc14-175787559561","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"f5ada959-254a-4f50-8f09-78ad9a00af3e","path":"sprites/s_node_vec2/s_node_vec2.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"f5ada959-254a-4f50-8f09-78ad9a00af3e","path":"sprites/s_node_vec2/s_node_vec2.yy",},"LayerId":{"name":"1e0d3c98-b63a-49af-b03d-65f4746769f0","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","name":"f5ada959-254a-4f50-8f09-78ad9a00af3e","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5373a256-ab1d-4206-bbdf-1779c58e9c36","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f1e1480-54cb-4661-bc14-175787559561","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"802a1f13-35f5-46bc-b01c-9c9dd7c58d42","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f5ada959-254a-4f50-8f09-78ad9a00af3e","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"01aa95f3-c7de-4980-b2b6-890c6643065a","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1e0d3c98-b63a-49af-b03d-65f4746769f0","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec3/662caf35-c086-4ae0-8fb9-5fdf8f852a38.png b/sprites/s_node_vec3/662caf35-c086-4ae0-8fb9-5fdf8f852a38.png deleted file mode 100644 index 18364b659..000000000 Binary files a/sprites/s_node_vec3/662caf35-c086-4ae0-8fb9-5fdf8f852a38.png and /dev/null differ diff --git a/sprites/s_node_vec3/cdf60f2a-ef52-463f-82e4-651dc79bd0a5.png b/sprites/s_node_vec3/cdf60f2a-ef52-463f-82e4-651dc79bd0a5.png new file mode 100644 index 000000000..fe13cfd62 Binary files /dev/null and b/sprites/s_node_vec3/cdf60f2a-ef52-463f-82e4-651dc79bd0a5.png differ diff --git a/sprites/s_node_vec3/layers/662caf35-c086-4ae0-8fb9-5fdf8f852a38/fd697e88-70d4-4fc4-8ac7-78fa08f3bad0.png b/sprites/s_node_vec3/layers/662caf35-c086-4ae0-8fb9-5fdf8f852a38/fd697e88-70d4-4fc4-8ac7-78fa08f3bad0.png deleted file mode 100644 index 18364b659..000000000 Binary files a/sprites/s_node_vec3/layers/662caf35-c086-4ae0-8fb9-5fdf8f852a38/fd697e88-70d4-4fc4-8ac7-78fa08f3bad0.png and /dev/null differ diff --git a/sprites/s_node_vec3/layers/cdf60f2a-ef52-463f-82e4-651dc79bd0a5/4b0b5db6-f862-4710-86c0-63f65984b0cf.png b/sprites/s_node_vec3/layers/cdf60f2a-ef52-463f-82e4-651dc79bd0a5/4b0b5db6-f862-4710-86c0-63f65984b0cf.png new file mode 100644 index 000000000..2e8818015 Binary files /dev/null and b/sprites/s_node_vec3/layers/cdf60f2a-ef52-463f-82e4-651dc79bd0a5/4b0b5db6-f862-4710-86c0-63f65984b0cf.png differ diff --git a/sprites/s_node_vec3/s_node_vec3.yy b/sprites/s_node_vec3/s_node_vec3.yy index 5028c467d..f90d02bbb 100644 --- a/sprites/s_node_vec3/s_node_vec3.yy +++ b/sprites/s_node_vec3/s_node_vec3.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 27, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_left": 1, + "bbox_right": 29, + "bbox_top": 11, + "bbox_bottom": 20, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"662caf35-c086-4ae0-8fb9-5fdf8f852a38","path":"sprites/s_node_vec3/s_node_vec3.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"662caf35-c086-4ae0-8fb9-5fdf8f852a38","path":"sprites/s_node_vec3/s_node_vec3.yy",},"LayerId":{"name":"fd697e88-70d4-4fc4-8ac7-78fa08f3bad0","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","name":"662caf35-c086-4ae0-8fb9-5fdf8f852a38","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"cdf60f2a-ef52-463f-82e4-651dc79bd0a5","path":"sprites/s_node_vec3/s_node_vec3.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"cdf60f2a-ef52-463f-82e4-651dc79bd0a5","path":"sprites/s_node_vec3/s_node_vec3.yy",},"LayerId":{"name":"4b0b5db6-f862-4710-86c0-63f65984b0cf","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","name":"cdf60f2a-ef52-463f-82e4-651dc79bd0a5","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"28dcf67a-a700-4e6a-bc8a-cf7a5c712fc1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"662caf35-c086-4ae0-8fb9-5fdf8f852a38","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ab1d3db3-5cf6-499c-a12d-b926f884ec82","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cdf60f2a-ef52-463f-82e4-651dc79bd0a5","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fd697e88-70d4-4fc4-8ac7-78fa08f3bad0","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4b0b5db6-f862-4710-86c0-63f65984b0cf","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec4/858afb00-57f3-4587-bd10-cfc7b501ef6c.png b/sprites/s_node_vec4/858afb00-57f3-4587-bd10-cfc7b501ef6c.png deleted file mode 100644 index 71fc1b057..000000000 Binary files a/sprites/s_node_vec4/858afb00-57f3-4587-bd10-cfc7b501ef6c.png and /dev/null differ diff --git a/sprites/s_node_vec4/e9442691-ec5c-4d18-9e9e-467d0bcfae20.png b/sprites/s_node_vec4/e9442691-ec5c-4d18-9e9e-467d0bcfae20.png new file mode 100644 index 000000000..429f0cc8d Binary files /dev/null and b/sprites/s_node_vec4/e9442691-ec5c-4d18-9e9e-467d0bcfae20.png differ diff --git a/sprites/s_node_vec4/layers/858afb00-57f3-4587-bd10-cfc7b501ef6c/ca9822e2-308b-49fe-9ba9-973a2c011ac2.png b/sprites/s_node_vec4/layers/858afb00-57f3-4587-bd10-cfc7b501ef6c/ca9822e2-308b-49fe-9ba9-973a2c011ac2.png deleted file mode 100644 index 71fc1b057..000000000 Binary files a/sprites/s_node_vec4/layers/858afb00-57f3-4587-bd10-cfc7b501ef6c/ca9822e2-308b-49fe-9ba9-973a2c011ac2.png and /dev/null differ diff --git a/sprites/s_node_vec4/layers/e9442691-ec5c-4d18-9e9e-467d0bcfae20/1eb5a166-ceae-4e96-af65-0f616989daf8.png b/sprites/s_node_vec4/layers/e9442691-ec5c-4d18-9e9e-467d0bcfae20/1eb5a166-ceae-4e96-af65-0f616989daf8.png new file mode 100644 index 000000000..6d995a32b Binary files /dev/null and b/sprites/s_node_vec4/layers/e9442691-ec5c-4d18-9e9e-467d0bcfae20/1eb5a166-ceae-4e96-af65-0f616989daf8.png differ diff --git a/sprites/s_node_vec4/s_node_vec4.yy b/sprites/s_node_vec4/s_node_vec4.yy index 8963d6019..2724485aa 100644 --- a/sprites/s_node_vec4/s_node_vec4.yy +++ b/sprites/s_node_vec4/s_node_vec4.yy @@ -8,9 +8,9 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_right": 29, + "bbox_top": 11, + "bbox_bottom": 20, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"858afb00-57f3-4587-bd10-cfc7b501ef6c","path":"sprites/s_node_vec4/s_node_vec4.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"858afb00-57f3-4587-bd10-cfc7b501ef6c","path":"sprites/s_node_vec4/s_node_vec4.yy",},"LayerId":{"name":"ca9822e2-308b-49fe-9ba9-973a2c011ac2","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","name":"858afb00-57f3-4587-bd10-cfc7b501ef6c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e9442691-ec5c-4d18-9e9e-467d0bcfae20","path":"sprites/s_node_vec4/s_node_vec4.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e9442691-ec5c-4d18-9e9e-467d0bcfae20","path":"sprites/s_node_vec4/s_node_vec4.yy",},"LayerId":{"name":"1eb5a166-ceae-4e96-af65-0f616989daf8","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","name":"e9442691-ec5c-4d18-9e9e-467d0bcfae20","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f53d2e63-de0f-44f8-a7cf-91ead3ee5671","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"858afb00-57f3-4587-bd10-cfc7b501ef6c","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a93860dc-e557-4f71-892f-4bb966331ec2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e9442691-ec5c-4d18-9e9e-467d0bcfae20","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ca9822e2-308b-49fe-9ba9-973a2c011ac2","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1eb5a166-ceae-4e96-af65-0f616989daf8","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec_split/0f1b8033-3527-4ae9-b844-ceb685010f87.png b/sprites/s_node_vec_split/0f1b8033-3527-4ae9-b844-ceb685010f87.png new file mode 100644 index 000000000..06aac8267 Binary files /dev/null and b/sprites/s_node_vec_split/0f1b8033-3527-4ae9-b844-ceb685010f87.png differ diff --git a/sprites/s_node_vec_split/c9b98691-eec0-4fd2-82a2-54c3ff650b0e.png b/sprites/s_node_vec_split/c9b98691-eec0-4fd2-82a2-54c3ff650b0e.png deleted file mode 100644 index 7e6d63fb8..000000000 Binary files a/sprites/s_node_vec_split/c9b98691-eec0-4fd2-82a2-54c3ff650b0e.png and /dev/null differ diff --git a/sprites/s_node_vec_split/layers/0f1b8033-3527-4ae9-b844-ceb685010f87/3eab51e9-67cc-483d-9334-f4bac8488324.png b/sprites/s_node_vec_split/layers/0f1b8033-3527-4ae9-b844-ceb685010f87/3eab51e9-67cc-483d-9334-f4bac8488324.png new file mode 100644 index 000000000..4adac241d Binary files /dev/null and b/sprites/s_node_vec_split/layers/0f1b8033-3527-4ae9-b844-ceb685010f87/3eab51e9-67cc-483d-9334-f4bac8488324.png differ diff --git a/sprites/s_node_vec_split/layers/c9b98691-eec0-4fd2-82a2-54c3ff650b0e/79527862-c87b-4964-87b9-70e9a0908b00.png b/sprites/s_node_vec_split/layers/c9b98691-eec0-4fd2-82a2-54c3ff650b0e/79527862-c87b-4964-87b9-70e9a0908b00.png deleted file mode 100644 index 7e6d63fb8..000000000 Binary files a/sprites/s_node_vec_split/layers/c9b98691-eec0-4fd2-82a2-54c3ff650b0e/79527862-c87b-4964-87b9-70e9a0908b00.png and /dev/null differ diff --git a/sprites/s_node_vec_split/s_node_vec_split.yy b/sprites/s_node_vec_split/s_node_vec_split.yy index 7a5956c67..16497fdb9 100644 --- a/sprites/s_node_vec_split/s_node_vec_split.yy +++ b/sprites/s_node_vec_split/s_node_vec_split.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"c9b98691-eec0-4fd2-82a2-54c3ff650b0e","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"c9b98691-eec0-4fd2-82a2-54c3ff650b0e","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"LayerId":{"name":"79527862-c87b-4964-87b9-70e9a0908b00","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","name":"c9b98691-eec0-4fd2-82a2-54c3ff650b0e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0f1b8033-3527-4ae9-b844-ceb685010f87","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0f1b8033-3527-4ae9-b844-ceb685010f87","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"LayerId":{"name":"3eab51e9-67cc-483d-9334-f4bac8488324","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","name":"0f1b8033-3527-4ae9-b844-ceb685010f87","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c217c44c-a881-481f-9fa8-cf5a4eb28d75","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c9b98691-eec0-4fd2-82a2-54c3ff650b0e","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"89913ea6-58d7-499b-8309-c6f3e43cd122","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f1b8033-3527-4ae9-b844-ceb685010f87","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"79527862-c87b-4964-87b9-70e9a0908b00","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3eab51e9-67cc-483d-9334-f4bac8488324","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_warp/14a12d3e-dbab-4288-94cc-ba61185355ef.png b/sprites/s_node_warp/14a12d3e-dbab-4288-94cc-ba61185355ef.png deleted file mode 100644 index 0f8738f12..000000000 Binary files a/sprites/s_node_warp/14a12d3e-dbab-4288-94cc-ba61185355ef.png and /dev/null differ diff --git a/sprites/s_node_warp/b2910cd3-fa83-4309-aebd-ee8dbaec5dac.png b/sprites/s_node_warp/b2910cd3-fa83-4309-aebd-ee8dbaec5dac.png new file mode 100644 index 000000000..dcb9e81cb Binary files /dev/null and b/sprites/s_node_warp/b2910cd3-fa83-4309-aebd-ee8dbaec5dac.png differ diff --git a/sprites/s_node_warp/layers/14a12d3e-dbab-4288-94cc-ba61185355ef/a16dc8dd-0f32-4795-a699-33a82d6d10ba.png b/sprites/s_node_warp/layers/14a12d3e-dbab-4288-94cc-ba61185355ef/a16dc8dd-0f32-4795-a699-33a82d6d10ba.png deleted file mode 100644 index 0f8738f12..000000000 Binary files a/sprites/s_node_warp/layers/14a12d3e-dbab-4288-94cc-ba61185355ef/a16dc8dd-0f32-4795-a699-33a82d6d10ba.png and /dev/null differ diff --git a/sprites/s_node_warp/layers/b2910cd3-fa83-4309-aebd-ee8dbaec5dac/af037f39-eef0-4b71-ad54-633641286b09.png b/sprites/s_node_warp/layers/b2910cd3-fa83-4309-aebd-ee8dbaec5dac/af037f39-eef0-4b71-ad54-633641286b09.png new file mode 100644 index 000000000..3f68f760f Binary files /dev/null and b/sprites/s_node_warp/layers/b2910cd3-fa83-4309-aebd-ee8dbaec5dac/af037f39-eef0-4b71-ad54-633641286b09.png differ diff --git a/sprites/s_node_warp/s_node_warp.yy b/sprites/s_node_warp/s_node_warp.yy index dd0a6e6dc..d9671f7b6 100644 --- a/sprites/s_node_warp/s_node_warp.yy +++ b/sprites/s_node_warp/s_node_warp.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 30, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 0, - "bbox_bottom": 30, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"14a12d3e-dbab-4288-94cc-ba61185355ef","path":"sprites/s_node_warp/s_node_warp.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"14a12d3e-dbab-4288-94cc-ba61185355ef","path":"sprites/s_node_warp/s_node_warp.yy",},"LayerId":{"name":"a16dc8dd-0f32-4795-a699-33a82d6d10ba","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","name":"14a12d3e-dbab-4288-94cc-ba61185355ef","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"b2910cd3-fa83-4309-aebd-ee8dbaec5dac","path":"sprites/s_node_warp/s_node_warp.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"b2910cd3-fa83-4309-aebd-ee8dbaec5dac","path":"sprites/s_node_warp/s_node_warp.yy",},"LayerId":{"name":"af037f39-eef0-4b71-ad54-633641286b09","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","name":"b2910cd3-fa83-4309-aebd-ee8dbaec5dac","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d9fef34e-d647-41cf-930e-f2935c96f671","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"14a12d3e-dbab-4288-94cc-ba61185355ef","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1fe8dd50-cd2a-4aa6-a93b-7ecc27da8cc6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b2910cd3-fa83-4309-aebd-ee8dbaec5dac","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a16dc8dd-0f32-4795-a699-33a82d6d10ba","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"af037f39-eef0-4b71-ad54-633641286b09","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_warp_mesh/90218d5a-74f0-4cab-98f7-5e09bfc8d1b3.png b/sprites/s_node_warp_mesh/90218d5a-74f0-4cab-98f7-5e09bfc8d1b3.png deleted file mode 100644 index e080657f4..000000000 Binary files a/sprites/s_node_warp_mesh/90218d5a-74f0-4cab-98f7-5e09bfc8d1b3.png and /dev/null differ diff --git a/sprites/s_node_warp_mesh/e99be139-daee-450d-a721-f6d192e2608c.png b/sprites/s_node_warp_mesh/e99be139-daee-450d-a721-f6d192e2608c.png new file mode 100644 index 000000000..03511d21a Binary files /dev/null and b/sprites/s_node_warp_mesh/e99be139-daee-450d-a721-f6d192e2608c.png differ diff --git a/sprites/s_node_warp_mesh/layers/90218d5a-74f0-4cab-98f7-5e09bfc8d1b3/1cf24f31-10ac-4ff4-9a21-b7e9281f6d05.png b/sprites/s_node_warp_mesh/layers/90218d5a-74f0-4cab-98f7-5e09bfc8d1b3/1cf24f31-10ac-4ff4-9a21-b7e9281f6d05.png deleted file mode 100644 index e080657f4..000000000 Binary files a/sprites/s_node_warp_mesh/layers/90218d5a-74f0-4cab-98f7-5e09bfc8d1b3/1cf24f31-10ac-4ff4-9a21-b7e9281f6d05.png and /dev/null differ diff --git a/sprites/s_node_warp_mesh/layers/e99be139-daee-450d-a721-f6d192e2608c/1176b135-1729-464c-ae73-7e183a09ede3.png b/sprites/s_node_warp_mesh/layers/e99be139-daee-450d-a721-f6d192e2608c/1176b135-1729-464c-ae73-7e183a09ede3.png new file mode 100644 index 000000000..db181bf8f Binary files /dev/null and b/sprites/s_node_warp_mesh/layers/e99be139-daee-450d-a721-f6d192e2608c/1176b135-1729-464c-ae73-7e183a09ede3.png differ diff --git a/sprites/s_node_warp_mesh/s_node_warp_mesh.yy b/sprites/s_node_warp_mesh/s_node_warp_mesh.yy index e45239627..b13161f07 100644 --- a/sprites/s_node_warp_mesh/s_node_warp_mesh.yy +++ b/sprites/s_node_warp_mesh/s_node_warp_mesh.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 30, + "bbox_left": 0, + "bbox_right": 31, "bbox_top": 0, - "bbox_bottom": 30, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"90218d5a-74f0-4cab-98f7-5e09bfc8d1b3","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"90218d5a-74f0-4cab-98f7-5e09bfc8d1b3","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"LayerId":{"name":"1cf24f31-10ac-4ff4-9a21-b7e9281f6d05","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","name":"90218d5a-74f0-4cab-98f7-5e09bfc8d1b3","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"e99be139-daee-450d-a721-f6d192e2608c","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"e99be139-daee-450d-a721-f6d192e2608c","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"LayerId":{"name":"1176b135-1729-464c-ae73-7e183a09ede3","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","name":"e99be139-daee-450d-a721-f6d192e2608c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3accaae0-adb7-40ba-a262-a2fd2fda0059","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"90218d5a-74f0-4cab-98f7-5e09bfc8d1b3","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c3a774c0-a32d-4164-a153-97144550993e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e99be139-daee-450d-a721-f6d192e2608c","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1cf24f31-10ac-4ff4-9a21-b7e9281f6d05","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1176b135-1729-464c-ae73-7e183a09ede3","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_wiggler/7071b853-bffd-442c-9d86-51c5586d6ac2.png b/sprites/s_node_wiggler/7071b853-bffd-442c-9d86-51c5586d6ac2.png new file mode 100644 index 000000000..07558d932 Binary files /dev/null and b/sprites/s_node_wiggler/7071b853-bffd-442c-9d86-51c5586d6ac2.png differ diff --git a/sprites/s_node_wiggler/ad5ef79b-c25d-4be8-9f27-25ead0f6860e.png b/sprites/s_node_wiggler/ad5ef79b-c25d-4be8-9f27-25ead0f6860e.png deleted file mode 100644 index 72cf4b829..000000000 Binary files a/sprites/s_node_wiggler/ad5ef79b-c25d-4be8-9f27-25ead0f6860e.png and /dev/null differ diff --git a/sprites/s_node_wiggler/layers/7071b853-bffd-442c-9d86-51c5586d6ac2/7467b41d-8f82-416c-8902-b5e323f3aae0.png b/sprites/s_node_wiggler/layers/7071b853-bffd-442c-9d86-51c5586d6ac2/7467b41d-8f82-416c-8902-b5e323f3aae0.png new file mode 100644 index 000000000..ee3f43a6c Binary files /dev/null and b/sprites/s_node_wiggler/layers/7071b853-bffd-442c-9d86-51c5586d6ac2/7467b41d-8f82-416c-8902-b5e323f3aae0.png differ diff --git a/sprites/s_node_wiggler/layers/ad5ef79b-c25d-4be8-9f27-25ead0f6860e/d81ab973-fbd7-4a8e-9ca2-7eecd0cbc775.png b/sprites/s_node_wiggler/layers/ad5ef79b-c25d-4be8-9f27-25ead0f6860e/d81ab973-fbd7-4a8e-9ca2-7eecd0cbc775.png deleted file mode 100644 index 72cf4b829..000000000 Binary files a/sprites/s_node_wiggler/layers/ad5ef79b-c25d-4be8-9f27-25ead0f6860e/d81ab973-fbd7-4a8e-9ca2-7eecd0cbc775.png and /dev/null differ diff --git a/sprites/s_node_wiggler/s_node_wiggler.yy b/sprites/s_node_wiggler/s_node_wiggler.yy index cbaf8a4b7..9ff56f0cf 100644 --- a/sprites/s_node_wiggler/s_node_wiggler.yy +++ b/sprites/s_node_wiggler/s_node_wiggler.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 6, - "bbox_bottom": 25, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 2, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ad5ef79b-c25d-4be8-9f27-25ead0f6860e","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ad5ef79b-c25d-4be8-9f27-25ead0f6860e","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"LayerId":{"name":"d81ab973-fbd7-4a8e-9ca2-7eecd0cbc775","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","name":"ad5ef79b-c25d-4be8-9f27-25ead0f6860e","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"7071b853-bffd-442c-9d86-51c5586d6ac2","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"7071b853-bffd-442c-9d86-51c5586d6ac2","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"LayerId":{"name":"7467b41d-8f82-416c-8902-b5e323f3aae0","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","name":"7071b853-bffd-442c-9d86-51c5586d6ac2","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"adffc3ba-cdbe-4bea-a807-227ed74bddc9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ad5ef79b-c25d-4be8-9f27-25ead0f6860e","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d367a1a6-d110-4ffe-ad94-bf8eb3799e8c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7071b853-bffd-442c-9d86-51c5586d6ac2","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d81ab973-fbd7-4a8e-9ca2-7eecd0cbc775","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7467b41d-8f82-416c-8902-b5e323f3aae0","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_zigzag/06bb9bf8-5ef9-4608-9c52-97fdb87c8c25.png b/sprites/s_node_zigzag/06bb9bf8-5ef9-4608-9c52-97fdb87c8c25.png deleted file mode 100644 index 3a0119766..000000000 Binary files a/sprites/s_node_zigzag/06bb9bf8-5ef9-4608-9c52-97fdb87c8c25.png and /dev/null differ diff --git a/sprites/s_node_zigzag/2e011302-938e-4db9-a1de-62bf33fed1d6.png b/sprites/s_node_zigzag/2e011302-938e-4db9-a1de-62bf33fed1d6.png new file mode 100644 index 000000000..7bdd58536 Binary files /dev/null and b/sprites/s_node_zigzag/2e011302-938e-4db9-a1de-62bf33fed1d6.png differ diff --git a/sprites/s_node_zigzag/layers/06bb9bf8-5ef9-4608-9c52-97fdb87c8c25/f2ac6cf8-e6d7-4782-9d11-9535881e63ff.png b/sprites/s_node_zigzag/layers/06bb9bf8-5ef9-4608-9c52-97fdb87c8c25/f2ac6cf8-e6d7-4782-9d11-9535881e63ff.png deleted file mode 100644 index 3a0119766..000000000 Binary files a/sprites/s_node_zigzag/layers/06bb9bf8-5ef9-4608-9c52-97fdb87c8c25/f2ac6cf8-e6d7-4782-9d11-9535881e63ff.png and /dev/null differ diff --git a/sprites/s_node_zigzag/layers/2e011302-938e-4db9-a1de-62bf33fed1d6/0fc48005-bad9-4f8f-836b-96f196c2da36.png b/sprites/s_node_zigzag/layers/2e011302-938e-4db9-a1de-62bf33fed1d6/0fc48005-bad9-4f8f-836b-96f196c2da36.png new file mode 100644 index 000000000..4410c50fd Binary files /dev/null and b/sprites/s_node_zigzag/layers/2e011302-938e-4db9-a1de-62bf33fed1d6/0fc48005-bad9-4f8f-836b-96f196c2da36.png differ diff --git a/sprites/s_node_zigzag/s_node_zigzag.yy b/sprites/s_node_zigzag/s_node_zigzag.yy index 132f25c47..5c0e311dc 100644 --- a/sprites/s_node_zigzag/s_node_zigzag.yy +++ b/sprites/s_node_zigzag/s_node_zigzag.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"06bb9bf8-5ef9-4608-9c52-97fdb87c8c25","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"06bb9bf8-5ef9-4608-9c52-97fdb87c8c25","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"LayerId":{"name":"f2ac6cf8-e6d7-4782-9d11-9535881e63ff","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","name":"06bb9bf8-5ef9-4608-9c52-97fdb87c8c25","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"2e011302-938e-4db9-a1de-62bf33fed1d6","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"2e011302-938e-4db9-a1de-62bf33fed1d6","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"LayerId":{"name":"0fc48005-bad9-4f8f-836b-96f196c2da36","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","name":"2e011302-938e-4db9-a1de-62bf33fed1d6","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"15020e63-cbad-406a-ab41-3a8500c7d57a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"06bb9bf8-5ef9-4608-9c52-97fdb87c8c25","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b0bb18d6-56f8-4897-b91c-5b318dddf8a0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2e011302-938e-4db9-a1de-62bf33fed1d6","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f2ac6cf8-e6d7-4782-9d11-9535881e63ff","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0fc48005-bad9-4f8f-836b-96f196c2da36","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": {