diff --git a/Pixels Composer.yyp b/Pixels Composer.yyp index d79bb70c8..4365d1538 100644 --- a/Pixels Composer.yyp +++ b/Pixels Composer.yyp @@ -3,56 +3,66 @@ "resourceVersion": "1.6", "name": "Pixels Composer", "resources": [ + {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},"order":88,}, {"id":{"name":"panel_function","path":"scripts/panel_function/panel_function.yy",},"order":5,}, {"id":{"name":"node_time_remap","path":"scripts/node_time_remap/node_time_remap.yy",},"order":33,}, {"id":{"name":"sh_perlin","path":"shaders/sh_perlin/sh_perlin.yy",},"order":1,}, - {"id":{"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"order":7,}, - {"id":{"name":"s_node_particle","path":"sprites/s_node_particle/s_node_particle.yy",},"order":77,}, {"id":{"name":"s_ui_panel_active","path":"sprites/s_ui_panel_active/s_ui_panel_active.yy",},"order":0,}, {"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_normal","path":"sprites/s_node_normal/s_node_normal.yy",},"order":19,}, + {"id":{"name":"buffer_surface","path":"scripts/buffer_surface/buffer_surface.yy",},"order":3,}, {"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":"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_blend","path":"sprites/s_node_blend/s_node_blend.yy",},"order":7,}, {"id":{"name":"libdlgmodule","path":"extensions/libdlgmodule/libdlgmodule.yy",},"order":2,}, {"id":{"name":"node_line","path":"scripts/node_line/node_line.yy",},"order":11,}, + {"id":{"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},"order":79,}, {"id":{"name":"s_cursor_path_add","path":"sprites/s_cursor_path_add/s_cursor_path_add.yy",},"order":0,}, + {"id":{"name":"s_noti_icon_log","path":"sprites/s_noti_icon_log/s_noti_icon_log.yy",},"order":7,}, {"id":{"name":"node_2d_light","path":"scripts/node_2d_light/node_2d_light.yy",},"order":40,}, + {"id":{"name":"s_node_color","path":"sprites/s_node_color/s_node_color.yy",},"order":17,}, {"id":{"name":"s_minus_24","path":"sprites/s_minus_24/s_minus_24.yy",},"order":17,}, - {"id":{"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",},"order":28,}, + {"id":{"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"order":69,}, + {"id":{"name":"s_node_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"order":114,}, + {"id":{"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",},"order":45,}, {"id":{"name":"node_dither","path":"scripts/node_dither/node_dither.yy",},"order":11,}, - {"id":{"name":"s_animation_setting","path":"sprites/s_animation_setting/s_animation_setting.yy",},"order":40,}, + {"id":{"name":"s_animation_setting","path":"sprites/s_animation_setting/s_animation_setting.yy",},"order":37,}, {"id":{"name":"sh_perlin_smear","path":"shaders/sh_perlin_smear/sh_perlin_smear.yy",},"order":7,}, - {"id":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},"order":63,}, {"id":{"name":"sh_corner","path":"shaders/sh_corner/sh_corner.yy",},"order":24,}, {"id":{"name":"s_button_path_icon","path":"sprites/s_button_path_icon/s_button_path_icon.yy",},"order":4,}, {"id":{"name":"s_add_24","path":"sprites/s_add_24/s_add_24.yy",},"order":0,}, - {"id":{"name":"s_node_image_copy","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"order":53,}, {"id":{"name":"node_array","path":"scripts/node_array/node_array.yy",},"order":3,}, {"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":1,}, + {"id":{"name":"s_timeline_graph","path":"sprites/s_timeline_graph/s_timeline_graph.yy",},"order":43,}, + {"id":{"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"order":52,}, {"id":{"name":"perlin_noise","path":"scripts/perlin_noise/perlin_noise.yy",},"order":5,}, {"id":{"name":"node_functions","path":"scripts/node_functions/node_functions.yy",},"order":2,}, - {"id":{"name":"s_inspector_area","path":"sprites/s_inspector_area/s_inspector_area.yy",},"order":7,}, - {"id":{"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"order":29,}, - {"id":{"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",},"order":88,}, + {"id":{"name":"s_inspector_area","path":"sprites/s_inspector_area/s_inspector_area.yy",},"order":5,}, {"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":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",},"order":90,}, {"id":{"name":"panel_preview","path":"scripts/panel_preview/panel_preview.yy",},"order":3,}, + {"id":{"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"order":42,}, + {"id":{"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",},"order":49,}, + {"id":{"name":"o_dialog_notifications","path":"objects/o_dialog_notifications/o_dialog_notifications.yy",},"order":28,}, + {"id":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"order":110,}, {"id":{"name":"node_blend","path":"scripts/node_blend/node_blend.yy",},"order":13,}, + {"id":{"name":"s_node_level","path":"sprites/s_node_level/s_node_level.yy",},"order":64,}, {"id":{"name":"s_refresh_16","path":"sprites/s_refresh_16/s_refresh_16.yy",},"order":19,}, - {"id":{"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",},"order":13,}, - {"id":{"name":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",},"order":90,}, {"id":{"name":"node_scatter","path":"scripts/node_scatter/node_scatter.yy",},"order":4,}, - {"id":{"name":"s_prop_keyframe","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"order":4,}, + {"id":{"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",},"order":104,}, + {"id":{"name":"s_prop_keyframe","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"order":2,}, {"id":{"name":"node_image","path":"scripts/node_image/node_image.yy",},"order":0,}, {"id":{"name":"sh_cell_noise","path":"shaders/sh_cell_noise/sh_cell_noise.yy",},"order":0,}, {"id":{"name":"sh_blend_max","path":"shaders/sh_blend_max/sh_blend_max.yy",},"order":8,}, + {"id":{"name":"s_node_color_out","path":"sprites/s_node_color_out/s_node_color_out.yy",},"order":93,}, {"id":{"name":"_3D","path":"scripts/_3D/_3D.yy",},"order":6,}, {"id":{"name":"s_timeline_keyframe_selecting","path":"sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy",},"order":3,}, {"id":{"name":"s_button","path":"sprites/s_button/s_button.yy",},"order":0,}, @@ -63,47 +73,42 @@ {"id":{"name":"colToVec4","path":"scripts/colToVec4/colToVec4.yy",},"order":0,}, {"id":{"name":"draw_surface_blend","path":"scripts/draw_surface_blend/draw_surface_blend.yy",},"order":1,}, {"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_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"order":64,}, - {"id":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"order":8,}, - {"id":{"name":"s_node_group","path":"sprites/s_node_group/s_node_group.yy",},"order":114,}, + {"id":{"name":"s_animate_node_go","path":"sprites/s_animate_node_go/s_animate_node_go.yy",},"order":24,}, {"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_add_32","path":"sprites/s_add_32/s_add_32.yy",},"order":1,}, - {"id":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"order":27,}, {"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":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"order":58,}, - {"id":{"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",},"order":100,}, - {"id":{"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"order":49,}, - {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},"order":34,}, - {"id":{"name":"s_hamburger_16","path":"sprites/s_hamburger_16/s_hamburger_16.yy",},"order":12,}, - {"id":{"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",},"order":15,}, + {"id":{"name":"s_hamburger_16","path":"sprites/s_hamburger_16/s_hamburger_16.yy",},"order":8,}, {"id":{"name":"sh_texture_atlas","path":"shaders/sh_texture_atlas/sh_texture_atlas.yy",},"order":0,}, - {"id":{"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"order":17,}, - {"id":{"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",},"order":73,}, + {"id":{"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",},"order":83,}, {"id":{"name":"icon_24","path":"sprites/icon_24/icon_24.yy",},"order":0,}, {"id":{"name":"sh_polar","path":"shaders/sh_polar/sh_polar.yy",},"order":31,}, + {"id":{"name":"s_node_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"order":22,}, {"id":{"name":"sh_pixel_cloud","path":"shaders/sh_pixel_cloud/sh_pixel_cloud.yy",},"order":13,}, {"id":{"name":"node_iterate","path":"scripts/node_iterate/node_iterate.yy",},"order":1,}, {"id":{"name":"sh_de_stray","path":"shaders/sh_de_stray/sh_de_stray.yy",},"order":17,}, {"id":{"name":"sh_chromatic_aberration","path":"shaders/sh_chromatic_aberration/sh_chromatic_aberration.yy",},"order":36,}, - {"id":{"name":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",},"order":39,}, {"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_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"order":58,}, {"id":{"name":"node_colorize","path":"scripts/node_colorize/node_colorize.yy",},"order":9,}, + {"id":{"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"order":97,}, {"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,}, - {"id":{"name":"s_menu_button","path":"sprites/s_menu_button/s_menu_button.yy",},"order":4,}, + {"id":{"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"order":117,}, + {"id":{"name":"s_node_trail","path":"sprites/s_node_trail/s_node_trail.yy",},"order":31,}, + {"id":{"name":"s_menu_button_mask","path":"sprites/s_menu_button_mask/s_menu_button_mask.yy",},"order":4,}, {"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":"globals","path":"scripts/globals/globals.yy",},"order":1,}, - {"id":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},"order":98,}, + {"id":{"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"order":57,}, {"id":{"name":"s_text_bullet","path":"sprites/s_text_bullet/s_text_bullet.yy",},"order":22,}, {"id":{"name":"s_canvas_tools_ellip","path":"sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy",},"order":1,}, {"id":{"name":"s_animate_clock","path":"sprites/s_animate_clock/s_animate_clock.yy",},"order":2,}, - {"id":{"name":"s_view_mode","path":"sprites/s_view_mode/s_view_mode.yy",},"order":42,}, + {"id":{"name":"s_view_mode","path":"sprites/s_view_mode/s_view_mode.yy",},"order":39,}, + {"id":{"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",},"order":82,}, {"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,}, @@ -111,73 +116,75 @@ {"id":{"name":"panel_inspector","path":"scripts/panel_inspector/panel_inspector.yy",},"order":0,}, {"id":{"name":"s_node_junctions_single","path":"sprites/s_node_junctions_single/s_node_junctions_single.yy",},"order":0,}, {"id":{"name":"node_padding","path":"scripts/node_padding/node_padding.yy",},"order":10,}, + {"id":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"order":50,}, {"id":{"name":"node_noise_grid","path":"scripts/node_noise_grid/node_noise_grid.yy",},"order":12,}, - {"id":{"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"order":69,}, + {"id":{"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",},"order":89,}, + {"id":{"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",},"order":86,}, {"id":{"name":"s_menu_black","path":"sprites/s_menu_black/s_menu_black.yy",},"order":2,}, {"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_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"order":94,}, {"id":{"name":"s_anchor","path":"sprites/s_anchor/s_anchor.yy",},"order":0,}, - {"id":{"name":"s_node_normal","path":"sprites/s_node_normal/s_node_normal.yy",},"order":71,}, {"id":{"name":"s_color_picker_sample","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"order":4,}, {"id":{"name":"rotatorRange","path":"scripts/rotatorRange/rotatorRange.yy",},"order":12,}, - {"id":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"order":74,}, {"id":{"name":"font_loader","path":"scripts/font_loader/font_loader.yy",},"order":8,}, {"id":{"name":"point_rotate","path":"scripts/point_rotate/point_rotate.yy",},"order":1,}, {"id":{"name":"node_displacement","path":"scripts/node_displacement/node_displacement.yy",},"order":8,}, + {"id":{"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",},"order":24,}, {"id":{"name":"s_workspace_0","path":"sprites/s_workspace_0/s_workspace_0.yy",},"order":0,}, {"id":{"name":"buttonGroup","path":"scripts/buttonGroup/buttonGroup.yy",},"order":5,}, + {"id":{"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"order":67,}, {"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_junc_visible","path":"sprites/s_junc_visible/s_junc_visible.yy",},"order":36,}, + {"id":{"name":"s_node_palette","path":"sprites/s_node_palette/s_node_palette.yy",},"order":54,}, + {"id":{"name":"s_junc_visible","path":"sprites/s_junc_visible/s_junc_visible.yy",},"order":33,}, {"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":"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":"curveBox","path":"scripts/curveBox/curveBox.yy",},"order":8,}, + {"id":{"name":"s_node_chromatic_abarration","path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",},"order":1,}, {"id":{"name":"node_blur_directional","path":"scripts/node_blur_directional/node_blur_directional.yy",},"order":26,}, {"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":"s_node_group","path":"sprites/s_node_group/s_node_group.yy",},"order":5,}, {"id":{"name":"o_dialog_splash","path":"objects/o_dialog_splash/o_dialog_splash.yy",},"order":19,}, {"id":{"name":"s_node_pin_bg_active_s","path":"sprites/s_node_pin_bg_active_s/s_node_pin_bg_active_s.yy",},"order":2,}, {"id":{"name":"s_dialog_bg","path":"sprites/s_dialog_bg/s_dialog_bg.yy",},"order":1,}, - {"id":{"name":"s_delete_16","path":"sprites/s_delete_16/s_delete_16.yy",},"order":13,}, + {"id":{"name":"s_delete_16","path":"sprites/s_delete_16/s_delete_16.yy",},"order":9,}, {"id":{"name":"node_gradient","path":"scripts/node_gradient/node_gradient.yy",},"order":1,}, {"id":{"name":"s_node_junctions_single_hover","path":"sprites/s_node_junctions_single_hover/s_node_junctions_single_hover.yy",},"order":3,}, - {"id":{"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",},"order":95,}, {"id":{"name":"textBox","path":"scripts/textBox/textBox.yy",},"order":17,}, {"id":{"name":"node_statistic","path":"scripts/node_statistic/node_statistic.yy",},"order":15,}, {"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":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"order":85,}, {"id":{"name":"sh_blend_normal","path":"shaders/sh_blend_normal/sh_blend_normal.yy",},"order":1,}, {"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":"s_node_shadow","path":"sprites/s_node_shadow/s_node_shadow.yy",},"order":41,}, {"id":{"name":"sh_zigzag","path":"shaders/sh_zigzag/sh_zigzag.yy",},"order":11,}, {"id":{"name":"sh_color_remove","path":"shaders/sh_color_remove/sh_color_remove.yy",},"order":27,}, + {"id":{"name":"s_node_blur","path":"sprites/s_node_blur/s_node_blur.yy",},"order":103,}, {"id":{"name":"textArea","path":"scripts/textArea/textArea.yy",},"order":20,}, + {"id":{"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"order":76,}, + {"id":{"name":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",},"order":25,}, {"id":{"name":"surface_valid","path":"scripts/surface_valid/surface_valid.yy",},"order":3,}, {"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_invert","path":"sprites/s_node_invert/s_node_invert.yy",},"order":65,}, {"id":{"name":"node_array_get","path":"scripts/node_array_get/node_array_get.yy",},"order":14,}, {"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":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"order":43,}, - {"id":{"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",},"order":18,}, {"id":{"name":"sh_twirl","path":"shaders/sh_twirl/sh_twirl.yy",},"order":19,}, + {"id":{"name":"s_node_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"order":40,}, {"id":{"name":"s_checkbox","path":"sprites/s_checkbox/s_checkbox.yy",},"order":11,}, {"id":{"name":"s_button_lime","path":"sprites/s_button_lime/s_button_lime.yy",},"order":1,}, - {"id":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},"order":22,}, - {"id":{"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",},"order":38,}, - {"id":{"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",},"order":75,}, {"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_3d_obj","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"order":4,}, {"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_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"order":93,}, - {"id":{"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",},"order":105,}, {"id":{"name":"s_ui_base_white","path":"sprites/s_ui_base_white/s_ui_base_white.yy",},"order":2,}, {"id":{"name":"node_blur","path":"scripts/node_blur/node_blur.yy",},"order":16,}, - {"id":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"order":25,}, + {"id":{"name":"s_node_loop","path":"sprites/s_node_loop/s_node_loop.yy",},"order":4,}, {"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,}, @@ -187,9 +194,10 @@ {"id":{"name":"checkbox","path":"scripts/checkbox/checkbox.yy",},"order":7,}, {"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_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"order":24,}, {"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_particle","path":"sprites/s_node_particle/s_node_particle.yy",},"order":53,}, {"id":{"name":"s_control_unpin","path":"sprites/s_control_unpin/s_control_unpin.yy",},"order":8,}, + {"id":{"name":"s_node_color_remove","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"order":92,}, {"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":"vertex_function","path":"scripts/vertex_function/vertex_function.yy",},"order":0,}, @@ -198,80 +206,80 @@ {"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_menu_button","path":"sprites/s_menu_button/s_menu_button.yy",},"order":13,}, {"id":{"name":"node_registry","path":"scripts/node_registry/node_registry.yy",},"order":5,}, {"id":{"name":"sh_checkerboard","path":"shaders/sh_checkerboard/sh_checkerboard.yy",},"order":12,}, {"id":{"name":"s_preview_crosshair","path":"sprites/s_preview_crosshair/s_preview_crosshair.yy",},"order":10,}, {"id":{"name":"node_character","path":"scripts/node_character/node_character.yy",},"order":9,}, - {"id":{"name":"s_folder_content_24","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"order":38,}, + {"id":{"name":"s_folder_content_24","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"order":35,}, {"id":{"name":"draw_set_text","path":"scripts/draw_set_text/draw_set_text.yy",},"order":1,}, + {"id":{"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",},"order":108,}, {"id":{"name":"s_button_right","path":"sprites/s_button_right/s_button_right.yy",},"order":6,}, + {"id":{"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",},"order":23,}, {"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_node_line","path":"sprites/s_node_line/s_node_line.yy",},"order":65,}, {"id":{"name":"s_cursor_path_anchor","path":"sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy",},"order":1,}, + {"id":{"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",},"order":30,}, {"id":{"name":"node_canvas","path":"scripts/node_canvas/node_canvas.yy",},"order":6,}, {"id":{"name":"node_chromatic_aberration","path":"scripts/node_chromatic_aberration/node_chromatic_aberration.yy",},"order":45,}, {"id":{"name":"node_pin","path":"scripts/node_pin/node_pin.yy",},"order":2,}, {"id":{"name":"sh_bw","path":"shaders/sh_bw/sh_bw.yy",},"order":1,}, + {"id":{"name":"s_node_stripe","path":"sprites/s_node_stripe/s_node_stripe.yy",},"order":36,}, {"id":{"name":"sh_grey_alpha","path":"shaders/sh_grey_alpha/sh_grey_alpha.yy",},"order":11,}, {"id":{"name":"sh_normal","path":"shaders/sh_normal/sh_normal.yy",},"order":1,}, + {"id":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},"order":33,}, {"id":{"name":"node_crop","path":"scripts/node_crop/node_crop.yy",},"order":8,}, {"id":{"name":"buttonPalette","path":"scripts/buttonPalette/buttonPalette.yy",},"order":6,}, - {"id":{"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"order":0,}, + {"id":{"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"order":21,}, {"id":{"name":"sh_edge_detect","path":"shaders/sh_edge_detect/sh_edge_detect.yy",},"order":35,}, - {"id":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"order":99,}, + {"id":{"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",},"order":109,}, {"id":{"name":"type_conversion","path":"scripts/type_conversion/type_conversion.yy",},"order":8,}, {"id":{"name":"node_keyframe","path":"scripts/node_keyframe/node_keyframe.yy",},"order":4,}, - {"id":{"name":"s_node_pixel_cloud","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"order":81,}, + {"id":{"name":"ac_flash","path":"animcurves/ac_flash/ac_flash.yy",},"order":0,}, {"id":{"name":"o_dialog_drag_folder","path":"objects/o_dialog_drag_folder/o_dialog_drag_folder.yy",},"order":20,}, - {"id":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"order":103,}, + {"id":{"name":"s_node_alpha_cut","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"order":111,}, {"id":{"name":"sh_blend_multiply_alpha","path":"shaders/sh_blend_multiply_alpha/sh_blend_multiply_alpha.yy",},"order":4,}, + {"id":{"name":"draw_sprite_ext_override","path":"scripts/draw_sprite_ext_override/draw_sprite_ext_override.yy",},"order":9,}, {"id":{"name":"node_noise_cell","path":"scripts/node_noise_cell/node_noise_cell.yy",},"order":3,}, {"id":{"name":"s_node_draw_path","path":"sprites/s_node_draw_path/s_node_draw_path.yy",},"order":1,}, + {"id":{"name":"s_noti_icon_error","path":"sprites/s_noti_icon_error/s_noti_icon_error.yy",},"order":6,}, {"id":{"name":"sh_scale2x","path":"shaders/sh_scale2x/sh_scale2x.yy",},"order":32,}, {"id":{"name":"node_vector","path":"scripts/node_vector/node_vector.yy",},"order":2,}, - {"id":{"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.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_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"order":55,}, - {"id":{"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",},"order":80,}, {"id":{"name":"s_text_slider","path":"sprites/s_text_slider/s_text_slider.yy",},"order":23,}, - {"id":{"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",},"order":12,}, {"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_palette","path":"sprites/s_node_palette/s_node_palette.yy",},"order":76,}, + {"id":{"name":"notification_system","path":"scripts/notification_system/notification_system.yy",},"order":7,}, {"id":{"name":"s_cursor_path_move","path":"sprites/s_cursor_path_move/s_cursor_path_move.yy",},"order":2,}, {"id":{"name":"node_color_from_hsv","path":"scripts/node_color_from_hsv/node_color_from_hsv.yy",},"order":6,}, - {"id":{"name":"s_node_blend","path":"sprites/s_node_blend/s_node_blend.yy",},"order":111,}, {"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,}, {"id":{"name":"s_gear_24","path":"sprites/s_gear_24/s_gear_24.yy",},"order":10,}, - {"id":{"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"order":30,}, - {"id":{"name":"s_rotator_bg","path":"sprites/s_rotator_bg/s_rotator_bg.yy",},"order":16,}, - {"id":{"name":"s_node_image_gif","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"order":56,}, + {"id":{"name":"s_rotator_bg","path":"sprites/s_rotator_bg/s_rotator_bg.yy",},"order":10,}, + {"id":{"name":"s_node_image_copy","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"order":0,}, {"id":{"name":"window_command_hook","path":"extensions/window_command_hook/window_command_hook.yy",},"order":6,}, {"id":{"name":"slider","path":"scripts/slider/slider.yy",},"order":15,}, {"id":{"name":"s_canvas_tools_ellip_fill","path":"sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy",},"order":2,}, {"id":{"name":"node_9slice","path":"scripts/node_9slice/node_9slice.yy",},"order":6,}, - {"id":{"name":"s_node_chromatic_abarration","path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",},"order":117,}, {"id":{"name":"node_data","path":"scripts/node_data/node_data.yy",},"order":1,}, {"id":{"name":"node_wiggler","path":"scripts/node_wiggler/node_wiggler.yy",},"order":2,}, - {"id":{"name":"s_node_color","path":"sprites/s_node_color/s_node_color.yy",},"order":23,}, + {"id":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},"order":98,}, + {"id":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"order":72,}, {"id":{"name":"o_dialog_preview_grid","path":"objects/o_dialog_preview_grid/o_dialog_preview_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,}, {"id":{"name":"o_dialog_anim_time_scaler","path":"objects/o_dialog_anim_time_scaler/o_dialog_anim_time_scaler.yy",},"order":17,}, {"id":{"name":"sh_blend_screen_alpha","path":"shaders/sh_blend_screen_alpha/sh_blend_screen_alpha.yy",},"order":6,}, {"id":{"name":"node_color_remove","path":"scripts/node_color_remove/node_color_remove.yy",},"order":38,}, - {"id":{"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"order":3,}, {"id":{"name":"s_panel_active_split","path":"sprites/s_panel_active_split/s_panel_active_split.yy",},"order":2,}, + {"id":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},"order":73,}, {"id":{"name":"node_perlin","path":"scripts/node_perlin/node_perlin.yy",},"order":2,}, - {"id":{"name":"s_node_transform","path":"sprites/s_node_transform/s_node_transform.yy",},"order":101,}, {"id":{"name":"o_dialog_add_multiple_images","path":"objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy",},"order":18,}, {"id":{"name":"assets_data","path":"scripts/assets_data/assets_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":"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":"ds_list","path":"scripts/ds_list/ds_list.yy",},"order":1,}, {"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":"o_dialog_gradient","path":"objects/o_dialog_gradient/o_dialog_gradient.yy",},"order":1,}, @@ -280,21 +288,19 @@ {"id":{"name":"o_dialog_file_name","path":"objects/o_dialog_file_name/o_dialog_file_name.yy",},"order":12,}, {"id":{"name":"panel_animation","path":"scripts/panel_animation/panel_animation.yy",},"order":4,}, {"id":{"name":"sh_gradient","path":"shaders/sh_gradient/sh_gradient.yy",},"order":8,}, + {"id":{"name":"s_node_zigzag","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"order":20,}, {"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":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",},"order":60,}, {"id":{"name":"libfilesystem","path":"extensions/libfilesystem/libfilesystem.yy",},"order":3,}, - {"id":{"name":"s_node_noise_perlin","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"order":70,}, {"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_graph","path":"sprites/s_graph/s_graph.yy",},"order":11,}, + {"id":{"name":"s_node_edge_detect","path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},"order":2,}, {"id":{"name":"node_blur_radial","path":"scripts/node_blur_radial/node_blur_radial.yy",},"order":29,}, {"id":{"name":"s_path_tools_anchor","path":"sprites/s_path_tools_anchor/s_path_tools_anchor.yy",},"order":5,}, - {"id":{"name":"s_node_mirror","path":"sprites/s_node_mirror/s_node_mirror.yy",},"order":67,}, {"id":{"name":"node_bloom","path":"scripts/node_bloom/node_bloom.yy",},"order":15,}, - {"id":{"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",},"order":35,}, - {"id":{"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",},"order":47,}, {"id":{"name":"s_icon_preview_export","path":"sprites/s_icon_preview_export/s_icon_preview_export.yy",},"order":6,}, - {"id":{"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"order":50,}, {"id":{"name":"sh_bevel","path":"shaders/sh_bevel/sh_bevel.yy",},"order":3,}, {"id":{"name":"node_sprite_stack","path":"scripts/node_sprite_stack/node_sprite_stack.yy",},"order":4,}, {"id":{"name":"sh_shape","path":"shaders/sh_shape/sh_shape.yy",},"order":3,}, @@ -302,29 +308,28 @@ {"id":{"name":"node_particle_effector","path":"scripts/node_particle_effector/node_particle_effector.yy",},"order":9,}, {"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_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"order":81,}, {"id":{"name":"s_icon_grid","path":"sprites/s_icon_grid/s_icon_grid.yy",},"order":4,}, {"id":{"name":"node_particle","path":"scripts/node_particle/node_particle.yy",},"order":0,}, {"id":{"name":"s_icon_grid_setting","path":"sprites/s_icon_grid_setting/s_icon_grid_setting.yy",},"order":5,}, {"id":{"name":"level_histogram","path":"scripts/level_histogram/level_histogram.yy",},"order":1,}, - {"id":{"name":"o_dialog_inspector_grid","path":"objects/o_dialog_inspector_grid/o_dialog_inspector_grid.yy",},"order":25,}, - {"id":{"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",},"order":11,}, + {"id":{"name":"o_dialog_graph_grid","path":"objects/o_dialog_graph_grid/o_dialog_graph_grid.yy",},"order":25,}, {"id":{"name":"append_function","path":"scripts/append_function/append_function.yy",},"order":1,}, - {"id":{"name":"s_node_array_get","path":"sprites/s_node_array_get/s_node_array_get.yy",},"order":112,}, {"id":{"name":"s_dialog_active","path":"sprites/s_dialog_active/s_dialog_active.yy",},"order":0,}, {"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,}, {"id":{"name":"node_perlin_smear","path":"scripts/node_perlin_smear/node_perlin_smear.yy",},"order":10,}, - {"id":{"name":"s_node_area","path":"sprites/s_node_area/s_node_area.yy",},"order":9,}, {"id":{"name":"node_alpha_cutoff","path":"scripts/node_alpha_cutoff/node_alpha_cutoff.yy",},"order":37,}, {"id":{"name":"sh_channel_R","path":"shaders/sh_channel_R/sh_channel_R.yy",},"order":12,}, {"id":{"name":"draw_circle_border","path":"scripts/draw_circle_border/draw_circle_border.yy",},"order":3,}, {"id":{"name":"sliderRange","path":"scripts/sliderRange/sliderRange.yy",},"order":16,}, {"id":{"name":"point_rect_overlap","path":"scripts/point_rect_overlap/point_rect_overlap.yy",},"order":2,}, - {"id":{"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",},"order":102,}, + {"id":{"name":"s_node_bevel","path":"sprites/s_node_bevel/s_node_bevel.yy",},"order":105,}, {"id":{"name":"s_icon_accept_32","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"order":15,}, {"id":{"name":"s_timeline_elastic","path":"sprites/s_timeline_elastic/s_timeline_elastic.yy",},"order":6,}, {"id":{"name":"sh_seperate_shape_counter","path":"shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.yy",},"order":1,}, + {"id":{"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"order":37,}, {"id":{"name":"node_timeline_preview","path":"scripts/node_timeline_preview/node_timeline_preview.yy",},"order":2,}, {"id":{"name":"s_node_junction_name_bg","path":"sprites/s_node_junction_name_bg/s_node_junction_name_bg.yy",},"order":19,}, {"id":{"name":"sh_greyscale","path":"shaders/sh_greyscale/sh_greyscale.yy",},"order":6,}, @@ -333,118 +338,113 @@ {"id":{"name":"node_checkerboard","path":"scripts/node_checkerboard/node_checkerboard.yy",},"order":17,}, {"id":{"name":"node_gradient_output","path":"scripts/node_gradient_output/node_gradient_output.yy",},"order":3,}, {"id":{"name":"display_refresh","path":"scripts/display_refresh/display_refresh.yy",},"order":18,}, + {"id":{"name":"s_node_grey_alpha","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"order":75,}, {"id":{"name":"o_dialog_color_selector","path":"objects/o_dialog_color_selector/o_dialog_color_selector.yy",},"order":0,}, {"id":{"name":"s_color_picker_dropper","path":"sprites/s_color_picker_dropper/s_color_picker_dropper.yy",},"order":6,}, {"id":{"name":"sh_bloom_pass1","path":"shaders/sh_bloom_pass1/sh_bloom_pass1.yy",},"order":0,}, {"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_anchor_scale","path":"sprites/s_anchor_scale/s_anchor_scale.yy",},"order":2,}, - {"id":{"name":"s_node_gradient_out","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"order":48,}, - {"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"order":97,}, {"id":{"name":"node_image_sheet","path":"scripts/node_image_sheet/node_image_sheet.yy",},"order":4,}, - {"id":{"name":"s_node_invert","path":"sprites/s_node_invert/s_node_invert.yy",},"order":61,}, {"id":{"name":"s_slider","path":"sprites/s_slider/s_slider.yy",},"order":12,}, {"id":{"name":"sh_posterize_palette","path":"shaders/sh_posterize_palette/sh_posterize_palette.yy",},"order":8,}, - {"id":{"name":"s_node_polar","path":"sprites/s_node_polar/s_node_polar.yy",},"order":82,}, {"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":"s_node_array_get","path":"sprites/s_node_array_get/s_node_array_get.yy",},"order":6,}, + {"id":{"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",},"order":100,}, {"id":{"name":"node_shadow","path":"scripts/node_shadow/node_shadow.yy",},"order":17,}, - {"id":{"name":"s_node_edge_detect","path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},"order":116,}, - {"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_warp_mesh","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"order":109,}, + {"id":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},"order":96,}, + {"id":{"name":"s_group_24","path":"sprites/s_group_24/s_group_24.yy",},"order":27,}, + {"id":{"name":"s_prop_on_end","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"order":3,}, {"id":{"name":"node_simple_shape","path":"scripts/node_simple_shape/node_simple_shape.yy",},"order":5,}, - {"id":{"name":"s_node_math","path":"sprites/s_node_math/s_node_math.yy",},"order":66,}, {"id":{"name":"node_atlas","path":"scripts/node_atlas/node_atlas.yy",},"order":42,}, {"id":{"name":"getGradientData","path":"scripts/getGradientData/getGradientData.yy",},"order":1,}, + {"id":{"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",},"order":99,}, {"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":"s_animation_timing","path":"sprites/s_animation_timing/s_animation_timing.yy",},"order":25,}, {"id":{"name":"s_node_val","path":"sprites/s_node_val/s_node_val.yy",},"order":16,}, - {"id":{"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",},"order":84,}, {"id":{"name":"node_polar","path":"scripts/node_polar/node_polar.yy",},"order":5,}, {"id":{"name":"s_node_bg_mini","path":"sprites/s_node_bg_mini/s_node_bg_mini.yy",},"order":18,}, + {"id":{"name":"s_node_twirl","path":"sprites/s_node_twirl/s_node_twirl.yy",},"order":29,}, {"id":{"name":"s_node_name","path":"sprites/s_node_name/s_node_name.yy",},"order":3,}, - {"id":{"name":"s_node_solid","path":"sprites/s_node_solid/s_node_solid.yy",},"order":92,}, {"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_solid","path":"sprites/s_node_solid/s_node_solid.yy",},"order":39,}, {"id":{"name":"string_hexadecimal","path":"scripts/string_hexadecimal/string_hexadecimal.yy",},"order":1,}, {"id":{"name":"surfaceBox","path":"scripts/surfaceBox/surfaceBox.yy",},"order":22,}, - {"id":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},"order":51,}, - {"id":{"name":"s_sort_24","path":"sprites/s_sort_24/s_sort_24.yy",},"order":33,}, - {"id":{"name":"s_node_dithering","path":"sprites/s_node_dithering/s_node_dithering.yy",},"order":42,}, + {"id":{"name":"s_sort_24","path":"sprites/s_sort_24/s_sort_24.yy",},"order":30,}, + {"id":{"name":"s_node_array_length","path":"sprites/s_node_array_length/s_node_array_length.yy",},"order":107,}, {"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":"s_loop_16","path":"sprites/s_loop_16/s_loop_16.yy",},"order":39,}, + {"id":{"name":"s_loop_16","path":"sprites/s_loop_16/s_loop_16.yy",},"order":36,}, {"id":{"name":"area_function","path":"scripts/area_function/area_function.yy",},"order":2,}, + {"id":{"name":"s_node_statistic","path":"sprites/s_node_statistic/s_node_statistic.yy",},"order":3,}, {"id":{"name":"sh_blend_alpha_addition","path":"shaders/sh_blend_alpha_addition/sh_blend_alpha_addition.yy",},"order":13,}, {"id":{"name":"sh_erode","path":"shaders/sh_erode/sh_erode.yy",},"order":20,}, - {"id":{"name":"s_node_vec4","path":"sprites/s_node_vec4/s_node_vec4.yy",},"order":107,}, {"id":{"name":"node_pixel_cloud","path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",},"order":19,}, {"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":"s_timeline_ease","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"order":5,}, - {"id":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"order":79,}, {"id":{"name":"o_dialog_animation","path":"objects/o_dialog_animation/o_dialog_animation.yy",},"order":9,}, {"id":{"name":"_f_p0b","path":"fonts/_f_p0b/_f_p0b.yy",},"order":5,}, {"id":{"name":"o_dialog_keyframe_curve","path":"objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy",},"order":22,}, {"id":{"name":"s_button_middle","path":"sprites/s_button_middle/s_button_middle.yy",},"order":7,}, + {"id":{"name":"s_node_vec2","path":"sprites/s_node_vec2/s_node_vec2.yy",},"order":26,}, {"id":{"name":"s_node_pin_bg_s","path":"sprites/s_node_pin_bg_s/s_node_pin_bg_s.yy",},"order":3,}, {"id":{"name":"node_twirl","path":"scripts/node_twirl/node_twirl.yy",},"order":30,}, + {"id":{"name":"s_node_decorner","path":"sprites/s_node_decorner/s_node_decorner.yy",},"order":10,}, {"id":{"name":"s_noti_icon_complete","path":"sprites/s_noti_icon_complete/s_noti_icon_complete.yy",},"order":0,}, + {"id":{"name":"s_node_gradient","path":"sprites/s_node_gradient/s_node_gradient.yy",},"order":77,}, + {"id":{"name":"s_node_padding","path":"sprites/s_node_padding/s_node_padding.yy",},"order":55,}, {"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_rotator_knob","path":"sprites/s_rotator_knob/s_rotator_knob.yy",},"order":11,}, {"id":{"name":"panel_collection","path":"scripts/panel_collection/panel_collection.yy",},"order":0,}, {"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":"s_node_error","path":"sprites/s_node_error/s_node_error.yy",},"order":17,}, {"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":"s_node_destray","path":"sprites/s_node_destray/s_node_destray.yy",},"order":9,}, {"id":{"name":"node_color_sampler","path":"scripts/node_color_sampler/node_color_sampler.yy",},"order":1,}, {"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":"s_node_colorize","path":"sprites/s_node_colorize/s_node_colorize.yy",},"order":31,}, - {"id":{"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"order":104,}, {"id":{"name":"sh_seperate_shape_sep","path":"shaders/sh_seperate_shape_sep/sh_seperate_shape_sep.yy",},"order":3,}, + {"id":{"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"order":68,}, {"id":{"name":"s_noti_icon_warning","path":"sprites/s_noti_icon_warning/s_noti_icon_warning.yy",},"order":3,}, - {"id":{"name":"s_node_crop","path":"sprites/s_node_crop/s_node_crop.yy",},"order":36,}, {"id":{"name":"sh_content_sampler","path":"shaders/sh_content_sampler/sh_content_sampler.yy",},"order":34,}, {"id":{"name":"s_menu_white","path":"sprites/s_menu_white/s_menu_white.yy",},"order":1,}, - {"id":{"name":"s_node_bloom","path":"sprites/s_node_bloom/s_node_bloom.yy",},"order":14,}, {"id":{"name":"node_trail","path":"scripts/node_trail/node_trail.yy",},"order":6,}, - {"id":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},"order":6,}, {"id":{"name":"byte_reader","path":"scripts/byte_reader/byte_reader.yy",},"order":0,}, {"id":{"name":"_p_dialog","path":"objects/_p_dialog/_p_dialog.yy",},"order":0,}, - {"id":{"name":"s_node_displace","path":"sprites/s_node_displace/s_node_displace.yy",},"order":41,}, {"id":{"name":"render_data","path":"scripts/render_data/render_data.yy",},"order":2,}, + {"id":{"name":"s_node_blur_directional","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"order":8,}, {"id":{"name":"distance_to_line","path":"scripts/distance_to_line/distance_to_line.yy",},"order":0,}, - {"id":{"name":"s_node_2d_light","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"order":1,}, {"id":{"name":"s_canvas_tools_rect","path":"sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy",},"order":5,}, {"id":{"name":"s_file","path":"sprites/s_file/s_file.yy",},"order":7,}, + {"id":{"name":"s_node_sprite_sheet","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"order":38,}, {"id":{"name":"s_control_edit","path":"sprites/s_control_edit/s_control_edit.yy",},"order":2,}, - {"id":{"name":"s_scroll_box_arrow","path":"sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy",},"order":32,}, + {"id":{"name":"s_node_3d_cube","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"order":116,}, + {"id":{"name":"s_scroll_box_arrow","path":"sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy",},"order":29,}, + {"id":{"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",},"order":46,}, {"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":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},"order":45,}, {"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_shape","path":"sprites/s_node_shape/s_node_shape.yy",},"order":91,}, + {"id":{"name":"s_node_number","path":"sprites/s_node_number/s_node_number.yy",},"order":12,}, {"id":{"name":"gif_reader","path":"scripts/gif_reader/gif_reader.yy",},"order":4,}, - {"id":{"name":"s_circle_16","path":"sprites/s_circle_16/s_circle_16.yy",},"order":43,}, + {"id":{"name":"s_circle_16","path":"sprites/s_circle_16/s_circle_16.yy",},"order":40,}, {"id":{"name":"_f_p3","path":"fonts/_f_p3/_f_p3.yy",},"order":7,}, - {"id":{"name":"s_loading","path":"sprites/s_loading/s_loading.yy",},"order":37,}, - {"id":{"name":"s_node_curve","path":"sprites/s_node_curve/s_node_curve.yy",},"order":37,}, - {"id":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"order":44,}, - {"id":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},"order":96,}, + {"id":{"name":"s_loading","path":"sprites/s_loading/s_loading.yy",},"order":34,}, {"id":{"name":"node_group_input","path":"scripts/node_group_input/node_group_input.yy",},"order":1,}, {"id":{"name":"s_icon_split_view","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"order":3,}, {"id":{"name":"draw_rect_border","path":"scripts/draw_rect_border/draw_rect_border.yy",},"order":6,}, - {"id":{"name":"s_node_particle_effector","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"order":78,}, {"id":{"name":"node_composite","path":"scripts/node_composite/node_composite.yy",},"order":4,}, + {"id":{"name":"s_node_greyscale","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"order":74,}, {"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_control_pin","path":"sprites/s_control_pin/s_control_pin.yy",},"order":7,}, @@ -453,35 +453,41 @@ {"id":{"name":"sh_mirror","path":"shaders/sh_mirror/sh_mirror.yy",},"order":10,}, {"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":"s_inspector_padding","path":"sprites/s_inspector_padding/s_inspector_padding.yy",},"order":6,}, + {"id":{"name":"s_node_atlas","path":"sprites/s_node_atlas/s_node_atlas.yy",},"order":106,}, {"id":{"name":"node_normal","path":"scripts/node_normal/node_normal.yy",},"order":1,}, + {"id":{"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",},"order":78,}, + {"id":{"name":"s_node_condition","path":"sprites/s_node_condition/s_node_condition.yy",},"order":11,}, {"id":{"name":"node_array_length","path":"scripts/node_array_length/node_array_length.yy",},"order":13,}, {"id":{"name":"s_icon_curve_connection","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"order":1,}, {"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":"s_node_vec3","path":"sprites/s_node_vec3/s_node_vec3.yy",},"order":106,}, {"id":{"name":"node_sprite_sheet","path":"scripts/node_sprite_sheet/node_sprite_sheet.yy",},"order":0,}, - {"id":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"order":52,}, {"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":2,}, {"id":{"name":"s_toolbar_shadow","path":"sprites/s_toolbar_shadow/s_toolbar_shadow.yy",},"order":6,}, - {"id":{"name":"s_node_sepearte_shape","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"order":89,}, {"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":"controlPointBox","path":"scripts/controlPointBox/controlPointBox.yy",},"order":21,}, - {"id":{"name":"s_grad_blend","path":"sprites/s_grad_blend/s_grad_blend.yy",},"order":34,}, + {"id":{"name":"s_grad_blend","path":"sprites/s_grad_blend/s_grad_blend.yy",},"order":31,}, {"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":"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,}, - {"id":{"name":"s_padding_link","path":"sprites/s_padding_link/s_padding_link.yy",},"order":31,}, + {"id":{"name":"s_padding_link","path":"sprites/s_padding_link/s_padding_link.yy",},"order":28,}, {"id":{"name":"gradients_function","path":"scripts/gradients_function/gradients_function.yy",},"order":0,}, - {"id":{"name":"s_refresh_24","path":"sprites/s_refresh_24/s_refresh_24.yy",},"order":29,}, + {"id":{"name":"s_node_border","path":"sprites/s_node_border/s_node_border.yy",},"order":101,}, + {"id":{"name":"s_node_pin","path":"sprites/s_node_pin/s_node_pin.yy",},"order":16,}, + {"id":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},"order":112,}, + {"id":{"name":"s_refresh_24","path":"sprites/s_refresh_24/s_refresh_24.yy",},"order":26,}, + {"id":{"name":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"order":102,}, + {"id":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},"order":35,}, + {"id":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"order":94,}, {"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":0,}, + {"id":{"name":"s_timeline_clock","path":"sprites/s_timeline_clock/s_timeline_clock.yy",},"order":42,}, {"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":"node_grid","path":"scripts/node_grid/node_grid.yy",},"order":20,}, @@ -491,32 +497,35 @@ {"id":{"name":"s_icon_reset_when_preview","path":"sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy",},"order":1,}, {"id":{"name":"directory_object","path":"scripts/directory_object/directory_object.yy",},"order":3,}, {"id":{"name":"node_dilate","path":"scripts/node_dilate/node_dilate.yy",},"order":34,}, - {"id":{"name":"s_node_statistic","path":"sprites/s_node_statistic/s_node_statistic.yy",},"order":115,}, {"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":"node_3d_transform","path":"scripts/node_3d_transform/node_3d_transform.yy",},"order":2,}, - {"id":{"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",},"order":40,}, - {"id":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"order":5,}, {"id":{"name":"node_display_text","path":"scripts/node_display_text/node_display_text.yy",},"order":3,}, - {"id":{"name":"s_prop_gradient","path":"sprites/s_prop_gradient/s_prop_gradient.yy",},"order":11,}, + {"id":{"name":"s_prop_gradient","path":"sprites/s_prop_gradient/s_prop_gradient.yy",},"order":7,}, {"id":{"name":"s_kenney","path":"sprites/s_kenney/s_kenney.yy",},"order":0,}, {"id":{"name":"sh_grid_noise","path":"shaders/sh_grid_noise/sh_grid_noise.yy",},"order":8,}, + {"id":{"name":"s_node_line","path":"sprites/s_node_line/s_node_line.yy",},"order":62,}, {"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":"node_counter","path":"scripts/node_counter/node_counter.yy",},"order":1,}, {"id":{"name":"sh_color_picker","path":"shaders/sh_color_picker/sh_color_picker.yy",},"order":3,}, + {"id":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"order":32,}, {"id":{"name":"scrollPane","path":"scripts/scrollPane/scrollPane.yy",},"order":14,}, + {"id":{"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"order":18,}, {"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,}, {"id":{"name":"buttonGradient","path":"scripts/buttonGradient/buttonGradient.yy",},"order":4,}, + {"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"order":34,}, + {"id":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"order":63,}, {"id":{"name":"s_noti_icon_file_save","path":"sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy",},"order":4,}, {"id":{"name":"random_function","path":"scripts/random_function/random_function.yy",},"order":3,}, - {"id":{"name":"s_node_sampler","path":"sprites/s_node_sampler/s_node_sampler.yy",},"order":85,}, - {"id":{"name":"s_circle_12","path":"sprites/s_circle_12/s_circle_12.yy",},"order":44,}, + {"id":{"name":"s_circle_12","path":"sprites/s_circle_12/s_circle_12.yy",},"order":41,}, {"id":{"name":"s_workspace_1","path":"sprites/s_workspace_1/s_workspace_1.yy",},"order":1,}, + {"id":{"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",},"order":66,}, {"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_math","path":"sprites/s_node_math/s_node_math.yy",},"order":61,}, {"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,}, @@ -524,106 +533,107 @@ {"id":{"name":"rectangle_collision","path":"scripts/rectangle_collision/rectangle_collision.yy",},"order":0,}, {"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":2,}, - {"id":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"order":26,}, {"id":{"name":"draw_line_round","path":"scripts/draw_line_round/draw_line_round.yy",},"order":4,}, - {"id":{"name":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",},"order":54,}, {"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_anchor_rotate","path":"sprites/s_anchor_rotate/s_anchor_rotate.yy",},"order":1,}, - {"id":{"name":"s_node_warp","path":"sprites/s_node_warp/s_node_warp.yy",},"order":108,}, {"id":{"name":"s_timeline_obj_halign","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"order":4,}, - {"id":{"name":"s_node_normal_light","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"order":72,}, + {"id":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"order":15,}, {"id":{"name":"sh_remove_black","path":"shaders/sh_remove_black/sh_remove_black.yy",},"order":37,}, {"id":{"name":"path_parser","path":"scripts/path_parser/path_parser.yy",},"order":3,}, + {"id":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"order":28,}, + {"id":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"order":95,}, {"id":{"name":"s_icon_minimap","path":"sprites/s_icon_minimap/s_icon_minimap.yy",},"order":0,}, {"id":{"name":"node_area","path":"scripts/node_area/node_area.yy",},"order":11,}, - {"id":{"name":"s_icon_spalsh_show_on_start","path":"sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy",},"order":12,}, + {"id":{"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",},"order":48,}, + {"id":{"name":"s_icon_splash_show_on_start","path":"sprites/s_icon_splash_show_on_start/s_icon_splash_show_on_start.yy",},"order":12,}, + {"id":{"name":"s_node_counter","path":"sprites/s_node_counter/s_node_counter.yy",},"order":87,}, + {"id":{"name":"s_node_image_sequence_to_anim","path":"sprites/s_node_image_sequence_to_anim/s_node_image_sequence_to_anim.yy",},"order":13,}, + {"id":{"name":"draw_UI_scale","path":"scripts/draw_UI_scale/draw_UI_scale.yy",},"order":8,}, {"id":{"name":"path_function","path":"scripts/path_function/path_function.yy",},"order":4,}, + {"id":{"name":"s_node_RGB","path":"sprites/s_node_RGB/s_node_RGB.yy",},"order":47,}, + {"id":{"name":"s_node_export","path":"sprites/s_node_export/s_node_export.yy",},"order":80,}, {"id":{"name":"node_grey_to_alpha","path":"scripts/node_grey_to_alpha/node_grey_to_alpha.yy",},"order":23,}, {"id":{"name":"sh_blend_add","path":"shaders/sh_blend_add/sh_blend_add.yy",},"order":7,}, - {"id":{"name":"s_fill_16","path":"sprites/s_fill_16/s_fill_16.yy",},"order":35,}, + {"id":{"name":"s_fill_16","path":"sprites/s_fill_16/s_fill_16.yy",},"order":32,}, {"id":{"name":"node_de_stray","path":"scripts/node_de_stray/node_de_stray.yy",},"order":27,}, {"id":{"name":"s_add_node_view","path":"sprites/s_add_node_view/s_add_node_view.yy",},"order":0,}, {"id":{"name":"s_node_pin_bg","path":"sprites/s_node_pin_bg/s_node_pin_bg.yy",},"order":0,}, {"id":{"name":"s_icon_accept_24","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"order":14,}, {"id":{"name":"sh_channel_G","path":"shaders/sh_channel_G/sh_channel_G.yy",},"order":13,}, {"id":{"name":"s_node_pin_bg_active","path":"sprites/s_node_pin_bg_active/s_node_pin_bg_active.yy",},"order":1,}, + {"id":{"name":"s_node_dilate","path":"sprites/s_node_dilate/s_node_dilate.yy",},"order":84,}, {"id":{"name":"node_collection","path":"scripts/node_collection/node_collection.yy",},"order":0,}, - {"id":{"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"order":87,}, {"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":"s_node_blur_contrast","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"order":16,}, {"id":{"name":"node_group_output","path":"scripts/node_group_output/node_group_output.yy",},"order":2,}, + {"id":{"name":"s_node_scatter","path":"sprites/s_node_scatter/s_node_scatter.yy",},"order":43,}, {"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":"s_button_path_not_found_icon","path":"sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy",},"order":41,}, + {"id":{"name":"s_button_path_not_found_icon","path":"sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy",},"order":38,}, {"id":{"name":"button","path":"scripts/button/button.yy",},"order":2,}, {"id":{"name":"sh_blur_gaussian","path":"shaders/sh_blur_gaussian/sh_blur_gaussian.yy",},"order":1,}, + {"id":{"name":"s_node_3d_cylinder","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"order":115,}, + {"id":{"name":"s_node_vec_split","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"order":27,}, {"id":{"name":"paddingBox","path":"scripts/paddingBox/paddingBox.yy",},"order":9,}, {"id":{"name":"_f_p1","path":"fonts/_f_p1/_f_p1.yy",},"order":1,}, {"id":{"name":"s_button_left","path":"sprites/s_button_left/s_button_left.yy",},"order":5,}, {"id":{"name":"curve_bezier_function","path":"scripts/curve_bezier_function/curve_bezier_function.yy",},"order":0,}, + {"id":{"name":"s_node_image_animation","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"order":70,}, {"id":{"name":"draw_line_dashed","path":"scripts/draw_line_dashed/draw_line_dashed.yy",},"order":7,}, - {"id":{"name":"s_node_glow","path":"sprites/s_node_glow/s_node_glow.yy",},"order":46,}, {"id":{"name":"regex","path":"scripts/regex/regex.yy",},"order":0,}, {"id":{"name":"node_invert","path":"scripts/node_invert/node_invert.yy",},"order":41,}, - {"id":{"name":"s_node_condition","path":"sprites/s_node_condition/s_node_condition.yy",},"order":33,}, + {"id":{"name":"s_node_path","path":"sprites/s_node_path/s_node_path.yy",},"order":51,}, {"id":{"name":"s_node_frame_bg_active","path":"sprites/s_node_frame_bg_active/s_node_frame_bg_active.yy",},"order":11,}, {"id":{"name":"node_level","path":"scripts/node_level/node_level.yy",},"order":12,}, - {"id":{"name":"s_node_scale","path":"sprites/s_node_scale/s_node_scale.yy",},"order":86,}, {"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":"s_node_image","path":"sprites/s_node_image/s_node_image.yy",},"order":71,}, {"id":{"name":"node_value_processor","path":"scripts/node_value_processor/node_value_processor.yy",},"order":1,}, - {"id":{"name":"s_node_posterize","path":"sprites/s_node_posterize/s_node_posterize.yy",},"order":83,}, - {"id":{"name":"s_node_compose","path":"sprites/s_node_compose/s_node_compose.yy",},"order":32,}, {"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":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"order":113,}, + {"id":{"name":"s_node_output","path":"sprites/s_node_output/s_node_output.yy",},"order":56,}, {"id":{"name":"sh_atlas","path":"shaders/sh_atlas/sh_atlas.yy",},"order":31,}, {"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":"s_prop_selecting","path":"sprites/s_prop_selecting/s_prop_selecting.yy",},"order":4,}, {"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":1,}, - {"id":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"order":20,}, - {"id":{"name":"s_node_input","path":"sprites/s_node_input/s_node_input.yy",},"order":60,}, + {"id":{"name":"s_node_scale_algo","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"order":44,}, {"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":"s_node_iterator_index","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"order":14,}, {"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":"sh_solid","path":"shaders/sh_solid/sh_solid.yy",},"order":15,}, - {"id":{"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"order":68,}, {"id":{"name":"timer_function","path":"scripts/timer_function/timer_function.yy",},"order":0,}, - {"id":{"name":"s_node_loop","path":"sprites/s_node_loop/s_node_loop.yy",},"order":113,}, + {"id":{"name":"animation_curve","path":"scripts/animation_curve/animation_curve.yy",},"order":19,}, + {"id":{"name":"s_node_color_replace","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"order":91,}, {"id":{"name":"sh_mask","path":"shaders/sh_mask/sh_mask.yy",},"order":36,}, - {"id":{"name":"s_node_image_sequence","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"order":57,}, {"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_iterator_index","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"order":62,}, {"id":{"name":"o_dialog_about","path":"objects/o_dialog_about/o_dialog_about.yy",},"order":13,}, {"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":"execute_shell_simple_ext","path":"extensions/execute_shell_simple_ext/execute_shell_simple_ext.yy",},"order":5,}, {"id":{"name":"node_solid","path":"scripts/node_solid/node_solid.yy",},"order":18,}, - {"id":{"name":"s_node_character","path":"sprites/s_node_character/s_node_character.yy",},"order":21,}, {"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":"o_dialog_assetbox","path":"objects/o_dialog_assetbox/o_dialog_assetbox.yy",},"order":26,}, - {"id":{"name":"s_node_BW","path":"sprites/s_node_BW/s_node_BW.yy",},"order":19,}, - {"id":{"name":"s_node_wiggler","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"order":110,}, - {"id":{"name":"s_node_image_sheet","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"order":59,}, {"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,}, + {"id":{"name":"s_node_noise_aniso","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"order":59,}, {"id":{"name":"sh_perlin_tiled","path":"shaders/sh_perlin_tiled/sh_perlin_tiled.yy",},"order":2,}, {"id":{"name":"sh_time_remap","path":"shaders/sh_time_remap/sh_time_remap.yy",},"order":33,}, - {"id":{"name":"s_node_array","path":"sprites/s_node_array/s_node_array.yy",},"order":10,}, {"id":{"name":"s_icon_center_canvas","path":"sprites/s_icon_center_canvas/s_icon_center_canvas.yy",},"order":0,}, {"id":{"name":"rm_main","path":"rooms/rm_main/rm_main.yy",},"order":0,}, ], @@ -649,6 +659,7 @@ {"roomId":{"name":"rm_main","path":"rooms/rm_main/rm_main.yy",},}, ], "Folders": [ + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"animation_curve","folderPath":"folders/animation_curve.yy","order":14,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"collection","folderPath":"folders/collection.yy","order":12,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dialog","folderPath":"folders/dialog.yy","order":5,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"selector","folderPath":"folders/dialog/selector.yy","order":23,}, @@ -707,6 +718,7 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dialog","folderPath":"folders/sprites/dialog.yy","order":8,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"add node","folderPath":"folders/sprites/dialog/add node.yy","order":5,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"icon","folderPath":"folders/sprites/icon.yy","order":1,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"workspace","folderPath":"folders/sprites/icon/workspace.yy","order":44,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"inspector","folderPath":"folders/sprites/inspector.yy","order":4,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"meta","folderPath":"folders/sprites/meta.yy","order":0,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"nodes","folderPath":"folders/sprites/nodes.yy","order":6,}, @@ -724,7 +736,6 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"tools","folderPath":"folders/sprites/tools.yy","order":10,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"canvas","folderPath":"folders/sprites/tools/canvas.yy","order":3,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"widget","folderPath":"folders/sprites/widget.yy","order":7,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"workspace","folderPath":"folders/sprites/workspace.yy","order":3,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"widgets","folderPath":"folders/widgets.yy","order":6,}, ], "AudioGroups": [ @@ -787,12 +798,6 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"5 Particle and effectors.pxc","CopyToMask":-1,"filePath":"datafiles/Getting started",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"4 Looping operation.pxc","CopyToMask":-1,"filePath":"datafiles/Getting started",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"2 animation.pxc","CopyToMask":-1,"filePath":"datafiles/Getting started",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"5 Particle and effectors.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"2 animation.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1 image import.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"0 introduction.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"3 Group and collection.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"4 Looping operation.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Assets.zip","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Collections.zip","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tile_0126.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, @@ -820,6 +825,12 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Regular.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-SemiBold.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"NotoSans-Thin.ttf","CopyToMask":-1,"filePath":"datafiles/data/fonts",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"5 Particle and effectors.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"2 animation.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"3 Group and collection.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"4 Looping operation.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"0 introduction.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1 image import.png","CopyToMask":-1,"filePath":"datafiles/Getting started",}, ], "MetaData": { "IDEVersion": "2022.9.0.49", diff --git a/animcurves/ac_flash/ac_flash.yy b/animcurves/ac_flash/ac_flash.yy new file mode 100644 index 000000000..16b106166 --- /dev/null +++ b/animcurves/ac_flash/ac_flash.yy @@ -0,0 +1,21 @@ +{ + "resourceType": "GMAnimCurve", + "resourceVersion": "1.2", + "name": "ac_flash", + "function": 1, + "channels": [ + {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"visible":true,"points":[ + {"th0":-0.1,"th1":0.1,"tv0":0.0,"tv1":0.0,"x":0.0,"y":0.0,}, + {"th0":1.0,"th1":-1.0,"tv0":0.0,"tv1":0.0,"x":0.16603054,"y":0.517304,}, + {"th0":-0.054580152,"th1":0.14541985,"tv0":0.0,"tv1":0.0,"x":0.33015275,"y":0.24000001,}, + {"th0":1.0,"th1":-1.0,"tv0":0.0,"tv1":0.0,"x":0.50763357,"y":0.7874107,}, + {"th0":1.0,"th1":-1.0,"tv0":0.0,"tv1":0.0,"x":0.66412216,"y":0.24862753,}, + {"th0":1.0,"th1":-1.0,"tv0":0.0,"tv1":0.0,"x":0.86641234,"y":0.92553616,}, + {"th0":-0.1,"th1":0.1,"tv0":0.0,"tv1":0.0,"x":1.0,"y":1.0,}, + ],}, + ], + "parent": { + "name": "animation_curve", + "path": "folders/animation_curve.yy", + }, +} \ No newline at end of file diff --git a/datafiles/Getting started/0 introduction.png b/datafiles/Getting started/0 introduction.png index 005c06618..d8985771d 100644 Binary files a/datafiles/Getting started/0 introduction.png and b/datafiles/Getting started/0 introduction.png differ diff --git a/datafiles/Getting started/1 image import.png b/datafiles/Getting started/1 image import.png index 07084336d..f15171dad 100644 Binary files a/datafiles/Getting started/1 image import.png and b/datafiles/Getting started/1 image import.png differ diff --git a/datafiles/Getting started/2 animation.png b/datafiles/Getting started/2 animation.png index c192f9041..57528a46a 100644 Binary files a/datafiles/Getting started/2 animation.png and b/datafiles/Getting started/2 animation.png differ diff --git a/datafiles/Getting started/3 Group and collection.png b/datafiles/Getting started/3 Group and collection.png index e016e67b8..ef86a7c43 100644 Binary files a/datafiles/Getting started/3 Group and collection.png and b/datafiles/Getting started/3 Group and collection.png differ diff --git a/datafiles/Getting started/4 Looping operation.png b/datafiles/Getting started/4 Looping operation.png index e609d37e0..923f8b4c3 100644 Binary files a/datafiles/Getting started/4 Looping operation.png and b/datafiles/Getting started/4 Looping operation.png differ diff --git a/datafiles/Getting started/5 Particle and effectors.png b/datafiles/Getting started/5 Particle and effectors.png index 5548e5ffd..9ae624f0f 100644 Binary files a/datafiles/Getting started/5 Particle and effectors.png and b/datafiles/Getting started/5 Particle and effectors.png differ diff --git a/fonts/_f_h3/_f_h3.old.png b/fonts/_f_h3/_f_h3.old.png new file mode 100644 index 000000000..d29cacc77 Binary files /dev/null and b/fonts/_f_h3/_f_h3.old.png differ diff --git a/fonts/_f_h3/_f_h3.old.yy b/fonts/_f_h3/_f_h3.old.yy new file mode 100644 index 000000000..1e02d94f6 --- /dev/null +++ b/fonts/_f_h3/_f_h3.old.yy @@ -0,0 +1,1214 @@ +{ + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_h3", + "hinting": 0, + "glyphOperations": 0, + "interpreter": 0, + "pointRounding": 0, + "applyKerning": 0, + "fontName": "Segoe UI", + "styleName": "Bold", + "size": 20.0, + "bold": true, + "italic": false, + "charset": 0, + "AntiAlias": 1, + "first": 0, + "last": 0, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: â–¯ (9647)", + "includeTTF": false, + "TTFName": "", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "ascenderOffset": 0, + "ascender": 0, + "glyphs": { + "32": {"x":2,"y":2,"w":7,"h":35,"character":32,"shift":7,"offset":0,}, + "33": {"x":47,"y":76,"w":5,"h":35,"character":33,"shift":9,"offset":2,}, + "34": {"x":36,"y":76,"w":9,"h":35,"character":34,"shift":13,"offset":2,}, + "35": {"x":18,"y":76,"w":16,"h":35,"character":35,"shift":16,"offset":0,}, + "36": {"x":2,"y":76,"w":14,"h":35,"character":36,"shift":16,"offset":1,}, + "37": {"x":474,"y":39,"w":22,"h":35,"character":37,"shift":23,"offset":1,}, + "38": {"x":449,"y":39,"w":23,"h":35,"character":38,"shift":23,"offset":0,}, + "39": {"x":443,"y":39,"w":4,"h":35,"character":39,"shift":8,"offset":2,}, + "40": {"x":433,"y":39,"w":8,"h":35,"character":40,"shift":10,"offset":2,}, + "41": {"x":423,"y":39,"w":8,"h":35,"character":41,"shift":10,"offset":0,}, + "42": {"x":54,"y":76,"w":12,"h":35,"character":42,"shift":12,"offset":0,}, + "43": {"x":408,"y":39,"w":13,"h":35,"character":43,"shift":19,"offset":3,}, + "44": {"x":385,"y":39,"w":6,"h":35,"character":44,"shift":7,"offset":0,}, + "45": {"x":374,"y":39,"w":9,"h":35,"character":45,"shift":11,"offset":1,}, + "46": {"x":366,"y":39,"w":6,"h":35,"character":46,"shift":7,"offset":1,}, + "47": {"x":350,"y":39,"w":14,"h":35,"character":47,"shift":12,"offset":-1,}, + "48": {"x":333,"y":39,"w":15,"h":35,"character":48,"shift":16,"offset":0,}, + "49": {"x":322,"y":39,"w":9,"h":35,"character":49,"shift":16,"offset":2,}, + "50": {"x":307,"y":39,"w":13,"h":35,"character":50,"shift":16,"offset":1,}, + "51": {"x":292,"y":39,"w":13,"h":35,"character":51,"shift":16,"offset":1,}, + "52": {"x":275,"y":39,"w":15,"h":35,"character":52,"shift":16,"offset":0,}, + "53": {"x":393,"y":39,"w":13,"h":35,"character":53,"shift":16,"offset":1,}, + "54": {"x":68,"y":76,"w":14,"h":35,"character":54,"shift":16,"offset":1,}, + "55": {"x":84,"y":76,"w":14,"h":35,"character":55,"shift":16,"offset":1,}, + "56": {"x":100,"y":76,"w":14,"h":35,"character":56,"shift":16,"offset":1,}, + "57": {"x":436,"y":76,"w":14,"h":35,"character":57,"shift":16,"offset":1,}, + "58": {"x":428,"y":76,"w":6,"h":35,"character":58,"shift":7,"offset":1,}, + "59": {"x":419,"y":76,"w":7,"h":35,"character":59,"shift":7,"offset":0,}, + "60": {"x":404,"y":76,"w":13,"h":35,"character":60,"shift":19,"offset":3,}, + "61": {"x":389,"y":76,"w":13,"h":35,"character":61,"shift":19,"offset":3,}, + "62": {"x":374,"y":76,"w":13,"h":35,"character":62,"shift":19,"offset":3,}, + "63": {"x":360,"y":76,"w":12,"h":35,"character":63,"shift":12,"offset":0,}, + "64": {"x":334,"y":76,"w":24,"h":35,"character":64,"shift":26,"offset":1,}, + "65": {"x":313,"y":76,"w":19,"h":35,"character":65,"shift":19,"offset":0,}, + "66": {"x":296,"y":76,"w":15,"h":35,"character":66,"shift":17,"offset":2,}, + "67": {"x":278,"y":76,"w":16,"h":35,"character":67,"shift":17,"offset":0,}, + "68": {"x":259,"y":76,"w":17,"h":35,"character":68,"shift":20,"offset":2,}, + "69": {"x":245,"y":76,"w":12,"h":35,"character":69,"shift":14,"offset":2,}, + "70": {"x":231,"y":76,"w":12,"h":35,"character":70,"shift":14,"offset":2,}, + "71": {"x":211,"y":76,"w":18,"h":35,"character":71,"shift":19,"offset":0,}, + "72": {"x":192,"y":76,"w":17,"h":35,"character":72,"shift":21,"offset":2,}, + "73": {"x":185,"y":76,"w":5,"h":35,"character":73,"shift":9,"offset":2,}, + "74": {"x":172,"y":76,"w":11,"h":35,"character":74,"shift":12,"offset":0,}, + "75": {"x":154,"y":76,"w":16,"h":35,"character":75,"shift":18,"offset":2,}, + "76": {"x":140,"y":76,"w":12,"h":35,"character":76,"shift":14,"offset":2,}, + "77": {"x":116,"y":76,"w":22,"h":35,"character":77,"shift":26,"offset":2,}, + "78": {"x":255,"y":39,"w":18,"h":35,"character":78,"shift":21,"offset":2,}, + "79": {"x":233,"y":39,"w":20,"h":35,"character":79,"shift":20,"offset":0,}, + "80": {"x":217,"y":39,"w":14,"h":35,"character":80,"shift":17,"offset":2,}, + "81": {"x":357,"y":2,"w":22,"h":35,"character":81,"shift":20,"offset":0,}, + "82": {"x":328,"y":2,"w":17,"h":35,"character":82,"shift":18,"offset":2,}, + "83": {"x":312,"y":2,"w":14,"h":35,"character":83,"shift":15,"offset":1,}, + "84": {"x":294,"y":2,"w":16,"h":35,"character":84,"shift":16,"offset":0,}, + "85": {"x":275,"y":2,"w":17,"h":35,"character":85,"shift":20,"offset":1,}, + "86": {"x":255,"y":2,"w":18,"h":35,"character":86,"shift":18,"offset":0,}, + "87": {"x":226,"y":2,"w":27,"h":35,"character":87,"shift":27,"offset":0,}, + "88": {"x":206,"y":2,"w":18,"h":35,"character":88,"shift":18,"offset":0,}, + "89": {"x":187,"y":2,"w":17,"h":35,"character":89,"shift":16,"offset":0,}, + "90": {"x":169,"y":2,"w":16,"h":35,"character":90,"shift":16,"offset":0,}, + "91": {"x":347,"y":2,"w":8,"h":35,"character":91,"shift":10,"offset":2,}, + "92": {"x":154,"y":2,"w":13,"h":35,"character":92,"shift":12,"offset":0,}, + "93": {"x":131,"y":2,"w":8,"h":35,"character":93,"shift":10,"offset":0,}, + "94": {"x":114,"y":2,"w":15,"h":35,"character":94,"shift":19,"offset":2,}, + "95": {"x":100,"y":2,"w":12,"h":35,"character":95,"shift":11,"offset":0,}, + "96": {"x":90,"y":2,"w":8,"h":35,"character":96,"shift":8,"offset":0,}, + "97": {"x":75,"y":2,"w":13,"h":35,"character":97,"shift":15,"offset":0,}, + "98": {"x":58,"y":2,"w":15,"h":35,"character":98,"shift":17,"offset":1,}, + "99": {"x":44,"y":2,"w":12,"h":35,"character":99,"shift":13,"offset":0,}, + "100": {"x":27,"y":2,"w":15,"h":35,"character":100,"shift":17,"offset":0,}, + "101": {"x":11,"y":2,"w":14,"h":35,"character":101,"shift":15,"offset":0,}, + "102": {"x":141,"y":2,"w":11,"h":35,"character":102,"shift":10,"offset":0,}, + "103": {"x":381,"y":2,"w":15,"h":35,"character":103,"shift":17,"offset":0,}, + "104": {"x":35,"y":39,"w":14,"h":35,"character":104,"shift":16,"offset":1,}, + "105": {"x":398,"y":2,"w":6,"h":35,"character":105,"shift":8,"offset":1,}, + "106": {"x":192,"y":39,"w":9,"h":35,"character":106,"shift":8,"offset":-2,}, + "107": {"x":175,"y":39,"w":15,"h":35,"character":107,"shift":15,"offset":1,}, + "108": {"x":168,"y":39,"w":5,"h":35,"character":108,"shift":8,"offset":1,}, + "109": {"x":143,"y":39,"w":23,"h":35,"character":109,"shift":25,"offset":1,}, + "110": {"x":127,"y":39,"w":14,"h":35,"character":110,"shift":16,"offset":1,}, + "111": {"x":109,"y":39,"w":16,"h":35,"character":111,"shift":17,"offset":0,}, + "112": {"x":92,"y":39,"w":15,"h":35,"character":112,"shift":17,"offset":1,}, + "113": {"x":75,"y":39,"w":15,"h":35,"character":113,"shift":17,"offset":0,}, + "114": {"x":63,"y":39,"w":10,"h":35,"character":114,"shift":11,"offset":1,}, + "115": {"x":203,"y":39,"w":12,"h":35,"character":115,"shift":12,"offset":0,}, + "116": {"x":51,"y":39,"w":10,"h":35,"character":116,"shift":11,"offset":0,}, + "117": {"x":19,"y":39,"w":14,"h":35,"character":117,"shift":16,"offset":1,}, + "118": {"x":2,"y":39,"w":15,"h":35,"character":118,"shift":15,"offset":0,}, + "119": {"x":483,"y":2,"w":22,"h":35,"character":119,"shift":22,"offset":0,}, + "120": {"x":466,"y":2,"w":15,"h":35,"character":120,"shift":15,"offset":0,}, + "121": {"x":448,"y":2,"w":16,"h":35,"character":121,"shift":15,"offset":-1,}, + "122": {"x":433,"y":2,"w":13,"h":35,"character":122,"shift":13,"offset":0,}, + "123": {"x":423,"y":2,"w":8,"h":35,"character":123,"shift":10,"offset":1,}, + "124": {"x":416,"y":2,"w":5,"h":35,"character":124,"shift":9,"offset":2,}, + "125": {"x":406,"y":2,"w":8,"h":35,"character":125,"shift":10,"offset":1,}, + "126": {"x":452,"y":76,"w":15,"h":35,"character":126,"shift":19,"offset":2,}, + "9647": {"x":469,"y":76,"w":16,"h":35,"character":9647,"shift":26,"offset":5,}, + }, + "kerningPairs": [ + {"first":34,"second":114,"amount":-1,}, + {"first":34,"second":115,"amount":-1,}, + {"first":34,"second":341,"amount":-1,}, + {"first":34,"second":343,"amount":-1,}, + {"first":34,"second":345,"amount":-1,}, + {"first":34,"second":347,"amount":-1,}, + {"first":34,"second":349,"amount":-1,}, + {"first":34,"second":351,"amount":-1,}, + {"first":34,"second":353,"amount":-1,}, + {"first":34,"second":537,"amount":-1,}, + {"first":34,"second":969,"amount":-1,}, + {"first":34,"second":1109,"amount":-1,}, + {"first":39,"second":114,"amount":-1,}, + {"first":39,"second":115,"amount":-1,}, + {"first":39,"second":341,"amount":-1,}, + {"first":39,"second":343,"amount":-1,}, + {"first":39,"second":345,"amount":-1,}, + {"first":39,"second":347,"amount":-1,}, + {"first":39,"second":349,"amount":-1,}, + {"first":39,"second":351,"amount":-1,}, + {"first":39,"second":353,"amount":-1,}, + {"first":39,"second":537,"amount":-1,}, + {"first":39,"second":969,"amount":-1,}, + {"first":39,"second":1109,"amount":-1,}, + {"first":40,"second":106,"amount":2,}, + {"first":40,"second":309,"amount":2,}, + {"first":42,"second":65,"amount":-2,}, + {"first":42,"second":74,"amount":-2,}, + {"first":42,"second":99,"amount":-1,}, + {"first":42,"second":100,"amount":-1,}, + {"first":42,"second":101,"amount":-1,}, + {"first":42,"second":103,"amount":-1,}, + {"first":42,"second":111,"amount":-1,}, + {"first":42,"second":113,"amount":-1,}, + {"first":42,"second":256,"amount":-2,}, + {"first":42,"second":258,"amount":-2,}, + {"first":42,"second":260,"amount":-2,}, + {"first":42,"second":263,"amount":-1,}, + {"first":42,"second":265,"amount":-1,}, + {"first":42,"second":269,"amount":-1,}, + {"first":42,"second":271,"amount":-1,}, + {"first":42,"second":273,"amount":-1,}, + {"first":42,"second":281,"amount":-1,}, + {"first":42,"second":285,"amount":-1,}, + {"first":42,"second":287,"amount":-1,}, + {"first":42,"second":289,"amount":-1,}, + {"first":42,"second":291,"amount":-1,}, + {"first":42,"second":308,"amount":-2,}, + {"first":42,"second":506,"amount":-2,}, + {"first":42,"second":508,"amount":-2,}, + {"first":42,"second":913,"amount":-2,}, + {"first":42,"second":916,"amount":-2,}, + {"first":42,"second":923,"amount":-2,}, + {"first":42,"second":1040,"amount":-2,}, + {"first":42,"second":1077,"amount":-1,}, + {"first":42,"second":1086,"amount":-1,}, + {"first":42,"second":1089,"amount":-1,}, + {"first":42,"second":1092,"amount":-1,}, + {"first":42,"second":1105,"amount":-1,}, + {"first":42,"second":1108,"amount":-1,}, + {"first":44,"second":8216,"amount":-3,}, + {"first":44,"second":8217,"amount":-3,}, + {"first":44,"second":8220,"amount":-3,}, + {"first":44,"second":8221,"amount":-3,}, + {"first":46,"second":8216,"amount":-3,}, + {"first":46,"second":8217,"amount":-3,}, + {"first":46,"second":8220,"amount":-3,}, + {"first":46,"second":8221,"amount":-2,}, + {"first":65,"second":42,"amount":-2,}, + {"first":65,"second":44,"amount":1,}, + {"first":65,"second":59,"amount":1,}, + {"first":65,"second":74,"amount":1,}, + {"first":65,"second":84,"amount":-2,}, + {"first":65,"second":86,"amount":-1,}, + {"first":65,"second":87,"amount":-1,}, + {"first":65,"second":89,"amount":-2,}, + {"first":65,"second":116,"amount":-1,}, + {"first":65,"second":118,"amount":-1,}, + {"first":65,"second":121,"amount":-1,}, + {"first":65,"second":221,"amount":-2,}, + {"first":65,"second":255,"amount":-1,}, + {"first":65,"second":308,"amount":1,}, + {"first":65,"second":354,"amount":-2,}, + {"first":65,"second":356,"amount":-2,}, + {"first":65,"second":358,"amount":-2,}, + {"first":65,"second":372,"amount":-1,}, + {"first":65,"second":374,"amount":-2,}, + {"first":65,"second":376,"amount":-2,}, + {"first":65,"second":377,"amount":1,}, + {"first":65,"second":379,"amount":1,}, + {"first":65,"second":381,"amount":1,}, + {"first":65,"second":7808,"amount":-1,}, + {"first":65,"second":7810,"amount":-1,}, + {"first":65,"second":7812,"amount":-1,}, + {"first":65,"second":7922,"amount":-2,}, + {"first":65,"second":8216,"amount":-2,}, + {"first":65,"second":8217,"amount":-2,}, + {"first":65,"second":8220,"amount":-2,}, + {"first":65,"second":8221,"amount":-2,}, + {"first":65,"second":8482,"amount":-2,}, + {"first":66,"second":84,"amount":-1,}, + {"first":66,"second":89,"amount":-1,}, + {"first":66,"second":221,"amount":-1,}, + {"first":66,"second":354,"amount":-1,}, + {"first":66,"second":356,"amount":-1,}, + {"first":66,"second":358,"amount":-1,}, + {"first":66,"second":374,"amount":-1,}, + {"first":66,"second":376,"amount":-1,}, + {"first":66,"second":7922,"amount":-1,}, + {"first":66,"second":8218,"amount":-1,}, + {"first":66,"second":8222,"amount":-1,}, + {"first":67,"second":67,"amount":-1,}, + {"first":67,"second":71,"amount":-1,}, + {"first":67,"second":81,"amount":-1,}, + {"first":67,"second":171,"amount":-1,}, + {"first":67,"second":199,"amount":-1,}, + {"first":67,"second":210,"amount":-1,}, + {"first":67,"second":211,"amount":-1,}, + {"first":67,"second":212,"amount":-1,}, + {"first":67,"second":213,"amount":-1,}, + {"first":67,"second":214,"amount":-1,}, + {"first":67,"second":216,"amount":-1,}, + {"first":67,"second":239,"amount":1,}, + {"first":67,"second":262,"amount":-1,}, + {"first":67,"second":264,"amount":-1,}, + {"first":67,"second":268,"amount":-1,}, + {"first":67,"second":284,"amount":-1,}, + {"first":67,"second":286,"amount":-1,}, + {"first":67,"second":288,"amount":-1,}, + {"first":67,"second":290,"amount":-1,}, + {"first":67,"second":338,"amount":-1,}, + {"first":67,"second":8249,"amount":-1,}, + {"first":68,"second":44,"amount":-1,}, + {"first":68,"second":46,"amount":-1,}, + {"first":68,"second":84,"amount":-1,}, + {"first":68,"second":88,"amount":-1,}, + {"first":68,"second":90,"amount":-1,}, + {"first":68,"second":198,"amount":-1,}, + {"first":68,"second":354,"amount":-1,}, + {"first":68,"second":356,"amount":-1,}, + {"first":68,"second":358,"amount":-1,}, + {"first":68,"second":377,"amount":-1,}, + {"first":68,"second":379,"amount":-1,}, + {"first":68,"second":381,"amount":-1,}, + {"first":68,"second":8218,"amount":-1,}, + {"first":68,"second":8222,"amount":-1,}, + {"first":68,"second":8230,"amount":-1,}, + {"first":69,"second":74,"amount":1,}, + {"first":69,"second":87,"amount":1,}, + {"first":69,"second":88,"amount":1,}, + {"first":69,"second":308,"amount":1,}, + {"first":70,"second":44,"amount":-2,}, + {"first":70,"second":46,"amount":-2,}, + {"first":70,"second":65,"amount":-1,}, + {"first":70,"second":74,"amount":-1,}, + {"first":70,"second":97,"amount":-1,}, + {"first":70,"second":192,"amount":-1,}, + {"first":70,"second":193,"amount":-1,}, + {"first":70,"second":194,"amount":-1,}, + {"first":70,"second":195,"amount":-1,}, + {"first":70,"second":196,"amount":-1,}, + {"first":70,"second":197,"amount":-1,}, + {"first":70,"second":198,"amount":-3,}, + {"first":70,"second":239,"amount":1,}, + {"first":70,"second":256,"amount":-1,}, + {"first":70,"second":258,"amount":-1,}, + {"first":70,"second":260,"amount":-1,}, + {"first":70,"second":261,"amount":-1,}, + {"first":70,"second":308,"amount":-1,}, + {"first":70,"second":506,"amount":-1,}, + {"first":70,"second":508,"amount":-1,}, + {"first":70,"second":509,"amount":-1,}, + {"first":70,"second":8218,"amount":-2,}, + {"first":70,"second":8222,"amount":-2,}, + {"first":70,"second":8230,"amount":-2,}, + {"first":71,"second":84,"amount":-1,}, + {"first":71,"second":354,"amount":-1,}, + {"first":71,"second":356,"amount":-1,}, + {"first":71,"second":358,"amount":-1,}, + {"first":74,"second":44,"amount":-1,}, + {"first":74,"second":46,"amount":-1,}, + {"first":74,"second":65,"amount":-1,}, + {"first":74,"second":74,"amount":-1,}, + {"first":74,"second":192,"amount":-1,}, + {"first":74,"second":193,"amount":-1,}, + {"first":74,"second":194,"amount":-1,}, + {"first":74,"second":195,"amount":-1,}, + {"first":74,"second":196,"amount":-1,}, + {"first":74,"second":197,"amount":-1,}, + {"first":74,"second":198,"amount":-2,}, + {"first":74,"second":308,"amount":-1,}, + {"first":74,"second":8218,"amount":-2,}, + {"first":74,"second":8222,"amount":-1,}, + {"first":74,"second":8230,"amount":-1,}, + {"first":75,"second":44,"amount":1,}, + {"first":75,"second":59,"amount":1,}, + {"first":75,"second":67,"amount":-1,}, + {"first":75,"second":71,"amount":-1,}, + {"first":75,"second":74,"amount":1,}, + {"first":75,"second":79,"amount":-1,}, + {"first":75,"second":81,"amount":-1,}, + {"first":75,"second":88,"amount":1,}, + {"first":75,"second":90,"amount":1,}, + {"first":75,"second":116,"amount":-1,}, + {"first":75,"second":118,"amount":-1,}, + {"first":75,"second":119,"amount":-1,}, + {"first":75,"second":121,"amount":-1,}, + {"first":75,"second":199,"amount":-1,}, + {"first":75,"second":210,"amount":-1,}, + {"first":75,"second":211,"amount":-1,}, + {"first":75,"second":212,"amount":-1,}, + {"first":75,"second":213,"amount":-1,}, + {"first":75,"second":214,"amount":-1,}, + {"first":75,"second":216,"amount":-1,}, + {"first":75,"second":236,"amount":1,}, + {"first":75,"second":237,"amount":-1,}, + {"first":75,"second":239,"amount":1,}, + {"first":75,"second":253,"amount":-1,}, + {"first":75,"second":255,"amount":-1,}, + {"first":75,"second":262,"amount":-1,}, + {"first":75,"second":264,"amount":-1,}, + {"first":75,"second":268,"amount":-1,}, + {"first":75,"second":284,"amount":-1,}, + {"first":75,"second":286,"amount":-1,}, + {"first":75,"second":288,"amount":-1,}, + {"first":75,"second":290,"amount":-1,}, + {"first":75,"second":308,"amount":1,}, + {"first":75,"second":332,"amount":-1,}, + {"first":75,"second":334,"amount":-1,}, + {"first":75,"second":336,"amount":-1,}, + {"first":75,"second":338,"amount":-1,}, + {"first":75,"second":373,"amount":-1,}, + {"first":75,"second":375,"amount":-1,}, + {"first":75,"second":510,"amount":-1,}, + {"first":75,"second":7809,"amount":-1,}, + {"first":75,"second":7811,"amount":-1,}, + {"first":75,"second":7813,"amount":-1,}, + {"first":75,"second":7923,"amount":-1,}, + {"first":75,"second":8218,"amount":1,}, + {"first":75,"second":8222,"amount":1,}, + {"first":76,"second":42,"amount":-3,}, + {"first":76,"second":63,"amount":-1,}, + {"first":76,"second":65,"amount":1,}, + {"first":76,"second":67,"amount":-1,}, + {"first":76,"second":71,"amount":-1,}, + {"first":76,"second":74,"amount":1,}, + {"first":76,"second":79,"amount":-1,}, + {"first":76,"second":81,"amount":-1,}, + {"first":76,"second":84,"amount":-2,}, + {"first":76,"second":85,"amount":-1,}, + {"first":76,"second":86,"amount":-2,}, + {"first":76,"second":87,"amount":-1,}, + {"first":76,"second":89,"amount":-2,}, + {"first":76,"second":90,"amount":1,}, + {"first":76,"second":118,"amount":-1,}, + {"first":76,"second":119,"amount":-1,}, + {"first":76,"second":121,"amount":-1,}, + {"first":76,"second":199,"amount":-1,}, + {"first":76,"second":210,"amount":-1,}, + {"first":76,"second":211,"amount":-1,}, + {"first":76,"second":212,"amount":-1,}, + {"first":76,"second":213,"amount":-1,}, + {"first":76,"second":214,"amount":-1,}, + {"first":76,"second":216,"amount":-1,}, + {"first":76,"second":217,"amount":-1,}, + {"first":76,"second":218,"amount":-1,}, + {"first":76,"second":219,"amount":-1,}, + {"first":76,"second":220,"amount":-1,}, + {"first":76,"second":221,"amount":-1,}, + {"first":76,"second":253,"amount":-1,}, + {"first":76,"second":255,"amount":-1,}, + {"first":76,"second":256,"amount":1,}, + {"first":76,"second":258,"amount":1,}, + {"first":76,"second":260,"amount":1,}, + {"first":76,"second":262,"amount":-1,}, + {"first":76,"second":264,"amount":-1,}, + {"first":76,"second":268,"amount":-1,}, + {"first":76,"second":284,"amount":-1,}, + {"first":76,"second":286,"amount":-1,}, + {"first":76,"second":288,"amount":-1,}, + {"first":76,"second":290,"amount":-1,}, + {"first":76,"second":308,"amount":1,}, + {"first":76,"second":332,"amount":-1,}, + {"first":76,"second":334,"amount":-1,}, + {"first":76,"second":336,"amount":-1,}, + {"first":76,"second":338,"amount":-1,}, + {"first":76,"second":354,"amount":-1,}, + {"first":76,"second":356,"amount":-1,}, + {"first":76,"second":358,"amount":-1,}, + {"first":76,"second":372,"amount":-1,}, + {"first":76,"second":373,"amount":-1,}, + {"first":76,"second":374,"amount":-1,}, + {"first":76,"second":375,"amount":-1,}, + {"first":76,"second":376,"amount":-2,}, + {"first":76,"second":377,"amount":1,}, + {"first":76,"second":379,"amount":1,}, + {"first":76,"second":381,"amount":1,}, + {"first":76,"second":506,"amount":1,}, + {"first":76,"second":508,"amount":1,}, + {"first":76,"second":510,"amount":-1,}, + {"first":76,"second":7808,"amount":-1,}, + {"first":76,"second":7809,"amount":-1,}, + {"first":76,"second":7810,"amount":-1,}, + {"first":76,"second":7811,"amount":-1,}, + {"first":76,"second":7812,"amount":-1,}, + {"first":76,"second":7813,"amount":-1,}, + {"first":76,"second":7922,"amount":-1,}, + {"first":76,"second":7923,"amount":-1,}, + {"first":76,"second":8216,"amount":-2,}, + {"first":76,"second":8217,"amount":-1,}, + {"first":76,"second":8218,"amount":1,}, + {"first":76,"second":8220,"amount":-2,}, + {"first":76,"second":8221,"amount":-1,}, + {"first":76,"second":8222,"amount":1,}, + {"first":76,"second":8482,"amount":-2,}, + {"first":79,"second":44,"amount":-1,}, + {"first":79,"second":46,"amount":-1,}, + {"first":79,"second":84,"amount":-1,}, + {"first":79,"second":88,"amount":-1,}, + {"first":79,"second":89,"amount":-1,}, + {"first":79,"second":90,"amount":-1,}, + {"first":79,"second":354,"amount":-1,}, + {"first":79,"second":356,"amount":-1,}, + {"first":79,"second":358,"amount":-1,}, + {"first":79,"second":377,"amount":-1,}, + {"first":79,"second":379,"amount":-1,}, + {"first":79,"second":381,"amount":-1,}, + {"first":79,"second":8218,"amount":-2,}, + {"first":79,"second":8222,"amount":-1,}, + {"first":79,"second":8230,"amount":-1,}, + {"first":80,"second":44,"amount":-5,}, + {"first":80,"second":46,"amount":-4,}, + {"first":80,"second":65,"amount":-2,}, + {"first":80,"second":74,"amount":-2,}, + {"first":80,"second":88,"amount":-1,}, + {"first":80,"second":97,"amount":-1,}, + {"first":80,"second":99,"amount":-1,}, + {"first":80,"second":100,"amount":-1,}, + {"first":80,"second":101,"amount":-1,}, + {"first":80,"second":103,"amount":-1,}, + {"first":80,"second":111,"amount":-1,}, + {"first":80,"second":113,"amount":-1,}, + {"first":80,"second":192,"amount":-2,}, + {"first":80,"second":193,"amount":-2,}, + {"first":80,"second":194,"amount":-2,}, + {"first":80,"second":195,"amount":-2,}, + {"first":80,"second":196,"amount":-2,}, + {"first":80,"second":197,"amount":-2,}, + {"first":80,"second":198,"amount":-4,}, + {"first":80,"second":224,"amount":-1,}, + {"first":80,"second":225,"amount":-1,}, + {"first":80,"second":226,"amount":-1,}, + {"first":80,"second":227,"amount":-1,}, + {"first":80,"second":228,"amount":-1,}, + {"first":80,"second":229,"amount":-1,}, + {"first":80,"second":230,"amount":-1,}, + {"first":80,"second":231,"amount":-1,}, + {"first":80,"second":232,"amount":-1,}, + {"first":80,"second":233,"amount":-1,}, + {"first":80,"second":234,"amount":-1,}, + {"first":80,"second":235,"amount":-1,}, + {"first":80,"second":242,"amount":-1,}, + {"first":80,"second":243,"amount":-1,}, + {"first":80,"second":244,"amount":-1,}, + {"first":80,"second":245,"amount":-1,}, + {"first":80,"second":246,"amount":-1,}, + {"first":80,"second":256,"amount":-2,}, + {"first":80,"second":257,"amount":-1,}, + {"first":80,"second":258,"amount":-2,}, + {"first":80,"second":259,"amount":-1,}, + {"first":80,"second":260,"amount":-2,}, + {"first":80,"second":261,"amount":-1,}, + {"first":80,"second":263,"amount":-1,}, + {"first":80,"second":265,"amount":-1,}, + {"first":80,"second":269,"amount":-1,}, + {"first":80,"second":271,"amount":-1,}, + {"first":80,"second":273,"amount":-1,}, + {"first":80,"second":275,"amount":-1,}, + {"first":80,"second":277,"amount":-1,}, + {"first":80,"second":279,"amount":-1,}, + {"first":80,"second":281,"amount":-1,}, + {"first":80,"second":283,"amount":-1,}, + {"first":80,"second":285,"amount":-1,}, + {"first":80,"second":287,"amount":-1,}, + {"first":80,"second":289,"amount":-1,}, + {"first":80,"second":291,"amount":-1,}, + {"first":80,"second":308,"amount":-1,}, + {"first":80,"second":333,"amount":-1,}, + {"first":80,"second":335,"amount":-1,}, + {"first":80,"second":337,"amount":-1,}, + {"first":80,"second":339,"amount":-1,}, + {"first":80,"second":506,"amount":-2,}, + {"first":80,"second":507,"amount":-1,}, + {"first":80,"second":508,"amount":-2,}, + {"first":80,"second":509,"amount":-1,}, + {"first":80,"second":511,"amount":-1,}, + {"first":80,"second":8218,"amount":-4,}, + {"first":80,"second":8222,"amount":-4,}, + {"first":80,"second":8230,"amount":-3,}, + {"first":81,"second":44,"amount":-1,}, + {"first":81,"second":46,"amount":-1,}, + {"first":81,"second":84,"amount":-1,}, + {"first":81,"second":88,"amount":-1,}, + {"first":81,"second":90,"amount":-1,}, + {"first":81,"second":354,"amount":-1,}, + {"first":81,"second":356,"amount":-1,}, + {"first":81,"second":358,"amount":-1,}, + {"first":81,"second":377,"amount":-1,}, + {"first":81,"second":379,"amount":-1,}, + {"first":81,"second":381,"amount":-1,}, + {"first":81,"second":8218,"amount":-1,}, + {"first":81,"second":8222,"amount":-1,}, + {"first":81,"second":8230,"amount":-1,}, + {"first":82,"second":59,"amount":1,}, + {"first":82,"second":74,"amount":1,}, + {"first":82,"second":84,"amount":-1,}, + {"first":82,"second":99,"amount":-1,}, + {"first":82,"second":100,"amount":-1,}, + {"first":82,"second":101,"amount":-1,}, + {"first":82,"second":103,"amount":-1,}, + {"first":82,"second":111,"amount":-1,}, + {"first":82,"second":113,"amount":-1,}, + {"first":82,"second":231,"amount":-1,}, + {"first":82,"second":232,"amount":-1,}, + {"first":82,"second":233,"amount":-1,}, + {"first":82,"second":234,"amount":-1,}, + {"first":82,"second":235,"amount":-1,}, + {"first":82,"second":242,"amount":-1,}, + {"first":82,"second":243,"amount":-1,}, + {"first":82,"second":244,"amount":-1,}, + {"first":82,"second":245,"amount":-1,}, + {"first":82,"second":246,"amount":-1,}, + {"first":82,"second":263,"amount":-1,}, + {"first":82,"second":265,"amount":-1,}, + {"first":82,"second":269,"amount":-1,}, + {"first":82,"second":271,"amount":-1,}, + {"first":82,"second":273,"amount":-1,}, + {"first":82,"second":275,"amount":-1,}, + {"first":82,"second":277,"amount":-1,}, + {"first":82,"second":279,"amount":-1,}, + {"first":82,"second":281,"amount":-1,}, + {"first":82,"second":283,"amount":-1,}, + {"first":82,"second":285,"amount":-1,}, + {"first":82,"second":287,"amount":-1,}, + {"first":82,"second":289,"amount":-1,}, + {"first":82,"second":291,"amount":-1,}, + {"first":82,"second":308,"amount":1,}, + {"first":82,"second":333,"amount":-1,}, + {"first":82,"second":335,"amount":-1,}, + {"first":82,"second":337,"amount":-1,}, + {"first":82,"second":339,"amount":-1,}, + {"first":82,"second":354,"amount":-1,}, + {"first":82,"second":356,"amount":-1,}, + {"first":82,"second":358,"amount":-1,}, + {"first":82,"second":511,"amount":-1,}, + {"first":83,"second":116,"amount":-1,}, + {"first":83,"second":118,"amount":-1,}, + {"first":83,"second":121,"amount":-1,}, + {"first":83,"second":255,"amount":-1,}, + {"first":83,"second":355,"amount":-1,}, + {"first":83,"second":357,"amount":-1,}, + {"first":83,"second":359,"amount":-1,}, + {"first":83,"second":8218,"amount":-1,}, + {"first":83,"second":8222,"amount":-1,}, + {"first":84,"second":44,"amount":-2,}, + {"first":84,"second":46,"amount":-2,}, + {"first":84,"second":65,"amount":-2,}, + {"first":84,"second":67,"amount":-1,}, + {"first":84,"second":71,"amount":-1,}, + {"first":84,"second":74,"amount":-2,}, + {"first":84,"second":79,"amount":-1,}, + {"first":84,"second":81,"amount":-1,}, + {"first":84,"second":84,"amount":1,}, + {"first":84,"second":86,"amount":1,}, + {"first":84,"second":87,"amount":1,}, + {"first":84,"second":89,"amount":1,}, + {"first":84,"second":97,"amount":-2,}, + {"first":84,"second":99,"amount":-2,}, + {"first":84,"second":100,"amount":-2,}, + {"first":84,"second":101,"amount":-2,}, + {"first":84,"second":102,"amount":-1,}, + {"first":84,"second":103,"amount":-2,}, + {"first":84,"second":109,"amount":-2,}, + {"first":84,"second":110,"amount":-2,}, + {"first":84,"second":111,"amount":-2,}, + {"first":84,"second":112,"amount":-2,}, + {"first":84,"second":113,"amount":-2,}, + {"first":84,"second":114,"amount":-2,}, + {"first":84,"second":115,"amount":-2,}, + {"first":84,"second":117,"amount":-2,}, + {"first":84,"second":118,"amount":-1,}, + {"first":84,"second":119,"amount":-1,}, + {"first":84,"second":120,"amount":-2,}, + {"first":84,"second":121,"amount":-1,}, + {"first":84,"second":122,"amount":-1,}, + {"first":84,"second":171,"amount":-1,}, + {"first":84,"second":187,"amount":-1,}, + {"first":84,"second":192,"amount":-2,}, + {"first":84,"second":193,"amount":-2,}, + {"first":84,"second":194,"amount":-2,}, + {"first":84,"second":195,"amount":-2,}, + {"first":84,"second":196,"amount":-2,}, + {"first":84,"second":197,"amount":-2,}, + {"first":84,"second":198,"amount":-3,}, + {"first":84,"second":199,"amount":-1,}, + {"first":84,"second":210,"amount":-1,}, + {"first":84,"second":211,"amount":-1,}, + {"first":84,"second":212,"amount":-1,}, + {"first":84,"second":213,"amount":-1,}, + {"first":84,"second":214,"amount":-1,}, + {"first":84,"second":216,"amount":-1,}, + {"first":84,"second":224,"amount":-2,}, + {"first":84,"second":225,"amount":-2,}, + {"first":84,"second":226,"amount":-2,}, + {"first":84,"second":227,"amount":-2,}, + {"first":84,"second":228,"amount":-2,}, + {"first":84,"second":229,"amount":-2,}, + {"first":84,"second":230,"amount":-2,}, + {"first":84,"second":231,"amount":-2,}, + {"first":84,"second":232,"amount":-2,}, + {"first":84,"second":233,"amount":-2,}, + {"first":84,"second":234,"amount":-2,}, + {"first":84,"second":235,"amount":-2,}, + {"first":84,"second":238,"amount":1,}, + {"first":84,"second":239,"amount":2,}, + {"first":84,"second":241,"amount":-2,}, + {"first":84,"second":242,"amount":-2,}, + {"first":84,"second":243,"amount":-2,}, + {"first":84,"second":244,"amount":-2,}, + {"first":84,"second":245,"amount":-2,}, + {"first":84,"second":246,"amount":-2,}, + {"first":84,"second":249,"amount":-2,}, + {"first":84,"second":250,"amount":-2,}, + {"first":84,"second":251,"amount":-2,}, + {"first":84,"second":252,"amount":-2,}, + {"first":84,"second":253,"amount":-1,}, + {"first":84,"second":255,"amount":-1,}, + {"first":84,"second":256,"amount":-2,}, + {"first":84,"second":257,"amount":-2,}, + {"first":84,"second":258,"amount":-2,}, + {"first":84,"second":259,"amount":-2,}, + {"first":84,"second":260,"amount":-2,}, + {"first":84,"second":261,"amount":-2,}, + {"first":84,"second":262,"amount":-1,}, + {"first":84,"second":263,"amount":-2,}, + {"first":84,"second":264,"amount":-1,}, + {"first":84,"second":265,"amount":-2,}, + {"first":84,"second":268,"amount":-1,}, + {"first":84,"second":269,"amount":-2,}, + {"first":84,"second":271,"amount":-2,}, + {"first":84,"second":273,"amount":-2,}, + {"first":84,"second":275,"amount":-2,}, + {"first":84,"second":277,"amount":-2,}, + {"first":84,"second":279,"amount":-2,}, + {"first":84,"second":281,"amount":-2,}, + {"first":84,"second":283,"amount":-2,}, + {"first":84,"second":284,"amount":-1,}, + {"first":84,"second":285,"amount":-2,}, + {"first":84,"second":286,"amount":-1,}, + {"first":84,"second":287,"amount":-2,}, + {"first":84,"second":288,"amount":-1,}, + {"first":84,"second":289,"amount":-2,}, + {"first":84,"second":290,"amount":-1,}, + {"first":84,"second":291,"amount":-2,}, + {"first":84,"second":297,"amount":1,}, + {"first":84,"second":299,"amount":1,}, + {"first":84,"second":301,"amount":1,}, + {"first":84,"second":308,"amount":-1,}, + {"first":84,"second":324,"amount":-2,}, + {"first":84,"second":328,"amount":-2,}, + {"first":84,"second":331,"amount":-2,}, + {"first":84,"second":332,"amount":-1,}, + {"first":84,"second":333,"amount":-2,}, + {"first":84,"second":334,"amount":-1,}, + {"first":84,"second":335,"amount":-2,}, + {"first":84,"second":336,"amount":-1,}, + {"first":84,"second":337,"amount":-2,}, + {"first":84,"second":338,"amount":-1,}, + {"first":84,"second":339,"amount":-2,}, + {"first":84,"second":341,"amount":-2,}, + {"first":84,"second":343,"amount":-2,}, + {"first":84,"second":345,"amount":-2,}, + {"first":84,"second":347,"amount":-2,}, + {"first":84,"second":349,"amount":-2,}, + {"first":84,"second":351,"amount":-2,}, + {"first":84,"second":353,"amount":-2,}, + {"first":84,"second":361,"amount":-2,}, + {"first":84,"second":363,"amount":-2,}, + {"first":84,"second":365,"amount":-2,}, + {"first":84,"second":367,"amount":-2,}, + {"first":84,"second":369,"amount":-2,}, + {"first":84,"second":371,"amount":-2,}, + {"first":84,"second":373,"amount":-1,}, + {"first":84,"second":375,"amount":-1,}, + {"first":84,"second":378,"amount":-1,}, + {"first":84,"second":380,"amount":-1,}, + {"first":84,"second":382,"amount":-1,}, + {"first":84,"second":506,"amount":-2,}, + {"first":84,"second":507,"amount":-2,}, + {"first":84,"second":508,"amount":-2,}, + {"first":84,"second":509,"amount":-2,}, + {"first":84,"second":510,"amount":-1,}, + {"first":84,"second":511,"amount":-2,}, + {"first":84,"second":537,"amount":-2,}, + {"first":84,"second":7809,"amount":-1,}, + {"first":84,"second":7811,"amount":-1,}, + {"first":84,"second":7813,"amount":-1,}, + {"first":84,"second":7923,"amount":-1,}, + {"first":84,"second":8217,"amount":1,}, + {"first":84,"second":8218,"amount":-3,}, + {"first":84,"second":8221,"amount":1,}, + {"first":84,"second":8222,"amount":-3,}, + {"first":84,"second":8230,"amount":-2,}, + {"first":84,"second":8249,"amount":-1,}, + {"first":84,"second":8250,"amount":-1,}, + {"first":84,"second":8482,"amount":1,}, + {"first":85,"second":65,"amount":-1,}, + {"first":85,"second":198,"amount":-2,}, + {"first":85,"second":8218,"amount":-1,}, + {"first":85,"second":8222,"amount":-1,}, + {"first":86,"second":44,"amount":-3,}, + {"first":86,"second":46,"amount":-3,}, + {"first":86,"second":58,"amount":-1,}, + {"first":86,"second":59,"amount":-1,}, + {"first":86,"second":65,"amount":-1,}, + {"first":86,"second":67,"amount":-1,}, + {"first":86,"second":71,"amount":-1,}, + {"first":86,"second":74,"amount":-1,}, + {"first":86,"second":84,"amount":1,}, + {"first":86,"second":97,"amount":-2,}, + {"first":86,"second":99,"amount":-2,}, + {"first":86,"second":100,"amount":-2,}, + {"first":86,"second":101,"amount":-2,}, + {"first":86,"second":103,"amount":-2,}, + {"first":86,"second":109,"amount":-1,}, + {"first":86,"second":110,"amount":-1,}, + {"first":86,"second":111,"amount":-2,}, + {"first":86,"second":112,"amount":-1,}, + {"first":86,"second":113,"amount":-2,}, + {"first":86,"second":114,"amount":-1,}, + {"first":86,"second":115,"amount":-1,}, + {"first":86,"second":117,"amount":-1,}, + {"first":86,"second":171,"amount":-1,}, + {"first":86,"second":191,"amount":-1,}, + {"first":86,"second":192,"amount":-1,}, + {"first":86,"second":193,"amount":-1,}, + {"first":86,"second":194,"amount":-1,}, + {"first":86,"second":195,"amount":-1,}, + {"first":86,"second":196,"amount":-1,}, + {"first":86,"second":197,"amount":-1,}, + {"first":86,"second":198,"amount":-3,}, + {"first":86,"second":199,"amount":-1,}, + {"first":86,"second":224,"amount":-2,}, + {"first":86,"second":225,"amount":-2,}, + {"first":86,"second":226,"amount":-2,}, + {"first":86,"second":227,"amount":-2,}, + {"first":86,"second":228,"amount":-2,}, + {"first":86,"second":229,"amount":-2,}, + {"first":86,"second":230,"amount":-2,}, + {"first":86,"second":231,"amount":-2,}, + {"first":86,"second":232,"amount":-2,}, + {"first":86,"second":233,"amount":-2,}, + {"first":86,"second":234,"amount":-2,}, + {"first":86,"second":235,"amount":-2,}, + {"first":86,"second":239,"amount":1,}, + {"first":86,"second":241,"amount":-1,}, + {"first":86,"second":242,"amount":-2,}, + {"first":86,"second":243,"amount":-2,}, + {"first":86,"second":244,"amount":-2,}, + {"first":86,"second":245,"amount":-2,}, + {"first":86,"second":246,"amount":-2,}, + {"first":86,"second":249,"amount":-1,}, + {"first":86,"second":250,"amount":-1,}, + {"first":86,"second":251,"amount":-1,}, + {"first":86,"second":252,"amount":-1,}, + {"first":86,"second":256,"amount":-1,}, + {"first":86,"second":257,"amount":-2,}, + {"first":86,"second":258,"amount":-1,}, + {"first":86,"second":259,"amount":-2,}, + {"first":86,"second":260,"amount":-1,}, + {"first":86,"second":261,"amount":-2,}, + {"first":86,"second":263,"amount":-1,}, + {"first":86,"second":265,"amount":-1,}, + {"first":86,"second":269,"amount":-1,}, + {"first":86,"second":271,"amount":-1,}, + {"first":86,"second":273,"amount":-1,}, + {"first":86,"second":275,"amount":-1,}, + {"first":86,"second":277,"amount":-1,}, + {"first":86,"second":279,"amount":-1,}, + {"first":86,"second":281,"amount":-1,}, + {"first":86,"second":283,"amount":-1,}, + {"first":86,"second":285,"amount":-1,}, + {"first":86,"second":287,"amount":-1,}, + {"first":86,"second":289,"amount":-1,}, + {"first":86,"second":291,"amount":-1,}, + {"first":86,"second":297,"amount":1,}, + {"first":86,"second":299,"amount":1,}, + {"first":86,"second":301,"amount":1,}, + {"first":86,"second":308,"amount":-1,}, + {"first":86,"second":324,"amount":-1,}, + {"first":86,"second":328,"amount":-1,}, + {"first":86,"second":331,"amount":-1,}, + {"first":86,"second":333,"amount":-1,}, + {"first":86,"second":335,"amount":-1,}, + {"first":86,"second":337,"amount":-1,}, + {"first":86,"second":339,"amount":-2,}, + {"first":86,"second":341,"amount":-1,}, + {"first":86,"second":343,"amount":-1,}, + {"first":86,"second":345,"amount":-1,}, + {"first":86,"second":347,"amount":-1,}, + {"first":86,"second":349,"amount":-1,}, + {"first":86,"second":351,"amount":-1,}, + {"first":86,"second":353,"amount":-1,}, + {"first":86,"second":361,"amount":-1,}, + {"first":86,"second":363,"amount":-1,}, + {"first":86,"second":365,"amount":-1,}, + {"first":86,"second":367,"amount":-1,}, + {"first":86,"second":369,"amount":-1,}, + {"first":86,"second":371,"amount":-1,}, + {"first":86,"second":506,"amount":-1,}, + {"first":86,"second":507,"amount":-2,}, + {"first":86,"second":508,"amount":-1,}, + {"first":86,"second":509,"amount":-2,}, + {"first":86,"second":511,"amount":-1,}, + {"first":86,"second":537,"amount":-1,}, + {"first":86,"second":8218,"amount":-1,}, + {"first":86,"second":8222,"amount":-1,}, + {"first":86,"second":8230,"amount":-2,}, + {"first":86,"second":8249,"amount":-1,}, + {"first":86,"second":8482,"amount":1,}, + {"first":87,"second":44,"amount":-2,}, + {"first":87,"second":46,"amount":-2,}, + {"first":87,"second":65,"amount":-1,}, + {"first":87,"second":97,"amount":-1,}, + {"first":87,"second":99,"amount":-1,}, + {"first":87,"second":100,"amount":-1,}, + {"first":87,"second":101,"amount":-1,}, + {"first":87,"second":103,"amount":-1,}, + {"first":87,"second":111,"amount":-1,}, + {"first":87,"second":113,"amount":-1,}, + {"first":87,"second":171,"amount":-1,}, + {"first":87,"second":187,"amount":1,}, + {"first":87,"second":191,"amount":-1,}, + {"first":87,"second":192,"amount":-1,}, + {"first":87,"second":193,"amount":-1,}, + {"first":87,"second":194,"amount":-1,}, + {"first":87,"second":195,"amount":-1,}, + {"first":87,"second":196,"amount":-1,}, + {"first":87,"second":197,"amount":-1,}, + {"first":87,"second":198,"amount":-2,}, + {"first":87,"second":224,"amount":-1,}, + {"first":87,"second":225,"amount":-1,}, + {"first":87,"second":226,"amount":-1,}, + {"first":87,"second":227,"amount":-1,}, + {"first":87,"second":228,"amount":-1,}, + {"first":87,"second":229,"amount":-1,}, + {"first":87,"second":230,"amount":-1,}, + {"first":87,"second":231,"amount":-1,}, + {"first":87,"second":232,"amount":-1,}, + {"first":87,"second":233,"amount":-1,}, + {"first":87,"second":234,"amount":-1,}, + {"first":87,"second":235,"amount":-1,}, + {"first":87,"second":238,"amount":1,}, + {"first":87,"second":239,"amount":1,}, + {"first":87,"second":242,"amount":-1,}, + {"first":87,"second":243,"amount":-1,}, + {"first":87,"second":244,"amount":-1,}, + {"first":87,"second":245,"amount":-1,}, + {"first":87,"second":246,"amount":-1,}, + {"first":87,"second":256,"amount":-1,}, + {"first":87,"second":257,"amount":-1,}, + {"first":87,"second":258,"amount":-1,}, + {"first":87,"second":259,"amount":-1,}, + {"first":87,"second":260,"amount":-1,}, + {"first":87,"second":261,"amount":-1,}, + {"first":87,"second":263,"amount":-1,}, + {"first":87,"second":265,"amount":-1,}, + {"first":87,"second":269,"amount":-1,}, + {"first":87,"second":271,"amount":-1,}, + {"first":87,"second":273,"amount":-1,}, + {"first":87,"second":275,"amount":-1,}, + {"first":87,"second":277,"amount":-1,}, + {"first":87,"second":279,"amount":-1,}, + {"first":87,"second":281,"amount":-1,}, + {"first":87,"second":283,"amount":-1,}, + {"first":87,"second":285,"amount":-1,}, + {"first":87,"second":287,"amount":-1,}, + {"first":87,"second":289,"amount":-1,}, + {"first":87,"second":291,"amount":-1,}, + {"first":87,"second":297,"amount":1,}, + {"first":87,"second":299,"amount":1,}, + {"first":87,"second":301,"amount":1,}, + {"first":87,"second":333,"amount":-1,}, + {"first":87,"second":335,"amount":-1,}, + {"first":87,"second":337,"amount":-1,}, + {"first":87,"second":339,"amount":-1,}, + {"first":87,"second":506,"amount":-1,}, + {"first":87,"second":507,"amount":-1,}, + {"first":87,"second":508,"amount":-1,}, + {"first":87,"second":509,"amount":-1,}, + {"first":87,"second":511,"amount":-1,}, + {"first":87,"second":8218,"amount":-1,}, + {"first":87,"second":8222,"amount":-1,}, + {"first":87,"second":8230,"amount":-1,}, + {"first":87,"second":8249,"amount":-1,}, + {"first":87,"second":8250,"amount":1,}, + {"first":88,"second":44,"amount":1,}, + {"first":88,"second":46,"amount":1,}, + {"first":88,"second":59,"amount":1,}, + {"first":88,"second":74,"amount":1,}, + {"first":88,"second":84,"amount":1,}, + {"first":88,"second":239,"amount":1,}, + {"first":88,"second":297,"amount":1,}, + {"first":88,"second":299,"amount":1,}, + {"first":88,"second":301,"amount":1,}, + {"first":88,"second":308,"amount":1,}, + {"first":88,"second":8218,"amount":1,}, + {"first":88,"second":8222,"amount":1,}, + {"first":88,"second":8230,"amount":1,}, + {"first":89,"second":44,"amount":-3,}, + {"first":89,"second":46,"amount":-3,}, + {"first":89,"second":65,"amount":-2,}, + {"first":89,"second":67,"amount":-1,}, + {"first":89,"second":71,"amount":-1,}, + {"first":89,"second":74,"amount":-1,}, + {"first":89,"second":79,"amount":-1,}, + {"first":89,"second":81,"amount":-1,}, + {"first":89,"second":84,"amount":1,}, + {"first":89,"second":97,"amount":-2,}, + {"first":89,"second":99,"amount":-2,}, + {"first":89,"second":100,"amount":-2,}, + {"first":89,"second":101,"amount":-2,}, + {"first":89,"second":103,"amount":-2,}, + {"first":89,"second":109,"amount":-2,}, + {"first":89,"second":110,"amount":-2,}, + {"first":89,"second":111,"amount":-2,}, + {"first":89,"second":112,"amount":-2,}, + {"first":89,"second":113,"amount":-2,}, + {"first":89,"second":114,"amount":-2,}, + {"first":89,"second":115,"amount":-1,}, + {"first":89,"second":117,"amount":-2,}, + {"first":89,"second":171,"amount":-1,}, + {"first":89,"second":191,"amount":-2,}, + {"first":89,"second":192,"amount":-2,}, + {"first":89,"second":193,"amount":-2,}, + {"first":89,"second":194,"amount":-2,}, + {"first":89,"second":195,"amount":-2,}, + {"first":89,"second":196,"amount":-2,}, + {"first":89,"second":197,"amount":-2,}, + {"first":89,"second":198,"amount":-3,}, + {"first":89,"second":199,"amount":-1,}, + {"first":89,"second":210,"amount":-1,}, + {"first":89,"second":211,"amount":-1,}, + {"first":89,"second":212,"amount":-1,}, + {"first":89,"second":213,"amount":-1,}, + {"first":89,"second":214,"amount":-1,}, + {"first":89,"second":216,"amount":-1,}, + {"first":89,"second":224,"amount":-2,}, + {"first":89,"second":225,"amount":-2,}, + {"first":89,"second":226,"amount":-2,}, + {"first":89,"second":227,"amount":-2,}, + {"first":89,"second":228,"amount":-2,}, + {"first":89,"second":229,"amount":-2,}, + {"first":89,"second":230,"amount":-2,}, + {"first":89,"second":231,"amount":-2,}, + {"first":89,"second":232,"amount":-2,}, + {"first":89,"second":233,"amount":-2,}, + {"first":89,"second":234,"amount":-2,}, + {"first":89,"second":235,"amount":-2,}, + {"first":89,"second":237,"amount":-1,}, + {"first":89,"second":239,"amount":1,}, + {"first":89,"second":241,"amount":-2,}, + {"first":89,"second":242,"amount":-2,}, + {"first":89,"second":243,"amount":-2,}, + {"first":89,"second":244,"amount":-2,}, + {"first":89,"second":245,"amount":-2,}, + {"first":89,"second":246,"amount":-2,}, + {"first":89,"second":249,"amount":-2,}, + {"first":89,"second":250,"amount":-2,}, + {"first":89,"second":251,"amount":-2,}, + {"first":89,"second":252,"amount":-2,}, + {"first":89,"second":256,"amount":-2,}, + {"first":89,"second":257,"amount":-1,}, + {"first":89,"second":258,"amount":-2,}, + {"first":89,"second":259,"amount":-1,}, + {"first":89,"second":260,"amount":-2,}, + {"first":89,"second":261,"amount":-2,}, + {"first":89,"second":263,"amount":-2,}, + {"first":89,"second":265,"amount":-2,}, + {"first":89,"second":269,"amount":-2,}, + {"first":89,"second":271,"amount":-2,}, + {"first":89,"second":273,"amount":-2,}, + {"first":89,"second":275,"amount":-2,}, + {"first":89,"second":277,"amount":-2,}, + {"first":89,"second":279,"amount":-2,}, + {"first":89,"second":281,"amount":-2,}, + {"first":89,"second":283,"amount":-2,}, + {"first":89,"second":285,"amount":-2,}, + {"first":89,"second":287,"amount":-2,}, + {"first":89,"second":289,"amount":-2,}, + {"first":89,"second":291,"amount":-2,}, + {"first":89,"second":297,"amount":1,}, + {"first":89,"second":299,"amount":1,}, + {"first":89,"second":301,"amount":1,}, + {"first":89,"second":308,"amount":-1,}, + {"first":89,"second":324,"amount":-1,}, + {"first":89,"second":328,"amount":-1,}, + {"first":89,"second":331,"amount":-1,}, + {"first":89,"second":333,"amount":-2,}, + {"first":89,"second":335,"amount":-2,}, + {"first":89,"second":337,"amount":-2,}, + {"first":89,"second":338,"amount":-1,}, + {"first":89,"second":339,"amount":-2,}, + {"first":89,"second":341,"amount":-1,}, + {"first":89,"second":343,"amount":-1,}, + {"first":89,"second":345,"amount":-1,}, + {"first":89,"second":347,"amount":-1,}, + {"first":89,"second":349,"amount":-1,}, + {"first":89,"second":351,"amount":-1,}, + {"first":89,"second":353,"amount":-1,}, + {"first":89,"second":361,"amount":-1,}, + {"first":89,"second":363,"amount":-1,}, + {"first":89,"second":365,"amount":-1,}, + {"first":89,"second":367,"amount":-1,}, + {"first":89,"second":369,"amount":-1,}, + {"first":89,"second":371,"amount":-1,}, + {"first":89,"second":506,"amount":-2,}, + {"first":89,"second":507,"amount":-1,}, + {"first":89,"second":508,"amount":-2,}, + {"first":89,"second":509,"amount":-2,}, + {"first":89,"second":511,"amount":-2,}, + {"first":89,"second":537,"amount":-1,}, + {"first":89,"second":8218,"amount":-3,}, + {"first":89,"second":8222,"amount":-3,}, + {"first":89,"second":8230,"amount":-2,}, + {"first":89,"second":8249,"amount":-1,}, + {"first":90,"second":74,"amount":1,}, + {"first":90,"second":84,"amount":1,}, + {"first":90,"second":121,"amount":-1,}, + {"first":90,"second":187,"amount":1,}, + {"first":90,"second":239,"amount":1,}, + {"first":90,"second":253,"amount":-1,}, + {"first":90,"second":255,"amount":-1,}, + {"first":90,"second":297,"amount":1,}, + {"first":90,"second":299,"amount":1,}, + {"first":90,"second":301,"amount":1,}, + {"first":90,"second":308,"amount":1,}, + {"first":90,"second":375,"amount":-1,}, + {"first":90,"second":7923,"amount":-1,}, + {"first":90,"second":8250,"amount":1,}, + {"first":91,"second":106,"amount":2,}, + {"first":91,"second":309,"amount":2,}, + {"first":98,"second":120,"amount":-1,}, + {"first":99,"second":74,"amount":1,}, + {"first":99,"second":84,"amount":-1,}, + {"first":99,"second":89,"amount":-1,}, + {"first":99,"second":221,"amount":-1,}, + {"first":99,"second":308,"amount":1,}, + {"first":99,"second":354,"amount":-1,}, + {"first":99,"second":356,"amount":-1,}, + {"first":99,"second":358,"amount":-1,}, + {"first":99,"second":374,"amount":-1,}, + {"first":99,"second":7922,"amount":-1,}, + {"first":101,"second":34,"amount":-1,}, + {"first":101,"second":39,"amount":-2,}, + {"first":102,"second":41,"amount":1,}, + {"first":102,"second":42,"amount":1,}, + {"first":102,"second":44,"amount":-1,}, + {"first":102,"second":45,"amount":-1,}, + {"first":102,"second":46,"amount":-1,}, + {"first":102,"second":58,"amount":1,}, + {"first":102,"second":59,"amount":1,}, + {"first":102,"second":63,"amount":1,}, + {"first":102,"second":93,"amount":1,}, + {"first":102,"second":116,"amount":1,}, + {"first":102,"second":118,"amount":1,}, + {"first":102,"second":119,"amount":1,}, + {"first":102,"second":121,"amount":1,}, + {"first":102,"second":125,"amount":1,}, + {"first":102,"second":187,"amount":1,}, + {"first":102,"second":236,"amount":1,}, + {"first":102,"second":238,"amount":1,}, + {"first":102,"second":239,"amount":2,}, + {"first":102,"second":297,"amount":1,}, + {"first":102,"second":299,"amount":1,}, + {"first":102,"second":301,"amount":1,}, + {"first":102,"second":8208,"amount":-1,}, + {"first":102,"second":8216,"amount":1,}, + {"first":102,"second":8217,"amount":1,}, + {"first":102,"second":8218,"amount":-1,}, + {"first":102,"second":8220,"amount":1,}, + {"first":102,"second":8221,"amount":1,}, + {"first":102,"second":8222,"amount":-1,}, + {"first":102,"second":8230,"amount":-1,}, + {"first":102,"second":8250,"amount":1,}, + {"first":102,"second":8482,"amount":2,}, + {"first":102,"second":64831,"amount":1,}, + {"first":107,"second":44,"amount":1,}, + {"first":107,"second":45,"amount":-1,}, + {"first":107,"second":46,"amount":1,}, + {"first":107,"second":58,"amount":1,}, + {"first":107,"second":59,"amount":1,}, + {"first":107,"second":8208,"amount":-1,}, + {"first":107,"second":8230,"amount":1,}, + {"first":110,"second":34,"amount":-1,}, + {"first":110,"second":39,"amount":-2,}, + {"first":111,"second":34,"amount":-1,}, + {"first":111,"second":39,"amount":-2,}, + {"first":111,"second":120,"amount":-1,}, + {"first":111,"second":8216,"amount":-1,}, + {"first":111,"second":8217,"amount":-2,}, + {"first":111,"second":8220,"amount":-1,}, + {"first":111,"second":8221,"amount":-2,}, + {"first":112,"second":120,"amount":-1,}, + {"first":112,"second":8216,"amount":-2,}, + {"first":112,"second":8217,"amount":-2,}, + {"first":112,"second":8220,"amount":-1,}, + {"first":112,"second":8221,"amount":-2,}, + {"first":113,"second":106,"amount":1,}, + {"first":113,"second":309,"amount":1,}, + {"first":114,"second":44,"amount":-2,}, + {"first":114,"second":45,"amount":-1,}, + {"first":114,"second":46,"amount":-2,}, + {"first":114,"second":58,"amount":1,}, + {"first":114,"second":59,"amount":1,}, + {"first":114,"second":102,"amount":1,}, + {"first":114,"second":116,"amount":1,}, + {"first":114,"second":118,"amount":1,}, + {"first":114,"second":119,"amount":1,}, + {"first":114,"second":120,"amount":1,}, + {"first":114,"second":121,"amount":1,}, + {"first":114,"second":122,"amount":1,}, + {"first":114,"second":253,"amount":1,}, + {"first":114,"second":355,"amount":1,}, + {"first":114,"second":357,"amount":1,}, + {"first":114,"second":359,"amount":1,}, + {"first":114,"second":373,"amount":1,}, + {"first":114,"second":375,"amount":1,}, + {"first":114,"second":7809,"amount":1,}, + {"first":114,"second":7811,"amount":1,}, + {"first":114,"second":7813,"amount":1,}, + {"first":114,"second":7923,"amount":1,}, + {"first":114,"second":8208,"amount":-1,}, + {"first":114,"second":8216,"amount":2,}, + {"first":114,"second":8217,"amount":2,}, + {"first":114,"second":8218,"amount":-2,}, + {"first":114,"second":8220,"amount":2,}, + {"first":114,"second":8221,"amount":2,}, + {"first":114,"second":8222,"amount":-2,}, + {"first":114,"second":8230,"amount":-2,}, + {"first":116,"second":45,"amount":-1,}, + {"first":116,"second":63,"amount":-1,}, + {"first":116,"second":187,"amount":1,}, + {"first":116,"second":8208,"amount":-1,}, + {"first":116,"second":8250,"amount":1,}, + {"first":117,"second":34,"amount":-1,}, + {"first":117,"second":39,"amount":-1,}, + {"first":118,"second":44,"amount":-2,}, + {"first":118,"second":46,"amount":-2,}, + {"first":118,"second":8218,"amount":-2,}, + {"first":118,"second":8222,"amount":-2,}, + {"first":118,"second":8230,"amount":-1,}, + {"first":119,"second":44,"amount":-1,}, + {"first":119,"second":46,"amount":-1,}, + {"first":119,"second":8218,"amount":-1,}, + {"first":119,"second":8222,"amount":-1,}, + {"first":119,"second":8230,"amount":-1,}, + {"first":121,"second":39,"amount":1,}, + {"first":121,"second":44,"amount":-1,}, + {"first":121,"second":46,"amount":-1,}, + {"first":121,"second":8218,"amount":-1,}, + {"first":121,"second":8222,"amount":-1,}, + {"first":121,"second":8230,"amount":-1,}, + {"first":123,"second":106,"amount":2,}, + {"first":123,"second":309,"amount":2,}, + ], + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "canGenerateBitmap": true, + "maintainGms1Font": false, + "parent": { + "name": "font", + "path": "folders/font.yy", + }, +} \ No newline at end of file diff --git a/fonts/_f_h3/_f_h3.png b/fonts/_f_h3/_f_h3.png index d29cacc77..6de33a967 100644 Binary files a/fonts/_f_h3/_f_h3.png and b/fonts/_f_h3/_f_h3.png differ diff --git a/fonts/_f_h3/_f_h3.yy b/fonts/_f_h3/_f_h3.yy index 1e02d94f6..c3ff84be9 100644 --- a/fonts/_f_h3/_f_h3.yy +++ b/fonts/_f_h3/_f_h3.yy @@ -24,7 +24,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, - "ascender": 0, + "ascender": 26, "glyphs": { "32": {"x":2,"y":2,"w":7,"h":35,"character":32,"shift":7,"offset":0,}, "33": {"x":47,"y":76,"w":5,"h":35,"character":33,"shift":9,"offset":2,}, diff --git a/objects/_p_dialog/Create_0.gml b/objects/_p_dialog/Create_0.gml index cdc5926cb..e66b28e41 100644 --- a/objects/_p_dialog/Create_0.gml +++ b/objects/_p_dialog/Create_0.gml @@ -17,8 +17,8 @@ dialog_resiz_my = 0; dialog_w_min = 320; dialog_h_min = 320; - dialog_w_max = 1000; - dialog_h_max = 1000; + dialog_w_max = WIN_W; + dialog_h_max = WIN_H; onResize = -1; draggable = true; @@ -39,7 +39,7 @@ dialog_dragging = false; } - if(FOCUS == self) { + if(sFOCUS) { if(destroy_on_escape && keyboard_check_pressed(vk_escape)) instance_destroy(self); if(mouse_check_button_pressed(mb_left)) { diff --git a/objects/_p_dialog/Destroy_0.gml b/objects/_p_dialog/Destroy_0.gml index bd37b463f..cad6a91ed 100644 --- a/objects/_p_dialog/Destroy_0.gml +++ b/objects/_p_dialog/Destroy_0.gml @@ -1,5 +1,5 @@ /// @description init -if(HOVER == self) HOVER = noone; -if(FOCUS == self) setFocus(noone); +if(sHOVER) HOVER = noone; +if(sFOCUS) setFocus(noone); TEXTBOX_ACTIVE = noone; \ No newline at end of file diff --git a/objects/_p_dialog/Step_1.gml b/objects/_p_dialog/Step_1.gml index ed88e517a..1ed3fd72e 100644 --- a/objects/_p_dialog/Step_1.gml +++ b/objects/_p_dialog/Step_1.gml @@ -35,7 +35,7 @@ if !ready exit; dialog_x + dialog_w, dialog_y + dialog_h) < 12) { CURSOR = cr_size_we; - if(FOCUS == self && mouse_check_button_pressed(mb_left)) { + if(sFOCUS && mouse_check_button_pressed(mb_left)) { dialog_resizing |= 1 << 0; dialog_resiz_sw = dialog_w; dialog_resiz_mx = mouse_mx; @@ -51,7 +51,7 @@ if !ready exit; else CURSOR = cr_size_ns; - if(FOCUS == self && mouse_check_button_pressed(mb_left)) { + if(sFOCUS && mouse_check_button_pressed(mb_left)) { dialog_resizing |= 1 << 1; dialog_resiz_sh = dialog_h; dialog_resiz_mx = mouse_mx; diff --git a/objects/o_dialog_about/Create_0.gml b/objects/o_dialog_about/Create_0.gml index 73f429213..f59ec72d6 100644 --- a/objects/o_dialog_about/Create_0.gml +++ b/objects/o_dialog_about/Create_0.gml @@ -2,10 +2,10 @@ event_inherited(); #region data - dialog_w = 500; - dialog_h = 600; + dialog_w = ui(500); + dialog_h = ui(600); - thank_h = dialog_h - 220; + thank_h = dialog_h - ui(220); destroy_on_click_out = true; #endregion @@ -17,8 +17,8 @@ event_inherited(); [ "gif importer\nWindow commands\nExecute shell simple", "YellowAfterLife" ], ] - sc_thank = new scrollPane(dialog_w - 64, thank_h, function(_y, _m) { - var cx = (dialog_w - 64) / 2; + sc_thank = new scrollPane(dialog_w - ui(64), thank_h, function(_y, _m) { + var cx = (dialog_w - ui(64)) / 2; var _h = _y; var yy = _y; draw_clear_alpha(c_ui_blue_grey, 0); @@ -28,7 +28,7 @@ event_inherited(); draw_text(cx, yy, "Special Thanks"); for( var i = 0; i < array_length(credits); i++ ) { - yy += 40; + yy += line_height(, 8); draw_set_font(f_p2); draw_set_color(c_ui_blue_grey); draw_text(cx, yy, credits[i][0]); @@ -37,13 +37,16 @@ event_inherited(); draw_set_font(f_p0b); draw_set_color(c_ui_blue_white); draw_text(cx, yy, credits[i][1]); + + yy += ui(8); } draw_set_font(f_p0); draw_set_color(c_ui_blue_ltgrey); - yy += 40; - draw_text(cx, yy, "Made with GameMaker Studio 2, Abode Illustrator,\nAseprite"); + yy += ui(40); + draw_text_ext(cx, yy, "Made with GameMaker Studio 2, Abode Illustrator, Aseprite", -1, sc_thank.w - ui(16)); + yy += ui(32); - return yy - _h + 32; + return yy - _h + ui(32); }) #endregion \ No newline at end of file diff --git a/objects/o_dialog_about/Draw_64.gml b/objects/o_dialog_about/Draw_64.gml index d548af72b..749903c75 100644 --- a/objects/o_dialog_about/Draw_64.gml +++ b/objects/o_dialog_about/Draw_64.gml @@ -3,23 +3,24 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion #region about var cx = dialog_x + dialog_w / 2; + var ly = dialog_y + ui(96); - draw_sprite(icon_64, 0, cx, dialog_y + 56); + draw_sprite_ui_uniform(icon_64, 0, cx, dialog_y + ui(56)); draw_set_text(f_h3, fa_center, fa_top, c_ui_orange); - draw_text(cx, dialog_y + 96, "Pixel Composer"); + draw_text(cx, ly, "Pixel Composer"); + ly += line_height(); draw_set_text(f_p0, fa_center, fa_top, c_ui_blue_ltgrey); - draw_text(cx, dialog_y + 132, "2021, MakhamDev"); + draw_text(cx, ly, "2021, MakhamDev"); - var thank_y = dialog_y + 180; - - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 24, thank_y - 8, dialog_w - 48, thank_h + 16); - sc_thank.active = FOCUS == self; - sc_thank.draw(dialog_x + 32, thank_y); + var thank_y = dialog_y + ui(188); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(24), thank_y - ui(8), dialog_w - ui(48), thank_h + ui(16)); + sc_thank.active = sFOCUS; + sc_thank.draw(dialog_x + ui(32), thank_y); #endregion \ No newline at end of file diff --git a/objects/o_dialog_add_multiple_images/Create_0.gml b/objects/o_dialog_add_multiple_images/Create_0.gml index d5c31d0e4..fb11b39b1 100644 --- a/objects/o_dialog_add_multiple_images/Create_0.gml +++ b/objects/o_dialog_add_multiple_images/Create_0.gml @@ -3,8 +3,8 @@ event_inherited(); #region data destroy_on_click_out = true; - dialog_w = 290; - dialog_h = 192; + dialog_w = ui(290); + dialog_h = ui(172); paths = ""; is_dir = false; @@ -16,7 +16,7 @@ event_inherited(); is_dir = directory_exists(path); if(is_dir) { - dialog_h += 96; + dialog_h += ui(96); } } diff --git a/objects/o_dialog_add_multiple_images/Draw_64.gml b/objects/o_dialog_add_multiple_images/Draw_64.gml index ad990a5e2..89c1827ce 100644 --- a/objects/o_dialog_add_multiple_images/Draw_64.gml +++ b/objects/o_dialog_add_multiple_images/Draw_64.gml @@ -3,23 +3,23 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Import multiple images"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Import multiple images"); #endregion #region nodes - draw_sprite_stretched(s_ui_panel_bg, 1, dialog_x + 16, dialog_y + 44, dialog_w - 32, 132); - var grid_size = 64; - var grid_width = 80; - var grid_space = 16; + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(16), dialog_y + ui(44), dialog_w - ui(32), ui(112)); + var grid_size = ui(64); + var grid_space = ui(16); + var grid_width = grid_size + grid_space; for(var i = 0; i < array_length(nodes); i++) { var _node = nodes[i]; - var xx = dialog_x + 16 + 16 + i * (grid_size + grid_space); - var yy = dialog_y + 44 + 16; + var xx = dialog_x + ui(32) + i * grid_width; + var yy = dialog_y + ui(60); PANEL_GRAPH.stepBegin(); var nx = PANEL_GRAPH.mouse_grid_x; @@ -35,7 +35,7 @@ if !ready exit; for( var i = 0; i < array_length(path_arr); i++ ) { var path = path_arr[i]; Node_create_Image_path(nx, ny, path); - ny += 160; + ny += ui(160); } break; case 1 : @@ -50,30 +50,30 @@ if !ready exit; } } - draw_sprite(_node.spr, 0, xx + grid_size / 2, yy + grid_size / 2); + draw_sprite_ui_uniform(_node.spr, 0, xx + grid_size / 2, yy + grid_size / 2); - draw_set_text(f_p1, fa_center, fa_top, c_white); - draw_text_ext(xx + grid_size / 2, yy + grid_size + 4, _node.name, -1, grid_width); + draw_set_text(f_p2, fa_center, fa_top, c_white); + draw_text(xx + grid_size / 2, yy + grid_size + 4, _node.name); } #endregion #region directory option if(is_dir) { - var dir_y = dialog_y + 188; + var dir_y = dialog_y + ui(172); - cb_recursive.active = FOCUS == self; - cb_recursive.hover = HOVER == self; - cb_recursive.draw(dialog_x + dialog_w - 48, dir_y, dir_recursive, [mouse_mx, mouse_my]); + cb_recursive.active = sFOCUS; + cb_recursive.hover = sHOVER; + cb_recursive.draw(dialog_x + dialog_w - ui(48), dir_y, dir_recursive, mouse_ui); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 20, dir_y + 14, "Recursive"); + draw_text(dialog_x + ui(24), dir_y + ui(14), "Recursive"); - dir_y += 40; - tb_filter.active = FOCUS == self; - tb_filter.hover = HOVER == self; - tb_filter.draw(dialog_x + 100, dir_y, dialog_w - 100 - 20, 36, dir_filter, [mouse_mx, mouse_my]); + dir_y += ui(40); + tb_filter.active = sFOCUS; + tb_filter.hover = sHOVER; + tb_filter.draw(dialog_x + ui(100), dir_y, dialog_w - ui(120), ui(36), dir_filter, mouse_ui); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 20, dir_y + 18, "Filter"); + draw_text(dialog_x + ui(24), dir_y + ui(18), "Filter"); } #endregion \ No newline at end of file diff --git a/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy b/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy index 8c9c3a594..389389083 100644 --- a/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy +++ b/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_add_multiple_images", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -30,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_add_multiple_images", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 2b66d57c6..75c0b58ef 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -9,6 +9,11 @@ event_inherited(); node_called = noone; junction_hovering = noone; + if(ADD_NODE_W == -1 || ADD_NODE_H == -1) { + ADD_NODE_W = ui(532); + ADD_NODE_H = ui(346); + } + dialog_w = ADD_NODE_W; dialog_h = ADD_NODE_H; @@ -92,11 +97,11 @@ event_inherited(); } } - catagory_pane = new scrollPane(132, dialog_h - 66, function(_y, _m) { + catagory_pane = new scrollPane(ui(132), dialog_h - ui(66), function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); var hh = 0; - var hg = 28; + var hg = ui(28); var key = ds_map_find_first(ALL_NODES); var cnt = PANEL_GRAPH.getCurrentContext(); var context = cnt == -1? "" : instanceof(cnt); @@ -117,9 +122,9 @@ event_inherited(); } 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)) { - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, _y + hh + 3, 103, hg - 6, c_white, 0.75); + draw_sprite_stretched(s_ui_panel_bg, 0, 0, _y + hh, ui(132), hg); + } else if(point_in_rectangle(_m[0], _m[1], 0, _y + hh, ui(100), _y + hh + hg - 1)) { + draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, _y + hh + ui(3), ui(103), hg - ui(6), c_white, 0.75); if(mouse_check_button(mb_left)) { page_key = key; ADD_NODE_PAGE = key; @@ -129,14 +134,14 @@ event_inherited(); } } - draw_text(8, _y + hh + hg / 2, key); + draw_text(ui(8), _y + hh + hg / 2, key); hh += hg; } return hh; }); - content_pane = new scrollPane(dialog_w - 144, dialog_h - 66, function(_y, _m) { + content_pane = new scrollPane(dialog_w - ui(144), dialog_h - ui(66), function(_y, _m) { draw_clear_alpha(c_white, 0); var nodes = page; @@ -144,9 +149,9 @@ event_inherited(); var hh = 0; if(ADD_NODE_MODE == 0) { - var grid_size = 64; - var grid_width = 80; - var grid_space = 12; + var grid_size = ui(64); + var grid_width = ui(80); + var grid_space = ui(12); var col = floor(content_pane.surface_w / (grid_width + grid_space)); var row = ceil(node_count / col); var yy = _y + grid_space; @@ -177,7 +182,7 @@ event_inherited(); var spr_x = _boxx + grid_size / 2; var spr_y = yy + grid_size / 2; if(variable_struct_exists(_node, "spr") && sprite_exists(_node.spr)) - draw_sprite(_node.spr, 0, spr_x, spr_y); + draw_sprite_ui_uniform(_node.spr, 0, spr_x, spr_y); draw_set_text(f_p2, fa_center, fa_top, c_white); name_height = max(name_height, string_height_ext(_node.name, -1, grid_width) + 8); @@ -190,7 +195,7 @@ event_inherited(); } } else if(ADD_NODE_MODE == 1) { var list_width = content_pane.surface_w; - var list_height = 28; + var list_height = ui(28); var yy = _y + list_height / 2; hh += list_height; @@ -200,25 +205,25 @@ event_inherited(); if(i % 2) { BLEND_ADD - draw_sprite_stretched_ext(s_node_bg, 0, 4, yy, list_width - 8, list_height, c_white, 0.2); + draw_sprite_stretched_ext(s_node_bg, 0, ui(4), yy, list_width - ui(8), list_height, c_white, 0.2); BLEND_NORMAL } if(point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) { - draw_sprite_stretched(s_node_active, 0, 4, yy, list_width - 8, list_height); + draw_sprite_stretched(s_node_active, 0, ui(4), yy, list_width - ui(8), list_height); if(mouse_check_button_pressed(mb_left)) buildNode(_node); } - var spr_x = list_height / 2 + 8 + 6; + var spr_x = list_height / 2 + ui(14); var spr_y = yy + list_height / 2; if(variable_struct_exists(_node, "spr") && sprite_exists(_node.spr)) { - var ss = (list_height - 8) / max(sprite_get_width(_node.spr), sprite_get_height(_node.spr)); + var ss = (list_height - ui(8)) / max(sprite_get_width(_node.spr), sprite_get_height(_node.spr)); draw_sprite_ext(_node.spr, 0, spr_x, spr_y, ss, ss, 0, c_white, 1); } draw_set_text(f_p2, fa_left, fa_center, c_white); - draw_text(list_height + 8 + 12, yy + list_height / 2, _node.name); + draw_text(list_height + ui(20), yy + list_height / 2, _node.name); yy += list_height; hh += list_height; @@ -231,15 +236,15 @@ event_inherited(); #region resize dialog_resizable = true; - dialog_w_min = 200; - dialog_h_min = 120; - dialog_w_max = 800; - dialog_h_max = 640; + dialog_w_min = ui(200); + dialog_h_min = ui(120); + dialog_w_max = ui(800); + dialog_h_max = ui(640); onResize = function() { - catagory_pane.resize(132, dialog_h - 66); - content_pane.resize(dialog_w - 144, dialog_h - 66); - search_pane.resize(dialog_w - 40, dialog_h - 66); + catagory_pane.resize(ui(132), dialog_h - ui(66)); + content_pane.resize(dialog_w - ui(144), dialog_h - ui(66)); + search_pane.resize(dialog_w - ui(40), dialog_h - ui(66)); ADD_NODE_W = dialog_w; ADD_NODE_H = dialog_h; @@ -298,16 +303,16 @@ event_inherited(); searchCollection(search_list, search_string, false); } - search_pane = new scrollPane(dialog_w - 40, dialog_h - 66, function(_y, _m) { + search_pane = new scrollPane(dialog_w - ui(40), dialog_h - ui(66), function(_y, _m) { draw_clear_alpha(c_white, 0); var amo = ds_list_size(search_list); var hh = 0; if(ADD_NODE_MODE == 0) { - var grid_size = 64; - var grid_width = 80; - var grid_space = 16; + var grid_size = ui(64); + var grid_width = ui(80); + var grid_space = ui(16); var col = floor(search_pane.surface_w / (grid_width + grid_space)); var yy = _y + grid_space; var index = 0; @@ -338,7 +343,7 @@ event_inherited(); var _si = current_time * PREF_MAP[? "collection_preview_speed"] / 3000; var _sw = sprite_get_width(_node.spr); var _sh = sprite_get_height(_node.spr); - var _ss = 32 / max(_sw, _sh); + var _ss = ui(32) / max(_sw, _sh); var _sox = sprite_get_xoffset(_node.spr); var _soy = sprite_get_yoffset(_node.spr); @@ -353,7 +358,7 @@ event_inherited(); draw_set_text(f_p2, fa_center, fa_top, c_white); var txt = _node.name; - name_height = max(name_height, string_height_ext(txt, -1, grid_width) + 8); + name_height = max(name_height, string_height_ext(txt, -1, grid_width) + ui(8)); draw_text_ext(_boxx + grid_size / 2, yy + grid_size + 4, txt, -1, grid_width); if(point_in_rectangle(_m[0], _m[1], _nx, yy, _nx + grid_width, yy + grid_size)) { @@ -381,7 +386,7 @@ event_inherited(); } } else if(ADD_NODE_MODE == 1) { var list_width = search_pane.surface_w; - var list_height = 28; + var list_height = ui(28); var yy = _y + list_height / 2; hh += list_height; @@ -396,7 +401,7 @@ event_inherited(); if(i % 2) { BLEND_ADD - draw_sprite_stretched_ext(s_node_bg, 0, 4, yy, list_width - 8, list_height, c_white, 0.2); + draw_sprite_stretched_ext(s_node_bg, 0, ui(4), yy, list_width - ui(8), list_height, c_white, 0.2); BLEND_NORMAL } @@ -404,12 +409,12 @@ event_inherited(); var _si = current_time * PREF_MAP[? "collection_preview_speed"] / 3000; var _sw = sprite_get_width(_node.spr); var _sh = sprite_get_height(_node.spr); - var _ss = (list_height - 8) / max(_sw, _sh); + var _ss = (list_height - ui(8)) / max(_sw, _sh); var _sox = sprite_get_xoffset(_node.spr); var _soy = sprite_get_yoffset(_node.spr); - var _sx = list_height / 2 + 8 + 6; + var _sx = list_height / 2 + ui(14); var _sy = yy + list_height / 2; _sx += _sw * _ss / 2 - _sox * _ss; _sy += _sh * _ss / 2 - _soy * _ss; @@ -418,7 +423,7 @@ event_inherited(); } draw_set_text(f_p2, fa_left, fa_center, c_white); - draw_text(list_height + 8 + 12, yy + list_height / 2, _node.name); + draw_text(list_height + ui(20), yy + list_height / 2, _node.name); if(point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) { node_selecting = i; @@ -427,7 +432,7 @@ event_inherited(); } if(node_selecting == i) { - draw_sprite_stretched(s_node_active, 0, 4, yy, list_width - 8, list_height); + draw_sprite_stretched(s_node_active, 0, ui(4), yy, list_width - ui(8), list_height); if(keyboard_check_pressed(vk_enter)) buildNode(_node, _param); } diff --git a/objects/o_dialog_add_node/Draw_64.gml b/objects/o_dialog_add_node/Draw_64.gml index 59aa6feed..e42249475 100644 --- a/objects/o_dialog_add_node/Draw_64.gml +++ b/objects/o_dialog_add_node/Draw_64.gml @@ -3,7 +3,7 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion @@ -15,26 +15,26 @@ if !ready exit; tb_search.hover = false; tb_search.sprite_index = 1; - catagory_pane.active = FOCUS == self; - catagory_pane.draw(dialog_x + 14, dialog_y + 52); + catagory_pane.active = sFOCUS; + catagory_pane.draw(dialog_x + ui(14), dialog_y + ui(52)); - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 120, dialog_y + 52, dialog_w - 120 - 14, dialog_h - 66); - content_pane.active = FOCUS == self; - content_pane.draw(dialog_x + 120, dialog_y + 52); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(120), dialog_y + ui(52), dialog_w - ui(134), dialog_h - ui(66)); + content_pane.active = sFOCUS; + content_pane.draw(dialog_x + ui(120), dialog_y + ui(52)); node_selecting = 0; } else { tb_search.focus = true; tb_search.hover = true; - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 14, dialog_y + 52, dialog_w - 28, dialog_h - 66); - search_pane.active = FOCUS == self; - search_pane.draw(dialog_x + 16, dialog_y + 52); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(14), dialog_y + ui(52), dialog_w - ui(28), dialog_h - ui(66)); + search_pane.active = sFOCUS; + search_pane.draw(dialog_x + ui(16), dialog_y + ui(52)); } - tb_search.draw(dialog_x + 14, dialog_y + 14, dialog_w - 64, 32, search_string, [mouse_mx, mouse_my]); - var bx = dialog_x + dialog_w - 44; - var by = dialog_y + 16; - var b = buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, + tb_search.draw(dialog_x + ui(14), dialog_y + ui(14), dialog_w - ui(64), ui(32), search_string, mouse_ui); + var bx = dialog_x + dialog_w - ui(44); + var by = dialog_y + ui(16); + var b = buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, ADD_NODE_MODE == 1? "List view" : "Grid view", s_add_node_view, ADD_NODE_MODE, c_ui_blue_grey); if(b == 2) ADD_NODE_MODE = !ADD_NODE_MODE; diff --git a/objects/o_dialog_anim_time_scaler/Create_0.gml b/objects/o_dialog_anim_time_scaler/Create_0.gml index cee2020a9..29a2e5bb9 100644 --- a/objects/o_dialog_anim_time_scaler/Create_0.gml +++ b/objects/o_dialog_anim_time_scaler/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 368; - dialog_h = 120; + dialog_w = ui(368); + dialog_h = ui(120); destroy_on_click_out = true; #endregion diff --git a/objects/o_dialog_anim_time_scaler/Draw_64.gml b/objects/o_dialog_anim_time_scaler/Draw_64.gml index 45860cd58..4e68e948f 100644 --- a/objects/o_dialog_anim_time_scaler/Draw_64.gml +++ b/objects/o_dialog_anim_time_scaler/Draw_64.gml @@ -3,30 +3,30 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Animation scaler"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Animation scaler"); #endregion #region scaler - var yy = dialog_y + 44; + var yy = dialog_y + ui(44); - tb_scale_frame.active = FOCUS == self; - tb_scale_frame.hover = HOVER == self; + tb_scale_frame.active = sFOCUS; + tb_scale_frame.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Target frame length"); - var tb_x = dialog_x + 200; - tb_scale_frame.draw(tb_x, yy, 96, 34, scale_to, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy + ui(17), "Target frame length"); + var tb_x = dialog_x + ui(200); + tb_scale_frame.draw(tb_x, yy, ui(96), TEXTBOX_HEIGHT, scale_to, mouse_ui); - var sx1 = tb_x + 96; + var sx1 = tb_x + ui(96); draw_set_text(f_p1, fa_right, fa_top, c_ui_blue_grey); - draw_text(sx1, yy + 34 + 4, "Scaling factor: " + string(scale_to / ANIMATOR.frames_total)); + draw_text(sx1, yy + ui(38), "Scaling factor: " + string(scale_to / ANIMATOR.frames_total)); - var bx = sx1 + 16; + var bx = sx1 + ui(16); var by = yy; - if(buttonInstant(s_button_lime, bx, by, 34, 34, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { + if(buttonInstant(s_button_lime, bx, by, ui(34), ui(34), mouse_ui, sFOCUS, sHOVER, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { var fac = scale_to / ANIMATOR.frames_total; var key = ds_map_find_first(NODE_MAP); repeat(ds_map_size(NODE_MAP)) { diff --git a/objects/o_dialog_animation/Create_0.gml b/objects/o_dialog_animation/Create_0.gml index 2584e6eb1..806bb7e5d 100644 --- a/objects/o_dialog_animation/Create_0.gml +++ b/objects/o_dialog_animation/Create_0.gml @@ -4,8 +4,8 @@ event_inherited(); #region data anchor = ANCHOR.right | ANCHOR.bottom; - dialog_w = 368; - dialog_h = 188; + dialog_w = ui(368); + dialog_h = ui(188); destroy_on_click_out = true; #endregion diff --git a/objects/o_dialog_animation/Draw_64.gml b/objects/o_dialog_animation/Draw_64.gml index 0e85025d3..7db9ffd70 100644 --- a/objects/o_dialog_animation/Draw_64.gml +++ b/objects/o_dialog_animation/Draw_64.gml @@ -3,33 +3,33 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Animation"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Animation"); #endregion #region draw - var yy = dialog_y + 44; + var yy = dialog_y + ui(44); - tb_length.active = FOCUS == self; - tb_length.hover = HOVER == self; + tb_length.active = sFOCUS; + tb_length.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Animation length"); - tb_length.draw(dialog_x + dialog_w - 24 - 96, yy, 96, 34, ANIMATOR.frames_total, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy + ui(17), "Animation length"); + tb_length.draw(dialog_x + dialog_w - ui(120), yy, ui(96), TEXTBOX_HEIGHT, ANIMATOR.frames_total, mouse_ui); - yy += 44; - tb_framerate.active = FOCUS == self; - tb_framerate.hover = HOVER == self; + yy += ui(44); + tb_framerate.active = sFOCUS; + tb_framerate.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Preview frame rate"); - tb_framerate.draw(dialog_x + dialog_w - 24 - 96, yy, 96, 34, ANIMATOR.framerate, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy + ui(17), "Preview frame rate"); + tb_framerate.draw(dialog_x + dialog_w - ui(120), yy, ui(96), TEXTBOX_HEIGHT, ANIMATOR.framerate, mouse_ui); - yy += 44; - eb_playback.active = FOCUS == self; - eb_playback.hover = HOVER == self; + yy += ui(44); + eb_playback.active = sFOCUS; + eb_playback.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "On end"); - eb_playback.draw(dialog_x + dialog_w - 24 - 128, yy, 128, 34, ANIMATOR.playback, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy + ui(17), "On end"); + eb_playback.draw(dialog_x + dialog_w - ui(152), yy, ui(128), TEXTBOX_HEIGHT, ANIMATOR.playback, mouse_ui); #endregion \ No newline at end of file diff --git a/objects/o_dialog_animation/o_dialog_animation.yy b/objects/o_dialog_animation/o_dialog_animation.yy index 1a78c3599..c3ff8d9c6 100644 --- a/objects/o_dialog_animation/o_dialog_animation.yy +++ b/objects/o_dialog_animation/o_dialog_animation.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_animation", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -30,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_animation", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_assetbox/Create_0.gml b/objects/o_dialog_assetbox/Create_0.gml index c5f61e6c9..1ee743f3a 100644 --- a/objects/o_dialog_assetbox/Create_0.gml +++ b/objects/o_dialog_assetbox/Create_0.gml @@ -7,16 +7,16 @@ event_inherited(); target = noone; - dialog_w = 608; - dialog_h = 320; + dialog_w = ui(608); + dialog_h = ui(320); anchor = ANCHOR.top | ANCHOR.right; dialog_resizable = true; - dialog_w_min = 200; - dialog_h_min = 120; - dialog_w_max = 640; - dialog_h_max = 480; + dialog_w_min = ui(200); + dialog_h_min = ui(120); + dialog_w_max = ui(640); + dialog_h_max = ui(480); #endregion #region context @@ -40,15 +40,15 @@ event_inherited(); #endregion #region surface - folderW = 180; - content_w = dialog_w - 32 - folderW; - content_h = dialog_h - 32; + folderW = ui(180); + content_w = dialog_w - ui(32) - folderW; + content_h = dialog_h - ui(32); function onResize() { - content_w = dialog_w - 32 - folderW; - content_h = dialog_h - 32; + content_w = dialog_w - ui(32) - folderW; + content_h = dialog_h - ui(32); contentPane.resize(content_w, content_h); - folderPane.resize(folderW - 8, content_h - 32); + folderPane.resize(folderW - ui(16), content_h - ui(32)); } contentPane = new scrollPane(content_w, content_h, function(_y, _m) { @@ -59,9 +59,9 @@ event_inherited(); var hh = 0; var frame = current_time * PREF_MAP[? "collection_preview_speed"] / 8000; - var grid_size = 64; - var img_size = grid_size - 16; - var grid_space = 12; + var grid_size = ui(64); + var img_size = grid_size - ui(16); + var grid_space = ui(12); var col = max(1, floor(content_w / (grid_size + grid_space))); var row = ceil(amo / col); var yy = _y + grid_space; @@ -106,16 +106,16 @@ event_inherited(); return hh; }); - folderPane = new scrollPane(folderW - 8, content_h - 48, function(_y, _m) { + folderPane = new scrollPane(folderW - ui(16), content_h - ui(32), function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); var hh = 8; for(var i = 0; i < ds_list_size(global.ASSETS.subDir); i++) { - var hg = global.ASSETS.subDir[| i].draw(self, 8, _y, _m, folderPane.w - 16, HOVER == self, FOCUS == self, global.ASSETS); + var hg = global.ASSETS.subDir[| i].draw(self, ui(8), _y + 8, _m, folderPane.w - ui(16), sHOVER, sFOCUS, global.ASSETS); hh += hg; _y += hg; } - return hh; + return hh + 8; }); #endregion \ No newline at end of file diff --git a/objects/o_dialog_assetbox/Draw_64.gml b/objects/o_dialog_assetbox/Draw_64.gml index 6217b8fb9..4831f747e 100644 --- a/objects/o_dialog_assetbox/Draw_64.gml +++ b/objects/o_dialog_assetbox/Draw_64.gml @@ -1,20 +1,20 @@ /// @description init #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion #region draw draw_set_text(f_p0b, fa_left, fa_top, c_white); - draw_text(dialog_x + 16, dialog_y + 16, "Assets"); + draw_text(dialog_x + ui(16), dialog_y + ui(16), "Assets"); - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 16, dialog_y + 40, folderW - 8, dialog_h - 16 - 40); - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 16 + folderW, dialog_y + 16, dialog_w - 16 - folderW - 16, dialog_h - 32); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(16), dialog_y + ui(48), folderW - ui(8), dialog_h - ui(64)); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(16) + folderW, dialog_y + ui(16), dialog_w - ui(32) - folderW, dialog_h - ui(32)); - folderPane.active = HOVER == self; - folderPane.draw(dialog_x + 16, dialog_y + 48); + folderPane.active = sHOVER; + folderPane.draw(dialog_x + ui(16), dialog_y + ui(48)); - contentPane.active = HOVER == self; - contentPane.draw(dialog_x + 20 + folderW, dialog_y + 16); + contentPane.active = sHOVER; + contentPane.draw(dialog_x + ui(20) + folderW, dialog_y + ui(16)); #endregion \ No newline at end of file diff --git a/objects/o_dialog_color_selector/Create_0.gml b/objects/o_dialog_color_selector/Create_0.gml index 990531082..94c3e2234 100644 --- a/objects/o_dialog_color_selector/Create_0.gml +++ b/objects/o_dialog_color_selector/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 240 + 16 + 540; - dialog_h = 380; + dialog_w = ui(796); + dialog_h = ui(380); destroy_on_click_out = true; name = "Color selector"; @@ -16,7 +16,7 @@ event_inherited(); sat = 0; val = 0; - color_surface = surface_create(256, 256); + color_surface = surface_create_valid(ui(256), ui(256)); onApply = -1; @@ -112,15 +112,15 @@ event_inherited(); } presetCollect(); - sp_preset_w = 240 - 32 - 16; - sp_preset_size = 24; + sp_preset_w = ui(240 - 32 - 16); + sp_preset_size = ui(24); click_block = false; - sp_presets = new scrollPane(sp_preset_w, dialog_h - 44 - 18, function(_y, _m) { - var ww = sp_preset_w - 32 - 8; - var hh = 32; + sp_presets = new scrollPane(sp_preset_w, dialog_h - ui(62), function(_y, _m) { + var ww = sp_preset_w - ui(40); + var hh = ui(32); var _gs = sp_preset_size; - var yy = _y + 8; + var yy = _y + ui(8); var _height, pre_amo; draw_clear_alpha(c_ui_blue_black, 0); @@ -130,25 +130,25 @@ event_inherited(); var row = ceil(pre_amo / col); if(preset_selecting == i) - _height = 28 + row * _gs + 12; + _height = ui(28) + row * _gs + ui(12); else - _height = 52; + _height = ui(52); - draw_sprite_stretched(s_ui_panel_bg, 1, 4, yy, sp_preset_w - 16, _height); + draw_sprite_stretched(s_ui_panel_bg, 1, ui(4), yy, sp_preset_w - ui(16), _height); draw_set_text(f_p2, fa_left, fa_top, c_ui_blue_ltgrey); - draw_text(16, yy + 8, preset_name[| i]); + draw_text(ui(16), yy + ui(8), preset_name[| i]); if(preset_selecting == i) - drawPaletteGrid(presets[| i], 16, yy + 28, ww, _gs, current_color); + drawPaletteGrid(presets[| i], ui(16), yy + ui(28), ww, _gs, current_color); else - drawPalette(presets[| i], 16, yy + 24, ww, 20); + drawPalette(presets[| i], ui(16), yy + ui(28), ww, ui(20)); - if(FOCUS == self) { + if(sFOCUS) { if(!click_block && mouse_check_button(mb_left)) { if(preset_selecting == i) { - if(point_in_rectangle(_m[0], _m[1], 16, yy + 28, 16 + ww, yy + 28 + _height)) { - var m_ax = _m[0] - 16; - var m_ay = _m[1] - (yy + 28); + if(point_in_rectangle(_m[0], _m[1], ui(16), yy + ui(28), ui(16) + ww, yy + ui(28) + _height)) { + var m_ax = _m[0] - ui(16); + var m_ay = _m[1] - (yy + ui(28)); var m_gx = floor(m_ax / _gs); var m_gy = floor(m_ay / _gs); @@ -157,15 +157,15 @@ event_inherited(); current_color = presets[| i][_index]; resetHSV(); } - } else if(point_in_rectangle(_m[0], _m[1], 4, yy, 4 + sp_preset_w - 16, yy + _height)) { + } else if(point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_preset_w - ui(16), yy + _height)) { preset_selecting = i; click_block = true; } } } - yy += _height + 4; - hh += _height + 4; + yy += _height + ui(4); + hh += _height + ui(4); } if(mouse_check_button_released(mb_left)) diff --git a/objects/o_dialog_color_selector/Draw_64.gml b/objects/o_dialog_color_selector/Draw_64.gml index 585214233..4b9381a7e 100644 --- a/objects/o_dialog_color_selector/Draw_64.gml +++ b/objects/o_dialog_color_selector/Draw_64.gml @@ -16,63 +16,63 @@ if !ready exit; if(mouse_check_button_pressed(mb_right)) if(dropper_active == true) instance_destroy(); - var dx = mouse_mx + 36; - var dy = mouse_my + 36; - draw_sprite_stretched(s_color_picker_sample, 0, dx - 20, dy - 20, 40, 40); - draw_sprite_stretched_ext(s_color_picker_sample, 0, dx - 18, dy - 18, 36, 36, dropper_color, 1); + var dx = mouse_mx + ui(36); + var dy = mouse_my + ui(36); + draw_sprite_stretched(s_color_picker_sample, 0, dx - ui(20), dy - ui(20), ui(40), ui(40)); + draw_sprite_stretched_ext(s_color_picker_sample, 0, dx - ui(18), dy - ui(18), ui(36), ui(36), dropper_color, 1); exit; } #endregion #region base UI var presets_x = dialog_x; - var presets_w = 240; + var presets_w = ui(240); - var content_x = dialog_x + presets_w + 16; - var content_w = dialog_w - presets_w - 16; + var content_x = dialog_x + presets_w + ui(16); + var content_w = dialog_w - presets_w - ui(16); draw_sprite_stretched(s_dialog_bg, 0, presets_x, dialog_y, presets_w, dialog_h); - if(FOCUS == self) draw_sprite_stretched(s_dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h); + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h); draw_sprite_stretched(s_dialog_bg, 0, content_x, dialog_y, content_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, content_x, dialog_y, content_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(presets_x + 24, dialog_y + 24, "Palettes"); - draw_text(content_x + 24, dialog_y + 24, name); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(presets_x + ui(24), dialog_y + ui(16), "Palettes"); + draw_text(content_x + ui(24), dialog_y + ui(16), name); #endregion #region palette - draw_sprite_stretched(s_ui_panel_bg, 0, presets_x + 16, dialog_y + 44, 240 - 32, dialog_h - 44 - 16); + draw_sprite_stretched(s_ui_panel_bg, 0, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60)); - sp_presets.active = FOCUS == self; - sp_presets.draw(presets_x + 16 + 8, dialog_y + 44); + sp_presets.active = sFOCUS; + sp_presets.draw(presets_x + ui(24), dialog_y + ui(44)); - var bx = presets_x + presets_w - 16 - 28; - var by = dialog_y + 12; + var bx = presets_x + presets_w - ui(44); + var by = dialog_y + ui(12); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Refresh", s_refresh_24) == 2) + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Refresh", s_refresh_24) == 2) presetCollect(); - bx -= 32; + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Open palette folder", s_folder_24) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open palette folder", s_folder_24) == 2) { var _realpath = environment_get_variable("LOCALAPPDATA") + "\\Pixels_Composer\\Palettes"; var _windir = environment_get_variable("WINDIR") + "\\explorer.exe"; execute_shell(_windir, _realpath); } - bx -= 32; + bx -= ui(32); #endregion #region color surface - var col_x = content_x + 20; - var col_y = dialog_y + 48; + var col_x = content_x + ui(20); + var col_y = dialog_y + ui(48); - draw_sprite_stretched(s_ui_panel_bg, 0, col_x - 8, col_y - 8, 256 + 16, 256 + 16); + draw_sprite_stretched(s_ui_panel_bg, 0, col_x - ui(8), col_y - ui(8), ui(256 + 16), ui(256 + 16)); - if(!is_surface(color_surface)) color_surface = surface_create(256, 256); + if(!is_surface(color_surface)) color_surface = surface_create_valid(ui(256), ui(256)); surface_set_target(color_surface); - draw_sprite_ext(s_fx_pixel, 0, 0, 0, 256, 256, 0, c_white, 1); + draw_sprite_uniform(s_fx_pixel, 0, 0, 0, ui(256)); surface_reset_target(); shader_set(sh_color_picker); @@ -84,32 +84,32 @@ if !ready exit; #endregion #region selector - var hue_x = content_x + 300; + var hue_x = content_x + ui(300); var hue_y = col_y; - draw_sprite_stretched(s_ui_panel_bg, 0, hue_x - 8, hue_y - 8, 32, 256 + 16); + draw_sprite_stretched(s_ui_panel_bg, 0, hue_x - ui(8), hue_y - ui(8), ui(32), ui(256 + 16)); for(var i = 0; i < 256; i++) { draw_set_color(make_color_hsv(i, 255, 255)); - draw_rectangle(hue_x, hue_y + i, hue_x + 16, hue_y + i + 1, false); + draw_rectangle(hue_x, hue_y + ui(i), hue_x + ui(16), hue_y + ui(i + 1), false); } - var hy = hue_y + hue; - draw_sprite_stretched_ext(s_ui_base_white, 0, hue_x - 3, hy - 6, 24, 10, make_color_hsv(hue, 255, 255), 1); - draw_sprite_stretched_ext(s_ui_base_white, 0, col_x + sat - 6, col_y + 256 - val - 6, 12, 12, current_color, 1); + var hy = hue_y + ui(hue); + draw_sprite_stretched_ext(s_ui_base_white, 0, hue_x - ui(3), hy - ui(6), ui(24), ui(10), make_color_hsv(hue, 255, 255), 1); + draw_sprite_stretched_ext(s_ui_base_white, 0, col_x + ui(sat - 6), col_y + ui(256 - val - 6), ui(12), ui(12), current_color, 1); - if(FOCUS == self) { + if(sFOCUS) { if(mouse_check_button_pressed(mb_left)) { - if(point_in_rectangle(mouse_mx, mouse_my, hue_x, hue_y, hue_x + 16, hue_y + 256)) { + if(point_in_rectangle(mouse_mx, mouse_my, hue_x, hue_y, hue_x + ui(16), hue_y + ui(256))) { hue_dragging = true; - } else if(point_in_rectangle(mouse_mx, mouse_my, col_x, col_y, col_x + 256, col_y + 256)) { + } else if(point_in_rectangle(mouse_mx, mouse_my, col_x, col_y, col_x + ui(256), col_y + ui(256))) { value_draggin = true; } } } if(hue_dragging) { - hue = clamp(mouse_my - hue_y, 0, 256); + hue = clamp((mouse_my - hue_y) / UI_SCALE, 0, 256); setHSV(); if(mouse_check_button_released(mb_left)) @@ -117,72 +117,69 @@ if !ready exit; } if(value_draggin) { - var smx = mouse_mx - col_x; - var smy = mouse_my - col_y; - - sat = clamp(smx, 0, 256); - val = 256 - clamp(smy, 0, 256); + sat = clamp((mouse_mx - col_x) / UI_SCALE, 0, 256); + val = 256 - clamp((mouse_my - col_y) / UI_SCALE, 0, 256); setHSV(); - + if(mouse_check_button_released(mb_left)) value_draggin = false; } #endregion #region data - var data_x = hue_x + 40; + var data_x = hue_x + ui(40); var data_y = col_y; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(data_x, data_y + 40 * 0 + 17, "Hue"); - draw_text(data_x, data_y + 40 * 1 + 17, "Saturation") - draw_text(data_x, data_y + 40 * 2 + 17, "Value"); + draw_text(data_x, data_y + ui(40 * 0 + 17), "Hue"); + draw_text(data_x, data_y + ui(40 * 1 + 17), "Saturation") + draw_text(data_x, data_y + ui(40 * 2 + 17), "Value"); - tb_hue.active = FOCUS == self; tb_hue.hover = HOVER == self; - tb_sat.active = FOCUS == self; tb_sat.hover = HOVER == self; - tb_val.active = FOCUS == self; tb_val.hover = HOVER == self; + tb_hue.active = sFOCUS; tb_hue.hover = sHOVER; + tb_sat.active = sFOCUS; tb_sat.hover = sHOVER; + tb_val.active = sFOCUS; tb_val.hover = sHOVER; - tb_hue.draw(data_x + 80, data_y + 44 * 0, 100, 34, round(color_get_hue(current_color)), [mouse_mx, mouse_my]); - tb_sat.draw(data_x + 80, data_y + 44 * 1, 100, 34, round(color_get_saturation(current_color)), [mouse_mx, mouse_my]); - tb_val.draw(data_x + 80, data_y + 44 * 2, 100, 34, round(color_get_value(current_color)), [mouse_mx, mouse_my]); + tb_hue.draw(data_x + ui(80), data_y + ui(44 * 0), ui(100), TEXTBOX_HEIGHT, round(color_get_hue(current_color)), mouse_ui); + tb_sat.draw(data_x + ui(80), data_y + ui(44 * 1), ui(100), TEXTBOX_HEIGHT, round(color_get_saturation(current_color)), mouse_ui); + tb_val.draw(data_x + ui(80), data_y + ui(44 * 2), ui(100), TEXTBOX_HEIGHT, round(color_get_value(current_color)), mouse_ui); - data_y = data_y + 44 * 3 + 8; + data_y = data_y + ui(44 * 3 + 8); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(data_x, data_y + 40 * 0 + 17, "Red"); - draw_text(data_x, data_y + 40 * 1 + 17, "Green"); - draw_text(data_x, data_y + 40 * 2 + 17, "Blue"); + draw_text(data_x, data_y + ui(40 * 0 + 17), "Red"); + draw_text(data_x, data_y + ui(40 * 1 + 17), "Green"); + draw_text(data_x, data_y + ui(40 * 2 + 17), "Blue"); - tb_red.active = FOCUS == self; tb_red.hover = HOVER == self; - tb_green.active = FOCUS == self; tb_green.hover = HOVER == self; - tb_blue.active = FOCUS == self; tb_blue.hover = HOVER == self; + tb_red.active = sFOCUS; tb_red.hover = sHOVER; + tb_green.active = sFOCUS; tb_green.hover = sHOVER; + tb_blue.active = sFOCUS; tb_blue.hover = sHOVER; - tb_red.draw (data_x + 80, data_y + 44 * 0, 100, 34, color_get_red(current_color), [mouse_mx, mouse_my]); - tb_green.draw(data_x + 80, data_y + 44 * 1, 100, 34, color_get_green(current_color), [mouse_mx, mouse_my]); - tb_blue.draw (data_x + 80, data_y + 44 * 2, 100, 34, color_get_blue(current_color), [mouse_mx, mouse_my]); + tb_red.draw (data_x + ui(80), data_y + ui(44 * 0), ui(100), TEXTBOX_HEIGHT, color_get_red(current_color), mouse_ui); + tb_green.draw(data_x + ui(80), data_y + ui(44 * 1), ui(100), TEXTBOX_HEIGHT, color_get_green(current_color), mouse_ui); + tb_blue.draw (data_x + ui(80), data_y + ui(44 * 2), ui(100), TEXTBOX_HEIGHT, color_get_blue(current_color), mouse_ui); - tb_hex.active = FOCUS == self; tb_hex.hover = HOVER == self; + tb_hex.active = sFOCUS; tb_hex.hover = sHOVER; - tb_hex.draw(hue_x - 108 - 20, data_y + 44 * 3, 108, 34, color_get_hex(current_color), [mouse_mx, mouse_my]); + tb_hex.draw(hue_x - ui(128), data_y + ui(44 * 3), ui(108), TEXTBOX_HEIGHT, color_get_hex(current_color), mouse_ui); #endregion #region controls - var cx = content_x + 36; - var cy = dialog_y + dialog_h - 36; + var cx = content_x + ui(36); + var cy = dialog_y + dialog_h - ui(36); - draw_sprite_stretched(s_color_picker_sample, 0, cx - 20, cy - 20, 40, 40); - draw_sprite_stretched_ext(s_color_picker_sample, 0, cx - 18, cy - 18, 36, 36, current_color, 1); + draw_sprite_stretched(s_color_picker_sample, 0, cx - ui(20), cy - ui(20), ui(40), ui(40)); + draw_sprite_stretched_ext(s_color_picker_sample, 0, cx - ui(18), cy - ui(18), ui(36), ui(36), current_color, 1); - var bx = content_x + content_w - 36; - var by = dialog_y + dialog_h - 36; - if(buttonInstant(s_button_lime, bx - 18, by - 18, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { + var bx = content_x + content_w - ui(36); + var by = dialog_y + dialog_h - ui(36); + if(buttonInstant(s_button_lime, bx - ui(18), by - ui(18), ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { onApply(current_color); instance_destroy(); } - var bx = content_x + 80; - var by = dialog_y + dialog_h - 36; - if(buttonInstant(s_button_hide, bx - 18, by - 18, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_color_picker_dropper, 0, c_white) == 2) { + var bx = content_x + ui(80); + var by = dialog_y + dialog_h - ui(36); + if(buttonInstant(s_button_hide, bx - ui(18), by - ui(18), ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "", s_color_picker_dropper, 0, c_white) == 2) { dropper_active = true; } #endregion \ No newline at end of file diff --git a/objects/o_dialog_color_selector/o_dialog_color_selector.yy b/objects/o_dialog_color_selector/o_dialog_color_selector.yy index 93f3e5159..3e7230f94 100644 --- a/objects/o_dialog_color_selector/o_dialog_color_selector.yy +++ b/objects/o_dialog_color_selector/o_dialog_color_selector.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_color_selector", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,10 +25,10 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -32,8 +36,4 @@ "name": "selector", "path": "folders/dialog/selector.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_color_selector", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_drag_folder/Create_0.gml b/objects/o_dialog_drag_folder/Create_0.gml index fa17b322e..37c49c1ee 100644 --- a/objects/o_dialog_drag_folder/Create_0.gml +++ b/objects/o_dialog_drag_folder/Create_0.gml @@ -3,8 +3,8 @@ event_inherited(); #region data destroy_on_click_out = true; - dialog_w = 290; - dialog_h = 188; + dialog_w = ui(290); + dialog_h = ui(188); target = noone; dir_paths = ""; diff --git a/objects/o_dialog_drag_folder/Draw_64.gml b/objects/o_dialog_drag_folder/Draw_64.gml index 739a9355d..e386e2bf1 100644 --- a/objects/o_dialog_drag_folder/Draw_64.gml +++ b/objects/o_dialog_drag_folder/Draw_64.gml @@ -3,35 +3,35 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Import directory"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Import directory"); #endregion #region directory option - var dir_y = dialog_y + 44; - - cb_recursive.active = FOCUS == self; - cb_recursive.hover = HOVER == self; - cb_recursive.draw(dialog_x + dialog_w - 48, dir_y, dir_recursive, [mouse_mx, mouse_my]); + var dir_y = dialog_y + ui(44); + + cb_recursive.active = sFOCUS; + cb_recursive.hover = sHOVER; + cb_recursive.draw(dialog_x + dialog_w - ui(48), dir_y, dir_recursive, mouse_ui); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 20, dir_y + 14, "Recursive"); - - dir_y += 40; - tb_filter.active = FOCUS == self; - tb_filter.hover = HOVER == self; - tb_filter.draw(dialog_x + 100, dir_y, dialog_w - 100 - 20, 36, dir_filter, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(20), dir_y + ui(14), "Recursive"); + + dir_y += ui(40); + tb_filter.active = sFOCUS; + tb_filter.hover = sHOVER; + tb_filter.draw(dialog_x + ui(100), dir_y, dialog_w - ui(120), ui(36), dir_filter, mouse_ui); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 20, dir_y + 18, "Filter"); + draw_text(dialog_x + ui(20), dir_y + ui(18), "Filter"); - var bx = dialog_x + dialog_w - 20 - 100; - dir_y += 48; + var bx = dialog_x + dialog_w - ui(120); + dir_y += ui(48); - if(buttonInstant(s_button, bx, dir_y, 100, 40, [mouse_mx, mouse_my], FOCUS == self, HOVER == self) == 2) { + if(buttonInstant(s_button, bx, dir_y, ui(100), ui(40), mouse_ui, sFOCUS, sHOVER) == 2) { if(target) { var paths = paths_to_array(dir_paths, dir_recursive, dir_filter); target.updatePaths(paths); @@ -41,5 +41,5 @@ if !ready exit; } draw_set_text(f_p0b, fa_center, fa_center, c_ui_orange); - draw_text(bx + 50, dir_y + 20, "Import"); + draw_text(bx + ui(50), dir_y + ui(20), "Import"); #endregion \ No newline at end of file diff --git a/objects/o_dialog_drag_folder/o_dialog_drag_folder.yy b/objects/o_dialog_drag_folder/o_dialog_drag_folder.yy index 5db658c31..d9881d11e 100644 --- a/objects/o_dialog_drag_folder/o_dialog_drag_folder.yy +++ b/objects/o_dialog_drag_folder/o_dialog_drag_folder.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_drag_folder", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -30,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_drag_folder", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_exit/Create_0.gml b/objects/o_dialog_exit/Create_0.gml index e5ba5c288..38baa8716 100644 --- a/objects/o_dialog_exit/Create_0.gml +++ b/objects/o_dialog_exit/Create_0.gml @@ -2,6 +2,6 @@ event_inherited(); #region data - dialog_w = 400; - dialog_h = 140; + dialog_w = ui(400); + dialog_h = ui(140); #endregion \ No newline at end of file diff --git a/objects/o_dialog_exit/Draw_64.gml b/objects/o_dialog_exit/Draw_64.gml index 4dde1dd64..c4ed3bb47 100644 --- a/objects/o_dialog_exit/Draw_64.gml +++ b/objects/o_dialog_exit/Draw_64.gml @@ -7,39 +7,41 @@ draw_set_alpha(1); #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion #region text + var py = dialog_y + ui(16); draw_set_text(f_h5, fa_left, fa_top, c_ui_blue_grey); - draw_text(dialog_x + 24, dialog_y + 24, "Project modified"); + draw_text(dialog_x + ui(24), py, "Project modified"); + py += line_height(, 4); draw_set_text(f_p0, fa_left, fa_top, c_white); - draw_text(dialog_x + 24, dialog_y + 54, "Save progress before exit?"); + draw_text(dialog_x + ui(24), py, "Save progress before exit?"); - var bw = 96, bh = 32; - var bx1 = dialog_x + dialog_w - 16; - var by1 = dialog_y + dialog_h - 16; + var bw = ui(96), bh = TEXTBOX_HEIGHT; + var bx1 = dialog_x + dialog_w - ui(16); + var by1 = dialog_y + dialog_h - ui(16); var bx0 = bx1 - bw; var by0 = by1 - bh; draw_set_text(f_p1, fa_center, fa_center, c_white); - var b = buttonInstant(s_button, bx0, by0, bw, bh, [mouse_mx, mouse_my], FOCUS == self, HOVER == self); + var b = buttonInstant(s_button, bx0, by0, bw, bh, mouse_ui, sFOCUS, sHOVER); draw_text(bx0 + bw / 2, by0 + bh / 2, "Cancel"); if(b == 2) instance_destroy(); - bx0 -= bw + 12; - var b = buttonInstant(s_button, bx0, by0, bw, bh, [mouse_mx, mouse_my], FOCUS == self, HOVER == self); + bx0 -= bw + ui(12); + var b = buttonInstant(s_button, bx0, by0, bw, bh, mouse_ui, sFOCUS, sHOVER); draw_text(bx0 + bw / 2, by0 + bh / 2, "Don't save"); if(b == 2) { PREF_SAVE(); game_end(); } - bx0 -= bw + 12; - var b = buttonInstant(s_button, bx0, by0, bw, bh, [mouse_mx, mouse_my], FOCUS == self, HOVER == self); + bx0 -= bw + ui(12); + var b = buttonInstant(s_button, bx0, by0, bw, bh, mouse_ui, sFOCUS, sHOVER); draw_text(bx0 + bw / 2, by0 + bh / 2, "Save"); if(b == 2) { SAVE(); diff --git a/objects/o_dialog_file_name/Create_0.gml b/objects/o_dialog_file_name/Create_0.gml index ca0c25c88..a0ac64925 100644 --- a/objects/o_dialog_file_name/Create_0.gml +++ b/objects/o_dialog_file_name/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 240; - dialog_h = 48; + dialog_w = ui(240); + dialog_h = ui(48); destroy_on_click_out = true; diff --git a/objects/o_dialog_file_name/Draw_64.gml b/objects/o_dialog_file_name/Draw_64.gml index 219cd572e..cc031afea 100644 --- a/objects/o_dialog_file_name/Draw_64.gml +++ b/objects/o_dialog_file_name/Draw_64.gml @@ -4,12 +4,12 @@ #endregion #region draw TB - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 8, dialog_y + dialog_h / 2, "Name "); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(8), dialog_y + dialog_h / 2, "Name "); - tb_name.active = FOCUS == self; - tb_name.hover = HOVER == self; + tb_name.active = sFOCUS; + tb_name.hover = sHOVER; - tb_name.draw(dialog_x + 64, dialog_y + 8, dialog_w - 64 - 8, dialog_h - 16, - "New file", [mouse_mx, mouse_my]); + tb_name.draw(dialog_x + ui(64), dialog_y + ui(8), dialog_w - ui(72), dialog_h - ui(16), + "New file", mouse_ui); #endregion \ No newline at end of file diff --git a/objects/o_dialog_file_name/o_dialog_file_name.yy b/objects/o_dialog_file_name/o_dialog_file_name.yy index 291e4f7b4..c81ec1309 100644 --- a/objects/o_dialog_file_name/o_dialog_file_name.yy +++ b/objects/o_dialog_file_name/o_dialog_file_name.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_file_name", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -30,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_file_name", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_gradient/Create_0.gml b/objects/o_dialog_gradient/Create_0.gml index 338dfea83..61dbc893e 100644 --- a/objects/o_dialog_gradient/Create_0.gml +++ b/objects/o_dialog_gradient/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 240 + 16 + 540; - dialog_h = 428; + dialog_w = ui(796); + dialog_h = ui(428); name = "Gradient editor"; gradient = noone; @@ -22,7 +22,7 @@ event_inherited(); sat = 0; val = 0; - color_surface = surface_create(256, 256); + color_surface = surface_create_valid(ui(256), ui(256)); onApply = -1; @@ -146,28 +146,28 @@ event_inherited(); } presetCollect(); - sp_preset_w = 240 - 32 - 16; - sp_presets = new scrollPane(sp_preset_w, dialog_h - 44 - 18, function(_y, _m) { - var ww = sp_preset_w - 32 - 8; - var hh = 32; - var yy = _y + 8; - var hg = 52; + sp_preset_w = ui(240 - 32 - 16); + sp_presets = new scrollPane(sp_preset_w, dialog_h - ui(62), function(_y, _m) { + var ww = sp_preset_w - ui(40); + var hh = ui(32); + var yy = _y + ui(8); + var hg = ui(52); draw_clear_alpha(c_ui_blue_black, 0); for(var i = 0; i < ds_list_size(presets); i++) { - draw_sprite_stretched(s_ui_panel_bg, 1, 4, yy, sp_preset_w - 16, hg); + draw_sprite_stretched(s_ui_panel_bg, 1, ui(4), yy, sp_preset_w - ui(16), hg); draw_set_text(f_p2, fa_left, fa_top, c_ui_blue_ltgrey); - draw_text(16, yy + 8, preset_name[| i]); - draw_gradient(16, yy + 24, ww, 16, presets[| i]); + draw_text(ui(16), yy + ui(8), preset_name[| i]); + draw_gradient(ui(16), yy + ui(28), ww, ui(16), presets[| i]); - if(FOCUS == self && point_in_rectangle(_m[0], _m[1], 4, yy, 4 + sp_preset_w - 16, yy + hg)) { + if(sFOCUS && point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_preset_w - ui(16), yy + hg)) { if(mouse_check_button_pressed(mb_left)) ds_list_copy(gradient, presets[| i]); } - yy += hg + 4; - hh += hg + 4; + yy += hg + ui(4); + hh += hg + ui(4); } return hh; diff --git a/objects/o_dialog_gradient/Draw_64.gml b/objects/o_dialog_gradient/Draw_64.gml index 016b93951..bb0e691ab 100644 --- a/objects/o_dialog_gradient/Draw_64.gml +++ b/objects/o_dialog_gradient/Draw_64.gml @@ -13,10 +13,10 @@ if !ready exit; if(dropper_active == 2) instance_destroy(); } - var dx = mouse_mx + 36; - var dy = mouse_my + 36; - draw_sprite_stretched(s_color_picker_sample, 0, dx - 20, dy - 20, 40, 40); - draw_sprite_stretched_ext(s_color_picker_sample, 0, dx - 18, dy - 18, 36, 36, dropper_color, 1); + var dx = mouse_mx + ui(36); + var dy = mouse_my + ui(36); + draw_sprite_stretched(s_color_picker_sample, 0, dx - ui(20), dy - ui(20), ui(40), ui(40)); + draw_sprite_stretched_ext(s_color_picker_sample, 0, dx - ui(18), dy - ui(18), ui(36), ui(36), dropper_color, 1); exit; } @@ -24,36 +24,36 @@ if !ready exit; #region base UI var presets_x = dialog_x; - var presets_w = 240; + var presets_w = ui(240); - var content_x = dialog_x + presets_w + 16; - var content_w = dialog_w - presets_w - 16; + var content_x = dialog_x + presets_w + ui(16); + var content_w = dialog_w - presets_w - ui(16); draw_sprite_stretched(s_dialog_bg, 0, presets_x, dialog_y, presets_w, dialog_h); - if(FOCUS == self) draw_sprite_stretched(s_dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h); + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h); draw_sprite_stretched(s_dialog_bg, 0, content_x, dialog_y, content_w, dialog_h); - if(FOCUS == self) draw_sprite_stretched(s_dialog_active, 0, content_x, dialog_y, content_w, dialog_h); + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, content_x, dialog_y, content_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(presets_x + 24, dialog_y + 24, "Presets"); - draw_text(content_x + 24, dialog_y + 24, name); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(presets_x + ui(24), dialog_y + ui(16), "Presets"); + draw_text(content_x + ui(24), dialog_y + ui(16), name); #endregion #region presets - draw_sprite_stretched(s_ui_panel_bg, 0, presets_x + 16, dialog_y + 44, 240 - 32, dialog_h - 44 - 16); + draw_sprite_stretched(s_ui_panel_bg, 0, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60)); - sp_presets.active = FOCUS == self; - sp_presets.draw(presets_x + 16 + 8, dialog_y + 44); + sp_presets.active = sFOCUS; + sp_presets.draw(presets_x + ui(16 + 8), dialog_y + ui(44)); - var bx = presets_x + presets_w - 16 - 28; - var by = dialog_y + 12; + var bx = presets_x + presets_w - ui(44); + var by = dialog_y + ui(12); - var _b = buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self); + var _b = buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER); if(_b) TOOLTIP = "Add to preset"; if(_b == 2) { - var dia = dialogCall(o_dialog_file_name, mouse_mx + 8, mouse_my + 8); + var dia = dialogCall(o_dialog_file_name, mouse_mx + ui(8), mouse_my + ui(8)); dia.onModify = function (txt) { var file = file_text_open_write(txt + ".txt"); for(var i = 0; i < ds_list_size(gradient); i++) { @@ -72,39 +72,39 @@ if !ready exit; }; dia.path = DIRECTORY + "Gradients/" } - draw_sprite_ext(s_add_24, 0, bx + 14, by + 14, 1, 1, 0, c_ui_blue_grey, 1); - bx -= 32; + draw_sprite_ui_uniform(s_add_24, 0, bx + ui(14), by + ui(14), 1, c_ui_blue_grey); + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Refresh", s_refresh_24) == 2) + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Refresh", s_refresh_24) == 2) presetCollect(); - bx -= 32; + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Open gradient folder", s_folder_24) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open gradient folder", s_folder_24) == 2) { var _realpath = environment_get_variable("LOCALAPPDATA") + "\\Pixels_Composer\\Gradients"; var _windir = environment_get_variable("WINDIR") + "\\explorer.exe"; execute_shell(_windir, _realpath); } - bx -= 32; + bx -= ui(32); #endregion #region gradient - var gr_x = content_x + 22; - var gr_y = dialog_y + 54; - var gr_w = content_w - 44; - var gr_h = 20; + var gr_x = content_x + ui(22); + var gr_y = dialog_y + ui(54); + var gr_w = content_w - ui(44); + var gr_h = ui(20); #region tools - var bx = content_x + content_w - 22 - 28; - var by = dialog_y + 16; + var bx = content_x + content_w - ui(50); + var by = dialog_y + ui(16); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Key blending", s_grad_blend) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Key blending", s_grad_blend) == 2) { if(grad_data != noone) grad_data[| 0] = !grad_data[| 0]; } - bx -= 32; + bx -= ui(32); #endregion - draw_sprite_stretched(s_textbox, 0, gr_x - 6, gr_y - 6, gr_w + 12, gr_h + 12); + draw_sprite_stretched(s_textbox, 0, gr_x - ui(6), gr_y - ui(6), gr_w + ui(12), gr_h + ui(12)); draw_gradient(gr_x, gr_y, gr_w, gr_h, gradient, grad_data[| 0]); var hover = noone; @@ -113,10 +113,10 @@ if !ready exit; var _kx = gr_x + _k.time * gr_w; var _in = _k == key_selecting? 1 : 0; - draw_sprite_ext(s_prop_gradient, _in, _kx, gr_y + gr_h / 2, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_prop_gradient, _in, _kx, gr_y + gr_h / 2, 1); - if(HOVER == self && point_in_rectangle(mouse_mx, mouse_my, _kx - 6, gr_y, _kx + 6, gr_y + gr_h)) { - draw_sprite_ext(s_prop_gradient, _in, _kx, gr_y + gr_h / 2, 1.2, 1.2, 0, c_white, 1); + if(sHOVER && point_in_rectangle(mouse_mx, mouse_my, _kx - ui(6), gr_y, _kx + ui(6), gr_y + gr_h)) { + draw_sprite_ui_uniform(s_prop_gradient, _in, _kx, gr_y + gr_h / 2, 1.2); hover = _k; } } @@ -138,8 +138,8 @@ if !ready exit; } } - if(FOCUS == self) { - if(point_in_rectangle(mouse_mx, mouse_my, gr_x - 6, gr_y - 6, gr_x + gr_w + 12, gr_y + gr_h + 12)) { + if(sFOCUS) { + if(point_in_rectangle(mouse_mx, mouse_my, gr_x - ui(6), gr_y - ui(6), gr_x + gr_w + ui(12), gr_y + gr_h + ui(12))) { if(mouse_check_button_pressed(mb_left)) { if(hover) { key_selecting = hover; @@ -174,14 +174,14 @@ if !ready exit; #endregion #region color surface - var col_x = content_x + 20; - var col_y = dialog_y + 96; + var col_x = content_x + ui(20); + var col_y = dialog_y + ui(96); - draw_sprite_stretched(s_ui_panel_bg, 0, col_x - 8, col_y - 8, 256 + 16, 256 + 16); + draw_sprite_stretched(s_ui_panel_bg, 0, col_x - ui(8), col_y - ui(8), ui(256 + 16), ui(256 + 16)); - if(!is_surface(color_surface)) color_surface = surface_create(256, 256); + if(!is_surface(color_surface)) color_surface = surface_create_valid(ui(256), ui(256)); surface_set_target(color_surface); - draw_sprite_ext(s_fx_pixel, 0, 0, 0, 256, 256, 0, c_white, 1); + draw_sprite_ext(s_fx_pixel, 0, 0, 0, ui(256), ui(256), 0, c_white, 1); surface_reset_target(); shader_set(sh_color_picker); @@ -193,32 +193,32 @@ if !ready exit; #endregion #region selector - var hue_x = content_x + 300; + var hue_x = content_x + ui(300); var hue_y = col_y; - draw_sprite_stretched(s_ui_panel_bg, 0, hue_x - 8, hue_y - 8, 32, 256 + 16); + draw_sprite_stretched(s_ui_panel_bg, 0, hue_x - ui(8), hue_y - ui(8), ui(32), ui(256 + 16)); for(var i = 0; i < 256; i++) { draw_set_color(make_color_hsv(i, 255, 255)); - draw_rectangle(hue_x, hue_y + i, hue_x + 16, hue_y + i + 1, false); + draw_rectangle(hue_x, hue_y + ui(i), hue_x + ui(16), hue_y + ui(i + 1), false); } - var hy = hue_y + hue; - draw_sprite_stretched_ext(s_ui_base_white, 0, hue_x - 3, hy - 6, 24, 10, make_color_hsv(hue, 255, 255), 1); - draw_sprite_stretched_ext(s_ui_base_white, 0, col_x + sat - 6, col_y + 256 - val - 6, 12, 12, current_color, 1); + var hy = hue_y + ui(hue); + draw_sprite_stretched_ext(s_ui_base_white, 0, hue_x - ui(3), hy - ui(6), ui(24), ui(10), make_color_hsv(hue, 255, 255), 1); + draw_sprite_stretched_ext(s_ui_base_white, 0, col_x + ui(sat - 6), col_y + ui(256 - val - 6), ui(12), ui(12), current_color, 1); - if(FOCUS == self) { + if(sFOCUS) { if(mouse_check_button_pressed(mb_left)) { - if(point_in_rectangle(mouse_mx, mouse_my, hue_x, hue_y, hue_x + 16, hue_y + 256)) { + if(point_in_rectangle(mouse_mx, mouse_my, hue_x, hue_y, hue_x + ui(16), hue_y + ui(256))) { hue_dragging = true; - } else if(point_in_rectangle(mouse_mx, mouse_my, col_x, col_y, col_x + 256, col_y + 256)) { + } else if(point_in_rectangle(mouse_mx, mouse_my, col_x, col_y, col_x + ui(256), col_y + ui(256))) { value_draggin = true; } } } if(hue_dragging) { - hue = clamp(mouse_my - hue_y, 0, 256); + hue = clamp((mouse_my - hue_y) / UI_SCALE, 0, 256); setHSV(); if(mouse_check_button_released(mb_left)) @@ -226,11 +226,8 @@ if !ready exit; } if(value_draggin) { - var smx = mouse_mx - col_x; - var smy = mouse_my - col_y; - - sat = clamp(smx, 0, 256); - val = 256 - clamp(smy, 0, 256); + sat = clamp((mouse_mx - col_x) / UI_SCALE, 0, 256); + val = 256 - clamp((mouse_my - col_y) / UI_SCALE, 0, 256); setHSV(); if(mouse_check_button_released(mb_left)) @@ -239,59 +236,59 @@ if !ready exit; #endregion #region data - var data_x = hue_x + 40; + var data_x = hue_x + ui(40); var data_y = col_y; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(data_x, data_y + 40 * 0 + 17, "Hue"); - draw_text(data_x, data_y + 40 * 1 + 17, "Saturation") - draw_text(data_x, data_y + 40 * 2 + 17, "Value"); + draw_text(data_x, data_y + ui(40 * 0 + 17), "Hue"); + draw_text(data_x, data_y + ui(40 * 1 + 17), "Saturation") + draw_text(data_x, data_y + ui(40 * 2 + 17), "Value"); - tb_hue.active = FOCUS == self; tb_hue.hover = HOVER == self; - tb_sat.active = FOCUS == self; tb_sat.hover = HOVER == self; - tb_val.active = FOCUS == self; tb_val.hover = HOVER == self; + tb_hue.active = sFOCUS; tb_hue.hover = sHOVER; + tb_sat.active = sFOCUS; tb_sat.hover = sHOVER; + tb_val.active = sFOCUS; tb_val.hover = sHOVER; - tb_hue.draw(data_x + 80, data_y + 44 * 0, 100, 34, round(color_get_hue(current_color)), [mouse_mx, mouse_my]); - tb_sat.draw(data_x + 80, data_y + 44 * 1, 100, 34, round(color_get_saturation(current_color)), [mouse_mx, mouse_my]); - tb_val.draw(data_x + 80, data_y + 44 * 2, 100, 34, round(color_get_value(current_color)), [mouse_mx, mouse_my]); + tb_hue.draw(data_x + ui(80), data_y + ui(44 * 0), ui(100), TEXTBOX_HEIGHT, round(color_get_hue(current_color)), mouse_ui); + tb_sat.draw(data_x + ui(80), data_y + ui(44 * 1), ui(100), TEXTBOX_HEIGHT, round(color_get_saturation(current_color)), mouse_ui); + tb_val.draw(data_x + ui(80), data_y + ui(44 * 2), ui(100), TEXTBOX_HEIGHT, round(color_get_value(current_color)), mouse_ui); - data_y = data_y + 44 * 3 + 8; + data_y = data_y + ui(44 * 3 + 8); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(data_x, data_y + 40 * 0 + 17, "Red"); - draw_text(data_x, data_y + 40 * 1 + 17, "Green"); - draw_text(data_x, data_y + 40 * 2 + 17, "Blue"); + draw_text(data_x, data_y + ui(40 * 0 + 17), "Red"); + draw_text(data_x, data_y + ui(40 * 1 + 17), "Green"); + draw_text(data_x, data_y + ui(40 * 2 + 17), "Blue"); - tb_red.active = FOCUS == self; tb_red.hover = HOVER == self; - tb_green.active = FOCUS == self; tb_green.hover = HOVER == self; - tb_blue.active = FOCUS == self; tb_blue.hover = HOVER == self; + tb_red.active = sFOCUS; tb_red.hover = sHOVER; + tb_green.active = sFOCUS; tb_green.hover = sHOVER; + tb_blue.active = sFOCUS; tb_blue.hover = sHOVER; - tb_red.draw (data_x + 80, data_y + 44 * 0, 100, 34, color_get_red(current_color), [mouse_mx, mouse_my]); - tb_green.draw(data_x + 80, data_y + 44 * 1, 100, 34, color_get_green(current_color), [mouse_mx, mouse_my]); - tb_blue.draw (data_x + 80, data_y + 44 * 2, 100, 34, color_get_blue(current_color), [mouse_mx, mouse_my]); + tb_red.draw (data_x + ui(80), data_y + ui(44 * 0), ui(100), TEXTBOX_HEIGHT, color_get_red(current_color), mouse_ui); + tb_green.draw(data_x + ui(80), data_y + ui(44 * 1), ui(100), TEXTBOX_HEIGHT, color_get_green(current_color), mouse_ui); + tb_blue.draw (data_x + ui(80), data_y + ui(44 * 2), ui(100), TEXTBOX_HEIGHT, color_get_blue(current_color), mouse_ui); - tb_hex.active = FOCUS == self; tb_hex.hover = HOVER == self; + tb_hex.active = sFOCUS; tb_hex.hover = sHOVER; - tb_hex.draw(hue_x - 108 - 20, data_y + 44 * 3, 108, 34, color_get_hex(current_color), [mouse_mx, mouse_my]); + tb_hex.draw(hue_x - ui(128), data_y + ui(44 * 3), ui(108), TEXTBOX_HEIGHT, color_get_hex(current_color), mouse_ui); #endregion #region controls - var cx = content_x + 36; - var cy = dialog_y + dialog_h - 36; + var cx = content_x + ui(36); + var cy = dialog_y + dialog_h - ui(36); - draw_sprite_stretched(s_color_picker_sample, 0, cx - 20, cy - 20, 40, 40); - draw_sprite_stretched_ext(s_color_picker_sample, 0, cx - 18, cy - 18, 36, 36, current_color, 1); + draw_sprite_stretched(s_color_picker_sample, 0, cx - ui(20), cy - ui(20), ui(40), ui(40)); + draw_sprite_stretched_ext(s_color_picker_sample, 0, cx - ui(18), cy - ui(18), ui(36), ui(36), current_color, 1); - var bx = content_x + content_w - 36; - var by = dialog_y + dialog_h - 36; - if(buttonInstant(s_button_lime, bx - 18, by - 18, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { + var bx = content_x + content_w - ui(36); + var by = dialog_y + dialog_h - ui(36); + if(buttonInstant(s_button_lime, bx - ui(18), by - ui(18), ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { onApply(); instance_destroy(); } - var bx = content_x + 80; - var by = dialog_y + dialog_h - 36; - if(buttonInstant(s_button_hide, bx - 18, by - 18, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_color_picker_dropper, 0, c_white) == 2) { + var bx = content_x + ui(80); + var by = dialog_y + dialog_h - ui(36); + if(buttonInstant(s_button_hide, bx - ui(18), by - ui(18), ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "", s_color_picker_dropper, 0, c_white) == 2) { dropper_active = true; } #endregion \ No newline at end of file diff --git a/objects/o_dialog_gradient/o_dialog_gradient.yy b/objects/o_dialog_gradient/o_dialog_gradient.yy index a708fbdce..3107884e5 100644 --- a/objects/o_dialog_gradient/o_dialog_gradient.yy +++ b/objects/o_dialog_gradient/o_dialog_gradient.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_gradient", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,11 +25,11 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -33,8 +37,4 @@ "name": "selector", "path": "folders/dialog/selector.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_gradient", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_inspector_grid/Create_0.gml b/objects/o_dialog_graph_grid/Create_0.gml similarity index 91% rename from objects/o_dialog_inspector_grid/Create_0.gml rename to objects/o_dialog_graph_grid/Create_0.gml index 0b9af9986..80de68b57 100644 --- a/objects/o_dialog_inspector_grid/Create_0.gml +++ b/objects/o_dialog_graph_grid/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 320; - dialog_h = 180; + dialog_w = ui(320); + dialog_h = ui(180); destroy_on_click_out = true; #endregion diff --git a/objects/o_dialog_graph_grid/Draw_64.gml b/objects/o_dialog_graph_grid/Draw_64.gml new file mode 100644 index 000000000..0992ea20a --- /dev/null +++ b/objects/o_dialog_graph_grid/Draw_64.gml @@ -0,0 +1,36 @@ +/// @description init +if !ready exit; + +#region base UI + draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); + if(sFOCUS) + draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); + + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Grid settings"); +#endregion + +#region draw + var yy = dialog_y + ui(64); + var ww = ui(128); + + cb_enable.active = sFOCUS; + cb_enable.hover = sHOVER; + draw_set_text(f_p1, fa_left, fa_center, c_white); + draw_text(dialog_x + ui(32), yy, "Snap to grid"); + cb_enable.draw(dialog_x + dialog_w - ww / 2, yy, PANEL_GRAPH.node_drag_snap, mouse_ui,, fa_center, fa_center); + + yy += ui(40); + tb_size.active = sFOCUS; + tb_size.hover = sHOVER; + draw_set_text(f_p1, fa_left, fa_center, c_white); + draw_text(dialog_x + ui(32), yy, "Grid size"); + tb_size.draw(dialog_x + dialog_w - ui(24), yy, ww, TEXTBOX_HEIGHT, PANEL_GRAPH.graph_line_s, mouse_ui,, fa_right, fa_center); + + yy += ui(40); + sl_opacity.active = sFOCUS; + sl_opacity.hover = sHOVER; + draw_set_text(f_p1, fa_left, fa_center, c_white); + draw_text(dialog_x + ui(32), yy, "Grid opacity"); + sl_opacity.draw(dialog_x + dialog_w - ui(24), yy, ww, TEXTBOX_HEIGHT, PANEL_GRAPH.grid_opacity, mouse_ui, ui(52), fa_right, fa_center); +#endregion \ No newline at end of file diff --git a/objects/o_dialog_inspector_grid/o_dialog_inspector_grid.yy b/objects/o_dialog_graph_grid/o_dialog_graph_grid.yy similarity index 96% rename from objects/o_dialog_inspector_grid/o_dialog_inspector_grid.yy rename to objects/o_dialog_graph_grid/o_dialog_graph_grid.yy index 1ca6ae1d8..3114a78f8 100644 --- a/objects/o_dialog_inspector_grid/o_dialog_inspector_grid.yy +++ b/objects/o_dialog_graph_grid/o_dialog_graph_grid.yy @@ -1,7 +1,7 @@ { "resourceType": "GMObject", "resourceVersion": "1.0", - "name": "o_dialog_inspector_grid", + "name": "o_dialog_graph_grid", "spriteId": null, "solid": false, "visible": true, diff --git a/objects/o_dialog_image_array_edit/Create_0.gml b/objects/o_dialog_image_array_edit/Create_0.gml index cf2dbfac3..fa8e37674 100644 --- a/objects/o_dialog_image_array_edit/Create_0.gml +++ b/objects/o_dialog_image_array_edit/Create_0.gml @@ -3,19 +3,19 @@ event_inherited(); #region data destroy_on_click_out = true; - dialog_w = 648; - dialog_h = max(500, WIN_H - 200); + dialog_w = ui(648); + dialog_h = max(ui(500), WIN_H - ui(200)); dialog_resizable = true; - dialog_w_min = 400; - dialog_h_min = 500; + dialog_w_min = ui(400); + dialog_h_min = ui(500); dialog_w_max = WIN_W; dialog_h_max = WIN_H; target = noone; function onResize() { - sp_content.resize(dialog_w - 150, dialog_h - 64); + sp_content.resize(dialog_w - ui(150), dialog_h - ui(64)); } #endregion @@ -24,15 +24,15 @@ event_inherited(); dragging = -1; drag_spr = -1; - sp_content = new scrollPane(dialog_w - 150, dialog_h - 64, function(_y, _m) { + sp_content = new scrollPane(dialog_w - ui(150), dialog_h - ui(64), function(_y, _m) { if(!target) return 0; draw_clear_alpha(c_ui_blue_grey, 0); - var _h = 8; + var _h = ui(8); - var ww = 100; - var hh = 100; - var pad = 16; + var ww = ui(100); + var hh = ui(100); + var pad = ui(16); var arr = target.inputs[| 0].getValue(); if(array_length(arr) != array_length(target.spr)) @@ -42,7 +42,7 @@ event_inherited(); var col = floor((sp_content.surface_w - pad) / (ww + pad)); var row = ceil(len / col); - var yy = _y + 8; + var yy = _y + ui(8); var menu = -1; var drag = -1; var inb_hover = -1; @@ -84,7 +84,7 @@ event_inherited(); var spr = target.spr[index]; var spr_w = sprite_get_width(spr); var spr_h = sprite_get_height(spr); - var spr_s = min((ww - 16) / spr_w, (hh - 16) / spr_h); + var spr_s = min((ww - ui(16)) / spr_w, (hh - ui(16)) / spr_h); var spr_x = xx + ww / 2 - spr_w * spr_s / 2; var spr_y = yy + hh / 2 - spr_h * spr_s / 2; @@ -98,9 +98,9 @@ event_inherited(); var name = string_cut_line(string_replace(filename_name(path), filename_ext(path), ""), ww); var txt_h = string_height_ext(name, -1, ww); - draw_text_ext(xx + ww / 2, yy + hh + 16, name, -1, ww); + draw_text_ext(xx + ww / 2, yy + hh + ui(16), name, -1, ww); - ch = max(ch, hh + txt_h + 32); + ch = max(ch, hh + txt_h + ui(32)); } yy += ch; diff --git a/objects/o_dialog_image_array_edit/Draw_64.gml b/objects/o_dialog_image_array_edit/Draw_64.gml index cc07c28f7..6e91b24c8 100644 --- a/objects/o_dialog_image_array_edit/Draw_64.gml +++ b/objects/o_dialog_image_array_edit/Draw_64.gml @@ -4,29 +4,29 @@ if !target exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Image array edit"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Image array edit"); #endregion #region content - var x0 = dialog_x + 20; + var x0 = dialog_x + ui(20); var x1 = x0 + sp_content.w; - var y0 = dialog_y + 44; + var y0 = dialog_y + ui(44); var y1 = y0 + sp_content.h; - draw_sprite_stretched(s_ui_panel_bg, 1, x0 - 6, y0 - 6, x1 - x0 + 12, y1 - y0 + 12); - sp_content.active = FOCUS == self; + draw_sprite_stretched(s_ui_panel_bg, 1, x0 - ui(6), y0 - ui(6), x1 - x0 + ui(12), y1 - y0 + ui(12)); + sp_content.active = sFOCUS; sp_content.draw(x0, y0); #endregion #region button - var bx = dialog_x + dialog_w - 20 - 88; + var bx = dialog_x + dialog_w - ui(108); var by = y0; - if(buttonInstant(s_button, bx, by, 88, 40, [mouse_mx, mouse_my], FOCUS == self, HOVER == self) == 2) { + if(buttonInstant(s_button, bx, by, ui(88), ui(40), mouse_ui, sFOCUS, sHOVER) == 2) { var path = get_open_filenames(".png", ""); if(path != "") { var paths = paths_to_array(path); @@ -40,5 +40,5 @@ if !target exit; } draw_set_text(f_p0, fa_center, fa_center, c_white); - draw_text(bx + 44, by + 20, "Add..."); + draw_text(bx + ui(44), by + ui(20), "Add..."); #endregion \ No newline at end of file diff --git a/objects/o_dialog_image_array_edit/o_dialog_image_array_edit.yy b/objects/o_dialog_image_array_edit/o_dialog_image_array_edit.yy index 697e8899a..df89ffc08 100644 --- a/objects/o_dialog_image_array_edit/o_dialog_image_array_edit.yy +++ b/objects/o_dialog_image_array_edit/o_dialog_image_array_edit.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_image_array_edit", "spriteId": null, "solid": false, "visible": true, @@ -22,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -31,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_image_array_edit", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_inspector_grid/Draw_64.gml b/objects/o_dialog_inspector_grid/Draw_64.gml deleted file mode 100644 index 553a14744..000000000 --- a/objects/o_dialog_inspector_grid/Draw_64.gml +++ /dev/null @@ -1,36 +0,0 @@ -/// @description init -if !ready exit; - -#region base UI - draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) - draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Grid settings"); -#endregion - -#region draw - var yy = dialog_y + 44; - var ww = 128; - - cb_enable.active = FOCUS == self; - cb_enable.hover = HOVER == self; - draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Snap to grid"); - cb_enable.draw(dialog_x + dialog_w - 24 - ww / 2 - 14, yy, PANEL_GRAPH.node_drag_snap, [mouse_mx, mouse_my]); - - yy += 40; - tb_size.active = FOCUS == self; - tb_size.hover = HOVER == self; - draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Grid size"); - tb_size.draw(dialog_x + dialog_w - 24 - ww, yy, ww, 34, PANEL_GRAPH.graph_line_s, [mouse_mx, mouse_my]); - - yy += 40; - sl_opacity.active = FOCUS == self; - sl_opacity.hover = HOVER == self; - draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Grid opacity"); - sl_opacity.draw(dialog_x + dialog_w - 24 - ww, yy, ww, 34, PANEL_GRAPH.grid_opacity, [mouse_mx, mouse_my], 52); -#endregion \ No newline at end of file diff --git a/objects/o_dialog_keyframe_curve/Create_0.gml b/objects/o_dialog_keyframe_curve/Create_0.gml index e2392677c..94d7a4282 100644 --- a/objects/o_dialog_keyframe_curve/Create_0.gml +++ b/objects/o_dialog_keyframe_curve/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 360; - dialog_h = 360; + dialog_w = ui(360); + dialog_h = ui(360); destroy_on_click_out = true; diff --git a/objects/o_dialog_keyframe_curve/Draw_64.gml b/objects/o_dialog_keyframe_curve/Draw_64.gml index 371307af1..0909f9da3 100644 --- a/objects/o_dialog_keyframe_curve/Draw_64.gml +++ b/objects/o_dialog_keyframe_curve/Draw_64.gml @@ -3,20 +3,18 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Interpolation curve"); - - + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Interpolation curve"); #endregion #region draw if(value_target != noone) { - editWidget.active = FOCUS == self; - editWidget.hover = HOVER == self; - editWidget.draw(dialog_x + 16, dialog_y + 48, dialog_w - 32, dialog_h - 48 - 16, - value_target.inter_curve, [mouse_mx, mouse_my]); + editWidget.active = sFOCUS; + editWidget.hover = sHOVER; + editWidget.draw(dialog_x + ui(16), dialog_y + ui(48), dialog_w - ui(32), dialog_h - ui(64), + value_target.inter_curve, mouse_ui); } #endregion \ No newline at end of file diff --git a/objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy b/objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy index 35c9fbd4d..c1e5b4f73 100644 --- a/objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy +++ b/objects/o_dialog_keyframe_curve/o_dialog_keyframe_curve.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_keyframe_curve", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,8 +25,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -30,8 +34,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_keyframe_curve", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_menubox/Create_0.gml b/objects/o_dialog_menubox/Create_0.gml index 53533d2b3..87f5899b7 100644 --- a/objects/o_dialog_menubox/Create_0.gml +++ b/objects/o_dialog_menubox/Create_0.gml @@ -6,7 +6,7 @@ event_inherited(); destroy_on_click_out = false; alarm[0] = -1; menu = 1; - hght = 36; + hght = ui(36); children = ds_list_create(); ds_list_add(children, self); @@ -27,11 +27,11 @@ event_inherited(); draw_set_text(f_p0, fa_center, fa_center, c_white); for(var i = 0; i < array_length(menu); i++) { if(!is_array(menu[i])) { - dialog_h += 8; + dialog_h += ui(8); continue; } draw_set_font(f_p0); - var ww = string_width(menu[i][0]) + 64; + var ww = string_width(menu[i][0]) + ui(64); if(array_length(menu[i]) > 2) { if(menu[i][2] == ">") { @@ -41,7 +41,7 @@ event_inherited(); if(_key) { draw_set_font(f_p1); var ss = key_get_name(_key.key, _key.modi); - ww += string_width(ss) + 16; + ww += string_width(ss) + ui(16); } } } @@ -52,10 +52,10 @@ event_inherited(); dialog_h += hght; } - if(dialog_x + dialog_w > WIN_W - 16) - dialog_x = WIN_W - 16 - dialog_w; - if(dialog_y + dialog_h > WIN_H - 16) - dialog_y = WIN_H - 16 - dialog_h; + if(dialog_x + dialog_w > WIN_W - ui(16)) + dialog_x = WIN_W - ui(16) - dialog_w; + if(dialog_y + dialog_h > WIN_H - ui(16)) + dialog_y = WIN_H - ui(16) - dialog_h; ready = true; } diff --git a/objects/o_dialog_menubox/Draw_64.gml b/objects/o_dialog_menubox/Draw_64.gml index 1322b725a..35b5cd8a4 100644 --- a/objects/o_dialog_menubox/Draw_64.gml +++ b/objects/o_dialog_menubox/Draw_64.gml @@ -1,13 +1,13 @@ /// @description init #region draw - var yy = dialog_y; + var yy = dialog_y; draw_sprite_stretched(s_textbox, 1, dialog_x, dialog_y, dialog_w, dialog_h); for(var i = 0; i < array_length(menu); i++) { if(!is_array(menu[i])) { - draw_sprite_stretched(s_menu_separator, 0, dialog_x + 8, yy, dialog_w - 16, 6); - yy += 8; + draw_sprite_stretched(s_menu_separator, 0, dialog_x + ui(8), yy, dialog_w - ui(16), ui(6)); + yy += ui(8); continue; } @@ -16,10 +16,10 @@ if(is_array(menu[i][1])) _h += hght; - if(HOVER == self && point_in_rectangle(mouse_mx, mouse_my, dialog_x, yy + 1, dialog_x + dialog_w, yy + _h - 1)) { + if(sHOVER && point_in_rectangle(mouse_mx, mouse_my, dialog_x, yy + 1, dialog_x + dialog_w, yy + _h - 1)) { draw_sprite_stretched_ext(s_textbox, 3, dialog_x, yy, dialog_w, _h, c_ui_blue_white, 1); - if(FOCUS == self && mouse_check_button_released(mb_left)) { + if(sFOCUS && mouse_check_button_released(mb_left)) { if(!is_array(menu[i][1])) { var res = menu[i][1](dialog_x + dialog_w, yy, depth, menu[i][0]); if(array_safe_get(menu[i], 2, 0) == ">") @@ -35,12 +35,12 @@ draw_text(dialog_x + dialog_w / 2, yy + hght / 2, menu[i][0]); var amo = array_length(menu[i][1]); - var _w = (amo - 1) / 2 * (hght + 4); + var _w = (amo - 1) / 2 * (hght + ui(4)); var _sx = dialog_x + dialog_w / 2 - _w; for(var j = 0; j < amo; j++) { - var _bx = _sx + j * (hght + 4); - var _by = yy + hght + hght / 2 - 4; + var _bx = _sx + j * (hght + ui(4)); + var _by = yy + hght + hght / 2 - ui(4); var _spr = noone, _ind = 0; var _ss = menu[i][1][j][0]; @@ -52,30 +52,30 @@ _ind = 0; } - if(HOVER == self && point_in_rectangle(mouse_mx, mouse_my, _bx - 14, _by - 14, _bx + 14, _by + 14)) { - draw_sprite_stretched(s_textbox, 1, _bx - 14, _by - 14, 28, 28); + if(sHOVER && point_in_rectangle(mouse_mx, mouse_my, _bx - ui(14), _by - ui(14), _bx + ui(14), _by + ui(14))) { + draw_sprite_stretched(s_textbox, 1, _bx - ui(14), _by - ui(14), ui(28), ui(28)); - if(FOCUS == self && mouse_check_button_pressed(mb_left)) { + if(sFOCUS && mouse_check_button_pressed(mb_left)) { menu[i][1][j][1](); instance_destroy(o_dialog_menubox); } } - draw_sprite(_spr, _ind, _bx, _by); + draw_sprite_ui_uniform(_spr, _ind, _bx, _by); } } else { draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(dialog_x + 16, yy + hght / 2, menu[i][0]); + draw_text(dialog_x + ui(16), yy + hght / 2, menu[i][0]); } if(array_length(menu[i]) > 2) { if(menu[i][2] == ">") { - draw_sprite_ext(s_arrow_16, 0, dialog_x + dialog_w - 20, yy + hght / 2, 1, 1, 0, c_ui_blue_dkgrey, 1); + draw_sprite_ui_uniform(s_arrow_16, 0, dialog_x + dialog_w - ui(20), yy + hght / 2, 1, c_ui_blue_dkgrey); } else if(is_array(menu[i][2])) { var _key = find_hotkey(menu[i][2][0], menu[i][2][1]); if(_key) { draw_set_text(f_p1, fa_right, fa_center, c_ui_blue_grey); - draw_text(dialog_x + dialog_w - 16, yy + hght / 2, key_get_name(_key.key, _key.modi)); + draw_text(dialog_x + dialog_w - ui(16), yy + hght / 2, key_get_name(_key.key, _key.modi)); } } } diff --git a/objects/o_dialog_notifications/Create_0.gml b/objects/o_dialog_notifications/Create_0.gml new file mode 100644 index 000000000..1ac9e5fea --- /dev/null +++ b/objects/o_dialog_notifications/Create_0.gml @@ -0,0 +1,62 @@ +/// @description init +event_inherited(); + +#region data + dialog_w = ui(600); + dialog_h = ui(360); + + dialog_resizable = true; + destroy_on_click_out = true; + + onResize = function() { + sp_noti.resize(dialog_w - ui(80), dialog_h - ui(88)); + } + + current_page = 0; + filter = NOTI_TYPE.log | NOTI_TYPE.warning | NOTI_TYPE.error; + + sp_noti = new scrollPane(dialog_w - ui(80), dialog_h - ui(88), function(_y, _m) { + draw_clear_alpha(c_ui_blue_black, 0); + + var hh = 32; + var yy = _y; + var txw = sp_noti.w - ui(48 + 16 + 20); + + for( var i = 0; i < ds_list_size(STATUSES); i++ ) { + var noti = STATUSES[| i]; + if(noti.type & filter == 0) continue; + + var _w = sp_noti.w - ui(12); + var _h = ui(8) + string_height_ext(noti.txt, -1, txw) + ui(8); + + draw_sprite_stretched_ext(s_node_name, 0, 0, yy + ui(2), _w, _h - ui(4), c_ui_blue_grey, 1); + + if(noti.life_max > 0) { + var _nwx = sp_noti.w - ui(12) - ui(44); + var _nw = _nwx * noti.life / noti.life_max; + + draw_sprite_stretched_ext(s_node_name, 0, ui(44), yy + ui(2), _nw, _h - ui(4), c_ui_blue_ltgrey, 0.5); + } + + draw_sprite_stretched_ext(s_node_name, 0, 0, yy + ui(2), ui(48), _h - ui(4), noti.color, 1); + + if(noti.icon) + draw_sprite_ui(noti.icon, 1, ui(24), yy + _h / 2); + + draw_set_text(f_p1, fa_left, fa_center, c_ui_blue_white); + draw_text_ext(ui(48 + 16), yy + _h / 2, noti.txt, -1, txw); + + if(noti.onClick != noone && point_in_rectangle(_m[0], _m[1], 0, yy, _w, yy + _h - ui(4))) { + draw_sprite_stretched_ext(s_node_active, 0, 0, yy + ui(2), _w, _h - ui(4), c_white, 1); + + if(mouse_check_button_pressed(mb_left)) + noti.onClick(); + } + + yy += _h; + hh += _h; + } + + return hh; + }) +#endregion \ No newline at end of file diff --git a/objects/o_dialog_notifications/Draw_64.gml b/objects/o_dialog_notifications/Draw_64.gml new file mode 100644 index 000000000..12b87846a --- /dev/null +++ b/objects/o_dialog_notifications/Draw_64.gml @@ -0,0 +1,36 @@ +/// @description init +if !ready exit; + +#region base UI + draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); + if(sFOCUS) + draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); +#endregion + +#region text + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Notification"); + + var ww = ui(32); + var hh = ui(32); + var bx = dialog_x + dialog_w - ui(24) - ww; + var by = dialog_y + ui(16) + line_height() / 2 - hh / 2; + + var error = !!(filter & NOTI_TYPE.error); + if(buttonInstant(s_button_hide, bx, by, ww, hh, mouse_ui, sFOCUS, sHOVER,, s_noti_icon_error, error, c_white, 0.3 + error * 0.7) == 2) + filter = filter ^ NOTI_TYPE.error; + bx -= ui(36); + + var warn = !!(filter & NOTI_TYPE.warning); + if(buttonInstant(s_button_hide, bx, by, ww, hh, mouse_ui, sFOCUS, sHOVER,, s_noti_icon_warning, warn, c_white, 0.3 + warn * 0.7) == 2) + filter = filter ^ NOTI_TYPE.warning; + bx -= ui(36); + + var log = !!(filter & NOTI_TYPE.log); + if(buttonInstant(s_button_hide, bx, by, ww, hh, mouse_ui, sFOCUS, sHOVER,, s_noti_icon_log, log, c_white, 0.3 + log * 0.7) == 2) + filter = filter ^ NOTI_TYPE.log; + + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(24), dialog_y + ui(48), dialog_w - ui(48), dialog_h - ui(72)); + sp_noti.active = sHOVER; + sp_noti.draw(dialog_x + ui(40), dialog_y + ui(56)); +#endregion \ No newline at end of file diff --git a/objects/o_dialog_notifications/o_dialog_notifications.yy b/objects/o_dialog_notifications/o_dialog_notifications.yy new file mode 100644 index 000000000..655945ae0 --- /dev/null +++ b/objects/o_dialog_notifications/o_dialog_notifications.yy @@ -0,0 +1,37 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_notifications", + "spriteId": null, + "solid": false, + "visible": true, + "managed": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "_p_dialog", + "path": "objects/_p_dialog/_p_dialog.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "dialog", + "path": "folders/dialog.yy", + }, +} \ No newline at end of file diff --git a/objects/o_dialog_notifications/o_dialog_warning.yy b/objects/o_dialog_notifications/o_dialog_warning.yy new file mode 100644 index 000000000..53c7fa8a7 --- /dev/null +++ b/objects/o_dialog_notifications/o_dialog_warning.yy @@ -0,0 +1,38 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "_p_dialog", + "path": "objects/_p_dialog/_p_dialog.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "dialog", + "path": "folders/dialog.yy", + }, + "resourceVersion": "1.0", + "name": "o_dialog_warning", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/o_dialog_palette/Create_0.gml b/objects/o_dialog_palette/Create_0.gml index 5b1f4e1dd..9a1af278b 100644 --- a/objects/o_dialog_palette/Create_0.gml +++ b/objects/o_dialog_palette/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 240 + 16 + 540; - dialog_h = 432; + dialog_w = ui(796); + dialog_h = ui(432); destroy_on_click_out = true; name = "Palette editor"; @@ -20,7 +20,7 @@ event_inherited(); sat = 0; val = 0; - color_surface = surface_create(256, 256); + color_surface = surface_create_valid(ui(256), ui(256)); onApply = -1; @@ -127,22 +127,22 @@ event_inherited(); } presetCollect(); - sp_preset_w = 240 - 32 - 16; - sp_presets = new scrollPane(sp_preset_w, dialog_h - 44 - 18, function(_y, _m) { - var ww = sp_preset_w - 32 - 8; - var hh = 32; - var yy = _y + 8; - var hg = 52; + sp_preset_w = ui(240 - 32 - 16); + sp_presets = new scrollPane(sp_preset_w, dialog_h - ui(62), function(_y, _m) { + var ww = sp_preset_w - ui(40); + var hh = ui(32); + var yy = _y + ui(8); + var hg = ui(52); draw_clear_alpha(c_ui_blue_black, 0); for(var i = 0; i < ds_list_size(presets); i++) { - draw_sprite_stretched(s_ui_panel_bg, 1, 4, yy, sp_preset_w - 16, hg); + draw_sprite_stretched(s_ui_panel_bg, 1, ui(4), yy, sp_preset_w - ui(16), hg); draw_set_text(f_p2, fa_left, fa_top, c_ui_blue_ltgrey); - draw_text(16, yy + 8, preset_name[| i]); - drawPalette(presets[| i], 16, yy + 24, ww, 16); + draw_text(ui(16), yy + ui(8), preset_name[| i]); + drawPalette(presets[| i], ui(16), yy + ui(28), ww, ui(16)); - if(FOCUS == self && point_in_rectangle(_m[0], _m[1], 4, yy, 4 + sp_preset_w - 16, yy + hg)) { + if(sFOCUS && point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_preset_w - ui(16), yy + hg)) { if(mouse_check_button_pressed(mb_left)) { palette = array_create(array_length(presets[| i])); for( var j = 0; j < array_length(presets[| i]); j++ ) { @@ -151,8 +151,8 @@ event_inherited(); } } - yy += hg + 4; - hh += hg + 4; + yy += hg + ui(4); + hh += hg + ui(4); } return hh; @@ -184,6 +184,6 @@ event_inherited(); #region resize onResize = function() { - sp_presets.resize(sp_preset_w, dialog_h - 44 - 18); + sp_presets.resize(sp_preset_w, dialog_h - ui(62)); } #endregion \ No newline at end of file diff --git a/objects/o_dialog_palette/Draw_64.gml b/objects/o_dialog_palette/Draw_64.gml index eca7083e0..09aaf5e72 100644 --- a/objects/o_dialog_palette/Draw_64.gml +++ b/objects/o_dialog_palette/Draw_64.gml @@ -15,10 +15,10 @@ if palette == 0 exit; if(dropper_active == 2) instance_destroy(); } - var dx = mouse_mx + 36; - var dy = mouse_my + 36; - draw_sprite_stretched(s_color_picker_sample, 0, dx - 20, dy - 20, 40, 40); - draw_sprite_stretched_ext(s_color_picker_sample, 0, dx - 18, dy - 18, 36, 36, dropper_color, 1); + var dx = mouse_mx + ui(36); + var dy = mouse_my + ui(36); + draw_sprite_stretched(s_color_picker_sample, 0, dx - ui(20), dy - ui(20), ui(40), ui(40)); + draw_sprite_stretched_ext(s_color_picker_sample, 0, dx - ui(18), dy - ui(18), ui(36), ui(36), dropper_color, 1); exit; } @@ -26,33 +26,33 @@ if palette == 0 exit; #region base UI var presets_x = dialog_x; - var presets_w = 240; + var presets_w = ui(240); - var content_x = dialog_x + presets_w + 16; - var content_w = dialog_w - presets_w - 16; + var content_x = dialog_x + presets_w + ui(16); + var content_w = dialog_w - presets_w - ui(16); draw_sprite_stretched(s_dialog_bg, 0, presets_x, dialog_y, presets_w, dialog_h); - if(FOCUS == self) draw_sprite_stretched(s_dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h); + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h); draw_sprite_stretched(s_dialog_bg, 0, content_x, dialog_y, content_w, dialog_h); - if(FOCUS == self) draw_sprite_stretched(s_dialog_active, 0, content_x, dialog_y, content_w, dialog_h); + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, content_x, dialog_y, content_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(presets_x + 24, dialog_y + 24, "Presets"); - draw_text(content_x + 24, dialog_y + 24, name); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(presets_x + ui(24), dialog_y + ui(16), "Presets"); + draw_text(content_x + ui(24), dialog_y + ui(16), name); #endregion #region presets - draw_sprite_stretched(s_ui_panel_bg, 0, presets_x + 16, dialog_y + 44, 240 - 32, dialog_h - 44 - 16); + draw_sprite_stretched(s_ui_panel_bg, 0, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60)); - sp_presets.active = FOCUS == self; - sp_presets.draw(presets_x + 16 + 8, dialog_y + 44); + sp_presets.active = sFOCUS; + sp_presets.draw(presets_x + ui(24), dialog_y + ui(44)); - var bx = presets_x + presets_w - 16 - 28; - var by = dialog_y + 10; + var bx = presets_x + presets_w - ui(44); + var by = dialog_y + ui(10); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Save current palette to preset", s_add_24) == 2) { - var dia = dialogCall(o_dialog_file_name, mouse_mx + 8, mouse_my + 8); + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Save current palette to preset", s_add_24) == 2) { + var dia = dialogCall(o_dialog_file_name, mouse_mx + ui(8), mouse_my + ui(8)); dia.onModify = function (txt) { var file = file_text_open_write(txt + ".hex"); for(var i = 0; i < array_length(palette); i++) { @@ -69,47 +69,47 @@ if palette == 0 exit; }; dia.path = DIRECTORY + "Palettes/" } - bx -= 32; + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Refresh", s_refresh_16) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Refresh", s_refresh_16) == 2) { presetCollect(); } - draw_sprite_ext(s_refresh_16, 0, bx + 14, by + 14, 1, 1, 0, c_ui_blue_grey, 1); - bx -= 32; + draw_sprite_ui_uniform(s_refresh_16, 0, bx + ui(14), by + ui(14), 1, c_ui_blue_grey); + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Open palette folder", s_folder_24) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open palette folder", s_folder_24) == 2) { var _realpath = environment_get_variable("LOCALAPPDATA") + "\\Pixels_Composer\\Palettes"; var _windir = environment_get_variable("WINDIR") + "\\explorer.exe"; execute_shell(_windir, _realpath); } - draw_sprite_ext(s_folder_24, 0, bx + 14, by + 14, 1, 1, 0, c_ui_blue_grey, 1); - bx -= 32; + draw_sprite_ui_uniform(s_folder_24, 0, bx + ui(14), by + ui(14), 1, c_ui_blue_grey); + bx -= ui(32); #endregion #region palette - var pl_x = content_x + 60; - var pl_y = dialog_y + 54; - var pl_w = content_w - 154; - var pl_h = 24; + var pl_x = content_x + ui(60); + var pl_y = dialog_y + ui(54); + var pl_w = content_w - ui(154); + var pl_h = ui(24); var max_col = 8; var col = min(array_length(palette), max_col); var row = ceil(array_length(palette) / col); var ww = pl_w / col; - var hh = (pl_h + 6) * row; - dialog_h = 400 + hh; + var hh = (pl_h + ui(6)) * row; + dialog_h = ui(400) + hh; - draw_sprite_stretched(s_textbox, 0, pl_x - 6, pl_y - 6, pl_w + 12, hh + 6); + draw_sprite_stretched(s_textbox, 0, pl_x - ui(6), pl_y - ui(6), pl_w + ui(12), hh + ui(6)); #region tools - var bx = content_x + content_w - 22 - 28; - var by = dialog_y + 16; + var bx = content_x + content_w - ui(50); + var by = dialog_y + ui(16); - if(buttonInstant(s_button_hide, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Sort color", s_sort_24) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Sort color", s_sort_24) == 2) { sortPalette(); } - bx -= 32; + bx -= ui(32); #endregion var hover = -1; @@ -119,11 +119,11 @@ if palette == 0 exit; if(index >= array_length(palette)) break; var _p = palette[index]; var _kx = pl_x + j * ww; - var _ky = pl_y + i * (pl_h + 6); + var _ky = pl_y + i * (pl_h + ui(6)); - draw_sprite_stretched_ext(s_color_picker_sample, index == index_selecting, _kx + 2, _ky, ww - 4, pl_h, _p, 1); + draw_sprite_stretched_ext(s_color_picker_sample, index == index_selecting, _kx + ui(2), _ky, ww - ui(4), pl_h, _p, 1); - if(HOVER == self && point_in_rectangle(mouse_mx, mouse_my, _kx, _ky, _kx + ww, _ky + pl_h)) { + if(sHOVER && point_in_rectangle(mouse_mx, mouse_my, _kx, _ky, _kx + ww, _ky + pl_h)) { if(index_dragging > -1 && index_dragging != index) { draw_set_color(c_ui_blue_grey); draw_line_width(_kx - 1, _ky, _kx - 1, _ky + pl_h, 2); @@ -148,7 +148,7 @@ if palette == 0 exit; } } - if(FOCUS == self) { + if(sFOCUS) { if(mouse_check_button_pressed(mb_left)) { if(hover > -1) { index_selecting = hover; @@ -159,40 +159,40 @@ if palette == 0 exit; } } - var bx = content_x + content_w - 22 - 28; - var by = pl_y - 2; + var bx = content_x + content_w - ui(50); + var by = pl_y - ui(2); if(array_length(palette) > 1) { - if(buttonInstant(s_button, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_minus_24) == 2) { + if(buttonInstant(s_button, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "", s_minus_24) == 2) { array_resize(palette, array_length(palette) - 1); } } else { - draw_sprite_ext(s_minus_24, 0, bx + 14, by + 14, 1, 1, 0, c_ui_blue_grey, 0.5); + draw_sprite_ui_uniform(s_minus_24, 0, bx + ui(14), by + ui(14), 1, c_ui_blue_grey, 0.5); } - bx -= 32; - if(buttonInstant(s_button, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_add_24) == 2) { + bx -= ui(32); + if(buttonInstant(s_button, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "", s_add_24) == 2) { palette[array_length(palette)] = c_black; } - bx = content_x + 18; - if(buttonInstant(s_button, bx, by, 28, 28, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Load palette file (.hex)", s_file) == 2) { + bx = content_x + ui(18); + if(buttonInstant(s_button, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Load palette file (.hex)", s_file) == 2) { var path = get_open_filename(".hex", ""); if(path != "") palette = loadPalette(path); } - draw_sprite_ext(s_file, 0, bx + 14, by + 14, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_file, 0, bx + ui(14), by + ui(14), 1, c_ui_blue_grey); #endregion #region color surface - var col_x = content_x + 20; - var col_y = dialog_y + 70 + hh; + var col_x = content_x + ui(20); + var col_y = dialog_y + ui(70) + hh; - draw_sprite_stretched(s_ui_panel_bg, 0, col_x - 8, col_y - 8, 256 + 16, 256 + 16); + draw_sprite_stretched(s_ui_panel_bg, 0, col_x - ui(8), col_y - ui(8), ui(256 + 16), ui(256 + 16)); - if(!is_surface(color_surface)) color_surface = surface_create(256, 256); + if(!is_surface(color_surface)) color_surface = surface_create_valid(ui(256), ui(256)); surface_set_target(color_surface); - draw_sprite_ext(s_fx_pixel, 0, 0, 0, 256, 256, 0, c_white, 1); + draw_sprite_ext(s_fx_pixel, 0, 0, 0, ui(256), ui(256), 0, c_white, 1); surface_reset_target(); shader_set(sh_color_picker); @@ -204,32 +204,32 @@ if palette == 0 exit; #endregion #region selector - var hue_x = content_x + 300; + var hue_x = content_x + ui(300); var hue_y = col_y; - draw_sprite_stretched(s_ui_panel_bg, 0, hue_x - 8, hue_y - 8, 32, 256 + 16); + draw_sprite_stretched(s_ui_panel_bg, 0, hue_x - ui(8), hue_y - ui(8), ui(32), ui(256 + 16)); for(var i = 0; i < 256; i++) { draw_set_color(make_color_hsv(i, 255, 255)); - draw_rectangle(hue_x, hue_y + i, hue_x + 16, hue_y + i + 1, false); + draw_rectangle(hue_x, hue_y + ui(i), hue_x + ui(16), hue_y + ui(i + 1), false); } - var hy = hue_y + hue; - draw_sprite_stretched_ext(s_ui_base_white, 0, hue_x - 3, hy - 6, 24, 10, make_color_hsv(hue, 255, 255), 1); - draw_sprite_stretched_ext(s_ui_base_white, 0, col_x + sat - 6, col_y + 256 - val - 6, 12, 12, current_color, 1); + var hy = hue_y + ui(hue); + draw_sprite_stretched_ext(s_ui_base_white, 0, hue_x - ui(3), hy - ui(6), ui(24), ui(10), make_color_hsv(hue, 255, 255), 1); + draw_sprite_stretched_ext(s_ui_base_white, 0, col_x + ui(sat - 6), col_y + ui(256 - val - 6), ui(12), ui(12), current_color, 1); - if(FOCUS == self) { + if(sFOCUS) { if(mouse_check_button_pressed(mb_left)) { - if(point_in_rectangle(mouse_mx, mouse_my, hue_x, hue_y, hue_x + 16, hue_y + 256)) { + if(point_in_rectangle(mouse_mx, mouse_my, hue_x, hue_y, hue_x + ui(16), hue_y + ui(256))) { hue_dragging = true; - } else if(point_in_rectangle(mouse_mx, mouse_my, col_x, col_y, col_x + 256, col_y + 256)) { + } else if(point_in_rectangle(mouse_mx, mouse_my, col_x, col_y, col_x + ui(256), col_y + ui(256))) { value_draggin = true; } } } if(hue_dragging) { - hue = clamp(mouse_my - hue_y, 0, 256); + hue = clamp((mouse_my - hue_y) / UI_SCALE, 0, 256); setHSV(); if(mouse_check_button_released(mb_left)) @@ -237,11 +237,8 @@ if palette == 0 exit; } if(value_draggin) { - var smx = mouse_mx - col_x; - var smy = mouse_my - col_y; - - sat = clamp(smx, 0, 256); - val = 256 - clamp(smy, 0, 256); + sat = clamp((mouse_mx - col_x) / UI_SCALE, 0, 256); + val = 256 - clamp((mouse_my - col_y) / UI_SCALE, 0, 256); setHSV(); if(mouse_check_button_released(mb_left)) @@ -250,59 +247,59 @@ if palette == 0 exit; #endregion #region data - var data_x = hue_x + 40; + var data_x = hue_x + ui(40); var data_y = col_y; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(data_x, data_y + 40 * 0 + 17, "Hue"); - draw_text(data_x, data_y + 40 * 1 + 17, "Saturation") - draw_text(data_x, data_y + 40 * 2 + 17, "Value"); + draw_text(data_x, data_y + ui(40 * 0 + 17), "Hue"); + draw_text(data_x, data_y + ui(40 * 1 + 17), "Saturation") + draw_text(data_x, data_y + ui(40 * 2 + 17), "Value"); - tb_hue.active = FOCUS == self; tb_hue.hover = HOVER == self; - tb_sat.active = FOCUS == self; tb_sat.hover = HOVER == self; - tb_val.active = FOCUS == self; tb_val.hover = HOVER == self; + tb_hue.active = sFOCUS; tb_hue.hover = sHOVER; + tb_sat.active = sFOCUS; tb_sat.hover = sHOVER; + tb_val.active = sFOCUS; tb_val.hover = sHOVER; - tb_hue.draw(data_x + 80, data_y + 44 * 0, 100, 34, round(color_get_hue(current_color)), [mouse_mx, mouse_my]); - tb_sat.draw(data_x + 80, data_y + 44 * 1, 100, 34, round(color_get_saturation(current_color)), [mouse_mx, mouse_my]); - tb_val.draw(data_x + 80, data_y + 44 * 2, 100, 34, round(color_get_value(current_color)), [mouse_mx, mouse_my]); + tb_hue.draw(data_x + ui(80), data_y + ui(44 * 0), ui(100), TEXTBOX_HEIGHT, round(color_get_hue(current_color)), mouse_ui); + tb_sat.draw(data_x + ui(80), data_y + ui(44 * 1), ui(100), TEXTBOX_HEIGHT, round(color_get_saturation(current_color)), mouse_ui); + tb_val.draw(data_x + ui(80), data_y + ui(44 * 2), ui(100), TEXTBOX_HEIGHT, round(color_get_value(current_color)), mouse_ui); - data_y = data_y + 44 * 3 + 8; + data_y = data_y + ui(44 * 3 + 8); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(data_x, data_y + 40 * 0 + 17, "Red"); - draw_text(data_x, data_y + 40 * 1 + 17, "Green"); - draw_text(data_x, data_y + 40 * 2 + 17, "Blue"); + draw_text(data_x, data_y + ui(40 * 0 + 17), "Red"); + draw_text(data_x, data_y + ui(40 * 1 + 17), "Green"); + draw_text(data_x, data_y + ui(40 * 2 + 17), "Blue"); - tb_red.active = FOCUS == self; tb_red.hover = HOVER == self; - tb_green.active = FOCUS == self; tb_green.hover = HOVER == self; - tb_blue.active = FOCUS == self; tb_blue.hover = HOVER == self; + tb_red.active = sFOCUS; tb_red.hover = sHOVER; + tb_green.active = sFOCUS; tb_green.hover = sHOVER; + tb_blue.active = sFOCUS; tb_blue.hover = sHOVER; - tb_red.draw (data_x + 80, data_y + 44 * 0, 100, 34, color_get_red(current_color), [mouse_mx, mouse_my]); - tb_green.draw(data_x + 80, data_y + 44 * 1, 100, 34, color_get_green(current_color), [mouse_mx, mouse_my]); - tb_blue.draw (data_x + 80, data_y + 44 * 2, 100, 34, color_get_blue(current_color), [mouse_mx, mouse_my]); + tb_red.draw (data_x + ui(80), data_y + ui(44 * 0), ui(100), TEXTBOX_HEIGHT, color_get_red(current_color), mouse_ui); + tb_green.draw(data_x + ui(80), data_y + ui(44 * 1), ui(100), TEXTBOX_HEIGHT, color_get_green(current_color), mouse_ui); + tb_blue.draw (data_x + ui(80), data_y + ui(44 * 2), ui(100), TEXTBOX_HEIGHT, color_get_blue(current_color), mouse_ui); - tb_hex.active = FOCUS == self; tb_hex.hover = HOVER == self; + tb_hex.active = sFOCUS; tb_hex.hover = sHOVER; - tb_hex.draw(hue_x - 108 - 20, data_y + 44 * 3, 108, 34, color_get_hex(current_color), [mouse_mx, mouse_my]); + tb_hex.draw(hue_x - ui(128), data_y + ui(44 * 3), ui(108), TEXTBOX_HEIGHT, color_get_hex(current_color), mouse_ui); #endregion #region controls - var cx = content_x + 36; - var cy = dialog_y + dialog_h - 36; + var cx = content_x + ui(36); + var cy = dialog_y + dialog_h - ui(36); - draw_sprite_stretched(s_color_picker_sample, 0, cx - 20, cy - 20, 40, 40); - draw_sprite_stretched_ext(s_color_picker_sample, 0, cx - 18, cy - 18, 36, 36, current_color, 1); + draw_sprite_stretched(s_color_picker_sample, 0, cx - ui(20), cy - ui(20), ui(40), ui(40)); + draw_sprite_stretched_ext(s_color_picker_sample, 0, cx - ui(18), cy - ui(18), ui(36), ui(36), current_color, 1); - var bx = content_x + content_w - 36; - var by = dialog_y + dialog_h - 36; - if(buttonInstant(s_button_lime, bx - 18, by - 18, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { + var bx = content_x + content_w - ui(36); + var by = dialog_y + dialog_h - ui(36); + if(buttonInstant(s_button_lime, bx - ui(18), by - ui(18), ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "", s_icon_accept_24, 0, c_ui_blue_black) == 2) { onApply(palette); instance_destroy(); } - var bx = content_x + 80; - var by = dialog_y + dialog_h - 36; - if(buttonInstant(s_button_hide, bx - 18, by - 18, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "", s_color_picker_dropper, 0, c_white) == 2) { + var bx = content_x + ui(80); + var by = dialog_y + dialog_h - ui(36); + if(buttonInstant(s_button_hide, bx - ui(18), by - ui(18), ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "", s_color_picker_dropper, 0, c_white) == 2) { dropper_active = true; } #endregion \ No newline at end of file diff --git a/objects/o_dialog_palette/o_dialog_palette.yy b/objects/o_dialog_palette/o_dialog_palette.yy index 13f61080f..0dd9e56f9 100644 --- a/objects/o_dialog_palette/o_dialog_palette.yy +++ b/objects/o_dialog_palette/o_dialog_palette.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_palette", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,10 +25,10 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -32,8 +36,4 @@ "name": "selector", "path": "folders/dialog/selector.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_palette", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_preference/Create_0.gml b/objects/o_dialog_preference/Create_0.gml index 3268eb643..9c9631d77 100644 --- a/objects/o_dialog_preference/Create_0.gml +++ b/objects/o_dialog_preference/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 640; - dialog_h = 480; + dialog_w = ui(640); + dialog_h = ui(480); destroy_on_click_out = true; destroy_on_escape = false; @@ -11,14 +11,12 @@ event_inherited(); #region resize dialog_resizable = true; - dialog_w_min = 640; - dialog_h_min = 400; - dialog_w_max = 1200; - dialog_h_max = 800; + dialog_w_min = ui(640); + dialog_h_min = ui(480); onResize = function() { - sp_pref.resize(dialog_w - 160 - 32, dialog_h - 56 - 24); - sp_hotkey.resize(dialog_w - 160 - 32, dialog_h - 56 - 24); + sp_pref.resize(dialog_w - ui(192), dialog_h - ui(80)); + sp_hotkey.resize(dialog_w - ui(192), dialog_h - ui(80)); } #endregion @@ -40,15 +38,24 @@ event_inherited(); }) ]); + + PREF_MAP[? "_display_scaling"] = PREF_MAP[? "display_scaling"]; ds_list_add(pref_global, [ "GUI scaling", - "display_scaling", + "_display_scaling", new slider(0.5, 2, 0.01, function(val) { - PREF_MAP[? "display_scaling"] = val; + PREF_MAP[? "_display_scaling"] = val; PREF_SAVE(); }, function() { + PREF_MAP[? "_display_scaling"] = clamp(PREF_MAP[? "_display_scaling"], 0.5, 2); + if(PREF_MAP[? "display_scaling"] == PREF_MAP[? "_display_scaling"]) + return; + + PREF_MAP[? "display_scaling"] = PREF_MAP[? "_display_scaling"]; setPanel(); loadFonts(); + + time_source_start(time_source_create(time_source_global, 1, time_source_units_frames, onResize)); }) ]); @@ -151,13 +158,13 @@ event_inherited(); current_list = pref_global; - sp_pref = new scrollPane(dialog_w - 160 - 32, dialog_h - 64 - 24, function(_y, _m) { + sp_pref = new scrollPane(dialog_w - ui(192), dialog_h - ui(88), function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); var hh = 0; - var th = 34; - var x1 = dialog_w - 160 - 32 - 8; - var yy = _y + 8; - var padd = 6; + var th = TEXTBOX_HEIGHT; + var x1 = dialog_w - ui(200); + var yy = _y + ui(8); + var padd = ui(6); var ind = 0; for(var i = 0; i < ds_list_size(current_list); i++) { @@ -165,9 +172,9 @@ event_inherited(); if(is_string(_pref)) { draw_set_text(f_p0b, fa_left, fa_top, c_ui_blue_grey); - draw_text(8, yy, _pref); - yy += string_height(_pref) + 8; - hh += string_height(_pref) + 8; + draw_text(ui(16), yy, _pref); + yy += string_height(_pref) + ui(8); + hh += string_height(_pref) + ui(8); ind = 0; continue; } @@ -176,27 +183,27 @@ event_inherited(); if(search_text == "" || string_pos(string_lower(search_text), string_lower(name)) > 0) { if(ind % 2 == 0) - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, yy - padd, dialog_w - 200, th + padd * 2, c_ui_blue_white, 1); + draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, yy - padd, sp_pref.w, th + padd * 2, c_ui_blue_white, 1); draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(8, yy + 17, _pref[0]); - _pref[2].active = FOCUS == self; - _pref[2].hover = HOVER == self; + draw_text(ui(8), yy + th / 2, _pref[0]); + _pref[2].active = sFOCUS; + _pref[2].hover = sHOVER; switch(instanceof(_pref[2])) { case "textBox" : - _pref[2].draw(x1 - 4 - 96, yy, 96, 34, PREF_MAP[? _pref[1]], _m); + _pref[2].draw(x1 - ui(4), yy + th / 2, ui(88), th, PREF_MAP[? _pref[1]], _m,, fa_right, fa_center); break; case "checkBox" : - _pref[2].draw(x1 - 36, yy + 2, PREF_MAP[? _pref[1]], _m); + _pref[2].draw(x1 - ui(48), yy + th / 2, PREF_MAP[? _pref[1]], _m,, fa_center, fa_center); break; case "slider" : - _pref[2].draw(x1 - 4 - 200, yy + 2, 200, 34, PREF_MAP[? _pref[1]], _m); + _pref[2].draw(x1 - ui(4), yy + th / 2, ui(200), th, PREF_MAP[? _pref[1]], _m, ui(88), fa_right, fa_center); break; } - yy += th + padd + 8; - hh += th + padd + 8; + yy += th + padd + ui(8); + hh += th + padd + ui(8); ind++; } } @@ -221,12 +228,12 @@ event_inherited(); ]; hk_editing = noone; - sp_hotkey = new scrollPane(dialog_w - 160 - 32, dialog_h - 64 - 24, function(_y, _m) { + sp_hotkey = new scrollPane(dialog_w - ui(192), dialog_h - ui(88), function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); - var padd = 8; + var padd = ui(8); var hh = 0; var currGroup = -1; - var x1 = dialog_w - 160 - 32; + var x1 = dialog_w - ui(192); for(var j = 0; j < ds_list_size(HOTKEY_CONTEXT); j++) { var ll = HOTKEYS[? HOTKEY_CONTEXT[| j]]; @@ -242,11 +249,11 @@ event_inherited(); continue; if(group != currGroup) { - if(group != "") hh += 12; + if(group != "") hh += ui(12); draw_set_text(f_p0b, fa_left, fa_top, c_ui_blue_grey); - draw_text(32, _y + hh, group == ""? "Global" : group); + draw_text(ui(16), _y + hh, group == ""? "Global" : group); - hh += string_height("l") + 16; + hh += string_height("l") + ui(16); currGroup = group; } draw_set_text(f_p0, fa_left, fa_top, c_white); @@ -254,11 +261,11 @@ event_inherited(); if(i % 2 == 0) { draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, _y + hh - padd, - dialog_w - 160 - 32, th + padd * 2, c_ui_blue_white, 1); + sp_hotkey.w, th + padd * 2, c_ui_blue_white, 1); } draw_set_text(f_p0, fa_left, fa_top, c_white); - draw_text(16, _y + hh, name); + draw_text(ui(16), _y + hh, name); var dk = key_get_name(key.key, key.modi); var kw = string_width(dk); @@ -298,15 +305,15 @@ event_inherited(); PREF_SAVE(); } - draw_sprite_stretched(s_button_hide, 2, x1 - 24 - kw - 16, _y + hh - 6, kw + 32, th + 12); + draw_sprite_stretched(s_button_hide, 2, x1 - ui(40) - kw, _y + hh - ui(6), kw + ui(32), th + ui(12)); } else { - if(buttonInstant(s_button_hide, x1 - 24 - kw - 16, _y + hh - 6, kw + 32, th + 12, _m, FOCUS == self, HOVER == self) == 2) { + if(buttonInstant(s_button_hide, x1 - ui(40) - kw, _y + hh - ui(6), kw + ui(32), th + ui(12), _m, sFOCUS, sHOVER) == 2) { hk_editing = key; keyboard_lastchar = pkey; } } draw_set_text(f_p0, fa_right, fa_top, hk_editing == key? c_ui_orange : c_white); - draw_text(x1 - 24, _y + hh, dk); + draw_text(x1 - ui(24), _y + hh, dk); hh += th + padd * 2; } diff --git a/objects/o_dialog_preference/Draw_64.gml b/objects/o_dialog_preference/Draw_64.gml index 3306aa4bb..043b81b43 100644 --- a/objects/o_dialog_preference/Draw_64.gml +++ b/objects/o_dialog_preference/Draw_64.gml @@ -3,56 +3,58 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Preferences"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Preferences"); + + var titlebar_h = ui(16) + line_height(f_p0, 16); #endregion #region page - var yy = dialog_y + 64; - var hh = yy - 8; - var hg = 36; + var yy = dialog_y + titlebar_h; + var yl = yy - ui(8); + var hg = line_height(f_p0, 8); for(var i = 0; i < array_length(page); i++) { draw_set_text(f_p0, fa_left, fa_center, c_white); if(i == page_current) { - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 16, hh, 160, hg); - } else if(point_in_rectangle(mouse_mx, mouse_my, dialog_x, hh, dialog_x + 160, hh + hg)) { - draw_sprite_stretched_ext(s_ui_panel_bg, 0, dialog_x + 16, hh, 160, hg, c_white, 0.5); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(16), yl, ui(160), hg); + } else if(point_in_rectangle(mouse_mx, mouse_my, dialog_x, yl, dialog_x + ui(160), yl + hg)) { + draw_sprite_stretched_ext(s_ui_panel_bg, 0, dialog_x + ui(16), yl, ui(160), hg, c_white, 0.5); if(mouse_check_button(mb_left)) page_current = i; } - draw_text(dialog_x + 28, hh + hg / 2, page[i]); - hh += hg; + draw_text(dialog_x + ui(28), yl + hg / 2, page[i]); + yl += hg; } #endregion #region draw - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 160, yy - 8, dialog_w - 160 - 16, dialog_h - 56 - 16); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(160), yy - ui(8), dialog_w - ui(176), dialog_h - titlebar_h - ui(16)); tb_search.auto_update = true; tb_search.no_empty = false; tb_search.font = f_p1; - tb_search.active = FOCUS == self; - tb_search.hover = HOVER == self; - tb_search.draw(dialog_x + dialog_w - 16 - 200, dialog_y + 16, 200, 32, search_text, [mouse_mx, mouse_my]); - draw_sprite_ext(s_search_16, 0, dialog_x + dialog_w - 16 - 200 - 16, dialog_y + 16 + 16, 1, 1, 0, c_ui_blue_grey, 1); + tb_search.active = sFOCUS; + tb_search.hover = sHOVER; + tb_search.draw(dialog_x + dialog_w - ui(16), dialog_y + titlebar_h / 2, ui(200), TEXTBOX_HEIGHT, search_text, mouse_ui,, fa_right, fa_center); + draw_sprite_ui_uniform(s_search_16, 0, dialog_x + dialog_w - ui(232), dialog_y + titlebar_h / 2, 1, c_ui_blue_grey); if(page_current == 0) { current_list = pref_global; - sp_pref.active = HOVER == self; - sp_pref.draw(dialog_x + 160 + 8, yy); + sp_pref.active = sHOVER; + sp_pref.draw(dialog_x + ui(168), yy); } else if(page_current == 1) { current_list = pref_node; - sp_pref.active = HOVER == self; - sp_pref.draw(dialog_x + 160 + 8, yy); + sp_pref.active = sHOVER; + sp_pref.draw(dialog_x + ui(168), yy); } else if(page_current == 2) { if(mouse_check_button_pressed(mb_left)) hk_editing = noone; - sp_hotkey.active = HOVER == self; - sp_hotkey.draw(dialog_x + 160 + 8, yy); + sp_hotkey.active = sHOVER; + sp_hotkey.draw(dialog_x + ui(168), yy); } #endregion \ No newline at end of file diff --git a/objects/o_dialog_preview_grid/Create_0.gml b/objects/o_dialog_preview_grid/Create_0.gml index 6484f8aa0..9f7ba3948 100644 --- a/objects/o_dialog_preview_grid/Create_0.gml +++ b/objects/o_dialog_preview_grid/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 280; - dialog_h = 188; + dialog_w = ui(320); + dialog_h = ui(260); destroy_on_click_out = true; #endregion @@ -11,13 +11,21 @@ event_inherited(); #region data cb_enable = new checkBox(function(str) { PANEL_PREVIEW.grid_show = !PANEL_PREVIEW.grid_show; - }) + }); tb_width = new textBox(TEXTBOX_INPUT.number, function(str) { PANEL_PREVIEW.grid_width = max(1, real(str)); - }) + }); tb_height = new textBox(TEXTBOX_INPUT.number, function(str) { PANEL_PREVIEW.grid_height = max(1, real(str)); - }) + }); + + sl_opacity = new slider(0, 1, .05, function(str) { + PANEL_PREVIEW.grid_opacity = clamp(real(str), 0, 1); + }); + + cl_color = buttonColor(function(color) { + PANEL_PREVIEW.grid_color = color; + }); #endregion \ No newline at end of file diff --git a/objects/o_dialog_preview_grid/Draw_64.gml b/objects/o_dialog_preview_grid/Draw_64.gml index 0ae5491bf..071dfc835 100644 --- a/objects/o_dialog_preview_grid/Draw_64.gml +++ b/objects/o_dialog_preview_grid/Draw_64.gml @@ -3,33 +3,48 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, "Grid settings"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), "Grid settings"); #endregion #region draw - var yy = dialog_y + 44; + var yy = dialog_y + ui(64); + var ww = ui(128); - cb_enable.active = FOCUS == self; - cb_enable.hover = HOVER == self; + cb_enable.active = sFOCUS; + cb_enable.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Enabled"); - cb_enable.draw(dialog_x + dialog_w - 24 - 48 - 14, yy, PANEL_PREVIEW.grid_show, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy, "Enabled"); + cb_enable.draw(dialog_x + dialog_w - ww / 2, yy, PANEL_PREVIEW.grid_show, mouse_ui,, fa_center, fa_center); - yy += 44; - tb_width.active = FOCUS == self; - tb_width.hover = HOVER == self; + yy += ui(40); + tb_width.active = sFOCUS; + tb_width.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Grid width"); - tb_width.draw(dialog_x + dialog_w - 24 - 96, yy, 96, 34, PANEL_PREVIEW.grid_width, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy, "Grid width"); + tb_width.draw(dialog_x + dialog_w - ui(24), yy, ww, TEXTBOX_HEIGHT, PANEL_PREVIEW.grid_width, mouse_ui,, fa_right, fa_center); - yy += 44; - tb_height.active = FOCUS == self; - tb_height.hover = HOVER == self; + yy += ui(40); + tb_height.active = sFOCUS; + tb_height.hover = sHOVER; draw_set_text(f_p1, fa_left, fa_center, c_white); - draw_text(dialog_x + 32, yy + 17, "Grid height"); - tb_height.draw(dialog_x + dialog_w - 24 - 96, yy, 96, 34, PANEL_PREVIEW.grid_height, [mouse_mx, mouse_my]); + draw_text(dialog_x + ui(32), yy, "Grid height"); + tb_height.draw(dialog_x + dialog_w - ui(24), yy, ww, TEXTBOX_HEIGHT, PANEL_PREVIEW.grid_height, mouse_ui,, fa_right, fa_center); + + yy += ui(40); + sl_opacity.active = sFOCUS; + sl_opacity.hover = sHOVER; + draw_set_text(f_p1, fa_left, fa_center, c_white); + draw_text(dialog_x + ui(32), yy, "Grid opacity"); + sl_opacity.draw(dialog_x + dialog_w - ui(24), yy, ww, TEXTBOX_HEIGHT, PANEL_PREVIEW.grid_opacity, mouse_ui, ui(52), fa_right, fa_center); + + yy += ui(40); + cl_color.active = sFOCUS; + cl_color.hover = sHOVER; + draw_set_text(f_p1, fa_left, fa_center, c_white); + draw_text(dialog_x + ui(32), yy, "Grid Color"); + cl_color.draw(dialog_x + dialog_w - ui(24) - ww, yy - TEXTBOX_HEIGHT / 2, ww, TEXTBOX_HEIGHT, PANEL_PREVIEW.grid_color, mouse_ui); #endregion \ No newline at end of file diff --git a/objects/o_dialog_release_note/Create_0.gml b/objects/o_dialog_release_note/Create_0.gml index 7a72c0208..1640cb27d 100644 --- a/objects/o_dialog_release_note/Create_0.gml +++ b/objects/o_dialog_release_note/Create_0.gml @@ -2,8 +2,8 @@ event_inherited(); #region data - dialog_w = 600; - dialog_h = 360; + dialog_w = ui(600); + dialog_h = ui(360); destroy_on_click_out = true; note = ""; @@ -11,7 +11,7 @@ event_inherited(); var link = "https://gist.githubusercontent.com/Ttanasart-pt/e7ab670299ce6b00cfd632646f3ac9a8/raw/0.9.0"; node_get = http_get(link); - sp_note = new scrollPane(dialog_w - 80, dialog_h - 88, function(_y, _m) { + sp_note = new scrollPane(dialog_w - ui(80), dialog_h - ui(88), function(_y, _m) { draw_clear_alpha(c_ui_blue_black, 0); var yy = 0; var txt = note; @@ -32,36 +32,36 @@ event_inherited(); var sp = string_pos(" ", line); var md = string_copy(line, 1, sp - 1); - var ww = dialog_w - 128; - var xx = (tab - 1) * 8; + var ww = dialog_w - ui(128); + var xx = (tab - 1) * ui(8); switch(md) { case "#" : draw_set_text(f_h5, fa_left, fa_top, c_ui_blue_grey); line = string_copy(line, sp + 1, string_length(line) - sp); - yy += 16; + yy += ui(16); draw_text_ext(xx, _y + yy, line, -1, ww); - yy += 4; + yy += ui(4); break; case "##" : draw_set_text(f_p0b, fa_left, fa_top, c_ui_blue_ltgrey); line = string_copy(line, sp + 1, string_length(line) - sp); - yy += 8; - draw_text_ext(xx + 16, _y + yy, line, -1, ww); - yy += 4; + yy += ui(8); + draw_text_ext(xx + ui(16), _y + yy, line, -1, ww); + yy += ui(4); break; case "-" : draw_set_text(f_p0, fa_left, fa_top, c_white); line = string_copy(line, sp + 1, string_length(line) - sp); - draw_sprite_ext(s_text_bullet, 0, xx + 16, _y + yy + 10, 1, 1, 0, c_ui_blue_grey, 1); - draw_text_ext(xx + 28, _y + yy, line, -1, ww); + draw_sprite_ui_uniform(s_text_bullet, 0, xx + ui(16), _y + yy + ui(10), 1, c_ui_blue_grey); + draw_text_ext(xx + ui(28), _y + yy, line, -1, ww); break; case "+" : draw_set_text(f_p0, fa_left, fa_top, c_white); line = string_copy(line, sp + 1, string_length(line) - sp); - draw_sprite_ext(s_text_bullet, 1, xx + 16, _y + yy + 10, 1, 1, 0, $5dde8f, 1); - draw_text_ext(xx + 28, _y + yy, line, -1, ww); + draw_sprite_ui_uniform(s_text_bullet, 1, xx + ui(16), _y + yy + ui(10), 1, $5dde8f); + draw_text_ext(xx + ui(28), _y + yy, line, -1, ww); break; default : draw_set_text(f_p0, fa_left, fa_top, c_white); @@ -72,6 +72,6 @@ event_inherited(); yy += string_height_ext(line, -1, ww); } - return yy + 64; + return yy + ui(64); }) #endregion \ No newline at end of file diff --git a/objects/o_dialog_release_note/Draw_64.gml b/objects/o_dialog_release_note/Draw_64.gml index ad2bf3c16..89b48af96 100644 --- a/objects/o_dialog_release_note/Draw_64.gml +++ b/objects/o_dialog_release_note/Draw_64.gml @@ -3,16 +3,16 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion #region text - draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - draw_text(dialog_x + 24, dialog_y + 24, string(VERSION_STRING) + " Release note"); + draw_set_text(f_p0, fa_left, fa_top, c_ui_blue_ltgrey); + draw_text(dialog_x + ui(24), dialog_y + ui(16), string(VERSION_STRING) + " Release note"); - draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + 24, dialog_y + 48, dialog_w - 48, dialog_h - 48 - 24); + draw_sprite_stretched(s_ui_panel_bg, 0, dialog_x + ui(24), dialog_y + ui(48), dialog_w - ui(48), dialog_h - ui(72)); - sp_note.active = HOVER == self; - sp_note.draw(dialog_x + 40, dialog_y + 56); + sp_note.active = sHOVER; + sp_note.draw(dialog_x + ui(40), dialog_y + ui(56)); #endregion \ No newline at end of file diff --git a/objects/o_dialog_release_note/o_dialog_release_note.yy b/objects/o_dialog_release_note/o_dialog_release_note.yy index 3579aa129..7069b8817 100644 --- a/objects/o_dialog_release_note/o_dialog_release_note.yy +++ b/objects/o_dialog_release_note/o_dialog_release_note.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_release_note", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,10 +25,10 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":62,"eventType":7,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":62,"eventType":7,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -32,8 +36,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_release_note", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_scrollbox/Alarm_0.gml b/objects/o_dialog_scrollbox/Alarm_0.gml index 59d79aa4c..a3061f84b 100644 --- a/objects/o_dialog_scrollbox/Alarm_0.gml +++ b/objects/o_dialog_scrollbox/Alarm_0.gml @@ -1,9 +1,8 @@ /// @description init #region pos - var hght = 32; + var hght = line_height(f_p0, 8); var hh = array_length(scrollbox.data_list) * hght; dialog_h = hh; #endregion -event_inherited(); - +event_inherited(); \ No newline at end of file diff --git a/objects/o_dialog_scrollbox/Draw_64.gml b/objects/o_dialog_scrollbox/Draw_64.gml index 893e7c564..43de43182 100644 --- a/objects/o_dialog_scrollbox/Draw_64.gml +++ b/objects/o_dialog_scrollbox/Draw_64.gml @@ -1,6 +1,6 @@ /// @description init #region draw - var hght = 32; + var hght = line_height(f_p0, 8); draw_sprite_stretched(s_textbox, 1, dialog_x, dialog_y, dialog_w, dialog_h); @@ -20,6 +20,6 @@ if(align == fa_center) draw_text(dialog_x + dialog_w / 2, _ly + hght / 2, scrollbox.data_list[i]); else if(align == fa_left) - draw_text(dialog_x + 8, _ly + hght / 2, scrollbox.data_list[i]); + draw_text(dialog_x + ui(8), _ly + hght / 2, scrollbox.data_list[i]); } #endregion \ No newline at end of file diff --git a/objects/o_dialog_scrollbox/o_dialog_scrollbox.yy b/objects/o_dialog_scrollbox/o_dialog_scrollbox.yy index df383942a..38bf1b771 100644 --- a/objects/o_dialog_scrollbox/o_dialog_scrollbox.yy +++ b/objects/o_dialog_scrollbox/o_dialog_scrollbox.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_scrollbox", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,10 +25,10 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -32,8 +36,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_scrollbox", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_dialog_splash/Create_0.gml b/objects/o_dialog_splash/Create_0.gml index 4720d7db4..9cb855de5 100644 --- a/objects/o_dialog_splash/Create_0.gml +++ b/objects/o_dialog_splash/Create_0.gml @@ -4,42 +4,45 @@ event_inherited(); #region data destroy_on_click_out = true; - dialog_w = 960; - dialog_h = 600; + dialog_w = ui(960); + dialog_h = ui(600); #endregion #region content - var x0 = dialog_x + 16; - var x1 = x0 + 288; - var y0 = dialog_y + 128; - var y1 = dialog_y + dialog_h - 16; + var x0 = dialog_x + ui(16); + var x1 = x0 + ui(288); + var y0 = dialog_y + ui(128); + var y1 = dialog_y + dialog_h - ui(16); - sp_recent = new scrollPane(x1 - x0 - 12, y1 - y0, function(_y, _m) { + sp_recent = new scrollPane(x1 - x0 - ui(12), y1 - y0, function(_y, _m) { draw_clear_alpha(c_ui_blue_dkblack, 0); + var ww = sp_recent.surface_w - ui(2); var hh = 0; - var pad = 8; - var hg = 64; + var pad = ui(8); + var hg = ui(16) + line_height(f_p0b) + line_height(f_p1); _y += pad; for(var i = 0; i < ds_list_size(RECENT_FILES); i++) { var _rec = RECENT_FILES[| i]; if(!file_exists(_rec)) continue; - draw_sprite_stretched(s_ui_panel_bg, 1, 0, _y, sp_recent.surface_w, hg); + draw_sprite_stretched(s_ui_panel_bg, 1, 0, _y, ww, hg); - if(HOVER == self && point_in_rectangle(_m[0], _m[1], 0, _y, sp_recent.surface_w, _y + hg)) { - draw_sprite_stretched(s_node_active, 0, 0, _y, sp_recent.surface_w, hg); + if(sHOVER && point_in_rectangle(_m[0], _m[1], 0, _y, ww, _y + hg)) { + draw_sprite_stretched(s_node_active, 0, 0, _y, ww, hg); - if(FOCUS == self && mouse_check_button_pressed(mb_left)) { + if(sFOCUS && mouse_check_button_pressed(mb_left)) { LOAD_PATH(_rec); instance_destroy(); } } + var ly = _y + ui(8); draw_set_text(f_p0b, fa_left, fa_top, c_white); - draw_text(12, _y + 12, filename_name(_rec)); + draw_text(ui(12), ly, filename_name(_rec)); + ly += line_height(); draw_set_text(f_p1, fa_left, fa_top, c_ui_blue_grey); - draw_text_cut(12, _y + 32, _rec, sp_recent.surface_w - 24); + draw_text_cut(ui(12), ly, _rec, ww - ui(24)); hh += hg + pad; _y += hg + pad; @@ -48,15 +51,15 @@ event_inherited(); return hh; }); - x0 = x1 + 16; - x1 = dialog_x + dialog_w - 16; + x0 = x1 + ui(16); + x1 = dialog_x + dialog_w - ui(16); - sp_sample = new scrollPane(x1 - x0 - 12, y1 - y0, function(_y, _m) { + sp_sample = new scrollPane(x1 - x0 - ui(12), y1 - y0, function(_y, _m) { draw_clear_alpha(c_ui_blue_dkblack, 0); var hh = 0; - var grid_heigh = 96; - var grid_width = 128; - var grid_space = 20; + var grid_heigh = ui(96); + var grid_width = ui(128); + var grid_space = ui(20); var node_count = ds_list_size(SAMPLE_PROJECTS); var col = floor(sp_sample.surface_w / (grid_width + grid_space)); var row = ceil(node_count / col); @@ -74,34 +77,34 @@ event_inherited(); var _boxx = _nx; draw_sprite_stretched(s_node_bg, 0, _boxx, yy, grid_width, grid_heigh); - if(HOVER == self && point_in_rectangle(_m[0], _m[1], _nx, yy, _nx + grid_width, yy + grid_heigh)) { + if(sHOVER && point_in_rectangle(_m[0], _m[1], _nx, yy, _nx + grid_width, yy + grid_heigh)) { draw_sprite_stretched(s_node_active, 0, _boxx, yy, grid_width, grid_heigh); - if(FOCUS == self && mouse_check_button_pressed(mb_left)) { + if(sFOCUS && mouse_check_button_pressed(mb_left)) { LOAD_PATH(_node.path, true); instance_destroy(); } } if(_node.spr) - draw_sprite(_node.spr, 0, _boxx + grid_width / 2, yy + grid_heigh / 2); + draw_sprite_ui_uniform(_node.spr, 0, _boxx + grid_width / 2, yy + grid_heigh / 2); var tx = _boxx + grid_width / 2; - var ty = yy + grid_heigh + 4; + var ty = yy + grid_heigh + ui(4); draw_set_text(f_p2, fa_center, fa_top, c_ui_blue_dkgrey); var _tw = string_width(_node.tag); var _th = string_height(_node.tag); draw_set_color(c_ui_blue_mdblack); - draw_roundrect_ext(tx - _tw / 2 - 6, ty - 2, tx + _tw / 2 + 6, ty + _th, 8, 8, 0); + draw_roundrect_ext(tx - _tw / 2 - ui(6), ty - ui(2), tx + _tw / 2 + ui(6), ty + _th, ui(8), ui(8), 0); draw_set_color(_node.tag == "Getting started"? c_ui_orange_light : c_ui_blue_grey); - draw_text(tx, ty, _node.tag); + draw_text(tx, ty - ui(2), _node.tag); draw_set_text(f_p1, fa_center, fa_top, c_white); - name_height = max(name_height, string_height_ext(_node.name, -1, grid_width) + 8); - draw_text_ext(tx, ty + 20, _node.name, -1, grid_width); + name_height = max(name_height, string_height_ext(_node.name, -1, grid_width) + ui(8)); + draw_text_ext(tx, ty + line_height() - ui(2), _node.name, -1, grid_width); } } - var hght = grid_heigh + grid_space + name_height + 20; + var hght = grid_heigh + grid_space + name_height + ui(20); hh += hght; yy += hght; } diff --git a/objects/o_dialog_splash/Draw_64.gml b/objects/o_dialog_splash/Draw_64.gml index 587014297..585ef4d81 100644 --- a/objects/o_dialog_splash/Draw_64.gml +++ b/objects/o_dialog_splash/Draw_64.gml @@ -3,58 +3,59 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion #region content - draw_sprite(icon_64, 0, dialog_x + 56, dialog_y + 56); - draw_set_text(f_h5, fa_left, fa_bottom, c_ui_orange); - draw_text(dialog_x + 56 + 40, dialog_y + 70, "Pixel Composer"); + draw_sprite_ui_uniform(icon_64, 0, dialog_x + ui(56), dialog_y + ui(56)); + draw_set_text(f_h5, fa_left, fa_center, c_ui_orange); + draw_text(dialog_x + ui(56 + 48), dialog_y + ui(56), "Pixel Composer"); - var bx = dialog_x + 266; - var by = dialog_y + 40; + var bx = dialog_x + ui(56 + 48) + string_width("Pixel Composer") + ui(16); + var by = dialog_y + ui(56); var txt = "v. " + VERSION_STRING; - draw_set_text(f_p0, fa_center, fa_center, c_ui_blue_grey); - var ww = string_width(txt) + 16; - if(buttonInstant(s_button_hide, bx, by, ww, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self) == 2) { + draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_grey); + var ww = string_width(txt) + ui(16); + var hh = line_height(, 16); + if(buttonInstant(s_button_hide, bx, by - hh / 2, ww, hh, mouse_ui, sFOCUS, sHOVER) == 2) { dialogCall(o_dialog_release_note, WIN_W / 2, WIN_H / 2); } - draw_text(bx + ww / 2, by + 18, txt); + draw_text(bx + ui(8), by, txt); - var bx = dialog_x + dialog_w - 16 - 36; - var by = dialog_y + 16; - if(buttonInstant(s_button_hide, bx, by, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Prefernece", s_gear_24) == 2) { + var bx = dialog_x + dialog_w - ui(52); + var by = dialog_y + ui(16); + if(buttonInstant(s_button_hide, bx, by, ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "Preference", s_gear_24) == 2) { dialogCall(o_dialog_preference, WIN_W / 2, WIN_H / 2); } - bx -= 40; - if(buttonInstant(s_button_hide, bx, by, 36, 36, [mouse_mx, mouse_my], FOCUS == self, HOVER == self, "Show on startup", s_icon_spalsh_show_on_start, PREF_MAP[? "show_splash"]) == 2) { + bx -= ui(40); + if(buttonInstant(s_button_hide, bx, by, ui(36), ui(36), mouse_ui, sFOCUS, sHOVER, "Show on startup", s_icon_splash_show_on_start, PREF_MAP[? "show_splash"]) == 2) { PREF_MAP[? "show_splash"] = !PREF_MAP[? "show_splash"]; PREF_SAVE(); } - var x0 = dialog_x + 16; - var x1 = x0 + 288; - var y0 = dialog_y + 128; - var y1 = dialog_y + dialog_h - 16; + var x0 = dialog_x + ui(16); + var x1 = x0 + ui(288); + var y0 = dialog_y + ui(128); + var y1 = dialog_y + dialog_h - ui(16); draw_set_text(f_p0, fa_left, fa_bottom, c_ui_blue_grey); - draw_text(x0, y0 - 4, "Recent files"); + draw_text(x0, y0 - ui(4), "Recent files"); draw_sprite_stretched(s_ui_panel_bg, 0, x0, y0, x1 - x0, y1 - y0); - sp_recent.active = FOCUS == self; - sp_recent.draw(x0 + 6, y0); + sp_recent.active = sFOCUS; + sp_recent.draw(x0 + ui(6), y0); - x0 = x1 + 16; - x1 = dialog_x + dialog_w - 16; + x0 = x1 + ui(16); + x1 = dialog_x + dialog_w - ui(16); draw_set_text(f_p0, fa_left, fa_bottom, c_ui_blue_grey); - draw_text(x0, y0 - 4, "Sample projects"); + draw_text(x0, y0 - ui(4), "Sample projects"); draw_sprite_stretched(s_ui_panel_bg, 0, x0, y0, x1 - x0, y1 - y0); - sp_sample.active = FOCUS == self; - sp_sample.draw(x0 + 6, y0); + sp_sample.active = sFOCUS; + sp_sample.draw(x0 + ui(6), y0); draw_set_text(f_p1, fa_right, fa_bottom, c_ui_blue_grey); - draw_text(x1 - 75 - 8, y0 - 4, "Art by "); - draw_sprite_ext(s_kenney, 0, x1, y0 - 4, 1, 1, 0, c_white, 0.5); + draw_text(x1 - ui(82), y0 - ui(4), "Art by "); + draw_sprite_ui_uniform(s_kenney, 0, x1, y0 - ui(4), 2, c_white, 0.5); #endregion \ No newline at end of file diff --git a/objects/o_dialog_warning/Draw_64.gml b/objects/o_dialog_warning/Draw_64.gml index 5d911dde8..f02078d15 100644 --- a/objects/o_dialog_warning/Draw_64.gml +++ b/objects/o_dialog_warning/Draw_64.gml @@ -3,12 +3,12 @@ if !ready exit; #region base UI draw_sprite_stretched(s_dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h); - if(FOCUS == self) + if(sFOCUS) draw_sprite_stretched(s_dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h); #endregion #region text draw_set_text(f_p0, fa_center, fa_top, c_white); - draw_text(dialog_x + dialog_w / 2, dialog_y + 24, warning_text); + draw_text(dialog_x + dialog_w / 2, dialog_y + ui(24), warning_text); #endregion \ No newline at end of file diff --git a/objects/o_dialog_warning/o_dialog_warning.yy b/objects/o_dialog_warning/o_dialog_warning.yy index 53c7fa8a7..204ce36da 100644 --- a/objects/o_dialog_warning/o_dialog_warning.yy +++ b/objects/o_dialog_warning/o_dialog_warning.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "o_dialog_warning", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": { @@ -21,9 +25,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -31,8 +35,4 @@ "name": "dialog", "path": "folders/dialog.yy", }, - "resourceVersion": "1.0", - "name": "o_dialog_warning", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/o_main/Create_0.gml b/objects/o_main/Create_0.gml index 3bc9660ee..b301c3b21 100644 --- a/objects/o_main/Create_0.gml +++ b/objects/o_main/Create_0.gml @@ -35,7 +35,7 @@ dc_check = 0; display_set_timing_method(tm_sleep); - + addHotkey("", "New file", "N", MOD_KEY.ctrl, NEW); addHotkey("", "Save", "S", MOD_KEY.ctrl, SAVE); addHotkey("", "Save as", "S", MOD_KEY.ctrl | MOD_KEY.shift, SAVE_AS); diff --git a/objects/o_main/Draw_75.gml b/objects/o_main/Draw_75.gml index 3ad98c6da..3033d5918 100644 --- a/objects/o_main/Draw_75.gml +++ b/objects/o_main/Draw_75.gml @@ -3,18 +3,18 @@ if(TOOLTIP != "") { draw_set_text(f_p0, fa_left, fa_top, c_white); - var mx = mouse_mx + 16; - var my = mouse_my + 16; + var mx = mouse_mx + ui(16); + var my = mouse_my + ui(16); var tw = string_width(TOOLTIP); var th = string_height(TOOLTIP); - if(mouse_mx + tw > WIN_W - 32) - mx = mouse_mx - 16 - tw; - if(mouse_my + th > WIN_H - 32) - my = mouse_my - 16 - th; + if(mouse_mx + tw + ui(16) > WIN_W) + mx = max(0, mouse_mx - ui(16) - tw); + if(mouse_my + th + ui(16) > WIN_H) + my = max(mouse_my - ui(16) - th); - draw_sprite_stretched(s_textbox, 0, mx - 8, my - 8, tw + 16, th + 16); + draw_sprite_stretched(s_textbox, 0, mx - ui(8), my - ui(8), tw + ui(16), th + ui(16)); draw_text(mx, my, TOOLTIP); } TOOLTIP = ""; diff --git a/objects/o_main/Step_0.gml b/objects/o_main/Step_0.gml index 13b3a4595..991ad6ea9 100644 --- a/objects/o_main/Step_0.gml +++ b/objects/o_main/Step_0.gml @@ -126,4 +126,22 @@ _modified = MODIFIED; window_set_caption(CURRENT_PATH + (MODIFIED? "*" : "") + " - Pixel Composer"); } +#endregion + +#region notification + if(!ds_list_empty(WARNING)) { + var rem = ds_stack_create(); + + for( var i = 0; i < ds_list_size(WARNING); i++ ) { + var w = WARNING[| i]; + if(--w.life <= 0) + ds_stack_push(rem, w); + } + + while(!ds_stack_empty(rem)) { + ds_list_delete(WARNING, ds_stack_pop(rem)); + } + + ds_stack_destroy(rem); + } #endregion \ No newline at end of file diff --git a/scripts/animation_curve/animation_curve.gml b/scripts/animation_curve/animation_curve.gml new file mode 100644 index 000000000..3f13accfb --- /dev/null +++ b/scripts/animation_curve/animation_curve.gml @@ -0,0 +1,4 @@ +function animation_curve_eval(curve, t) { + var ch = animcurve_get_channel(curve, 0); + return animcurve_channel_evaluate(ch, t); +} \ No newline at end of file diff --git a/scripts/animation_curve/animation_curve.yy b/scripts/animation_curve/animation_curve.yy new file mode 100644 index 000000000..27856cd74 --- /dev/null +++ b/scripts/animation_curve/animation_curve.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "animation_curve", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "functions", + "path": "folders/functions.yy", + }, +} \ No newline at end of file diff --git a/scripts/append_function/append_function.gml b/scripts/append_function/append_function.gml index 1e06fdf5f..97378154e 100644 --- a/scripts/append_function/append_function.gml +++ b/scripts/append_function/append_function.gml @@ -15,12 +15,12 @@ function APPEND(_path) { if(_v != SAVEFILE_VERSION) { var warn = "File version mismatch : loading file verion " + string(_v) + " to Pixel Composer " + string(SAVEFILE_VERSION); log_warning("FILE", warn) - PANEL_MENU.addNotiExtra(warn); + noti_warning(warn); } } else { var warn = "File version mismatch : loading old format to Pixel Composer " + string(SAVEFILE_VERSION); log_warning("FILE", warn) - PANEL_MENU.addNotiExtra(warn); + noti_warning(warn); } var _node_list = _map[? "nodes"]; @@ -45,7 +45,7 @@ function APPEND(_path) { ds_list_add(node_create, _node); } } catch(e) { - PANEL_MENU.addNotiExtra("Node load error : " + e.message); + noti_warning("Node load error : " + e.message); log_warning("APPEND, node", e.longMessage); } @@ -53,7 +53,7 @@ function APPEND(_path) { for(var i = 0; i < ds_list_size(appended_list); i++) appended_list[| i].postDeserialize(); } catch(e) { - PANEL_MENU.addNotiExtra("Deserialize error : " + e.message); + noti_warning("Deserialize error : " + e.message); log_warning("APPEND, deserialize", e.longMessage); } @@ -65,7 +65,7 @@ function APPEND(_path) { for(var i = 0; i < ds_list_size(appended_list); i++) appended_list[| i].postConnect(); } catch(e) { - PANEL_MENU.addNotiExtra("Connect error : " + e.message); + noti_warning("Connect error : " + e.message); log_warning("APPEND, connect", e.longMessage); } @@ -73,7 +73,7 @@ function APPEND(_path) { for(var i = 0; i < ds_list_size(appended_list); i++) appended_list[| i].doUpdate(); } catch(e) { - PANEL_MENU.addNotiExtra("Update error : " + e.message); + noti_warning("Update error : " + e.message); log_warning("APPEND, update", e.longMessage); } @@ -98,9 +98,9 @@ function APPEND(_path) { } 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."); + noti_warning("Some connection(s) is unsolved. This may caused by render node not being update properly, or image path is broken."); } catch(e) { - PANEL_MENU.addNotiExtra("Conflict solver error : " + e.message); + noti_warning("Conflict solver error : " + e.message); log_warning("APPEND, solver", e.longMessage); } } @@ -109,7 +109,7 @@ function APPEND(_path) { PANEL_ANIMATION.updatePropertyList(); log_message("FILE", "append file " + _path); - PANEL_MENU.showNoti("Collection loaded", s_noti_icon_file_load); + noti_status("Collection loaded", s_noti_icon_file_load); ds_map_destroy(_map); return node_create; diff --git a/scripts/areaBox/areaBox.gml b/scripts/areaBox/areaBox.gml index ea7d3ac80..338f2be5f 100644 --- a/scripts/areaBox/areaBox.gml +++ b/scripts/areaBox/areaBox.gml @@ -20,7 +20,7 @@ function areaBox(_onModify) constructor { } static draw = function(_x, _y, _data, _m) { - if(buttonInstant(s_button_hide, _x - 48, _y + 64 - 48, 96, 96, _m, active, hover, "", s_inspector_area, array_safe_get(_data, 4), c_white) == 2) { + if(buttonInstant(s_button_hide, _x - ui(48), _y + ui(64 - 48), ui(96), ui(96), _m, active, hover, "", s_inspector_area, array_safe_get(_data, 4), c_white) == 2) { if(mouse_check_button_pressed(mb_left)) { var val = (array_safe_get(_data, 4) + 1) % 2; onModify(4, val); @@ -28,7 +28,7 @@ function areaBox(_onModify) constructor { } if(onSurfaceSize != -1) { - if(buttonInstant(s_button_hide, _x - 64 - 12, _y + 28 - 12, 24, 24, _m, active, hover, "Fill surface", s_fill_16, 0, c_white) == 2) { + if(buttonInstant(s_button_hide, _x - ui(76), _y + ui(28 - 12), ui(24), ui(24), _m, active, hover, "Fill surface", s_fill_16, 0, c_white) == 2) { var ss = onSurfaceSize(); onModify(0, toNumber(ss[0] / 2)); onModify(1, toNumber(ss[1] / 2)); @@ -43,11 +43,11 @@ function areaBox(_onModify) constructor { tb[i].align = fa_center; } - tb[0].draw(_x - 56 - 48, _y - 28, 96, 34, array_safe_get(_data, 0), _m); - tb[1].draw(_x + 56 - 48, _y - 28, 96, 34, array_safe_get(_data, 1), _m); + tb[0].draw(_x - ui(56) - ui(48), _y - ui(28), ui(96), TEXTBOX_HEIGHT, array_safe_get(_data, 0), _m); + tb[1].draw(_x + ui(56) - ui(48), _y - ui(28), ui(96), TEXTBOX_HEIGHT, array_safe_get(_data, 1), _m); - tb[2].draw(_x - 36, _y + 64 + 48 + 8, 64, 34, array_safe_get(_data, 2), _m); - tb[3].draw(_x + 64, _y + 64 - 16, 64, 34, array_safe_get(_data, 3), _m); + tb[2].draw(_x - ui(36), _y + ui(64 + 48 + 8), ui(64), TEXTBOX_HEIGHT, array_safe_get(_data, 2), _m); + tb[3].draw(_x + ui(64), _y + ui(64 - 16), ui(64), TEXTBOX_HEIGHT, array_safe_get(_data, 3), _m); active = false; hover = false; diff --git a/scripts/areaBox/areaBox.yy b/scripts/areaBox/areaBox.yy index 15011d887..73fe259c5 100644 --- a/scripts/areaBox/areaBox.yy +++ b/scripts/areaBox/areaBox.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "areaBox", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "areaBox", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/blurSurface/blurSurface.gml b/scripts/blurSurface/blurSurface.gml index 1c5675e20..91f38bfe7 100644 --- a/scripts/blurSurface/blurSurface.gml +++ b/scripts/blurSurface/blurSurface.gml @@ -5,8 +5,8 @@ function surface_apply_gaussian(surface, size, bg = false, bg_c = c_white, clamp static uni_wei = shader_get_uniform(sh_blur_gaussian, "weight"); static uni_sze = shader_get_uniform(sh_blur_gaussian, "size"); - var hori = surface_create(surface_get_width(surface), surface_get_height(surface)); - var vert = surface_create(surface_get_width(surface), surface_get_height(surface)); + var hori = surface_create_valid(surface_get_width(surface), surface_get_height(surface)); + var vert = surface_create_valid(surface_get_width(surface), surface_get_height(surface)); size = max(1, round(size)); var gau_array = array_create(size); diff --git a/scripts/blurSurface/blurSurface.yy b/scripts/blurSurface/blurSurface.yy index 5b39a25a4..515dfb4c1 100644 --- a/scripts/blurSurface/blurSurface.yy +++ b/scripts/blurSurface/blurSurface.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "blurSurface", "isDnD": false, "isCompatibility": false, "parent": { "name": "surface", "path": "folders/functions/surface.yy", }, - "resourceVersion": "1.0", - "name": "blurSurface", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/buffer_surface/buffer_surface.gml b/scripts/buffer_surface/buffer_surface.gml new file mode 100644 index 000000000..c6379c210 --- /dev/null +++ b/scripts/buffer_surface/buffer_surface.gml @@ -0,0 +1,6 @@ +function buffer_get_color(buffer, _x, _y, w, h) { + buffer_seek(buffer, buffer_seek_start, (w * _y + _x) * 4); + var c = buffer_read(buffer, buffer_u32); + + return c; +} \ No newline at end of file diff --git a/scripts/buffer_surface/buffer_surface.yy b/scripts/buffer_surface/buffer_surface.yy new file mode 100644 index 000000000..2a38548d6 --- /dev/null +++ b/scripts/buffer_surface/buffer_surface.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "buffer_surface", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "surface", + "path": "folders/functions/surface.yy", + }, +} \ No newline at end of file diff --git a/scripts/button/button.gml b/scripts/button/button.gml index bbacddde9..6e163b750 100644 --- a/scripts/button/button.gml +++ b/scripts/button/button.gml @@ -43,7 +43,7 @@ function buttonClass(_onClick) constructor { } else { draw_sprite_stretched_ext(spr, 0, _x, _y, _w, _h, blend, 1); } - if(icon) draw_sprite(icon, icon_index, _x + _w / 2, _y + _h / 2); + if(icon) draw_sprite_ui_uniform(icon, icon_index, _x + _w / 2, _y + _h / 2); if(text != "") { draw_set_text(f_p0, fa_center, fa_center, c_white); draw_text(_x + _w / 2, _y + _h / 2, text); @@ -73,7 +73,7 @@ function buttonInstant(spr, _x, _y, _w, _h, _m, _act, _hvr, _tip = "", _icon = n } if(_icon) { - draw_sprite_ext(_icon, _icon_index, _x + _w / 2, _y + _h / 2, 1, 1, 0, _icon_blend, _icon_alpha); + draw_sprite_ui_uniform(_icon, _icon_index, _x + _w / 2, _y + _h / 2, 1, _icon_blend, _icon_alpha); } return res; diff --git a/scripts/button/button.yy b/scripts/button/button.yy index 9b9213afd..ac23628e9 100644 --- a/scripts/button/button.yy +++ b/scripts/button/button.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "button", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "button", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/buttonColor/buttonColor.gml b/scripts/buttonColor/buttonColor.gml index 660039af1..31b67cac6 100644 --- a/scripts/buttonColor/buttonColor.gml +++ b/scripts/buttonColor/buttonColor.gml @@ -21,7 +21,7 @@ function buttonColorClass(_onApply) constructor { static draw = function(_x, _y, _w, _h, _color, _m) { b_picker.hover = hover; b_picker.active = active; - b_picker.draw(_x + _w - 32, _y + _h / 2 - 16, 32, 32, _m, s_button_hide); + b_picker.draw(_x + _w - ui(32), _y + _h / 2 - ui(16), ui(32), ui(32), _m, s_button_hide); if(keyboard_check_pressed(vk_alt)) { onColorPick(); @@ -34,7 +34,7 @@ function buttonColorClass(_onApply) constructor { } } - var _cw = _w - 40; + var _cw = _w - ui(40); var click = false; if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _cw, _y + _h)) { draw_sprite_stretched(s_button, 1, _x, _y, _cw, _h); @@ -50,7 +50,7 @@ function buttonColorClass(_onApply) constructor { } else { draw_sprite_stretched(s_button, 0, _x, _y, _cw, _h); } - draw_sprite_stretched_ext(s_color_picker_sample, 0, _x + 4, _y + 4, _cw - 8, _h - 8, _color, 1); + draw_sprite_stretched_ext(s_color_picker_sample, 0, _x + ui(4), _y + ui(4), _cw - ui(8), _h - ui(8), _color, 1); hover = false; active = false; diff --git a/scripts/buttonColor/buttonColor.yy b/scripts/buttonColor/buttonColor.yy index ad735c414..85b68b311 100644 --- a/scripts/buttonColor/buttonColor.yy +++ b/scripts/buttonColor/buttonColor.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "buttonColor", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "buttonColor", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/buttonGradient/buttonGradient.gml b/scripts/buttonGradient/buttonGradient.gml index 163006041..d9c7d5ddd 100644 --- a/scripts/buttonGradient/buttonGradient.gml +++ b/scripts/buttonGradient/buttonGradient.gml @@ -24,7 +24,7 @@ function buttonGradientClass(_onApply) constructor { draw_sprite_stretched(s_button, 0, _x, _y, _w, _h); } - draw_gradient(_x + 6, _y + 6, _w - 12, _h - 12, _gradient, _data[| 0]); + draw_gradient(_x + ui(6), _y + ui(6), _w - ui(12), _h - ui(12), _gradient, _data[| 0]); hover = false; active = false; diff --git a/scripts/buttonGradient/buttonGradient.yy b/scripts/buttonGradient/buttonGradient.yy index a2f08471d..e07b10672 100644 --- a/scripts/buttonGradient/buttonGradient.yy +++ b/scripts/buttonGradient/buttonGradient.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "buttonGradient", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "buttonGradient", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/buttonGroup/buttonGroup.gml b/scripts/buttonGroup/buttonGroup.gml index da12092c4..4bfd9d70a 100644 --- a/scripts/buttonGroup/buttonGroup.gml +++ b/scripts/buttonGroup/buttonGroup.gml @@ -34,7 +34,7 @@ function buttonGroupClass(_data, _onClick) constructor { draw_set_text(f_p0, fa_center, fa_center, c_white); draw_text(bx + ww / 2, _y + _h / 2, data[i]); } else if(sprite_exists(data[i])) { - draw_sprite(data[i], i, bx + ww / 2, _y + _h / 2); + draw_sprite_ui_uniform(data[i], i, bx + ww / 2, _y + _h / 2); } } hover = false; diff --git a/scripts/buttonGroup/buttonGroup.yy b/scripts/buttonGroup/buttonGroup.yy index c50a35594..e8d5f04ff 100644 --- a/scripts/buttonGroup/buttonGroup.yy +++ b/scripts/buttonGroup/buttonGroup.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "buttonGroup", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "buttonGroup", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/buttonPalette/buttonPalette.gml b/scripts/buttonPalette/buttonPalette.gml index a80f61103..66dd21f68 100644 --- a/scripts/buttonPalette/buttonPalette.gml +++ b/scripts/buttonPalette/buttonPalette.gml @@ -24,7 +24,7 @@ function buttonPaletteClass(_onApply) constructor { draw_sprite_stretched(s_button, 0, _x, _y, _w, _h); } - drawPalette(_color, _x + 6, _y + 6, _w - 12, _h - 12); + drawPalette(_color, _x + ui(6), _y + ui(6), _w - ui(12), _h - ui(12)); hover = false; active = false; diff --git a/scripts/buttonPalette/buttonPalette.yy b/scripts/buttonPalette/buttonPalette.yy index 8d8786afe..42e2899aa 100644 --- a/scripts/buttonPalette/buttonPalette.yy +++ b/scripts/buttonPalette/buttonPalette.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "buttonPalette", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "buttonPalette", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/checkbox/checkbox.gml b/scripts/checkbox/checkbox.gml index 1e5f0840a..e4083c2cb 100644 --- a/scripts/checkbox/checkbox.gml +++ b/scripts/checkbox/checkbox.gml @@ -4,14 +4,23 @@ function checkBox(_onClick) constructor { onClick = _onClick; - static draw = function(_x, _y, _value, _m, _s = 28) { - var cx = _x; - var cy = _y; + static draw = function(_x, _y, _value, _m, ss = ui(28), halign = fa_left, valign = fa_top) { + switch(halign) { + case fa_left: _x = _x; break; + case fa_center: _x = _x - ss / 2; break; + case fa_right: _x = _x - ss; break; + } - draw_sprite_stretched(s_checkbox, _value * 2, cx, cy, _s, _s); + switch(valign) { + case fa_top: _y = _y; break; + case fa_center: _y = _y - ss / 2; break; + case fa_bottom: _y = _y - ss; break; + } - if(hover && point_in_rectangle(_m[0], _m[1], cx, cy, cx + _s, cy + _s)) { - draw_sprite_stretched(s_checkbox, _value * 2 + 1, _x, _y, _s, _s); + draw_sprite_stretched(s_checkbox, _value * 2, _x, _y, ss, ss); + + if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + ss, _y + ss)) { + draw_sprite_stretched(s_checkbox, _value * 2 + 1, _x, _y, ss, ss); if(active && mouse_check_button_pressed(mb_left)) { if(onClick) onClick(); diff --git a/scripts/controlPointBox/controlPointBox.gml b/scripts/controlPointBox/controlPointBox.gml index 45831a227..85c0c7672 100644 --- a/scripts/controlPointBox/controlPointBox.gml +++ b/scripts/controlPointBox/controlPointBox.gml @@ -55,57 +55,57 @@ function controlPointBox(_onModify) constructor { var yy = _y; - scMode.draw(_x, yy, _w, 34, sMode[_data[PUPPET_CONTROL.mode]], _m, _rx, _ry); - yy += 34 + 8; + scMode.draw(_x, yy, _w, TEXTBOX_HEIGHT, sMode[_data[PUPPET_CONTROL.mode]], _m, _rx, _ry); + yy += TEXTBOX_HEIGHT + ui(8); - var lw = 80; + var lw = ui(80); var w = _w / 2 - lw; draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(_x, yy + 17, "cx"); - draw_text(_x + _w / 2 + 10, yy + 17, "cy"); - tbCx.draw(_x + lw, yy, w, 34, _data[PUPPET_CONTROL.cx], _m); - tbCy.draw(_x + _w / 2 + lw, yy, w, 34, _data[PUPPET_CONTROL.cy], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "cx"); + draw_text(_x + _w / 2 + ui(10), yy + ui(17), "cy"); + tbCx.draw(_x + lw, yy, w, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.cx], _m); + tbCy.draw(_x + _w / 2 + lw, yy, w, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.cy], _m); + yy += TEXTBOX_HEIGHT + ui(8); switch(_data[PUPPET_CONTROL.mode]) { case PUPPET_FORCE_MODE.move: draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(_x, yy + 17, "fx"); - draw_text(_x + _w / 2 + 10, yy + 17, "fy"); - tbFx.draw(_x + lw, yy, w, 34, _data[PUPPET_CONTROL.fx], _m); - tbFy.draw(_x + _w / 2 + lw, yy, w, 34, _data[PUPPET_CONTROL.fy], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "fx"); + draw_text(_x + _w / 2 + ui(10), yy + ui(17), "fy"); + tbFx.draw(_x + lw, yy, w, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.fx], _m); + tbFy.draw(_x + _w / 2 + lw, yy, w, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.fy], _m); + yy += TEXTBOX_HEIGHT + ui(8); draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(_x, yy + 17, "radius"); - sW.draw(_x + lw, yy, _w - lw, 34, _data[PUPPET_CONTROL.width], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "radius"); + sW.draw(_x + lw, yy, _w - lw, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.width], _m); + yy += TEXTBOX_HEIGHT + ui(8); break; case PUPPET_FORCE_MODE.pinch: case PUPPET_FORCE_MODE.inflate: draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(_x, yy + 17, "radius"); - sW.draw(_x + lw, yy, _w - lw, 34, _data[PUPPET_CONTROL.width], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "radius"); + sW.draw(_x + lw, yy, _w - lw, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.width], _m); + yy += TEXTBOX_HEIGHT + ui(8); - draw_text(_x, yy + 17, "strength"); - tbH.draw(_x + lw, yy, _w - lw, 34, _data[PUPPET_CONTROL.height], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "strength"); + tbH.draw(_x + lw, yy, _w - lw, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.height], _m); + yy += TEXTBOX_HEIGHT + ui(8); break; case PUPPET_FORCE_MODE.wind: draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(_x, yy + 17, "stength"); - tbFx.draw(_x + lw, yy, _w - lw, 34, _data[PUPPET_CONTROL.fx], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "stength"); + tbFx.draw(_x + lw, yy, _w - lw, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.fx], _m); + yy += TEXTBOX_HEIGHT + ui(8); draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(_x, yy + 17, "width"); - tbW.draw(_x + lw, yy, _w - lw, 34, _data[PUPPET_CONTROL.width], _m); - yy += 34 + 8; + draw_text(_x, yy + ui(17), "width"); + tbW.draw(_x + lw, yy, _w - lw, TEXTBOX_HEIGHT, _data[PUPPET_CONTROL.width], _m); + yy += TEXTBOX_HEIGHT + ui(8); rot.draw(_x + _w / 2, yy, _data[PUPPET_CONTROL.fy], _m); - yy += 94 + 8; + yy += ui(94 + 8); break; } diff --git a/scripts/directory_object/directory_object.gml b/scripts/directory_object/directory_object.gml index 69b1adee0..487ecda98 100644 --- a/scripts/directory_object/directory_object.gml +++ b/scripts/directory_object/directory_object.gml @@ -68,20 +68,20 @@ function DirectoryObject(name, path) constructor { } static draw = function(parent, _x, _y, _m, _w, _hover, _focus, _homedir) { - var hg = 28; + var hg = ui(28); var hh = 0; if(path == parent.context.path) - draw_sprite_stretched_ext(s_ui_panel_bg, 0, _x + 28, _y, _w - 28, hg, c_ui_blue_ltgrey, 1); + draw_sprite_stretched_ext(s_ui_panel_bg, 0, _x + ui(28), _y, _w - ui(28), hg, c_ui_blue_ltgrey, 1); - if(!ds_list_empty(subDir) && _hover && point_in_rectangle(_m[0], _m[1], _x, _y, 32, _y + hg - 1)) { - draw_sprite_stretched_ext(s_ui_panel_bg, 0, _x, _y, 32, hg, c_ui_blue_white, 1); + if(!ds_list_empty(subDir) && _hover && point_in_rectangle(_m[0], _m[1], _x, _y, ui(32), _y + hg - 1)) { + draw_sprite_stretched_ext(s_ui_panel_bg, 0, _x, _y, ui(32), hg, c_ui_blue_white, 1); if(_focus && mouse_check_button_pressed(mb_left)) open = !open; } - if(_hover && point_in_rectangle(_m[0], _m[1], _x + 32, _y, _w, _y + hg - 1)) { - draw_sprite_stretched_ext(s_ui_panel_bg, 0, _x + 28, _y, _w - 28, hg, c_ui_blue_white, 1); + if(_hover && point_in_rectangle(_m[0], _m[1], _x + ui(32), _y, _w, _y + hg - 1)) { + draw_sprite_stretched_ext(s_ui_panel_bg, 0, _x + ui(28), _y, _w - ui(28), hg, c_ui_blue_white, 1); if(_focus && mouse_check_button_pressed(mb_left)) { if(parent.context == self) parent.setContext(_homedir); @@ -92,26 +92,26 @@ function DirectoryObject(name, path) constructor { draw_set_text(f_p0, fa_left, fa_center, c_white); if(ds_list_empty(subDir)) { - draw_sprite_ext(s_folder_content_24, parent.context == self, _x + 16, _y + hg / 2 - 1, 1, 1, 0, c_ui_blue_dkgrey, 1); + draw_sprite_ui_uniform(s_folder_content_24, parent.context == self, _x + ui(16), _y + hg / 2 - 1, 1, c_ui_blue_dkgrey); } else { - draw_sprite_ext(s_folder_content_24, open, _x + 16, _y + hg / 2 - 1, 1, 1, 0, c_ui_blue_ltgrey, 1); + draw_sprite_ui_uniform(s_folder_content_24, open, _x + ui(16), _y + hg / 2 - 1, 1, c_ui_blue_ltgrey); } - draw_text(_x + 8 + 24, _y + hg / 2, name); + draw_text(_x + ui(32), _y + hg / 2, name); hh += hg; _y += hg; if(open && !ds_list_empty(subDir)) { var l_y = _y; for(var i = 0; i < ds_list_size(subDir); i++) { - var _hg = subDir[| i].draw(parent, _x + 16, _y, _m, _w - 16, _hover, _focus, _homedir); + var _hg = subDir[| i].draw(parent, _x + ui(16), _y, _m, _w - ui(16), _hover, _focus, _homedir); draw_set_color(c_ui_blue_dkgrey); - draw_line(_x + 12, _y + hg / 2, _x + 12 + 4, _y + hg / 2); + draw_line(_x + ui(12), _y + hg / 2, _x + ui(16), _y + hg / 2); hh += _hg; _y += _hg; } draw_set_color(c_ui_blue_dkgrey); - draw_line(_x + 12, l_y, _x + 12, _y - hg / 2); + draw_line(_x + ui(12), l_y, _x + ui(12), _y - hg / 2); } return hh; diff --git a/scripts/draw_UI_scale/draw_UI_scale.gml b/scripts/draw_UI_scale/draw_UI_scale.gml new file mode 100644 index 000000000..7c227e3ff --- /dev/null +++ b/scripts/draw_UI_scale/draw_UI_scale.gml @@ -0,0 +1,15 @@ +function line_height(font = noone, offset = 0) { + var ff = draw_get_font(); + + if(font != noone) + draw_set_font(font); + var hh = string_height("l") + offset * UI_SCALE; + + draw_set_font(ff); + return hh; +} + +#macro TEXTBOX_HEIGHT line_height(f_p0, 12) + +gml_pragma("forceinline"); +function ui(val) { return val * UI_SCALE; } \ No newline at end of file diff --git a/scripts/draw_UI_scale/draw_UI_scale.yy b/scripts/draw_UI_scale/draw_UI_scale.yy new file mode 100644 index 000000000..4f2e82f3e --- /dev/null +++ b/scripts/draw_UI_scale/draw_UI_scale.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "draw_UI_scale", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "draw", + "path": "folders/functions/draw.yy", + }, +} \ No newline at end of file diff --git a/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml b/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml new file mode 100644 index 000000000..3059c5bb8 --- /dev/null +++ b/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml @@ -0,0 +1,23 @@ +#macro draw_sprite_ext draw_sprite_ext_override +#macro __draw_sprite_ext draw_sprite_ext + +function draw_sprite_ext_override(spr, ind, _x, _y, xscale = 1, yscale = 1, rot = 0, color = c_white, alpha = 1) { + __draw_sprite_ext(spr, ind, _x, _y, xscale, yscale, rot, color, alpha); +} + +function draw_sprite_uniform(spr, ind, _x, _y, scale, color = c_white) { + draw_sprite_ext(spr, ind, _x, _y, scale, scale, 0, color, 1); +} + +function draw_sprite_ui(spr, ind, _x, _y, xscale = 1, yscale = 1, rot = 0, color = c_white, alpha = 1) { + static UI_SPRITE_SCALE = 2; + + var xscale_ui = ui(xscale) / UI_SPRITE_SCALE; + var yscale_ui = ui(yscale) / UI_SPRITE_SCALE; + + draw_sprite_ext(spr, ind, _x, _y, xscale_ui, yscale_ui, rot, color, alpha); +} + +function draw_sprite_ui_uniform(spr, ind, _x, _y, scale = 1, color = c_white, alpha = 1) { + draw_sprite_ui(spr, ind, _x, _y, scale, scale, 0, color, alpha); +} diff --git a/scripts/draw_sprite_ext_override/draw_sprite_ext_override.yy b/scripts/draw_sprite_ext_override/draw_sprite_ext_override.yy new file mode 100644 index 000000000..17f6e28a9 --- /dev/null +++ b/scripts/draw_sprite_ext_override/draw_sprite_ext_override.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "draw_sprite_ext_override", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "draw", + "path": "folders/functions/draw.yy", + }, +} \ No newline at end of file diff --git a/scripts/ds_extra/ds_extra.gml b/scripts/ds_list/ds_list.gml similarity index 96% rename from scripts/ds_extra/ds_extra.gml rename to scripts/ds_list/ds_list.gml index 3c990449b..eb6cde5b6 100644 --- a/scripts/ds_extra/ds_extra.gml +++ b/scripts/ds_list/ds_list.gml @@ -51,5 +51,5 @@ function ds_list_append(list, _append) { } function ds_list_exist(list, item) { - return ds_list_find_index(list, item) != -1; + return ds_list_find_index(list, item) >= 0; } \ No newline at end of file diff --git a/scripts/ds_extra/ds_extra.yy b/scripts/ds_list/ds_list.yy similarity index 89% rename from scripts/ds_extra/ds_extra.yy rename to scripts/ds_list/ds_list.yy index 72d6c122d..3f89b7ebe 100644 --- a/scripts/ds_extra/ds_extra.yy +++ b/scripts/ds_list/ds_list.yy @@ -1,7 +1,7 @@ { "resourceType": "GMScript", "resourceVersion": "1.0", - "name": "ds_extra", + "name": "ds_list", "isDnD": false, "isCompatibility": false, "parent": { diff --git a/scripts/font_loader/font_loader.gml b/scripts/font_loader/font_loader.gml index f3a4c0b0d..872a7bbf5 100644 --- a/scripts/font_loader/font_loader.gml +++ b/scripts/font_loader/font_loader.gml @@ -1,14 +1,30 @@ -globalvar f_h3, f_h5, f_p0, f_p0b, f_p1, f_p2, f_p3; +globalvar FONT_LOADED, f_h3, f_h5, f_p0, f_p0b, f_p1, f_p2, f_p3; + +FONT_LOADED = false; function loadFonts() { + if(FONT_LOADED) { + font_delete(f_h3); + font_delete(f_h5); + + font_delete(f_p0); + font_delete(f_p0b); + + font_delete(f_p1); + font_delete(f_p2); + font_delete(f_p3); + } + var font = "NotoSans"; - f_h3 = font_add("data/fonts/" + font + "-Bold.ttf", 20 * DISP_SCALE, false, false, 32, 127); - f_h5 = font_add("data/fonts/" + font + "-Bold.ttf", 16 * DISP_SCALE, false, false, 32, 127); + f_h3 = font_add("data/fonts/" + font + "-Bold.ttf", 20 * UI_SCALE, false, false, 32, 127); + f_h5 = font_add("data/fonts/" + font + "-Bold.ttf", 16 * UI_SCALE, false, false, 32, 127); - f_p0 = font_add("data/fonts/" + font + "-Medium.ttf", 12 * DISP_SCALE, false, false, 32, 127); - f_p0b = font_add("data/fonts/" + font + "-Bold.ttf", 12 * DISP_SCALE, false, false, 32, 127); + f_p0 = font_add("data/fonts/" + font + "-Medium.ttf", 12 * UI_SCALE, false, false, 32, 127); + f_p0b = font_add("data/fonts/" + font + "-Bold.ttf", 12 * UI_SCALE, false, false, 32, 127); - f_p1 = font_add("data/fonts/" + font + "-Medium.ttf", 11 * DISP_SCALE, false, false, 32, 127); - f_p2 = font_add("data/fonts/" + font + "-SemiBold.ttf", 10 * DISP_SCALE, false, false, 32, 127); - f_p3 = font_add("data/fonts/" + font + "-SemiBold.ttf", 9 * DISP_SCALE, false, false, 32, 127); + f_p1 = font_add("data/fonts/" + font + "-SemiBold.ttf", 11 * UI_SCALE, false, false, 32, 127); + f_p2 = font_add("data/fonts/" + font + "-SemiBold.ttf", 10 * UI_SCALE, false, false, 32, 127); + f_p3 = font_add("data/fonts/" + font + "-SemiBold.ttf", 9 * UI_SCALE, false, false, 32, 127); + + FONT_LOADED = true; } \ No newline at end of file diff --git a/scripts/gif_reader/gif_reader.gml b/scripts/gif_reader/gif_reader.gml index 597d96831..0b5d502f5 100644 --- a/scripts/gif_reader/gif_reader.gml +++ b/scripts/gif_reader/gif_reader.gml @@ -105,7 +105,7 @@ function gif_std_enum_getIndex() { if (_col == _transparentIndex) buffer_write(_buf, buffer_s32, 0); else buffer_write(_buf, buffer_s32, _colorTable[_col]); } _gf.buffer = _buf; - var _sf = surface_create(_f.width, _f.height); + var _sf = surface_create_valid(_f.width, _f.height); gif_std_gml_io__Buffer_BufferImpl_setSurface(_buf, _sf, 0); _gf.surface = _sf; _gce = undefined; @@ -149,14 +149,14 @@ function gif_std_enum_getIndex() { function __gif_sprite_builder(_gif) constructor { gif = _gif; - _sf = surface_create(gif.width, gif.height); + _sf = surface_create_valid(gif.width, gif.height); //show_debug_message("gif creation: width = " + string(_gif.width)); _restoreBuf = -1; _spr = -1; spr_size = 0; _white32 = Gif_white32; if (_white32 == -1) { - var _ws = surface_create(32, 32); + var _ws = surface_create_valid(32, 32); surface_set_target(_ws); draw_clear(16777215); surface_reset_target(); @@ -223,14 +223,14 @@ function gif_std_enum_getIndex() { } function __gif_create_sprite(_gif) { - var _sf = surface_create(_gif.width, _gif.height); + var _sf = surface_create_valid(_gif.width, _gif.height); //show_debug_message("gif creation: width = " + string(_gif.width)); var _restoreBuf = -1; var _spr = -1; var spr_size = 0; var _white32 = Gif_white32; if (_white32 == -1) { - var _ws = surface_create(32, 32); + var _ws = surface_create_valid(32, 32); surface_set_target(_ws); draw_clear(16777215); surface_reset_target(); diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 4146b291e..2e95aceec 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -63,8 +63,8 @@ globalvar ADD_NODE_PAGE, ADD_NODE_W, ADD_NODE_H, ADD_NODE_MODE; ADD_NODE_PAGE = ""; - ADD_NODE_W = 532; - ADD_NODE_H = 346; + ADD_NODE_W = -1; + ADD_NODE_H = -1; ADD_NODE_MODE = 0; globalvar AXIS_COLOR; @@ -78,10 +78,14 @@ #macro WIN_SW window_get_width() #macro WIN_SH window_get_height() - #macro DISP_SCALE PREF_MAP[? "display_scaling"] + #macro UI_SCALE PREF_MAP[? "display_scaling"] #macro mouse_mx device_mouse_x_to_gui(0) #macro mouse_my device_mouse_y_to_gui(0) + #macro mouse_ui [device_mouse_x_to_gui(0), device_mouse_y_to_gui(0)] + + #macro sFOCUS FOCUS == self + #macro sHOVER HOVER == self #region color #macro c_ui_blue_dkblack $251919 @@ -112,7 +116,7 @@ #macro BLEND_OVERRIDE gpu_set_blendmode_ext(bm_one, bm_zero); #endregion - #macro PIXEL_SURFACE surface_create(1, 1) + #macro PIXEL_SURFACE surface_create_valid(1, 1) #macro print show_debug_message #endregion diff --git a/scripts/lerp_float/lerp_float.gml b/scripts/lerp_float/lerp_float.gml index 806120125..ff149208c 100644 --- a/scripts/lerp_float/lerp_float.gml +++ b/scripts/lerp_float/lerp_float.gml @@ -4,6 +4,7 @@ /// @param speed /// @param *precision function lerp_float(from, to, speed) { + if(fps < 15) return to; var pre = argument_count > 3? argument[3] : 0.01; if(abs(from - to) < pre) @@ -13,6 +14,7 @@ function lerp_float(from, to, speed) { } function lerp_linear(from, to, speed) { + if(fps < 15) return to; if(abs(from - to) < speed) return to; else @@ -20,10 +22,12 @@ function lerp_linear(from, to, speed) { } function lerp_angle(from, to, speed) { + if(fps < 15) return to; return from + angle_difference(to, from) / speed * delta_time/15000; } function lerp_angle_linear(from, to, speed) { + if(fps < 15) return to; if(abs(angle_difference(to, from)) < speed) return to; return from + sign(angle_difference(to, from)) * speed; diff --git a/scripts/lerp_float/lerp_float.yy b/scripts/lerp_float/lerp_float.yy index 576ac0aae..3423d7b4c 100644 --- a/scripts/lerp_float/lerp_float.yy +++ b/scripts/lerp_float/lerp_float.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "lerp_float", "isDnD": false, "isCompatibility": false, "parent": { "name": "value", "path": "folders/functions/value.yy", }, - "resourceVersion": "1.0", - "name": "lerp_float", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/level_histogram/level_histogram.gml b/scripts/level_histogram/level_histogram.gml index 90ef32ceb..277044fcb 100644 --- a/scripts/level_histogram/level_histogram.gml +++ b/scripts/level_histogram/level_histogram.gml @@ -58,10 +58,13 @@ function histogramUpdate(surface) { for( var i = 0; i < array_length(hist[0]); i++ ) { hist[j][i] = 0; } + + var surface_buffer = buffer_create(sw * sh * 4, buffer_grow, 1); + buffer_get_surface(surface_buffer, surface, 0); - for( var i = 1; i <= sw; i += stw ) - for( var j = 1; j <= sh; j += sth ) { - var col = surface_getpixel(surface, i, j); + for( var i = 0; i < sw; i += stw ) + for( var j = 0; j < sh; j += sth ) { + var col = buffer_get_color(surface_buffer, i, j, sw, sh); var colA = []; colA[0] = round(color_get_red(col) / 256 * PREF_MAP[? "level_resolution"]); colA[1] = round(color_get_green(col) / 256 * PREF_MAP[? "level_resolution"]); diff --git a/scripts/load_function/load_function.gml b/scripts/load_function/load_function.gml index ef9da64da..9c33791cc 100644 --- a/scripts/load_function/load_function.gml +++ b/scripts/load_function/load_function.gml @@ -9,16 +9,20 @@ function LOAD() { gc_collect(); LOAD_PATH(path); + + ds_list_clear(STATUSES); + ds_list_clear(WARNING); + ds_list_clear(ERRORS); } function LOAD_PATH(path, readonly = false) { if(!file_exists(path)) { - PANEL_MENU.showNoti("File not found", s_noti_icon_warning); + noti_warning("File not found"); return false; } if(filename_ext(path) != ".json" && filename_ext(path) != ".pxc") { - PANEL_MENU.showNoti("File not a valid project", s_noti_icon_warning); + noti_warning("File not a valid project"); return false; } @@ -44,12 +48,12 @@ function LOAD_PATH(path, readonly = false) { if(_v != SAVEFILE_VERSION) { var warn = "File version mismatch : loading file verion " + string(_v) + " to Pixel Composer " + string(SAVEFILE_VERSION); log_warning("FILE", warn) - PANEL_MENU.addNotiExtra(warn); + noti_warning(warn); } } else { var warn = "File version mismatch : loading old format to Pixel Composer " + string(SAVEFILE_VERSION); log_warning("FILE", warn) - PANEL_MENU.addNotiExtra(warn); + noti_warning(warn); } nodeCleanUp(); @@ -63,7 +67,7 @@ function LOAD_PATH(path, readonly = false) { if(_node) ds_list_add(create_list, _node); } } catch(e) { - PANEL_MENU.addNotiExtra("Node load error : " + e.message); + noti_warning("Node load error : " + e.message); log_warning("LOAD, node", e.longMessage); } } @@ -75,7 +79,7 @@ function LOAD_PATH(path, readonly = false) { ANIMATOR.framerate = ds_map_try_get(_anim_map, "framerate"); } } catch(e) { - PANEL_MENU.addNotiExtra("Animator load error : " + e.message); + noti_warning("Animator load error : " + e.message); log_warning("LOAD, animator", e.longMessage); } @@ -85,7 +89,7 @@ function LOAD_PATH(path, readonly = false) { for(var i = 0; i < ds_list_size(create_list); i++) create_list[| i].loadGroup(); } catch(e) { - PANEL_MENU.addNotiExtra("Group load error : " + e.message); + noti_warning("Group load error : " + e.message); log_warning("LOAD, group", e.longMessage); } @@ -93,7 +97,7 @@ function LOAD_PATH(path, readonly = false) { for(var i = 0; i < ds_list_size(create_list); i++) create_list[| i].postDeserialize(); } catch(e) { - PANEL_MENU.addNotiExtra("Deserialize error : " + e.message); + noti_warning("Deserialize error : " + e.message); log_warning("LOAD, deserialize", e.longMessage); } @@ -105,7 +109,7 @@ function LOAD_PATH(path, readonly = false) { for(var i = 0; i < ds_list_size(create_list); i++) create_list[| i].postConnect(); } catch(e) { - PANEL_MENU.addNotiExtra("Connect error : " + e.message); + noti_warning("Connect error : " + e.message); log_warning("LOAD, connect", e.longMessage); } @@ -113,7 +117,7 @@ function LOAD_PATH(path, readonly = false) { for(var i = 0; i < ds_list_size(create_list); i++) create_list[| i].doUpdate(); } catch(e) { - PANEL_MENU.addNotiExtra("Update error : " + e.message); + noti_warning("Update error : " + e.message); log_warning("LOAD, update", e.longMessage); } @@ -133,9 +137,9 @@ function LOAD_PATH(path, readonly = false) { } 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."); + noti_warning("Some connection(s) is unsolved. This may caused by render node not being update properly, or image path is broken."); } catch(e) { - PANEL_MENU.addNotiExtra("Conflict solver error : " + e.message); + noti_warning("Conflict solver error : " + e.message); log_warning("LOAD, connect solver", e.longMessage); } } @@ -147,7 +151,7 @@ function LOAD_PATH(path, readonly = false) { PANEL_ANIMATION.updatePropertyList(); log_message("FILE", "load at " + path); - PANEL_MENU.showNoti("File loaded", s_noti_icon_file_load); + noti_status("File loaded", s_noti_icon_file_load); ds_map_destroy(_map); return true; diff --git a/scripts/node_3D_obj/node_3D_obj.gml b/scripts/node_3D_obj/node_3D_obj.gml index 0afcd8cbf..646a69532 100644 --- a/scripts/node_3D_obj/node_3D_obj.gml +++ b/scripts/node_3D_obj/node_3D_obj.gml @@ -187,7 +187,7 @@ function Node_3D_Obj(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(_dim[0], _dim[1]); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else surface_size_to(_outSurf, _dim[0], _dim[1]); diff --git a/scripts/node_3D_obj/node_3D_obj.yy b/scripts/node_3D_obj/node_3D_obj.yy index 964bdd673..edc9802e5 100644 --- a/scripts/node_3D_obj/node_3D_obj.yy +++ b/scripts/node_3D_obj/node_3D_obj.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_3D_obj", "isDnD": false, "isCompatibility": false, "parent": { "name": "3D", "path": "folders/nodes/data/3D.yy", }, - "resourceVersion": "1.0", - "name": "node_3D_obj", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_3d_prim_cube/node_3d_prim_cube.gml b/scripts/node_3d_prim_cube/node_3d_prim_cube.gml index 6aeeb1116..932007e46 100644 --- a/scripts/node_3d_prim_cube/node_3d_prim_cube.gml +++ b/scripts/node_3d_prim_cube/node_3d_prim_cube.gml @@ -149,7 +149,7 @@ function Node_3D_Cube(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(_dim[0], _dim[1]); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else surface_size_to(_outSurf, _dim[0], _dim[1]); diff --git a/scripts/node_3d_prim_cube/node_3d_prim_cube.yy b/scripts/node_3d_prim_cube/node_3d_prim_cube.yy index 9d30547ce..a7ad13f97 100644 --- a/scripts/node_3d_prim_cube/node_3d_prim_cube.yy +++ b/scripts/node_3d_prim_cube/node_3d_prim_cube.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_3d_prim_cube", "isDnD": false, "isCompatibility": false, "parent": { "name": "3D", "path": "folders/nodes/data/3D.yy", }, - "resourceVersion": "1.0", - "name": "node_3d_prim_cube", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.gml b/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.gml index 347ff3d2e..16111d2c8 100644 --- a/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.gml +++ b/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.gml @@ -202,7 +202,7 @@ function Node_3D_Cylinder(_x, _y) : Node(_x, _y) constructor { var _outSurf = outputs[| 0].getValue(); if(!is_surface(_outSurf)) { - _outSurf = surface_create(_dim[0], _dim[1]); + _outSurf = surface_create_valid(_dim[0], _dim[1]); outputs[| 0].setValue(_outSurf); } else surface_size_to(_outSurf, _dim[0], _dim[1]); diff --git a/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.yy b/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.yy index ea7a58750..8ed2acd24 100644 --- a/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.yy +++ b/scripts/node_3d_prim_cylinder/node_3d_prim_cylinder.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_3d_prim_cylinder", "isDnD": false, "isCompatibility": false, "parent": { "name": "3D", "path": "folders/nodes/data/3D.yy", }, - "resourceVersion": "1.0", - "name": "node_3d_prim_cylinder", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_animate_curve/node_animate_curve.yy b/scripts/node_animate_curve/node_animate_curve.yy index 3e45e63d3..a8c781442 100644 --- a/scripts/node_animate_curve/node_animate_curve.yy +++ b/scripts/node_animate_curve/node_animate_curve.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_animate_curve", "isDnD": false, "isCompatibility": false, "parent": { "name": "animation", "path": "folders/nodes/data/animation.yy", }, - "resourceVersion": "1.0", - "name": "node_animate_curve", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_area/node_area.gml b/scripts/node_area/node_area.gml index 80d9d79c3..7ce3074c8 100644 --- a/scripts/node_area/node_area.gml +++ b/scripts/node_area/node_area.gml @@ -55,6 +55,6 @@ function Node_Area(_x, _y) : Node_Value_Processor(_x, _y) constructor { doUpdate(); static onDrawNode = function(xx, yy, _mx, _my, _s) { - draw_sprite_ext(s_node_draw_area, 0, xx + w * _s / 2, yy + 10 + (h - 10) * _s / 2, _s, _s, 0, c_white, 1); + draw_sprite_ui_uniform(s_node_draw_area, 0, xx + w * _s / 2, yy + 10 + (h - 10) * _s / 2, _s, c_white); } } \ No newline at end of file diff --git a/scripts/node_bloom/node_bloom.gml b/scripts/node_bloom/node_bloom.gml index 8b6ef5d91..d8ab42b63 100644 --- a/scripts/node_bloom/node_bloom.gml +++ b/scripts/node_bloom/node_bloom.gml @@ -26,7 +26,7 @@ function Node_Bloom(_x, _y) : Node_Processor(_x, _y) constructor { var _size = _data[1]; var _tole = _data[2]; var _stre = _data[3]; - var pass1 = surface_create(surface_get_width(_outSurf), surface_get_height(_outSurf)); + var pass1 = surface_create_valid(surface_get_width(_outSurf), surface_get_height(_outSurf)); surface_set_target(pass1); draw_clear_alpha(c_black, 1); diff --git a/scripts/node_bloom/node_bloom.yy b/scripts/node_bloom/node_bloom.yy index e02ad0825..b9dfec711 100644 --- a/scripts/node_bloom/node_bloom.yy +++ b/scripts/node_bloom/node_bloom.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_bloom", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_bloom", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_blur_contrast/node_blur_contrast.gml b/scripts/node_blur_contrast/node_blur_contrast.gml index 9f27aa146..217045324 100644 --- a/scripts/node_blur_contrast/node_blur_contrast.gml +++ b/scripts/node_blur_contrast/node_blur_contrast.gml @@ -32,7 +32,7 @@ function Node_Blur_Contrast(_x, _y) : Node_Processor(_x, _y) constructor { var hh = surface_get_height(_surf); if(is_surface(pass)) surface_size_to(pass, ww, hh); - else pass = surface_create(ww, hh); + else pass = surface_create_valid(ww, hh); surface_set_target(pass); draw_clear_alpha(0, 0); diff --git a/scripts/node_color_adjustment/node_color_adjustment.gml b/scripts/node_color_adjustment/node_color_adjustment.gml index f30194432..137eefe51 100644 --- a/scripts/node_color_adjustment/node_color_adjustment.gml +++ b/scripts/node_color_adjustment/node_color_adjustment.gml @@ -7,7 +7,8 @@ function Node_create_Color_adjust(_x, _y) { function Node_Color_adjust(_x, _y) : Node_Processor(_x, _y) constructor { name = "Color adjust"; - uniform_exp = shader_get_uniform(sh_color_adjust, "brightness"); + uniform_bri = shader_get_uniform(sh_color_adjust, "brightness"); + uniform_exp = shader_get_uniform(sh_color_adjust, "exposure"); uniform_con = shader_get_uniform(sh_color_adjust, "contrast"); uniform_hue = shader_get_uniform(sh_color_adjust, "hue"); uniform_sat = shader_get_uniform(sh_color_adjust, "sat"); @@ -25,8 +26,8 @@ function Node_Color_adjust(_x, _y) : Node_Processor(_x, _y) constructor { inputs[| 1] = nodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) .setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = nodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) - .setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); + inputs[| 2] = nodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + .setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01]); inputs[| 3] = nodeValue(3, "Hue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) .setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); @@ -47,16 +48,19 @@ function Node_Color_adjust(_x, _y) : Node_Processor(_x, _y) constructor { inputs[| 9] = nodeValue(9, "Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) .setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01]); + inputs[| 10] = nodeValue(10, "Exposure", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + .setDisplay(VALUE_DISPLAY.slider, [ 0, 4, 0.01]); + outputs[| 0] = nodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, PIXEL_SURFACE); input_display_list = [0, 8, - ["Brightness", false], 1, 2, + ["Brightness", false], 1, 10, 2, ["HSV", false], 3, 4, 5, ["Color blend", false], 6, 7, 9 ]; static process_data = function(_outSurf, _data, _output_index) { - var _exp = _data[1]; + var _bri = _data[1]; var _con = _data[2]; var _hue = _data[3]; var _sat = _data[4]; @@ -66,6 +70,7 @@ function Node_Color_adjust(_x, _y) : Node_Processor(_x, _y) constructor { var _bla = _data[7]; var _m = _data[8]; var _alp = _data[9]; + var _exp = _data[10]; surface_set_target(_outSurf); draw_clear_alpha(0, 0); @@ -75,6 +80,7 @@ function Node_Color_adjust(_x, _y) : Node_Processor(_x, _y) constructor { shader_set_uniform_i(uniform_mask_use, _m != DEF_SURFACE); texture_set_stage(uniform_mask, surface_get_texture(_m)); + shader_set_uniform_f(uniform_bri, _bri); shader_set_uniform_f(uniform_exp, _exp); shader_set_uniform_f(uniform_con, _con); shader_set_uniform_f(uniform_hue, _hue); diff --git a/scripts/node_color_adjustment/node_color_adjustment.yy b/scripts/node_color_adjustment/node_color_adjustment.yy index 8df16cc8c..866c76a10 100644 --- a/scripts/node_color_adjustment/node_color_adjustment.yy +++ b/scripts/node_color_adjustment/node_color_adjustment.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_color_adjustment", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_color_adjustment", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_composite/node_composite.gml b/scripts/node_composite/node_composite.gml index 4b508eef9..ee698d2d0 100644 --- a/scripts/node_composite/node_composite.gml +++ b/scripts/node_composite/node_composite.gml @@ -63,12 +63,12 @@ function Node_Composite(_x, _y) : Node_Processor(_x, _y) constructor { var _cy = ly + i * (lh + 4); if(point_in_circle(_m[0], _m[1], _bx, _cy + lh / 2, 16)) { - draw_sprite_ext(s_delete_16, 3, _bx, _cy + lh / 2, 1, 1, 0, c_ui_red, 1); + draw_sprite_ui_uniform(s_delete_16, 3, _bx, _cy + lh / 2, 1, c_ui_red); if(_focus && mouse_check_button_pressed(mb_left)) layer_remove = ind; } else - draw_sprite_ext(s_delete_16, 3, _bx, _cy + lh / 2, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_delete_16, 3, _bx, _cy + lh / 2, 1, c_ui_blue_grey); if(!is_surface(_surf)) continue; @@ -81,7 +81,7 @@ function Node_Composite(_x, _y) : Node_Processor(_x, _y) constructor { var _bx = _x + 24 * 2 + 8; if(point_in_circle(_m[0], _m[1], _bx, _cy + lh / 2, 12)) { - draw_sprite_ext(s_junc_visible, vis, _bx, _cy + lh / 2, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_junc_visible, vis, _bx, _cy + lh / 2, 1, c_white); if(_focus) { if(mouse_check_button_pressed(mb_left)) @@ -93,7 +93,7 @@ function Node_Composite(_x, _y) : Node_Processor(_x, _y) constructor { } } } else - draw_sprite_ext(s_junc_visible, vis, _bx, _cy + lh / 2, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_junc_visible, vis, _bx, _cy + lh / 2, 1, c_ui_blue_grey); draw_set_color(c_ui_blue_dkgrey); var _sx0 = _x + 24 * 3 + 8; @@ -126,12 +126,12 @@ function Node_Composite(_x, _y) : Node_Processor(_x, _y) constructor { if(layer_dragging == noone || layer_dragging == ind) { var _bx = _x + 24; if(point_in_circle(_m[0], _m[1], _bx, _cy + lh / 2, 16)) { - draw_sprite_ext(s_hamburger_16, 3, _bx, _cy + lh / 2, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_hamburger_16, 3, _bx, _cy + lh / 2, 1, c_white); if(_focus && mouse_check_button_pressed(mb_left)) layer_dragging = ind; } else - draw_sprite_ext(s_hamburger_16, 3, _bx, _cy + lh / 2, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_hamburger_16, 3, _bx, _cy + lh / 2, 1, c_ui_blue_grey); } } @@ -344,8 +344,8 @@ function Node_Composite(_x, _y) : Node_Processor(_x, _y) constructor { _ri = 1; } - draw_sprite(s_anchor_rotate, _ri, _rx, _ry); - draw_sprite(s_anchor_scale, _si, _sx, _sy); + draw_sprite_ui_uniform(s_anchor_rotate, _ri, _rx, _ry); + draw_sprite_ui_uniform(s_anchor_scale, _si, _sx, _sy); draw_set_color(_borcol); draw_rectangle(_dx0, _dy0, _dx1, _dy1, true); @@ -444,7 +444,7 @@ function Node_Composite(_x, _y) : Node_Processor(_x, _y) constructor { surface_size_to(_outSurf, ww, hh); for(var i = 0; i < 2; i++) { - if(!is_surface(temp_surf[i])) temp_surf[i] = surface_create(surface_get_width(_outSurf), surface_get_height(_outSurf)); + if(!is_surface(temp_surf[i])) temp_surf[i] = surface_create_valid(surface_get_width(_outSurf), surface_get_height(_outSurf)); else surface_size_to(temp_surf[i], surface_get_width(_outSurf), surface_get_height(_outSurf)); surface_set_target(temp_surf[i]); diff --git a/scripts/node_corner/node_corner.gml b/scripts/node_corner/node_corner.gml index f30397fa5..bfe2b1d93 100644 --- a/scripts/node_corner/node_corner.gml +++ b/scripts/node_corner/node_corner.gml @@ -33,7 +33,7 @@ function Node_Corner(_x, _y) : Node_Processor(_x, _y) constructor { static process_data = function(_outSurf, _data, _output_index) { var wd = _data[1]; - var temp = surface_create(surface_get_width(_data[0]), surface_get_height(_data[0])); + var temp = surface_create_valid(surface_get_width(_data[0]), surface_get_height(_data[0])); surface_set_target(temp); draw_clear_alpha(0, 0); diff --git a/scripts/node_corner/node_corner.yy b/scripts/node_corner/node_corner.yy index c45414c7f..1a141d62b 100644 --- a/scripts/node_corner/node_corner.yy +++ b/scripts/node_corner/node_corner.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_corner", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_corner", - "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 73148eae4..d244bf06b 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -21,7 +21,6 @@ function Node(_x, _y) constructor { h = 128; min_h = 128; auto_height = true; - junction_shift_y = 32; input_display_list = -1; inspector_display_list = -1; @@ -58,7 +57,7 @@ function Node(_x, _y) constructor { anim_show = true; - value_validation = [0, 0]; + value_validation = array_create(3); MODIFIED = true; static getInputJunctionIndex = function(index) { @@ -72,8 +71,8 @@ function Node(_x, _y) constructor { } static setHeight = function() { - var _hi = junction_shift_y; - var _ho = 32; + var _hi = ui(32); + var _ho = ui(32); for( var i = 0; i < ds_list_size(inputs); i++ ) { if(inputs[| i].isVisible()) _hi += 24; } @@ -206,7 +205,7 @@ function Node(_x, _y) constructor { var jun; var amo = input_display_list == -1? ds_list_size(inputs) : array_length(input_display_list); - var _in = yy + junction_shift_y * _s; + var _in = yy + ui(32) * _s; for(var i = 0; i < amo; i++) { var idx = getInputJunctionIndex(i); @@ -220,7 +219,7 @@ function Node(_x, _y) constructor { } xx = xx + w * _s; - _in = yy + junction_shift_y * _s; + _in = yy + ui(32) * _s; for(var i = 0; i < ds_list_size(outputs); i++) { jun = outputs[| i]; @@ -238,15 +237,15 @@ function Node(_x, _y) constructor { if(name == "") return; if(_s * w > 48) { - draw_sprite_stretched_ext(s_node_name, 0, xx, yy, w * _s, 20, color, 0.75); + draw_sprite_stretched_ext(s_node_name, 0, xx, yy, w * _s, ui(20), color, 0.75); draw_set_text(f_p1, fa_left, fa_center, c_white); if(!auto_update) icon = s_refresh_16; if(icon) { - draw_sprite_ext(icon, 0, xx + 12, yy + 10, 1, 1, 0, c_white, 1); - draw_text_cut(xx + 24, yy + 10, name, w * _s - 24); + draw_sprite_ui_uniform(icon, 0, xx + ui(12), yy + ui(10)); + draw_text_cut(xx + ui(24), yy + ui(10), name, w * _s - ui(24)); } else { - draw_text_cut(xx + 8, yy + 10, name, w * _s - 8); + draw_text_cut(xx + ui(8), yy + ui(10), name, w * _s - ui(8)); } } } @@ -383,41 +382,41 @@ function Node(_x, _y) constructor { surf = surf[preview_index]; } - if(is_surface(surf)) { - var pw = surface_get_width(surf); - var ph = surface_get_height(surf); - var ps = min((w * _s - 8) / pw, (h * _s - 8) / ph); - var px = xx + w * _s / 2 - pw * ps / 2; - var py = yy + h * _s / 2 - ph * ps / 2; + if(!is_surface(surf)) return; + + var pw = surface_get_width(surf); + var ph = surface_get_height(surf); + var ps = min((w * _s - 8) / pw, (h * _s - 8) / ph); + var px = xx + w * _s / 2 - pw * ps / 2; + var py = yy + h * _s / 2 - ph * ps / 2; - draw_surface_ext_safe(surf, px, py, ps, ps, 0, c_white, 1); - //draw_set_color(c_ui_blue_grey); - //draw_rectangle(px, py, px + pw * ps - 1, py + ph * ps - 1, true); + draw_surface_ext_safe(surf, px, py, ps, ps, 0, c_white, 1); + //draw_set_color(c_ui_blue_grey); + //draw_rectangle(px, py, px + pw * ps - 1, py + ph * ps - 1, true); - if(_s * w > 64) { - draw_set_text(_s >= 1? f_p1 : f_p2, fa_center, fa_top, c_ui_blue_grey); - var tx = xx + w * _s / 2; - var ty = yy + (h + 4) * _s; - draw_text(round(tx), round(ty), string(pw) + " x " + string(ph) + "px"); + if(_s * w > 64) { + draw_set_text(_s >= 1? f_p1 : f_p2, fa_center, fa_top, c_ui_blue_grey); + var tx = xx + w * _s / 2; + var ty = yy + (h + 4) * _s; + draw_text(round(tx), round(ty), string(pw) + " x " + string(ph) + "px"); - if(PREF_MAP[? "node_show_time"]) { - ty += string_height("l") * 0.8; - var rt, unit; - if(render_time < 1000) { - rt = round(render_time / 10) * 10; - unit = "us"; - draw_set_color(c_ui_lime); - } else if(render_time < 1000000) { - rt = string_format(render_time / 1000, -1, 2); - unit = "ms"; - draw_set_color(c_ui_orange); - } else { - rt = string_format(render_time / 1000000, -1, 2); - unit = "s"; - draw_set_color(c_ui_red); - } - draw_text(round(tx), round(ty), string(rt) + " " + unit); + if(PREF_MAP[? "node_show_time"]) { + ty += line_height() * 0.8; + var rt, unit; + if(render_time < 1000) { + rt = round(render_time / 10) * 10; + unit = "us"; + draw_set_color(c_ui_lime); + } else if(render_time < 1000000) { + rt = string_format(render_time / 1000, -1, 2); + unit = "ms"; + draw_set_color(c_ui_orange); + } else { + rt = string_format(render_time / 1000000, -1, 2); + unit = "s"; + draw_set_color(c_ui_red); } + draw_text(round(tx), round(ty), string(rt) + " " + unit); } } } @@ -428,9 +427,8 @@ function Node(_x, _y) constructor { var xx = x * _s + _x; var yy = y * _s + _y; - if(value_validation[1]) { + if(value_validation[VALIDATION.error]) draw_sprite_stretched(s_node_error, 0, xx - 9, yy - 9, w * _s + 18, h * _s + 18); - } drawNodeBase(xx, yy, _s); if(previewable && ds_list_size(outputs) > 0) @@ -503,13 +501,14 @@ function Node(_x, _y) constructor { onDestroy(); } static onValidate = function() { - value_validation[0] = 0; - value_validation[1] = 0; + value_validation[VALIDATION.pass] = 0; + value_validation[VALIDATION.warning] = 0; + value_validation[VALIDATION.error] = 0; for( var i = 0; i < ds_list_size(inputs); i++ ) { var jun = inputs[| i]; if(jun.value_validation) - value_validation[jun.value_validation - 1]++; + value_validation[jun.value_validation]++; } } @@ -676,7 +675,7 @@ function Node(_x, _y) constructor { NODE_MAP[? _group].add(self); } else { var txt = "Group load failed. Can't find node ID " + string(_group); - PANEL_MENU.addNotiExtra(txt); + noti_warning(txt); log_warning("LOAD", txt); } } diff --git a/scripts/node_export/node_export.gml b/scripts/node_export/node_export.gml index ccd0196e1..50facf581 100644 --- a/scripts/node_export/node_export.gml +++ b/scripts/node_export/node_export.gml @@ -26,6 +26,8 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { inputs[| 2] = nodeValue(2, "Template", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "%d%n") .setDisplay(VALUE_DISPLAY.export_format); + format_single = ["Single image (.png)", "Image sequence (.png)", "Animated gif (.gif)"]; + format_array = ["Multiple image (.png)", "Image sequence (.png)", "Animated gif (.gif)"]; inputs[| 3] = nodeValue(3, "Format", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) .setDisplay(VALUE_DISPLAY.enum_scroll, ["Single image (.png)", "Image sequence (.png)", "Animated gif (.gif)"]); @@ -35,7 +37,7 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { %1d Goes up 1 level %n File name %f Frame -%i Index" ); +%i Array index" ); inputs[| 5] = nodeValue(5, "Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) .setVisible(false); @@ -57,7 +59,7 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { var form = inputs[| 3].getValue(); if(_index == 3 && form == 1) { - inputs[| 2].setValue("%d%n%3f"); + inputs[| 2].setValue("%d%n%3f%i"); } inputs[| 5].setVisible(form == 2); @@ -102,41 +104,49 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { } static step = function() { + var surf = inputs[| 0].getValue(); + if(is_array(surf)) inputs[| 3].display_data = format_array; + else inputs[| 3].display_data = format_single; + var anim = inputs[| 3].getValue(); if(!anim) return; - if(ANIMATOR.is_playing) { - if(ANIMATOR.frame_progress && playing && ANIMATOR.current_frame > -1) { - export(); - - if(ANIMATOR.current_frame == ANIMATOR.frames_total - 1) { - ANIMATOR.is_playing = false; - playing = false; - - if(anim == 2) { - var surf = inputs[| 0].getValue(); - var path = inputs[| 1].getValue(); - var suff = inputs[| 2].getValue(); - var temp_path, target_path; - - if(is_array(surf)) { - for(var i = 0; i < array_length(surf); i++) { - temp_path = "\"" + DIRECTORY + "temp\\" + string(i) + "\\" + "*.png\""; - if(is_array(path)) - target_path = pathString(path[ safe_mod(i, array_length(path)) ], suff, i); - else - target_path = pathString(path, suff, i); - renderGif(temp_path, "\"" + target_path + "\""); - } - } else { - target_path = "\"" + pathString(path, suff) + "\""; - renderGif("\"" + DIRECTORY + "temp\\*.png\"", target_path); - } - } - } - } - } else + if(!ANIMATOR.is_playing) { playing = false; + return; + } + + if(!ANIMATOR.frame_progress || !playing || ANIMATOR.current_frame <= -1) + return; + + export(); + + if(ANIMATOR.current_frame < ANIMATOR.frames_total - 1) + return; + + ANIMATOR.is_playing = false; + playing = false; + + if(anim != 2) + return; + + var path = inputs[| 1].getValue(); + var suff = inputs[| 2].getValue(); + var temp_path, target_path; + + if(is_array(surf)) { + for(var i = 0; i < array_length(surf); i++) { + temp_path = "\"" + DIRECTORY + "temp\\" + string(i) + "\\" + "*.png\""; + if(is_array(path)) + target_path = pathString(path[ safe_mod(i, array_length(path)) ], suff, i); + else + target_path = pathString(path, suff, i); + renderGif(temp_path, "\"" + target_path + "\""); + } + } else { + target_path = "\"" + pathString(path, suff) + "\""; + renderGif("\"" + DIRECTORY + "temp\\*.png\"", target_path); + } } static pathString = function(path, suff, index = 0) { @@ -268,8 +278,7 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { if(directory_exists(DIRECTORY + "temp")) directory_destroy(DIRECTORY + "temp"); - } else { + } else export(); - } } } \ No newline at end of file diff --git a/scripts/node_glow/node_glow.gml b/scripts/node_glow/node_glow.gml index 4f9c38f30..185273dcc 100644 --- a/scripts/node_glow/node_glow.gml +++ b/scripts/node_glow/node_glow.gml @@ -30,7 +30,7 @@ function Node_Glow(_x, _y) : Node_Processor(_x, _y) constructor { var _size = _data[2]; var _stre = _data[3]; var cl = _data[4]; - var pass1 = surface_create(surface_get_width(_outSurf), surface_get_height(_outSurf)); + var pass1 = surface_create_valid(surface_get_width(_outSurf), surface_get_height(_outSurf)); surface_set_target(pass1); draw_clear_alpha(c_black, 1); diff --git a/scripts/node_glow/node_glow.yy b/scripts/node_glow/node_glow.yy index 9c327598d..84412b0e8 100644 --- a/scripts/node_glow/node_glow.yy +++ b/scripts/node_glow/node_glow.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_glow", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_glow", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_image/node_image.gml b/scripts/node_image/node_image.gml index 000fbac31..acaf51df5 100644 --- a/scripts/node_image/node_image.gml +++ b/scripts/node_image/node_image.gml @@ -97,7 +97,7 @@ function Node_Image(_x, _y) : Node(_x, _y) constructor { if(is_surface(_outsurf)) surface_size_to(_outsurf, ww, hh); else { - _outsurf = surface_create(ww, hh); + _outsurf = surface_create_valid(ww, hh); outputs[| 0].setValue(_outsurf); } diff --git a/scripts/node_image_animated/node_image_animated.gml b/scripts/node_image_animated/node_image_animated.gml index 99606331f..bdb007d3e 100644 --- a/scripts/node_image_animated/node_image_animated.gml +++ b/scripts/node_image_animated/node_image_animated.gml @@ -131,7 +131,7 @@ function Node_Image_Animated(_x, _y) : Node(_x, _y) constructor { var surfs = outputs[| 0].getValue(); if(!is_surface(surfs)) { - surfs = surface_create(ww, hh); + surfs = surface_create_valid(ww, hh); outputs[| 0].setValue(surfs); } else surface_size_to(surfs, ww, hh); diff --git a/scripts/node_image_animated/node_image_animated.yy b/scripts/node_image_animated/node_image_animated.yy index 8d88db29c..c234b965a 100644 --- a/scripts/node_image_animated/node_image_animated.yy +++ b/scripts/node_image_animated/node_image_animated.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_image_animated", "isDnD": false, "isCompatibility": false, "parent": { "name": "input", "path": "folders/nodes/data/input.yy", }, - "resourceVersion": "1.0", - "name": "node_image_animated", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_image_gif/node_image_gif.gml b/scripts/node_image_gif/node_image_gif.gml index cc3a98271..bef0fea89 100644 --- a/scripts/node_image_gif/node_image_gif.gml +++ b/scripts/node_image_gif/node_image_gif.gml @@ -116,7 +116,7 @@ function Node_Image_gif(_x, _y) : Node(_x, _y) constructor { if(is_surface(_outsurf)) surface_size_to(_outsurf, ww, hh); else { - _outsurf = surface_create(ww, hh); + _outsurf = surface_create_valid(ww, hh); outputs[| 0].setValue(_outsurf); } @@ -131,7 +131,7 @@ function Node_Image_gif(_x, _y) : Node(_x, _y) constructor { function onDrawNode(xx, yy, _mx, _my, _s) { if(loading) { - draw_sprite_ext(s_loading, 0, xx + w * _s / 2, yy + h * _s / 2, _s, _s, current_time / 2, c_ui_blue_grey, 1); + draw_sprite_ui(s_loading, 0, xx + w * _s / 2, yy + h * _s / 2, _s, _s, current_time / 2, c_ui_blue_grey, 1); } } diff --git a/scripts/node_image_sequence/node_image_sequence.gml b/scripts/node_image_sequence/node_image_sequence.gml index 1682385e8..6526d8dde 100644 --- a/scripts/node_image_sequence/node_image_sequence.gml +++ b/scripts/node_image_sequence/node_image_sequence.gml @@ -164,7 +164,7 @@ function Node_Image_Sequence(_x, _y) : Node(_x, _y) constructor { ww = sprite_get_width(_spr) + pad[0] + pad[2]; hh = sprite_get_height(_spr) + pad[1] + pad[3]; - surfs[i] = surface_create(ww, hh); + surfs[i] = surface_create_valid(ww, hh); surface_set_target(surfs[i]); draw_clear_alpha(0, 0); BLEND_ADD @@ -174,7 +174,7 @@ function Node_Image_Sequence(_x, _y) : Node(_x, _y) constructor { break; case CANVAS_SIZE.maximum : case CANVAS_SIZE.minimum : - surfs[i] = surface_create(ww, hh); + surfs[i] = surface_create_valid(ww, hh); var _w = sprite_get_width(_spr); var _h = sprite_get_height(_spr); diff --git a/scripts/node_image_sequence/node_image_sequence.yy b/scripts/node_image_sequence/node_image_sequence.yy index ca6be00c7..e54985591 100644 --- a/scripts/node_image_sequence/node_image_sequence.yy +++ b/scripts/node_image_sequence/node_image_sequence.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_image_sequence", "isDnD": false, "isCompatibility": false, "parent": { "name": "input", "path": "folders/nodes/data/input.yy", }, - "resourceVersion": "1.0", - "name": "node_image_sequence", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_image_sheet/node_image_sheet.gml b/scripts/node_image_sheet/node_image_sheet.gml index f374ec8f6..43091eb63 100644 --- a/scripts/node_image_sheet/node_image_sheet.gml +++ b/scripts/node_image_sheet/node_image_sheet.gml @@ -68,8 +68,8 @@ function Node_Image_Sheet(_x, _y) : Node(_x, _y) constructor { }, "Generate"] ); input_display_list = [ - ["Sprite", false], 0, 1, 6, - ["Sheet", false], 2, 3, 9, 10, 4, 5, + ["Sprite", false], 0, 1, 6, 10, + ["Sheet", false], 2, 3, 9, 4, 5, ["Output", false], 7, 8 ]; @@ -244,7 +244,7 @@ function Node_Image_Sheet(_x, _y) : Node(_x, _y) constructor { if(is_surface(_outSurf)) surface_size_to(_outSurf, ww, hh); else { - _outSurf = surface_create(ww, hh); + _outSurf = surface_create_valid(ww, hh); outputs[| 0].setValue(_outSurf); } @@ -263,7 +263,7 @@ function Node_Image_Sheet(_x, _y) : Node(_x, _y) constructor { surf_array = array_create(_amo); for(var i = 0; i < _amo; i++) { - surf_array[i] = surface_create(ww, hh); + surf_array[i] = surface_create_valid(ww, hh); var _spr_pos = getSpritePosition(i); surface_set_target(surf_array[i]); diff --git a/scripts/node_level/node_level.gml b/scripts/node_level/node_level.gml index 73a0ee18f..55238ed5d 100644 --- a/scripts/node_level/node_level.gml +++ b/scripts/node_level/node_level.gml @@ -36,11 +36,11 @@ function Node_Level(_x, _y) : Node_Processor(_x, _y) constructor { for( var i = 0; i < 4; i++ ) { var _bx = x1 - 20 - i * 24; - var _by = y0 - 24; + var _by = y0; if(buttonInstant(s_button_hide, _bx, _by, 20, 20, _m, _focus, _hover) == 2) histShow[i] = !histShow[i]; - draw_sprite_ext(s_circle_12, 0, _bx + 10, _by + 10, 1, 1, 0, his_colors[i], 0.5 + histShow[i] * 0.5); + draw_sprite_ui_uniform(s_circle_12, 0, _bx + 10, _by + 10, 1, his_colors[i], 0.5 + histShow[i] * 0.5); } if(histMax > 0) diff --git a/scripts/node_level_selector/node_level_selector.gml b/scripts/node_level_selector/node_level_selector.gml index c4ec062c4..558328165 100644 --- a/scripts/node_level_selector/node_level_selector.gml +++ b/scripts/node_level_selector/node_level_selector.gml @@ -39,11 +39,11 @@ function Node_Level_Selector(_x, _y) : Node_Processor(_x, _y) constructor { for( var i = 0; i < 4; i++ ) { var _bx = x1 - 20 - i * 24; - var _by = y0 - 24; + var _by = y0; if(buttonInstant(s_button_hide, _bx, _by, 20, 20, _m, _focus, _hover) == 2) histShow[i] = !histShow[i]; - draw_sprite_ext(s_circle_12, 0, _bx + 10, _by + 10, 1, 1, 0, his_colors[i], 0.5 + histShow[i] * 0.5); + draw_sprite_ui_uniform(s_circle_12, 0, _bx + 10, _by + 10, 1, his_colors[i], 0.5 + histShow[i] * 0.5); } if(histMax > 0) diff --git a/scripts/node_particle_effector/node_particle_effector.gml b/scripts/node_particle_effector/node_particle_effector.gml index 0c2f3ee03..215e63738 100644 --- a/scripts/node_particle_effector/node_particle_effector.gml +++ b/scripts/node_particle_effector/node_particle_effector.gml @@ -142,7 +142,7 @@ function Node_Particle_Effector(_x, _y) : Node(_x, _y) constructor { break; } - draw_sprite_ext(s_preview_crosshair, 0, px, py, 1, 1, 0, cc, ss); + draw_sprite_ui_uniform(s_preview_crosshair, 0, px, py, 1, cc, ss); } } diff --git a/scripts/node_path/node_path.gml b/scripts/node_path/node_path.gml index fba754fbb..d6e5527e3 100644 --- a/scripts/node_path/node_path.gml +++ b/scripts/node_path/node_path.gml @@ -140,24 +140,24 @@ function Node_Path(_x, _y) : Node(_x, _y) constructor { draw_line(_ax0, _ay0, xx, yy); draw_line(_ax1, _ay1, xx, yy); - draw_sprite(s_anchor_selector, 2, _ax0, _ay0); - draw_sprite(s_anchor_selector, 2, _ax1, _ay1); + draw_sprite_ui_uniform(s_anchor_selector, 2, _ax0, _ay0); + draw_sprite_ui_uniform(s_anchor_selector, 2, _ax1, _ay1); } - draw_sprite(s_anchor_selector, 0, xx, yy); + draw_sprite_ui_uniform(s_anchor_selector, 0, xx, yy); if(drag_point == i) { - draw_sprite(s_anchor_selector, 1, xx, yy); + draw_sprite_ui_uniform(s_anchor_selector, 1, xx, yy); } else if(point_in_circle(_mx, _my, xx, yy, 8)) { - draw_sprite(s_anchor_selector, 1, xx, yy); + draw_sprite_ui_uniform(s_anchor_selector, 1, xx, yy); anchor_hover = i; hover_type = 0; } else if(cont && point_in_circle(_mx, _my, _ax0, _ay0, 8)) { - draw_sprite(s_anchor_selector, 0, _ax0, _ay0); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax0, _ay0); anchor_hover = i; hover_type = 1; } else if(cont && point_in_circle(_mx, _my, _ax1, _ay1, 8)) { - draw_sprite(s_anchor_selector, 0, _ax1, _ay1); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax1, _ay1); anchor_hover = i; hover_type = -1; } @@ -166,7 +166,7 @@ function Node_Path(_x, _y) : Node(_x, _y) constructor { if(anchor_hover != -1) { var _a = inputs[| list_start + anchor_hover].getValue(); if(keyboard_check(vk_shift) || PANEL_PREVIEW.tool_index == 1) { - draw_sprite(s_cursor_path_anchor, 0, _mx + 16, _my + 16); + draw_sprite_ui_uniform(s_cursor_path_anchor, 0, _mx + 16, _my + 16); if(_active && mouse_check_button_pressed(mb_left)) { if(_a[2] != 0 || _a[3] != 0 || _a[4] != 0 || _a[5] != 0) { @@ -190,14 +190,14 @@ function Node_Path(_x, _y) : Node(_x, _y) constructor { } } } else if(keyboard_check(vk_control) || PANEL_PREVIEW.tool_index == 0) { - draw_sprite(s_cursor_path_remove, 0, _mx + 16, _my + 16); + draw_sprite_ui_uniform(s_cursor_path_remove, 0, _mx + 16, _my + 16); if(_active && mouse_check_button_pressed(mb_left)) { ds_list_delete(inputs, list_start + anchor_hover); doUpdate(); } } else { - draw_sprite(s_cursor_path_move, 0, _mx + 16, _my + 16); + draw_sprite_ui_uniform(s_cursor_path_move, 0, _mx + 16, _my + 16); if(_active && mouse_check_button_pressed(mb_left)) { drag_point = anchor_hover; @@ -217,7 +217,7 @@ function Node_Path(_x, _y) : Node(_x, _y) constructor { } } } else if(keyboard_check(vk_control) || PANEL_PREVIEW.tool_index == 0) { - draw_sprite(s_cursor_path_add, 0, _mx + 16, _my + 16); + draw_sprite_ui_uniform(s_cursor_path_add, 0, _mx + 16, _my + 16); if(_active && mouse_check_button_pressed(mb_left)) { drag_point = ds_list_size(inputs) - list_start; diff --git a/scripts/node_processor/node_processor.gml b/scripts/node_processor/node_processor.gml index 08b58c9ea..365244e78 100644 --- a/scripts/node_processor/node_processor.gml +++ b/scripts/node_processor/node_processor.gml @@ -44,7 +44,7 @@ function Node_Processor(_x, _y) : Node(_x, _y) constructor { } if(!is_surface(outSurfs[i])) - outSurfs[i] = surface_create(ww, hh); + outSurfs[i] = surface_create_valid(ww, hh); else surface_size_to(outSurfs[i], ww, hh) @@ -76,7 +76,7 @@ function Node_Processor(_x, _y) : Node(_x, _y) constructor { } if(!is_surface(outSurfs)) { - outSurfs = surface_create(ww, hh); + outSurfs = surface_create_valid(ww, hh); outputs[| _oi].setValue(outSurfs); } else surface_size_to(outSurfs, ww, hh); diff --git a/scripts/node_processor/node_processor.yy b/scripts/node_processor/node_processor.yy index 845580b8e..d68206625 100644 --- a/scripts/node_processor/node_processor.yy +++ b/scripts/node_processor/node_processor.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_processor", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_processor", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_scatter/node_scatter.gml b/scripts/node_scatter/node_scatter.gml index eb26206dc..ca656e9d0 100644 --- a/scripts/node_scatter/node_scatter.gml +++ b/scripts/node_scatter/node_scatter.gml @@ -91,7 +91,7 @@ function Node_Scatter(_x, _y) : Node(_x, _y) constructor { for(var i = 0; i < 2; i++) { if(!is_surface(temp_surf[i])) - temp_surf[i] = surface_create(ww, hh); + temp_surf[i] = surface_create_valid(ww, hh); else surface_size_to(temp_surf[i], ww, hh); diff --git a/scripts/node_seperate_shapes/node_seperate_shapes.gml b/scripts/node_seperate_shapes/node_seperate_shapes.gml index 6d8be3610..ec8581dd3 100644 --- a/scripts/node_seperate_shapes/node_seperate_shapes.gml +++ b/scripts/node_seperate_shapes/node_seperate_shapes.gml @@ -48,7 +48,7 @@ function Node_Seperate_Shape(_x, _y) : Node(_x, _y) constructor { var hh = surface_get_height(_inSurf); for(var i = 0; i < 2; i++) { - if(!is_surface(temp_surf[i])) temp_surf[i] = surface_create(ww, hh); + if(!is_surface(temp_surf[i])) temp_surf[i] = surface_create_valid(ww, hh); else surface_size_to(temp_surf[i], ww, hh); surface_set_target(temp_surf[i]); @@ -84,7 +84,7 @@ function Node_Seperate_Shape(_x, _y) : Node(_x, _y) constructor { res_index = bg; } - var _pixel_surface = surface_create(PREF_MAP[? "shape_separation_max"], 1); + var _pixel_surface = surface_create_valid(PREF_MAP[? "shape_separation_max"], 1); surface_set_target(_pixel_surface); draw_clear_alpha(0, 0); BLEND_ADD @@ -134,7 +134,7 @@ function Node_Seperate_Shape(_x, _y) : Node(_x, _y) constructor { _outSurf = outputs[| i].getValue(); surface_size_to(_outSurf, ww, hh); } else { - _outSurf = surface_create(ww, hh); + _outSurf = surface_create_valid(ww, hh); _val[@ i] = _outSurf; } diff --git a/scripts/node_seperate_shapes/node_seperate_shapes.yy b/scripts/node_seperate_shapes/node_seperate_shapes.yy index 7ca5b1e67..40f7b7182 100644 --- a/scripts/node_seperate_shapes/node_seperate_shapes.yy +++ b/scripts/node_seperate_shapes/node_seperate_shapes.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_seperate_shapes", "isDnD": false, "isCompatibility": false, "parent": { "name": "generator", "path": "folders/nodes/data/generator.yy", }, - "resourceVersion": "1.0", - "name": "node_seperate_shapes", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_shadow/node_shadow.gml b/scripts/node_shadow/node_shadow.gml index 9672c379a..7f5039049 100644 --- a/scripts/node_shadow/node_shadow.gml +++ b/scripts/node_shadow/node_shadow.gml @@ -48,7 +48,7 @@ function Node_Shadow(_x, _y) : Node_Processor(_x, _y) constructor { var _border = _data[4]; var _size = _data[5]; - var pass1 = surface_create(surface_get_width(_outSurf), surface_get_height(_outSurf)); + var pass1 = surface_create_valid(surface_get_width(_outSurf), surface_get_height(_outSurf)); surface_set_target(pass1); draw_clear_alpha(0, 0); diff --git a/scripts/node_shadow/node_shadow.yy b/scripts/node_shadow/node_shadow.yy index 7e2b62567..6bb54fa0e 100644 --- a/scripts/node_shadow/node_shadow.yy +++ b/scripts/node_shadow/node_shadow.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_shadow", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_shadow", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_simple_shape/node_simple_shape.yy b/scripts/node_simple_shape/node_simple_shape.yy index 06a184f69..ec2407ae5 100644 --- a/scripts/node_simple_shape/node_simple_shape.yy +++ b/scripts/node_simple_shape/node_simple_shape.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_simple_shape", "isDnD": false, "isCompatibility": false, "parent": { "name": "generator", "path": "folders/nodes/data/generator.yy", }, - "resourceVersion": "1.0", - "name": "node_simple_shape", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_sprite_sheet/node_sprite_sheet.gml b/scripts/node_sprite_sheet/node_sprite_sheet.gml index 32e5609ce..8bb63838d 100644 --- a/scripts/node_sprite_sheet/node_sprite_sheet.gml +++ b/scripts/node_sprite_sheet/node_sprite_sheet.gml @@ -168,7 +168,7 @@ function Node_Render_Sprite_Sheet(_x, _y) : Node(_x, _y) constructor { break; } - _surf[i] = surface_create(ww, hh); + _surf[i] = surface_create_valid(ww, hh); surface_set_target(_surf[i]); draw_clear_alpha(0, 0); surface_reset_target(); @@ -218,7 +218,7 @@ function Node_Render_Sprite_Sheet(_x, _y) : Node(_x, _y) constructor { break; } - var _surf = surface_create(ww, hh); + var _surf = surface_create_valid(ww, hh); surface_set_target(_surf); draw_clear_alpha(0, 0); diff --git a/scripts/node_time_remap/node_time_remap.gml b/scripts/node_time_remap/node_time_remap.gml index 29f9f5ed8..8e24d6838 100644 --- a/scripts/node_time_remap/node_time_remap.gml +++ b/scripts/node_time_remap/node_time_remap.gml @@ -28,7 +28,7 @@ function Node_Time_Remap(_x, _y) : Node(_x, _y) constructor { var _surf = outputs[| 0].getValue(); if(!is_surface(_surf)) { - _surf = surface_create(surface_get_width(_inSurf), surface_get_height(_inSurf)); + _surf = surface_create_valid(surface_get_width(_inSurf), surface_get_height(_inSurf)); outputs[| 0].setValue(_surf); } else surface_size_to(_surf, surface_get_width(_inSurf), surface_get_height(_inSurf)); diff --git a/scripts/node_time_remap/node_time_remap.yy b/scripts/node_time_remap/node_time_remap.yy index 93704d3d3..1cddc5923 100644 --- a/scripts/node_time_remap/node_time_remap.yy +++ b/scripts/node_time_remap/node_time_remap.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_time_remap", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_time_remap", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_trail/node_trail.gml b/scripts/node_trail/node_trail.gml index c2a212702..f162d66ca 100644 --- a/scripts/node_trail/node_trail.gml +++ b/scripts/node_trail/node_trail.gml @@ -31,7 +31,7 @@ function Node_Trail(_x, _y) : Node_Processor(_x, _y) constructor { return _outSurf for(var i = 0; i < 2; i++) { - if(!is_surface(temp_surf[i])) temp_surf[i] = surface_create(surface_get_width(_outSurf), surface_get_height(_outSurf)); + if(!is_surface(temp_surf[i])) temp_surf[i] = surface_create_valid(surface_get_width(_outSurf), surface_get_height(_outSurf)); else surface_size_to(temp_surf[i], surface_get_width(_outSurf), surface_get_height(_outSurf)); surface_set_target(temp_surf[i]); diff --git a/scripts/node_trail/node_trail.yy b/scripts/node_trail/node_trail.yy index 12bd2130f..9fc4df2d8 100644 --- a/scripts/node_trail/node_trail.yy +++ b/scripts/node_trail/node_trail.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_trail", "isDnD": false, "isCompatibility": false, "parent": { "name": "filter", "path": "folders/nodes/data/filter.yy", }, - "resourceVersion": "1.0", - "name": "node_trail", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_transform/node_transform.gml b/scripts/node_transform/node_transform.gml index 2e118e1b1..c5cf34da8 100644 --- a/scripts/node_transform/node_transform.gml +++ b/scripts/node_transform/node_transform.gml @@ -192,7 +192,7 @@ function Node_Transform(_x, _y) : Node_Processor(_x, _y) constructor { var _h = _hh * sqrt(2); var _px = (_w - _ww) / 2; var _py = (_h - _hh) / 2; - var _s = surface_create(_w, _h); + var _s = surface_create_valid(_w, _h); surface_set_target(_s); draw_clear_alpha(0, 0); @@ -318,23 +318,23 @@ function Node_Transform(_x, _y) : Node_Processor(_x, _y) constructor { var rth = point_rotate((bx0 + bx1) / 2, by0 - 16, bax, bay, rot); draw_set_color(c_ui_orange); - draw_sprite_ext(s_anchor, 0, bax, bay, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_anchor, 0, bax, bay); var r_index = 0; - draw_sprite(s_anchor_selector, 0, tl[0], tl[1]); - draw_sprite(s_anchor_selector, 0, tr[0], tr[1]); - draw_sprite(s_anchor_selector, 0, bl[0], bl[1]); - draw_sprite(s_anchor_selector, 0, br[0], br[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, tl[0], tl[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, tr[0], tr[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, bl[0], bl[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, br[0], br[1]); - if(point_in_circle(_mx, _my, bax, bay, 8)) draw_sprite_ext(s_anchor, 0, bax, bay, 1.25, 1.25, 0, c_white, 1); + if(point_in_circle(_mx, _my, bax, bay, 8)) draw_sprite_ui_uniform(s_anchor, 0, bax, bay, 1.25); else if(point_in_circle(_mx, _my, rth[0], rth[1], 8)) r_index = 1; - else if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) draw_sprite(s_anchor_selector, 1, tl[0], tl[1]); - else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) draw_sprite(s_anchor_selector, 1, tr[0], tr[1]); - else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) draw_sprite(s_anchor_selector, 1, bl[0], bl[1]); - else if(point_in_circle(_mx, _my, br[0], br[1], 8)) draw_sprite(s_anchor_selector, 1, br[0], br[1]); + else if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, tl[0], tl[1]); + else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, tr[0], tr[1]); + else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, bl[0], bl[1]); + else if(point_in_circle(_mx, _my, br[0], br[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, br[0], br[1]); - draw_sprite_ext(s_anchor_rotate, r_index, rth[0], rth[1], 1, 1, rot, c_white, 1); + draw_sprite_ui(s_anchor_rotate, r_index, rth[0], rth[1], 1, 1, rot); draw_line(tl[0], tl[1], tr[0], tr[1]); draw_line(tl[0], tl[1], bl[0], bl[1]); diff --git a/scripts/node_transform_single/node_transform_single.gml b/scripts/node_transform_single/node_transform_single.gml index ddb8bb21e..3ce0e8478 100644 --- a/scripts/node_transform_single/node_transform_single.gml +++ b/scripts/node_transform_single/node_transform_single.gml @@ -94,18 +94,18 @@ function Node_Transform_Single(_x, _y) : Node_Processor(_x, _y) constructor { var br = point_rotate(bx1, by1, bax, bay, rot); draw_set_color(c_ui_orange); - draw_sprite_ext(s_anchor, 0, bax, bay, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_anchor, 0, bax, bay); - draw_sprite(s_anchor_selector, 0, tl[0], tl[1]); - draw_sprite(s_anchor_selector, 0, tr[0], tr[1]); - draw_sprite(s_anchor_selector, 0, bl[0], bl[1]); - draw_sprite(s_anchor_selector, 0, br[0], br[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, tl[0], tl[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, tr[0], tr[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, bl[0], bl[1]); + draw_sprite_ui_uniform(s_anchor_selector, 0, br[0], br[1]); - if(point_in_circle(_mx, _my, bax, bay, 8)) draw_sprite_ext(s_anchor, 0, bax, bay, 1.25, 1.25, 0, c_white, 1); - else if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) draw_sprite(s_anchor_selector, 1, tl[0], tl[1]); - else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) draw_sprite(s_anchor_selector, 1, tr[0], tr[1]); - else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) draw_sprite(s_anchor_selector, 1, bl[0], bl[1]); - else if(point_in_circle(_mx, _my, br[0], br[1], 8)) draw_sprite(s_anchor_selector, 1, br[0], br[1]); + if(point_in_circle(_mx, _my, bax, bay, 8)) draw_sprite_ui_uniform(s_anchor, 0, bax, bay, 1.25); + else if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, tl[0], tl[1]); + else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, tr[0], tr[1]); + else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, bl[0], bl[1]); + else if(point_in_circle(_mx, _my, br[0], br[1], 8)) draw_sprite_ui_uniform(s_anchor_selector, 1, br[0], br[1]); draw_line(tl[0], tl[1], tr[0], tr[1]); draw_line(tl[0], tl[1], bl[0], bl[1]); diff --git a/scripts/node_transform_single/node_transform_single.yy b/scripts/node_transform_single/node_transform_single.yy index 8d2c7576f..ef9409e58 100644 --- a/scripts/node_transform_single/node_transform_single.yy +++ b/scripts/node_transform_single/node_transform_single.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_transform_single", "isDnD": false, "isCompatibility": false, "parent": { "name": "transform", "path": "folders/nodes/data/transform.yy", }, - "resourceVersion": "1.0", - "name": "node_transform_single", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index b90e9dae5..116175f2c 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -385,7 +385,9 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T } resetDisplay(); + error_notification = noone; static onValidate = function() { + var _val = value_validation, str = ""; value_validation = VALIDATION.pass; switch(type) { @@ -393,24 +395,42 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T switch(display_type) { case VALUE_DISPLAY.path_load: var path = animator.getValue(); - if(try_get_path(path) == -1) + if(try_get_path(path) == -1) { value_validation = VALIDATION.error; + str = "File not exist"; + } break; case VALUE_DISPLAY.path_array: var paths = animator.getValue(); if(is_array(paths)) { for( var i = 0; i < array_length(paths); i++ ) { - if(try_get_path(paths[i]) == -1) + if(try_get_path(paths[i]) == -1) { value_validation = VALIDATION.error; + str = "File not exist"; + } } - } else + } else { value_validation = VALIDATION.error; + str = "File not exist"; + } break; } break; } node.onValidate(); + if(_val != value_validation) { + if(value_validation == VALIDATION.error && error_notification == noone) { + error_notification = noti_error(str); + error_notification.onClick = function() { PANEL_GRAPH.node_focus = node; }; + } + + if(value_validation == VALIDATION.pass && error_notification != noone) { + noti_remove(error_notification); + error_notification = noone; + } + } + return self; } @@ -707,7 +727,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T } } - draw_sprite(spr, index, _ax, _ay); + draw_sprite_ui_uniform(spr, index, _ax, _ay); break; #endregion case VALUE_DISPLAY.rotation : #region @@ -715,7 +735,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T var _ax = _x + lengthdir_x(_rad, _val); var _ay = _y + lengthdir_y(_rad, _val); - draw_sprite_ext(s_anchor_rotate, 0, _ax, _ay, 1, 1, _val - 90, c_white, 1); + draw_sprite_ui(s_anchor_rotate, 0, _ax, _ay, 1, 1, _val - 90, c_white, 1); if(drag_type) { draw_set_color(c_ui_orange); @@ -723,7 +743,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T draw_circle(_x, _y, _rad, true); draw_set_alpha(1); - draw_sprite_ext(s_anchor_rotate, 1, _ax, _ay, 1, 1, _val - 90, c_white, 1); + draw_sprite_ui(s_anchor_rotate, 1, _ax, _ay, 1, 1, _val - 90, c_white, 1); var angle = point_direction(_x, _y, _mx, _my); if(keyboard_check(vk_control)) angle = round(angle / 15) * 15; @@ -744,7 +764,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T draw_set_alpha(1); hover = 1; - draw_sprite_ext(s_anchor_rotate, 1, _ax, _ay, 1, 1, _val - 90, c_white, 1); + draw_sprite_ui(s_anchor_rotate, 1, _ax, _ay, 1, 1, _val - 90, c_white, 1); if(_active && mouse_check_button_pressed(mb_left)) { drag_type = 1; drag_mx = _mx; @@ -765,10 +785,10 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T var _ax = __ax * _s + _x; var _ay = __ay * _s + _y; - draw_sprite(s_anchor_selector, 0, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax, _ay); if(drag_type) { - draw_sprite(s_anchor_selector, 1, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 1, _ax, _ay); var _nx = (drag_sx + (_mx - drag_mx) - _x) / _s / _psx; var _ny = (drag_sy + (_my - drag_my) - _y) / _s / _psy; if(keyboard_check(vk_control)) { @@ -790,7 +810,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T if(point_in_circle(_mx, _my, _ax, _ay, 8)) { hover = 1; - draw_sprite(s_anchor_selector, 1, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 1, _ax, _ay); if(_active && mouse_check_button_pressed(mb_left)) { drag_type = 1; drag_mx = _mx; @@ -823,13 +843,13 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T break; } - draw_sprite_ext(s_anchor, 0, _ax, _ay, 1, 1, 0, c_white, 1); - draw_sprite(s_anchor_selector, 0, _ax + _aw, _ay + _ah); + draw_sprite_ui_uniform(s_anchor, 0, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax + _aw, _ay + _ah); if(point_in_circle(_mx, _my, _ax + _aw, _ay + _ah, 8)) - draw_sprite(s_anchor_selector, 1, _ax + _aw, _ay + _ah); + draw_sprite_ui_uniform(s_anchor_selector, 1, _ax + _aw, _ay + _ah); else if(point_in_rectangle(_mx, _my, _ax - _aw, _ay - _ah, _ax + _aw, _ay + _ah)) - draw_sprite_ext(s_anchor, 0, _ax, _ay, 1.25, 1.25, 0, c_white, 1); + draw_sprite_ui_uniform(s_anchor, 0, _ax, _ay, 1.25, c_white); if(drag_type == 1) { var _xx = drag_sx + (_mx - drag_mx) / _s; @@ -909,13 +929,13 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T case PUPPET_FORCE_MODE.move : draw_line_width2(_ax, _ay, _ax1, _ay1, 6, 1); - draw_sprite(s_anchor_selector, 0, _ax, _ay); - draw_sprite(s_anchor_selector, 2, _ax1, _ay1); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 2, _ax1, _ay1); draw_circle(_ax, _ay, _val[PUPPET_CONTROL.width] * _s, true); break; case PUPPET_FORCE_MODE.pinch : case PUPPET_FORCE_MODE.inflate : - draw_sprite(s_anchor_selector, 0, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax, _ay); draw_circle(_ax, _ay, _val[PUPPET_CONTROL.width] * _s, true); break; case PUPPET_FORCE_MODE.wind : @@ -939,12 +959,12 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T draw_line(_l0x0, _l0y0, _l0x1, _l0y1); draw_line(_l1x0, _l1y0, _l1x1, _l1y1); - draw_sprite(s_anchor_selector, 0, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax, _ay); break; } if(drag_type == 1) { - draw_sprite(s_anchor_selector, 1, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 1, _ax, _ay); var _nx = drag_sx + (_mx - drag_mx) / _s; var _ny = drag_sy + (_my - drag_my) / _s; @@ -964,7 +984,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T UNDO_HOLDING = false; } } else if(drag_type == 2) { - draw_sprite(s_anchor_selector, 0, _ax1, _ay1); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax1, _ay1); var _nx = drag_sx + (_mx - drag_mx) / _s; var _ny = drag_sy + (_my - drag_my) / _s; @@ -987,7 +1007,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T if(point_in_circle(_mx, _my, _ax, _ay, 8)) { hover = 1; - draw_sprite(s_anchor_selector, 1, _ax, _ay); + draw_sprite_ui_uniform(s_anchor_selector, 1, _ax, _ay); if(_active && mouse_check_button_pressed(mb_left)) { drag_type = 1; drag_mx = _mx; @@ -999,7 +1019,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T if(_val[PUPPET_CONTROL.mode] == PUPPET_FORCE_MODE.move && point_in_circle(_mx, _my, _ax1, _ay1, 8)) { hover = 2; - draw_sprite(s_anchor_selector, 0, _ax1, _ay1); + draw_sprite_ui_uniform(s_anchor_selector, 0, _ax1, _ay1); if(_active && mouse_check_button_pressed(mb_left)) { drag_type = 2; drag_mx = _mx; diff --git a/scripts/node_wrap_mesh/node_wrap_mesh.gml b/scripts/node_wrap_mesh/node_wrap_mesh.gml index c69aedada..356bf78f8 100644 --- a/scripts/node_wrap_mesh/node_wrap_mesh.gml +++ b/scripts/node_wrap_mesh/node_wrap_mesh.gml @@ -268,7 +268,7 @@ function Node_Mesh_Warp(_x, _y) : Node(_x, _y) constructor { var gw = floor(ww / sample) + 1; var gh = floor(hh / sample) + 1; - var cont = surface_create(ww, hh) + var cont = surface_create_valid(ww, hh) surface_set_target(cont); shader_set(sh_content_sampler); var uniform_dim = shader_get_uniform(sh_content_sampler, "dimension"); @@ -437,7 +437,7 @@ function Node_Mesh_Warp(_x, _y) : Node(_x, _y) constructor { if(is_surface(_outSurf)) surface_size_to(_outSurf, surface_get_width(_inSurf), surface_get_height(_inSurf)); else { - _outSurf = surface_create(surface_get_width(_inSurf), surface_get_height(_inSurf)); + _outSurf = surface_create_valid(surface_get_width(_inSurf), surface_get_height(_inSurf)); outputs[| 0].setValue(_outSurf); } diff --git a/scripts/notification_system/notification_system.gml b/scripts/notification_system/notification_system.gml new file mode 100644 index 000000000..9e09a0d7e --- /dev/null +++ b/scripts/notification_system/notification_system.gml @@ -0,0 +1,53 @@ +#region notification + globalvar STATUSES, WARNING, ERRORS; + + STATUSES = ds_list_create(); + WARNING = ds_list_create(); + ERRORS = ds_list_create(); +#endregion + +#region classes + enum NOTI_TYPE { + log = 1 << 0, + warning = 1 << 1, + error = 1 << 2, + } + + function notification(type, str, icon = noone, color = c_ui_blue_dkgrey, life = -1) constructor { + self.type = type; + self.txt = str; + self.icon = icon; + self.color = color; + + self.life_max = life; + self.life = life; + + self.onClick = noone; + } + + function noti_status(str, icon = noone) { + ds_list_add(STATUSES, new notification(NOTI_TYPE.log, str, icon)); + } + + function noti_warning(str, icon = s_noti_icon_warning) { + var noti = new notification(NOTI_TYPE.warning, str, icon, c_ui_orange, 180); + ds_list_add(STATUSES, noti); + ds_list_add(WARNING, noti); + + PANEL_MENU.noti_flash = 1; + return noti; + } + + function noti_error(str, icon = s_noti_icon_error) { + var noti = new notification(NOTI_TYPE.error, str, icon, c_ui_red); + ds_list_add(STATUSES, noti); + ds_list_add(ERRORS, noti); + + return noti; + } + + function noti_remove(noti) { + ds_list_remove(STATUSES, noti); + ds_list_remove(ERRORS, noti); + } +#endregion \ No newline at end of file diff --git a/scripts/notification_system/notification_system.yy b/scripts/notification_system/notification_system.yy new file mode 100644 index 000000000..f34f5d5ad --- /dev/null +++ b/scripts/notification_system/notification_system.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "notification_system", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "scritps", + "path": "folders/main/scritps.yy", + }, +} \ No newline at end of file diff --git a/scripts/paddingBox/paddingBox.gml b/scripts/paddingBox/paddingBox.gml index 0c4c808e0..d50365a43 100644 --- a/scripts/paddingBox/paddingBox.gml +++ b/scripts/paddingBox/paddingBox.gml @@ -18,7 +18,7 @@ function paddingBox(_onModify, _linked) constructor { b_link = button(linked); static draw = function(_x, _y, _data, _mod, _m) { - draw_sprite(s_inspector_padding, 0, _x, _y + 64); + draw_sprite_ui_uniform(s_inspector_padding, 0, _x, _y + ui(64)); for(var i = 0; i < 4; i++) { tb[i].hover = hover; @@ -26,17 +26,17 @@ function paddingBox(_onModify, _linked) constructor { tb[i].align = fa_center; } - tb[0].draw(_x + 64, _y + 64 - 17, 64, 34, _data[0], _m); - tb[1].draw(_x - 32, _y + 64 - 48 - 8 - 34, 64, 34, _data[1], _m); - tb[2].draw(_x - 64 - 64, _y + 64 - 17, 64, 34, _data[2], _m); - tb[3].draw(_x - 32, _y + 64 + 48 + 8, 64, 34, _data[3], _m); + tb[0].draw(_x + ui(64), _y + ui(64 - 17), ui(64), TEXTBOX_HEIGHT, _data[0], _m); + tb[1].draw(_x - ui(32), _y + ui(64 - 48 - 8 - 34), ui(64), TEXTBOX_HEIGHT, _data[1], _m); + tb[2].draw(_x - ui(64) - ui(64), _y + ui(64 - 17), ui(64), TEXTBOX_HEIGHT, _data[2], _m); + tb[3].draw(_x - ui(32), _y + ui(64 + 48 + 8), ui(64), TEXTBOX_HEIGHT, _data[3], _m); b_link.hover = hover; b_link.active = active; - var bx = _x - 64 - 16; - var by = _y - 16; - b_link.draw(bx, by, 32, 32, _m, s_button_hide); - draw_sprite(s_padding_link, (_mod & VALUE_MODIFIER.linked) != 0, bx + 16, by + 16); + var bx = _x - ui(80); + var by = _y - ui(16); + b_link.draw(bx, by, ui(32), ui(32), _m, s_button_hide); + draw_sprite_ui_uniform(s_padding_link, (_mod & VALUE_MODIFIER.linked) != 0, bx + ui(16), by + ui(16)); active = false; hover = false; diff --git a/scripts/paddingBox/paddingBox.yy b/scripts/paddingBox/paddingBox.yy index eb47974e3..a9a45dbcf 100644 --- a/scripts/paddingBox/paddingBox.yy +++ b/scripts/paddingBox/paddingBox.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "paddingBox", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "paddingBox", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/panel_animation/panel_animation.gml b/scripts/panel_animation/panel_animation.gml index 39166f564..a22f68f7b 100644 --- a/scripts/panel_animation/panel_animation.gml +++ b/scripts/panel_animation/panel_animation.gml @@ -8,24 +8,24 @@ enum KEYFRAME_DRAG_TYPE { function Panel_Animation(_panel) : PanelContent(_panel) constructor { context_str = "Animation"; - timeline_h = 28; - min_w = 348; - min_h = 48; - tool_width = 280; + timeline_h = ui(28); + min_w = ui(348); + min_h = ui(48); + tool_width = ui(280); - timeline_surface = surface_create(w - tool_width, timeline_h); - timeline_mask = surface_create(w - tool_width, timeline_h); + timeline_surface = surface_create_valid(w - tool_width, timeline_h); + timeline_mask = surface_create_valid(w - tool_width, timeline_h); - dope_sheet_w = w - tool_width - 8; - dope_sheet_h = h - timeline_h - 20; - dope_sheet_surface = surface_create(dope_sheet_w, 1); - dope_sheet_mask = surface_create(dope_sheet_w, 1); + dope_sheet_w = w - tool_width - ui(8); + dope_sheet_h = h - timeline_h - ui(20); + dope_sheet_surface = surface_create_valid(dope_sheet_w, 1); + dope_sheet_mask = surface_create_valid(dope_sheet_w, 1); dope_sheet_y = 0; dope_sheet_y_to = 0; dope_sheet_y_max = 0; is_scrolling = false; - ds_name_surface = surface_create(tool_width - 16, 1); + ds_name_surface = surface_create_valid(tool_width - ui(16), 1); timeline_scubbing = false; timeline_scub_st = 0; @@ -196,38 +196,38 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(is_surface(timeline_mask) && surface_exists(timeline_mask)) surface_size_to(timeline_mask, w - tool_width, timeline_h); else - timeline_mask = surface_create(w - tool_width, timeline_h); + timeline_mask = surface_create_valid(w - tool_width, timeline_h); if(is_surface(timeline_surface) && surface_exists(timeline_surface)) surface_size_to(timeline_surface, w - tool_width, timeline_h); else - timeline_surface = surface_create(w - tool_width, timeline_h); + timeline_surface = surface_create_valid(w - tool_width, timeline_h); } - dope_sheet_w = w - tool_width - 8; - dope_sheet_h = h - timeline_h - 24; - if(dope_sheet_h > 8) { + dope_sheet_w = w - tool_width - ui(8); + dope_sheet_h = h - timeline_h - ui(24); + if(dope_sheet_h > ui(8)) { if(is_surface(dope_sheet_mask) && surface_exists(dope_sheet_mask)) surface_size_to(dope_sheet_mask, dope_sheet_w, dope_sheet_h); else - dope_sheet_mask = surface_create(dope_sheet_w, dope_sheet_h); + dope_sheet_mask = surface_create_valid(dope_sheet_w, dope_sheet_h); if(is_surface(dope_sheet_surface) && surface_exists(dope_sheet_surface)) surface_size_to(dope_sheet_surface, dope_sheet_w, dope_sheet_h); else - dope_sheet_surface = surface_create(dope_sheet_w, dope_sheet_h); + dope_sheet_surface = surface_create_valid(dope_sheet_w, dope_sheet_h); if(is_surface(ds_name_surface) && surface_exists(ds_name_surface)) - surface_size_to(ds_name_surface, tool_width - 16, dope_sheet_h); + surface_size_to(ds_name_surface, tool_width - ui(16), dope_sheet_h); else - ds_name_surface = surface_create(tool_width - 16, dope_sheet_h); + ds_name_surface = surface_create_valid(tool_width - ui(16), dope_sheet_h); } resetTimelineMask(); } function resetTimelineMask() { if(!surface_exists(timeline_mask)) - timeline_mask = surface_create(w - tool_width, timeline_h); + timeline_mask = surface_create_valid(w - tool_width, timeline_h); surface_set_target(timeline_mask); draw_clear(c_black); @@ -238,7 +238,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(dope_sheet_h > 8) { if(!surface_exists(dope_sheet_mask)) - dope_sheet_mask = surface_create(dope_sheet_w, dope_sheet_h); + dope_sheet_mask = surface_create_valid(dope_sheet_w, dope_sheet_h); surface_set_target(dope_sheet_mask); draw_clear(c_black); @@ -269,34 +269,35 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { } } + //TODO: Divide this 800+ lines monstrosity into subfunctions function drawAnimationControl() { - var bar_x = tool_width - 48; - var bar_y = h - timeline_h - 10; + var bar_x = tool_width - ui(48); + var bar_y = h - timeline_h - ui(10); var bar_w = w - tool_width; var bar_h = timeline_h; - var bar_total_w = ANIMATOR.frames_total * timeline_scale; + var bar_total_w = ANIMATOR.frames_total * ui(timeline_scale); resetTimelineMask(); if(!is_surface(timeline_surface) || !surface_exists(timeline_surface)) - timeline_surface = surface_create(w - tool_width, timeline_h); + timeline_surface = surface_create_valid(w - tool_width, timeline_h); if(dope_sheet_h > 8) { if(!is_surface(dope_sheet_surface) || !surface_exists(dope_sheet_surface)) - dope_sheet_surface = surface_create(dope_sheet_w, dope_sheet_h); + dope_sheet_surface = surface_create_valid(dope_sheet_w, dope_sheet_h); if(!is_surface(ds_name_surface) || !surface_exists(ds_name_surface)) - ds_name_surface = surface_create(dope_sheet_w, dope_sheet_h); + ds_name_surface = surface_create_valid(dope_sheet_w, dope_sheet_h); #region scroll dope_sheet_y = lerp_float(dope_sheet_y, dope_sheet_y_to, 5); - if(HOVER == panel && point_in_rectangle(mx, my, 8, 8, tool_width, 8 + dope_sheet_h)) { - if(mouse_wheel_down()) dope_sheet_y_to = clamp(dope_sheet_y_to - 32, -dope_sheet_y_max, 0); - if(mouse_wheel_up()) dope_sheet_y_to = clamp(dope_sheet_y_to + 32, -dope_sheet_y_max, 0); + if(HOVER == panel && point_in_rectangle(mx, my, ui(8), ui(8), tool_width, ui(8) + dope_sheet_h)) { + if(mouse_wheel_down()) dope_sheet_y_to = clamp(dope_sheet_y_to - ui(32), -dope_sheet_y_max, 0); + if(mouse_wheel_up()) dope_sheet_y_to = clamp(dope_sheet_y_to + ui(32), -dope_sheet_y_max, 0); } - var scr_x = bar_x + dope_sheet_w + 4; - var scr_y = 8; + var scr_x = bar_x + dope_sheet_w + ui(4); + var scr_y = ui(8); var scr_s = dope_sheet_h; var scr_prog = -dope_sheet_y / dope_sheet_y_max; var scr_size = dope_sheet_h / (dope_sheet_h + dope_sheet_y_max); @@ -304,9 +305,9 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { var scr_scale_s = scr_s * scr_size; var scr_prog_s = scr_prog * (scr_s - scr_scale_s); - var scr_w = 4; + var scr_w = ui(4); var scr_h = scr_s; - var s_bar_w = 4; + var s_bar_w = ui(4); var s_bar_h = scr_scale_s; var s_bar_x = scr_x; var s_bar_y = scr_y + scr_prog_s; @@ -317,7 +318,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(mouse_check_button_released(mb_left)) is_scrolling = false; } - if(point_in_rectangle(mx, my, scr_x - 2, scr_y - 2, scr_x + scr_w + 2, scr_y + scr_h + 2)) { + if(point_in_rectangle(mx, my, scr_x - ui(2), scr_y - ui(2), scr_x + scr_w + ui(2), scr_y + scr_h + ui(2))) { draw_sprite_stretched_ext(s_ui_scrollbar, 0, s_bar_x, s_bar_y, s_bar_w, s_bar_h, c_ui_blue_white, 1); if(mouse_check_button(mb_left)) { is_scrolling = true; @@ -330,8 +331,8 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { surface_set_target(dope_sheet_surface); draw_clear_alpha(c_ui_blue_black, 0); var msx = mx - bar_x; - var msy = my - 8; - var graph_h = 48; + var msy = my - ui(8); + var graph_h = ui(48); #region bg draw_sprite_stretched(s_ui_panel_bg, 1, 0, 0, bar_w, dope_sheet_h); @@ -341,56 +342,56 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { draw_rectangle(0, 0, bar_total_w, 16, false); dope_sheet_y_max = 0; - var key_y = 24 + dope_sheet_y, key_y_node, _node = noone; + var key_y = ui(24) + dope_sheet_y, key_y_node, _node = noone; for( var i = 0; i < ds_list_size(anim_properties); i++ ) { var prop = anim_properties[| i]; if(_node != prop.node) { _node = prop.node; - key_y += 6; + key_y += ui(6); key_y_node = key_y; draw_set_color(c_ui_blue_ltgrey); - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - 10, bar_total_w, 20, c_ui_blue_grey, 1); - key_y += 22; - dope_sheet_y_max += 28; + draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - ui(10), bar_total_w, ui(20), c_ui_blue_grey, 1); + key_y += ui(22); + dope_sheet_y_max += ui(28); } if(prop.node.anim_show) { - key_y += 18; - dope_sheet_y_max += 18; + key_y += ui(18); + dope_sheet_y_max += ui(18); if(prop.animator.show_graph) { - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - 4, bar_total_w, graph_h, c_ui_blue_ltgrey, 1); - key_y += graph_h + 8; - dope_sheet_y_max += graph_h + 8; + draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - ui(4), bar_total_w, graph_h, c_ui_blue_ltgrey, 1); + key_y += graph_h + ui(8); + dope_sheet_y_max += graph_h + ui(8); } } } - dope_sheet_y_max = max(0, dope_sheet_y_max - dope_sheet_h + 48); + dope_sheet_y_max = max(0, dope_sheet_y_max - dope_sheet_h + ui(48)); for(var i = 0; i < ANIMATOR.frames_total; i += 10) { - var bar_line_x = i * timeline_scale + timeline_shift; + var bar_line_x = i * ui(timeline_scale) + timeline_shift; draw_set_color(c_ui_blue_black); - draw_line(bar_line_x, 16, bar_line_x, dope_sheet_h); + draw_line(bar_line_x, ui(16), bar_line_x, dope_sheet_h); draw_set_text(f_p2, fa_center, fa_bottom, c_ui_blue_grey); - draw_text(bar_line_x, 16, string(i)); + draw_text(bar_line_x, ui(16), string(i)); } - var bar_line_x = ANIMATOR.current_frame * timeline_scale + timeline_shift; + var bar_line_x = ANIMATOR.current_frame * ui(timeline_scale) + timeline_shift; var cc = ANIMATOR.is_playing? c_ui_lime : c_ui_orange; draw_set_color(cc); - draw_line(bar_line_x, 16, bar_line_x, dope_sheet_h); + draw_line(bar_line_x, ui(16), bar_line_x, dope_sheet_h); draw_set_text(f_p2, fa_center, fa_bottom, cc); - draw_text(bar_line_x, 16, string(ANIMATOR.current_frame)); + draw_text(bar_line_x, ui(16), string(ANIMATOR.current_frame)); #endregion #region dope sheet - var key_sy = 24 + dope_sheet_y; + var key_sy = ui(24) + dope_sheet_y; var key_y, key_y_node, _node = noone; draw_set_text(f_p2, fa_left, fa_top, c_ui_blue_white); var key_hover = noone; @@ -401,7 +402,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(_node != prop.node) { _node = prop.node; - key_y += 28 + key_y += ui(28); } if(prop.node.anim_show && prop.on_end != KEYFRAME_END.hold) { @@ -410,8 +411,8 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { var keyframe_s = key_list[| 0].time; var keyframe_e = key_list[| ds_list_size(key_list) - 1].time; - var ks_x = keyframe_s * timeline_scale + timeline_shift; - var ke_x = keyframe_e * timeline_scale + timeline_shift; + var ks_x = keyframe_s * ui(timeline_scale) + timeline_shift; + var ke_x = keyframe_e * ui(timeline_scale) + timeline_shift; draw_set_color(merge_color(c_ui_blue_black, c_ui_lime, 0.2)); draw_line_width(ks_x, key_y - 1, ke_x, key_y - 1, 4); @@ -419,15 +420,15 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { } if(!prop.node.anim_show) { - //key_y += 18; + //key_y += ui(18); continue; } if(isGraphable(prop.type)) { var _gy_val_min = 999999; var _gy_val_max = -999999; - var _gy_top = key_y + 16; - var _gy_bottom = _gy_top + graph_h - 8; + var _gy_top = key_y + ui(16); + var _gy_bottom = _gy_top + graph_h - ui(8); var amo = ds_list_size(prop.animator.values); @@ -446,43 +447,43 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { for(var k = 0; k < amo; k++) { var key = prop.animator.values[| k]; - var t = key.time * timeline_scale + timeline_shift; + var t = key.time * ui(timeline_scale) + timeline_shift; #region easing line if(key.ease_in > 0) { draw_set_color(c_ui_blue_dkgrey); - var _tx = t - key.ease_in * timeline_scale * 2; + var _tx = t - key.ease_in * ui(timeline_scale) * 2; if(key.ease_in_type == CURVE_TYPE.bezier) draw_line_width(_tx, key_y - 1, t, key_y - 1, 2); else if(key.ease_in_type == CURVE_TYPE.damping) draw_sprite_stretched_ext(s_timeline_elastic, 0, _tx, key_y - 4, t - _tx, 8, c_ui_blue_dkgrey, 1); - if(HOVER == panel && point_in_circle(msx, msy, _tx, key_y, 6)) { + if(HOVER == panel && point_in_circle(msx, msy, _tx, key_y, ui(6))) { key_hover = key; - draw_sprite_ext(s_timeline_keyframe, 2, _tx, key_y, 1, 1, 0, c_ui_blue_white, 2); + draw_sprite_ui_uniform(s_timeline_keyframe, 2, _tx, key_y, 1, c_ui_blue_white); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { keyframe_dragging = prop.animator.values[| k]; keyframe_drag_type = KEYFRAME_DRAG_TYPE.ease_in; } } else - draw_sprite_ext(s_timeline_keyframe, 2, _tx, key_y, 1, 1, 0, c_ui_blue_ltgrey, 2); + draw_sprite_ui_uniform(s_timeline_keyframe, 2, _tx, key_y, 1, c_ui_blue_ltgrey); } if(key.ease_out > 0) { draw_set_color(c_ui_blue_dkgrey); - var _tx = t + key.ease_out * timeline_scale * 2; + var _tx = t + key.ease_out * ui(timeline_scale) * 2; if(key.ease_out_type == CURVE_TYPE.bezier) draw_line_width(t, key_y - 1, _tx, key_y - 1, 2); else if(key.ease_out_type == CURVE_TYPE.damping) draw_sprite_stretched_ext(s_timeline_elastic, 0, t, key_y - 4, _tx - t, 8, c_ui_blue_dkgrey, 1); - - if(HOVER == panel && point_in_circle(msx, msy, _tx, key_y, 6)) { + + if(HOVER == panel && point_in_circle(msx, msy, _tx, key_y, ui(6))) { key_hover = key; - draw_sprite_ext(s_timeline_keyframe, 3, _tx, key_y, 1, 1, 0, c_ui_blue_white, 2); + draw_sprite_ui_uniform(s_timeline_keyframe, 3, _tx, key_y, 1, c_ui_blue_white); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { keyframe_dragging = prop.animator.values[| k]; keyframe_drag_type = KEYFRAME_DRAG_TYPE.ease_out; } } else - draw_sprite_ext(s_timeline_keyframe, 3, _tx, key_y, 1, 1, 0, c_ui_blue_ltgrey, 2); + draw_sprite_ui_uniform(s_timeline_keyframe, 3, _tx, key_y, 1, c_ui_blue_ltgrey); } #endregion @@ -496,7 +497,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { var ox = 0, oy = 0, nx = 0, ny = 0, oly = 0, nly = 0; if(tott == 0) { - nx = key_next.time * timeline_scale + timeline_shift; + nx = key_next.time * ui(timeline_scale) + timeline_shift; if(is_array(key.value)) { for( var ki = 0; ki < array_length(key.value); ki++ ) { draw_set_color(AXIS_COLOR[ki]); @@ -516,7 +517,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { var _step = 1 / 20; for( var _r = 0; _r <= 1; _r += _step ) { - nx = t + _r * dx * timeline_scale; + nx = t + _r * dx * ui(timeline_scale); var nly = prop.animator.interpolate(key, key_next, _r); if(is_array(key.value)) { @@ -549,10 +550,10 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { #region graph pre-post line if(prop.animator.show_graph && ds_list_size(prop.animator.values) > 0) { var key_first = prop.animator.values[| 0]; - var t_first = key_first.time * timeline_scale + timeline_shift; + var t_first = key_first.time * ui(timeline_scale) + timeline_shift; var key_last = prop.animator.values[| ds_list_size(prop.animator.values) - 1]; - var t_last = key_last.time * timeline_scale + timeline_shift; + var t_last = key_last.time * ui(timeline_scale) + timeline_shift; var oy = 0; @@ -574,12 +575,12 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { draw_line(0, oy, t_first, oy); } - key_y += graph_h + 8; + key_y += graph_h + ui(8); } #endregion } - key_y += 18; + key_y += ui(18); } #region keyframes @@ -603,22 +604,22 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(_node != prop.node) { _node = prop.node; - key_y += 6; + key_y += ui(6); key_y_node = key_y; - key_y += 22; + key_y += ui(22); } for(var k = 0; k < ds_list_size(prop.animator.values); k++) { - var t = prop.animator.values[| k].time * timeline_scale + timeline_shift; + var t = prop.animator.values[| k].time * ui(timeline_scale) + timeline_shift; var keyframe = prop.animator.values[| k]; if(!prop.node.anim_show) { - draw_sprite_ext(s_timeline_keyframe, 0, t, key_y_node, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_timeline_keyframe, 0, t, key_y_node, 1, c_ui_blue_grey); continue; } var cc = c_ui_blue_grey; - if(HOVER == panel && point_in_circle(msx, msy, t, key_y, 8)) { + if(HOVER == panel && point_in_circle(msx, msy, t, key_y, ui(8))) { cc = c_ui_blue_white; key_hover = keyframe; @@ -636,10 +637,10 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(stagger_mode == 1 && ds_list_exist(keyframe_selecting, keyframe)) cc = c_ui_orange; - draw_sprite_ext(s_timeline_keyframe, 1, t, key_y, 1, 1, 0, cc, 1); + draw_sprite_ui_uniform(s_timeline_keyframe, 1, t, key_y, 1, cc); if(ds_list_exist(keyframe_selecting, keyframe)) - draw_sprite_ext(s_timeline_keyframe_selecting, 0, t, key_y, 1, 1, 0, c_ui_orange, 1); - + draw_sprite_ui_uniform(s_timeline_keyframe_selecting, 0, t, key_y, 1, c_ui_orange); + if(keyframe_boxing) { var box_x0 = min(keyframe_box_sx, msx); var box_x1 = max(keyframe_box_sx, msx); @@ -655,13 +656,13 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(prop.node.anim_show) { if(prop.animator.show_graph) - key_y += graph_h + 8; + key_y += graph_h + ui(8); key_y += 18; } } - if(FOCUS == panel && point_in_rectangle(msx, msy, 0, 16, dope_sheet_w, dope_sheet_h)) { + if(FOCUS == panel && point_in_rectangle(msx, msy, 0, ui(16), dope_sheet_w, dope_sheet_h)) { if(mouse_check_button_pressed(mb_left) || mouse_check_button_pressed(mb_right)) { if(key_hover == noone) { ds_list_clear(keyframe_selecting); @@ -701,14 +702,14 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(FOCUS == panel && mouse_check_button_pressed(mb_right)) { if(!ds_list_empty(keyframe_selecting)) { - dialogCall(o_dialog_menubox, mouse_mx + 8, mouse_my + 8) + dialogCall(o_dialog_menubox, mouse_mx + ui(8), mouse_my + ui(8)) .setMenu(keyframe_menu); } } if(keyframe_dragging) { if(keyframe_drag_type == KEYFRAME_DRAG_TYPE.move) { - var tt = clamp(round((mx - bar_x) / timeline_scale) + timeline_shift, 0, ANIMATOR.frames_total); + var tt = clamp(round((mx - bar_x) / ui(timeline_scale)) + timeline_shift, 0, ANIMATOR.frames_total); var sh = tt - keyframe_dragging.time; for( var i = 0; i < ds_list_size(keyframe_selecting); i++ ) { @@ -729,7 +730,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { } } } else { - var dx = (keyframe_dragging.time - (mx - bar_x) / timeline_scale) / 2; + var dx = (keyframe_dragging.time - (mx - bar_x) / ui(timeline_scale)) / 2; dx = clamp(abs(dx), 0, 0.9); if(dx < 0.1) dx = 0; @@ -756,7 +757,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { } break; } - + if(mouse_check_button_released(mb_left)) { recordAction(ACTION_TYPE.var_modify, keyframe_dragging, [_in, "ease_in"]); recordAction(ACTION_TYPE.var_modify, keyframe_dragging, [_ot, "ease_out"]); @@ -770,7 +771,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { #region stagger if(stagger_mode == 2) { var ts = keyframe_selecting[| stagger_index].time; - var tm = clamp(round((mx - bar_x) / timeline_scale) + timeline_shift, 0, ANIMATOR.frames_total); + var tm = clamp(round((mx - bar_x) / ui(timeline_scale)) + timeline_shift, 0, ANIMATOR.frames_total); var stg = tm - ts; staggerKeys(stagger_index, stg); @@ -785,8 +786,8 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { surface_set_target(ds_name_surface); draw_clear_alpha(c_ui_blue_black, 0); - var msx = mx - 8; - var msy = my - 8; + var msx = mx - ui(8); + var msy = my - ui(8); #region dope sheet name var key_y = key_sy, _node = noone; @@ -798,21 +799,21 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(_node != prop.node) { _node = prop.node; - key_y += 6; + key_y += ui(6); draw_set_color(c_ui_blue_ltgrey); - if(HOVER == panel && point_in_rectangle(msx, msy, 0, key_y - 10, tool_width - 64, key_y + 10)) { - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - 10, tool_width - 64, 20, c_ui_blue_ltgrey, 1); - if(FOCUS == panel && msx < tool_width - 88 && mouse_check_button_pressed(mb_left)) + if(HOVER == panel && point_in_rectangle(msx, msy, 0, key_y - ui(10), tool_width - ui(64), key_y + ui(10))) { + draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - ui(10), tool_width - ui(64), ui(20), c_ui_blue_ltgrey, 1); + if(FOCUS == panel && msx < tool_width - ui(88) && mouse_check_button_pressed(mb_left)) prop.node.anim_show = !prop.node.anim_show; } else - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - 10, tool_width - 64, 20, merge_color(c_ui_blue_white, c_ui_blue_ltgrey, 0.5), 1); + draw_sprite_stretched_ext(s_ui_panel_bg, 0, 0, key_y - ui(10), tool_width - ui(64), ui(20), merge_color(c_ui_blue_white, c_ui_blue_ltgrey, 0.5), 1); if(prop.node == PANEL_INSPECTOR.inspecting) - draw_sprite_stretched(s_node_active, 0, 0, key_y - 10, tool_width - 64, 20); + draw_sprite_stretched(s_node_active, 0, 0, key_y - ui(10), tool_width - ui(64), ui(20)); - var tx = tool_width - 76 - 16 * 0; - if(HOVER == panel && point_in_circle(msx, msy, tx, key_y - 1, 10)) { - draw_sprite_ext(s_animate_node_go, 0, tx, key_y - 1, 1, 1, 0, c_ui_blue_white, 1); + var tx = tool_width - ui(76 + 16 * 0); + if(HOVER == panel && point_in_circle(msx, msy, tx, key_y - 1, ui(10))) { + draw_sprite_ui_uniform(s_animate_node_go, 0, tx, key_y - 1, 1, c_ui_blue_white); TOOLTIP = "Go to node"; if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { @@ -822,19 +823,19 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { PANEL_GRAPH.fullView(); } } else - draw_sprite_ext(s_animate_node_go, 0, tx, key_y - 1, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_animate_node_go, 0, tx, key_y - 1, 1, c_ui_blue_grey); - draw_sprite_ext(s_arrow_16, prop.node.anim_show? 3 : 0, 10, key_y, 1, 1, 0, c_ui_blue_grey, 1); - draw_text(20, key_y - 2, prop.node.name); - key_y += 22; + draw_sprite_ui_uniform(s_arrow_16, prop.node.anim_show? 3 : 0, ui(10), key_y, 1, c_ui_blue_grey); + draw_text(ui(20), key_y - ui(2), prop.node.name); + key_y += ui(22); } if(!prop.node.anim_show) continue; - var tx = tool_width - 72 - 16 * 3; + var tx = tool_width - ui(72 + 16 * 3); var ty = key_y - 1; - if(HOVER == panel && point_in_circle(msx, msy, tx, ty, 6)) { - draw_sprite_ext(s_prop_keyframe, 0, tx, ty, 1, 1, 0, c_ui_blue_white, 1); + if(HOVER == panel && point_in_circle(msx, msy, tx, ty, ui(6))) { + draw_sprite_ui_uniform(s_prop_keyframe, 0, tx, ty, 1, c_ui_blue_white); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { var _t = -1; @@ -848,11 +849,11 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { ANIMATOR.is_scrubing = true; } } else - draw_sprite_ext(s_prop_keyframe, 0, tx, ty, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_prop_keyframe, 0, tx, ty, 1, c_ui_blue_grey); - var tx = tool_width - 72 - 16 * 1; - if(HOVER == panel && point_in_circle(msx, msy, tx, ty, 6)) { - draw_sprite_ext(s_prop_keyframe, 2, tx, ty, 1, 1, 0, c_ui_blue_white, 1); + var tx = tool_width - ui(72 + 16 * 1); + if(HOVER == panel && point_in_circle(msx, msy, tx, ty, ui(6))) { + draw_sprite_ui_uniform(s_prop_keyframe, 2, tx, ty, 1, c_ui_blue_white); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { for(var j = 0; j < ds_list_size(prop.animator.values); j++) { @@ -865,11 +866,11 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { } } } else - draw_sprite_ext(s_prop_keyframe, 2, tx, ty, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_prop_keyframe, 2, tx, ty, 1, c_ui_blue_grey); - var tx = tool_width - 72 - 16 * 2; - if(HOVER == panel && point_in_circle(msx, msy, tx, ty, 6)) { - draw_sprite_ext(s_prop_keyframe, 1, tx, ty, 1, 1, 0, c_ui_orange_light, 1); + var tx = tool_width - ui(72 + 16 * 2); + if(HOVER == panel && point_in_circle(msx, msy, tx, ty, ui(6))) { + draw_sprite_ui_uniform(s_prop_keyframe, 1, tx, ty, 1, c_ui_orange_light); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { var _add = false; @@ -889,56 +890,56 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(!_add) ds_list_add(prop.animator.values, new valueKey(ANIMATOR.current_frame, prop.getValue(), prop.animator)); } } else - draw_sprite_ext(s_prop_keyframe, 1, tx, ty, 1, 1, 0, c_ui_orange, 1); + draw_sprite_ui_uniform(s_prop_keyframe, 1, tx, ty, 1, c_ui_orange); if(isGraphable(prop.type)) { - var tx = tool_width - 68 - 16 * 0; - if(HOVER == panel && point_in_circle(msx, msy, tx, ty, 8)) { - draw_sprite_ext(s_timeline_graph, 1, tx, ty, 1, 1, 0, prop.animator.show_graph? c_ui_orange_light : c_ui_blue_white, 1); + var tx = tool_width - ui(68 + 16 * 0); + if(HOVER == panel && point_in_circle(msx, msy, tx, ty, ui(8))) { + draw_sprite_ui_uniform(s_timeline_graph, 1, tx, ty, 1, prop.animator.show_graph? c_ui_orange_light : c_ui_blue_white); TOOLTIP = "Show graph"; if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { prop.animator.show_graph = !prop.animator.show_graph; } } else - draw_sprite_ext(s_timeline_graph, 1, tx, ty, 1, 1, 0, prop.animator.show_graph? c_ui_orange : c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_timeline_graph, 1, tx, ty, 1, prop.animator.show_graph? c_ui_orange : c_ui_blue_grey); } - var tx = tool_width - 72 - 16 * 4.5; - if(HOVER == panel && point_in_circle(msx, msy, tx, ty, 6)) { - draw_sprite_ext(s_prop_on_end, prop.on_end, tx, ty, 1, 1, 0, c_ui_blue_white, 1); + var tx = tool_width - ui(72 + 16 * 4.5); + if(HOVER == panel && point_in_circle(msx, msy, tx, ty, ui(6))) { + draw_sprite_ui_uniform(s_prop_on_end, prop.on_end, tx, ty, 1, c_ui_blue_white, 1); TOOLTIP = "Looping mode " + ON_END_NAME[prop.on_end]; if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { prop.on_end = safe_mod(prop.on_end + 1, sprite_get_number(s_prop_on_end)); } } else - draw_sprite_ext(s_prop_on_end, prop.on_end, tx, ty, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_prop_on_end, prop.on_end, tx, ty, 1, c_ui_blue_grey); - if(HOVER == panel && point_in_circle(msx, msy, 22, key_y - 1, 10)) { - draw_sprite_ext(s_timeline_clock, 1, 22, key_y - 1, 1, 1, 0, c_ui_blue_white, 1); + if(HOVER == panel && point_in_circle(msx, msy, ui(22), key_y - 1, ui(10))) { + draw_sprite_ui_uniform(s_timeline_clock, 1, ui(22), key_y - 1, 1, c_ui_blue_white); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { prop.animator.is_anim = !prop.animator.is_anim; updatePropertyList(); } } else - draw_sprite_ext(s_timeline_clock, 1, 22, key_y - 1, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_timeline_clock, 1, ui(22), key_y - 1, 1, c_ui_blue_grey); draw_set_color(c_ui_blue_white); - draw_text(32, key_y - 2, prop.name); + draw_text(ui(32), key_y - 2, prop.name); if(prop.animator.show_graph) - key_y += graph_h + 8; + key_y += graph_h + ui(8); - key_y += 18; + key_y += ui(18); } #endregion surface_reset_target(); - draw_sprite_stretched_ext(s_ui_panel_bg, 0, 8, 8, tool_width, dope_sheet_h, c_ui_blue_white, 1); - draw_surface_safe(ds_name_surface, 8, 8); - draw_surface_safe(dope_sheet_surface, bar_x, 8); + draw_sprite_stretched_ext(s_ui_panel_bg, 0, ui(8), ui(8), tool_width, dope_sheet_h, c_ui_blue_white, 1); + draw_surface_safe(ds_name_surface, ui(8), ui(8)); + draw_surface_safe(dope_sheet_surface, bar_x, ui(8)); } surface_set_target(timeline_surface); @@ -948,39 +949,40 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { draw_sprite_stretched(s_ui_panel_bg, 1, 0, 0, bar_w, bar_h); draw_sprite_stretched_ext(s_ui_panel_bg, 1, 0, 0, bar_total_w, bar_h, c_ltgray, 1); - if(timeline_scale > 16 && timeline_preview != noone) { - var prev_s = timeline_scale - 4; - draw_set_color(c_ui_blue_dkgrey); - for(var i = 0; i < ANIMATOR.frames_total; i++) { - var fr_x = i * timeline_scale + timeline_shift + 2; - var fr_y = timeline_h - 2 - prev_s; + //TODO: Add UI scaling, no one use timeline preview anyway + //if(timeline_scale > 16 && timeline_preview != noone) { + // var prev_s = timeline_scale - ui(4); + // draw_set_color(c_ui_blue_dkgrey); + // for(var i = 0; i < ANIMATOR.frames_total; i++) { + // var fr_x = i * timeline_scale + timeline_shift + ui(2); + // var fr_y = timeline_h - ui(2) - prev_s; - var surf = timeline_preview.cached_output[i]; - if(!surf || !surface_exists(surf)) continue; + // var surf = timeline_preview.cached_output[i]; + // if(!surf || !surface_exists(surf)) continue; - var ss = prev_s / max(surface_get_width(surf), surface_get_height(surf)); - draw_rectangle(fr_x, fr_y, fr_x + prev_s, fr_y + prev_s, 1); + // var ss = prev_s / max(surface_get_width(surf), surface_get_height(surf)); + // draw_rectangle(fr_x, fr_y, fr_x + prev_s, fr_y + prev_s, 1); - draw_surface_ext(surf, fr_x, fr_y, ss, ss, 0, c_white, 1); - } - } + // draw_surface_ext(surf, fr_x, fr_y, ss, ss, 0, c_white, 1); + // } + //} for(var i = 0; i < ANIMATOR.frames_total; i += 10) { - var bar_line_x = i * timeline_scale + timeline_shift; + var bar_line_x = i * ui(timeline_scale) + timeline_shift; draw_set_color(c_ui_blue_black); - draw_line(bar_line_x, 12, bar_line_x, bar_h); + draw_line(bar_line_x, ui(12), bar_line_x, bar_h); draw_set_text(f_p2, fa_center, fa_bottom, c_ui_blue_grey); - draw_text(bar_line_x, 16, string(i)); + draw_text(bar_line_x, ui(16), string(i)); } - var bar_line_x = ANIMATOR.current_frame * timeline_scale + timeline_shift; + var bar_line_x = ANIMATOR.current_frame * ui(timeline_scale) + timeline_shift; var cc = ANIMATOR.is_playing? c_ui_lime : c_ui_orange; draw_set_color(cc); - draw_line(bar_line_x, 12, bar_line_x, bar_h); + draw_line(bar_line_x, ui(12), bar_line_x, bar_h); draw_set_text(f_p2, fa_center, fa_bottom, cc); - draw_text(bar_line_x, 16, string(ANIMATOR.current_frame)); + draw_text(bar_line_x, ui(16), string(ANIMATOR.current_frame)); #endregion #region cache @@ -989,10 +991,10 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { if(inspecting && inspecting.use_cache) { for(var i = 0; i < ANIMATOR.frames_total; i++) { if(i >= array_length(inspecting.cached_output)) { - //?? + //TODO: Deal with cache index overflow } else { - var x0 = i * timeline_scale + timeline_shift; - var x1 = (i + 1) * timeline_scale + timeline_shift; + var x0 = i * ui(timeline_scale) + timeline_shift; + var x1 = (i + 1) * ui(timeline_scale) + timeline_shift; var sh = inspecting.cached_output[i]; if(is_surface(sh)) @@ -1000,7 +1002,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { else draw_set_color(c_red); draw_set_alpha(0.5); - draw_rectangle(x0, bar_h - 4, x1, bar_h, false); + draw_rectangle(x0, bar_h - ui(4), x1, bar_h, false); draw_set_alpha(1); } } @@ -1014,8 +1016,8 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { var prop = anim_properties[| i]; for(var k = 0; k < ds_list_size(prop.animator.values); k++) { - var t = prop.animator.values[| k].time * timeline_scale + timeline_shift; - draw_sprite_ext(s_timeline_keyframe, 1, t, key_y, 1, 1, 0, c_ui_blue_grey, 1); + var t = prop.animator.values[| k].time * ui(timeline_scale) + timeline_shift; + draw_sprite_ui_uniform(s_timeline_keyframe, 1, t, key_y, 1, c_ui_blue_grey); } } #endregion @@ -1024,7 +1026,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { timeline_shift = lerp_float(timeline_shift, timeline_shift_to, 5); if(timeline_scubbing) { - ANIMATOR.real_frame = clamp((mx - bar_x) / timeline_scale + timeline_shift, 0, ANIMATOR.frames_total); + ANIMATOR.real_frame = clamp((mx - bar_x) / ui(timeline_scale) + timeline_shift, 0, ANIMATOR.frames_total); timeline_show_time = ANIMATOR.current_frame; if(timeline_show_time != _scrub_frame) { @@ -1097,52 +1099,52 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { draw_surface_safe(timeline_surface, bar_x, bar_y); #region control - var bx = 8; - var by = h - 40; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Stop", s_sequence_control, 4, ANIMATOR.is_playing? c_ui_orange : c_ui_blue_grey) == 2) { + var bx = ui(8); + var by = h - ui(40); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Stop", s_sequence_control, 4, ANIMATOR.is_playing? c_ui_orange : c_ui_blue_grey) == 2) { ANIMATOR.is_playing = false; ANIMATOR.real_frame = 0; } - bx += 36; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, ANIMATOR.is_playing? "Pause" : "Play", + bx += ui(36); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, ANIMATOR.is_playing? "Pause" : "Play", s_sequence_control, !ANIMATOR.is_playing, ANIMATOR.is_playing? c_ui_orange : c_ui_blue_grey) == 2) ANIMATOR.is_playing = !ANIMATOR.is_playing; - bx += 36; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Go to first frame", s_sequence_control, 3) == 2) { + bx += ui(36); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Go to first frame", s_sequence_control, 3) == 2) { ANIMATOR.real_frame = 0; ANIMATOR.is_scrubing = true; } - bx += 36; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Go to last frame", s_sequence_control, 2) == 2) { + bx += ui(36); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Go to last frame", s_sequence_control, 2) == 2) { ANIMATOR.real_frame = ANIMATOR.frames_total; ANIMATOR.is_scrubing = true; } - bx += 36; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Previous frame", s_sequence_control, 5) == 2) { + bx += ui(36); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Previous frame", s_sequence_control, 5) == 2) { ANIMATOR.real_frame = clamp(ANIMATOR.real_frame - 1, 0, ANIMATOR.frames_total); ANIMATOR.is_scrubing = true; } - bx += 36; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Next frame", s_sequence_control, 6) == 2) { + bx += ui(36); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Next frame", s_sequence_control, 6) == 2) { ANIMATOR.real_frame = clamp(ANIMATOR.real_frame + 1, 0, ANIMATOR.frames_total); ANIMATOR.is_scrubing = true; } - bx = w - 40; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Animation settings", s_animation_setting, 2) == 2) + bx = w - ui(40); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Animation settings", s_animation_setting, 2) == 2) dialogCall(o_dialog_animation, x + bx + 32, y + by - 8); if(dope_sheet_h > 8) { - by -= 40; - bx = w - 40; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Scale animation", s_animation_timing, 2) == 2) { - var dia = dialogCall(o_dialog_anim_time_scaler, x + bx + 32, y + by - 8); + by -= ui(40); + bx = w - ui(40); + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Scale animation", s_animation_timing, 2) == 2) { + var dia = dialogCall(o_dialog_anim_time_scaler, x + bx + ui(32), y + by - ui(8)); dia.anchor = ANCHOR.right | ANCHOR.bottom; } } diff --git a/scripts/panel_collection/panel_collection.gml b/scripts/panel_collection/panel_collection.gml index 2a08a04f4..94402de5f 100644 --- a/scripts/panel_collection/panel_collection.gml +++ b/scripts/panel_collection/panel_collection.gml @@ -1,10 +1,10 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { - group_w = 180; - content_w = w - 24 - group_w; - content_h = h - 40 - 16; + group_w = ui(180); + content_w = w - ui(24) - group_w; + content_h = h - ui(40) - ui(16); - min_w = group_w + 40; - min_h = 40; + min_w = group_w + ui(40); + min_h = ui(40); roots = [ ["Collections", COLLECTIONS] , ["Assets", global.ASSETS] ]; mode = 0; @@ -48,15 +48,15 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { contentPane = new scrollPane(content_w, content_h, function(_y, _m) { draw_clear_alpha(c_white, 0); - var nodes = search_string == ""? context.content : search_list; + var nodes = search_string == ""? context.content : search_list; var node_count = ds_list_size(nodes); var hh = 0; var frame = current_time * PREF_MAP[? "collection_preview_speed"] / 3000; if(contentView == 0) { - var grid_size = 64; - var grid_width = 80; - var grid_space = 12; + var grid_size = ui(64); + var grid_width = ui(80); + var grid_space = ui(12); var col = max(1, floor(content_w / (grid_width + grid_space))); var row = ceil(node_count / col); var yy = _y + grid_space; @@ -92,7 +92,7 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { if(_node.spr) { var sw = sprite_get_width(_node.spr); var sh = sprite_get_height(_node.spr); - var ss = 32 / max(sw, sh); + var ss = ui(32) / max(sw, sh); var xo = (sprite_get_xoffset(_node.spr) - sw / 2) * ss; var yo = (sprite_get_yoffset(_node.spr) - sh / 2) * ss; @@ -101,12 +101,12 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { draw_sprite_ext(_node.spr, frame, sx, sy, ss, ss, 0, c_white, 1); } else { - draw_sprite_ext(s_group_24, 0, _boxx + grid_size / 2, yy + grid_size / 2, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_group_24, 0, _boxx + grid_size / 2, yy + grid_size / 2, 1, c_white); } - + draw_set_text(f_p2, fa_center, fa_top, c_white); name_height = max(name_height, string_height_ext(_node.name, -1, grid_size) + 8); - draw_text_ext(_boxx + grid_size / 2, yy + grid_size + 4, _node.name, -1, grid_width); + draw_text_ext(_boxx + grid_size / 2, yy + grid_size + ui(4), _node.name, -1, grid_width); } } var hght = grid_size + grid_space + name_height; @@ -114,8 +114,8 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { yy += hght; } } else { - var list_width = content_w - 12; - var list_height = 28; + var list_width = content_w - ui(12); + var list_height = ui(28); var yy = _y + list_height / 2; hh += list_height; @@ -125,25 +125,25 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { if(i % 2) { BLEND_ADD - draw_sprite_stretched_ext(s_node_bg, 0, 4, yy, list_width - 8, list_height, c_white, 0.2); + draw_sprite_stretched_ext(s_node_bg, 0, ui(4), yy, list_width - 8, list_height, c_white, 0.2); BLEND_NORMAL } if(point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) { - draw_sprite_stretched(s_node_active, 0, 4, yy, list_width - 8, list_height); + draw_sprite_stretched(s_node_active, 0, ui(4), yy, list_width - ui(8), list_height); if(mouse_check_button_pressed(mb_left)) file_dragging = _node; if(mouse_check_button_pressed(mb_right)) { _menu_node = _node; - var dia = dialogCall(o_dialog_menubox, mouse_mx + 8, mouse_my + 8); + var dia = dialogCall(o_dialog_menubox, mouse_mx + ui(8), mouse_my + ui(8)); dia.setMenu(contentMenu); } } - var spr_x = list_height / 2 + 8 + 6; + var spr_x = list_height / 2 + ui(14); var spr_y = yy + list_height / 2; - var spr_s = list_height - 8; + var spr_s = list_height - ui(8); if(variable_struct_exists(_node, "spr") && sprite_exists(_node.spr)) { var sw = sprite_get_width(_node.spr); var sh = sprite_get_height(_node.spr); @@ -155,12 +155,11 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { var sy = spr_y + yo; draw_sprite_ext(_node.spr, frame, sx, sy, ss, ss, 0, c_white, 1); - } else { - draw_sprite_ext(s_group_24, 0, spr_x, spr_y, 0.75, 0.75, 0, c_white, 1); - } + } else + draw_sprite_ui_uniform(s_group_24, 0, spr_x, spr_y, 0.75, c_white); draw_set_text(f_p2, fa_left, fa_center, c_white); - draw_text(list_height + 8 + 12, yy + list_height / 2, _node.name); + draw_text(list_height + ui(20), yy + list_height / 2, _node.name); yy += list_height; hh += list_height; @@ -170,12 +169,12 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { return hh; }); - folderPane = new scrollPane(group_w - 8, content_h, function(_y, _m) { + folderPane = new scrollPane(group_w - ui(8), content_h, function(_y, _m) { draw_clear(c_ui_blue_black); - var hh = 8; + var hh = ui(8); for(var i = 0; i < ds_list_size(root.subDir); i++) { - var hg = root.subDir[| i].draw(self, 8, _y, _m, folderPane.w - 16, HOVER == panel, FOCUS == panel, root); + var hg = root.subDir[| i].draw(self, ui(8), _y, _m, folderPane.w - ui(16), HOVER == panel, FOCUS == panel, root); hh += hg; _y += hg; } @@ -184,10 +183,10 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { }); function onResize() { - content_w = w - 24 - group_w; - content_h = h - 40 - 16; + content_w = w - ui(24) - group_w; + content_h = h - ui(40) - ui(16); contentPane.resize(content_w, content_h); - folderPane.resize(group_w - 8, content_h); + folderPane.resize(group_w - ui(8), content_h); } function setContext(cont) { @@ -213,20 +212,21 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { function drawContent() { draw_clear_alpha(c_ui_blue_black, 0); - var content_y = 48; - draw_sprite_stretched(s_ui_panel_bg, 1, group_w, content_y, content_w + 16, content_h); + var content_y = ui(48); + draw_sprite_stretched(s_ui_panel_bg, 1, group_w, content_y, content_w + ui(16), content_h); contentPane.active = HOVER == panel; - contentPane.draw(group_w + 8, content_y, mx - group_w - 8, my - content_y); + contentPane.draw(group_w + ui(8), content_y, mx - group_w - ui(8), my - content_y); folderPane.active = HOVER == panel; folderPane.draw(0, content_y, mx, my - content_y); - var _x = 16; - var _y = 24; + var _x = ui(16); + var _y = ui(24); + var bh = line_height(f_p0b, 8); for( var i = 0; i < array_length(roots); i++ ) { var r = roots[i]; - var b = buttonInstant(s_button_hide_fill, _x - 8, _y - 14, string_width(r[0]) + 20, string_height(r[0]) + 8, [mx, my], FOCUS == panel, HOVER == panel); + var b = buttonInstant(s_button_hide_fill, _x - ui(8), _y - bh / 2, string_width(r[0]) + ui(20), bh, [mx, my], FOCUS == panel, HOVER == panel); if(b == 2) { mode = i; root = r[1]; @@ -235,11 +235,11 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { draw_set_text(f_p0b, fa_left, fa_center, i == mode? c_ui_blue_white : c_ui_blue_dkgrey); draw_text(_x, _y, r[0]); - _x += string_width(r[0]) + 20; + _x += string_width(r[0]) + ui(20); } - var bx = w - 16 - 24; - var by = 12; + var bx = w - ui(40); + var by = ui(12); //tb_search.hover = HOVER == panel; //tb_search.focus = FOCUS == panel; @@ -252,16 +252,16 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { if(FOCUS == panel) tb_search.editText(); - if(buttonInstant(s_button_hide, bx, by, 24, 24, [mx, my], FOCUS == panel, HOVER == panel, contentView? "Grid view" : "List view", s_view_mode, contentView) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(24), ui(24), [mx, my], FOCUS == panel, HOVER == panel, contentView? "Grid view" : "List view", s_view_mode, contentView) == 2) { contentView = !contentView; } - bx -= 32; + bx -= ui(32); if(mode == 0) { if(context != root) { - if(buttonInstant(s_button_hide, bx, by, 24, 24, [mx, my], FOCUS == panel, HOVER == panel, "Add selecting node as collection", s_add_24, 0, c_ui_lime) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(24), ui(24), [mx, my], FOCUS == panel, HOVER == panel, "Add selecting node as collection", s_add_24, 0, c_ui_lime) == 2) { if(PANEL_INSPECTOR.inspecting != noone) { - var dia = dialogCall(o_dialog_file_name, mouse_mx + 8, mouse_my + 8); + var dia = dialogCall(o_dialog_file_name, mouse_mx + ui(8), mouse_my + ui(8)); data_path = context.path; if(PANEL_INSPECTOR.inspecting) dia.tb_name._input_text = PANEL_INSPECTOR.inspecting.name; @@ -279,38 +279,38 @@ function Panel_Collection(_panel) : PanelContent(_panel) constructor { } } } else { - draw_sprite_ext(s_add_24, 0, bx + 12, by + 12, 1, 1, 0, c_ui_blue_dkgrey, 1); + draw_sprite_ui_uniform(s_add_24, 0, bx + ui(12), by + ui(12), 1, c_ui_blue_dkgrey); } - bx -= 32; + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 24, 24, [mx, my], FOCUS == panel, HOVER == panel, "Add folder") == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(24), ui(24), [mx, my], FOCUS == panel, HOVER == panel, "Add folder") == 2) { var dia = dialogCall(o_dialog_file_name, mouse_mx + 8, mouse_my + 8); dia.onModify = function (txt) { directory_create(txt); }; dia.path = context.path + "\\"; } - draw_sprite_ext(s_folder_add, 0, bx + 12, by + 12, 1, 1, 0, c_ui_blue_grey, 1); - draw_sprite_ext(s_folder_add, 1, bx + 12, by + 12, 1, 1, 0, c_ui_lime, 1); - bx -= 32; + draw_sprite_ui_uniform(s_folder_add, 0, bx + ui(12), by + ui(12), 1, c_ui_blue_grey); + draw_sprite_ui_uniform(s_folder_add, 1, bx + ui(12), by + ui(12), 1, c_ui_lime); + bx -= ui(32); } - if(buttonInstant(s_button_hide, bx, by, 24, 24, [mx, my], FOCUS == panel, HOVER == panel, "Open in file explorer", s_folder_24) == 2) { + if(buttonInstant(s_button_hide, bx, by, ui(24), ui(24), [mx, my], FOCUS == panel, HOVER == panel, "Open in file explorer", s_folder_24) == 2) { var _contPath = context.path; var _windir = environment_get_variable("WINDIR") + "/explorer.exe"; execute_shell_simple(_windir, _contPath); } - bx -= 32; + bx -= ui(32); - if(buttonInstant(s_button_hide, bx, by, 24, 24, [mx, my], FOCUS == panel, HOVER == panel, "Refresh", s_refresh_16) == 2) + if(buttonInstant(s_button_hide, bx, by, ui(24), ui(24), [mx, my], FOCUS == panel, HOVER == panel, "Refresh", s_refresh_16) == 2) refreshContext(); - bx -= 32; + bx -= ui(32); } else { - var tb_w = 200; - var tb_x = w - 10 - tb_w; - var tb_y = 10; + var tb_w = ui(200); + var tb_x = w - ui(10) - tb_w; + var tb_y = ui(10); - tb_search.draw(tb_x, tb_y, tb_w, 32, search_string, [mx, my]); + tb_search.draw(tb_x, tb_y, tb_w, TEXTBOX_HEIGHT, search_string, [mx, my]); } if(file_dragging) { diff --git a/scripts/panel_data/panel_data.gml b/scripts/panel_data/panel_data.gml index d4cbb37cf..79ecdf65b 100644 --- a/scripts/panel_data/panel_data.gml +++ b/scripts/panel_data/panel_data.gml @@ -19,8 +19,8 @@ function Panel(_parent, _x, _y, _w, _h) constructor { w = _w; h = _h; - min_w = 32; - min_h = 32; + min_w = ui(32); + min_h = ui(32); dragging = -1; drag_sval = 0; @@ -33,7 +33,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { surface_set_target(mask_surface); draw_clear(c_black); gpu_set_blendmode(bm_subtract); - draw_sprite_stretched(s_ui_panel_bg, 0, 2, 2, w - 4, h - 4); + draw_sprite_stretched(s_ui_panel_bg, 0, ui(2), ui(2), w - ui(4), h - ui(4)); gpu_set_blendmode(bm_normal); surface_reset_target(); } @@ -201,7 +201,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { if(content) content.onStepBegin(); if(dragging == 1) { - var _mx = clamp(mouse_mx, 16, WIN_W - 16); + var _mx = clamp(mouse_mx, ui(16), WIN_W - ui(16)); var dw = _mx - drag_sm; var res = true; @@ -236,7 +236,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { if(mouse_check_button_released(mb_left)) dragging = -1; } else if(dragging == 2) { - var _my = clamp(mouse_my, 16, WIN_H - 16); + var _my = clamp(mouse_my, ui(16), WIN_H - ui(16)); var dh = _my - drag_sm; var res = true; @@ -277,12 +277,12 @@ function Panel(_parent, _x, _y, _w, _h) constructor { } if(ds_list_empty(childs)) { - if(point_in_rectangle(mouse_mx, mouse_my, x + 2, y + 2, x + w - 4, y + h - 4)) { + if(point_in_rectangle(mouse_mx, mouse_my, x + ui(2), y + ui(2), x + w - ui(4), y + h - ui(4))) { HOVER = self; if(mouse_check_button_pressed(mb_left)) setFocus(self); if(mouse_check_button_pressed(mb_right)) setFocus(self); if(mouse_check_button_pressed(mb_middle)) setFocus(self); - if(FOCUS == self && content) + if(sFOCUS && content) FOCUS_STR = content.context_str; } } @@ -311,44 +311,47 @@ function Panel(_parent, _x, _y, _w, _h) constructor { var _panel = childs[| i]; _panel.draw(); - if(_drag && (HOVER == noone || is_struct(HOVER)) ) { - switch(_panel.anchor) { - case ANCHOR.left : - if(point_in_rectangle(mouse_mx, mouse_my, _panel.x + _panel.w - 2, _panel.y, _panel.x + _panel.w + 2, _panel.y + _panel.h)) { - CURSOR = cr_size_we; - if(mouse_check_button_pressed(mb_left)) { - dragging = 1; - drag_sval = _panel.w; - drag_sm = mouse_mx; - } - } + if!(_drag && (HOVER == noone || is_struct(HOVER))) + continue; + + switch(_panel.anchor) { + case ANCHOR.left : + if(!point_in_rectangle(mouse_mx, mouse_my, _panel.x + _panel.w - ui(2), _panel.y, _panel.x + _panel.w + ui(2), _panel.y + _panel.h)) break; - case ANCHOR.top : - if(point_in_rectangle(mouse_mx, mouse_my, _panel.x, _panel.y + _panel.h - 2, _panel.x + _panel.w, _panel.y + _panel.h + 2)) { - CURSOR = cr_size_ns; - if(mouse_check_button_pressed(mb_left)) { - dragging = 2; - drag_sval = _panel.h; - drag_sm = mouse_my; - } - } + + CURSOR = cr_size_we; + if(mouse_check_button_pressed(mb_left)) { + dragging = 1; + drag_sval = _panel.w; + drag_sm = mouse_mx; + } + break; + case ANCHOR.top : + if(!point_in_rectangle(mouse_mx, mouse_my, _panel.x, _panel.y + _panel.h - ui(2), _panel.x + _panel.w, _panel.y + _panel.h + ui(2))) break; - } + + CURSOR = cr_size_ns; + if(mouse_check_button_pressed(mb_left)) { + dragging = 2; + drag_sval = _panel.h; + drag_sm = mouse_my; + } + break; } } } } function drawPanel() { - if(w <= 16) return; - draw_sprite_stretched(s_ui_panel_bg, 0, x + 2, y + 2, w - 4, h - 4); + if(w <= ui(16)) return; + draw_sprite_stretched(s_ui_panel_bg, 0, x + ui(2), y + ui(2), w - ui(4), h - ui(4)); if(!is_surface(mask_surface)) { mask_surface = surface_create_valid(w, h); resetMask(); } - if(!is_surface(content_surface)) content_surface = surface_create(w, h); + if(!is_surface(content_surface)) content_surface = surface_create_valid(w, h); surface_set_target(content_surface); draw_clear(c_ui_blue_black); if(content) { @@ -365,7 +368,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { draw_surface_safe(content_surface, x, y); - if(FOCUS == self) draw_sprite_stretched(s_ui_panel_active, 0, x + 2, y + 2, w - 4, h - 4); + if(sFOCUS) draw_sprite_stretched(s_ui_panel_active, 0, x + ui(2), y + ui(2), w - ui(4), h - ui(4)); } function remove() { @@ -395,8 +398,8 @@ function PanelContent(_panel) constructor { mx = 0; my = 0; - min_w = 32; - min_h = 32; + min_w = ui(32); + min_h = ui(32); function refresh() { onResize(); diff --git a/scripts/panel_function/panel_function.gml b/scripts/panel_function/panel_function.gml index 89b860ccf..6da70d6fc 100644 --- a/scripts/panel_function/panel_function.gml +++ b/scripts/panel_function/panel_function.gml @@ -35,40 +35,40 @@ function setPanel() { PANEL_MAIN = new Panel(noone, 0, 0, WIN_SW, WIN_SH); - var split_menu = PANEL_MAIN.split_v(40 * DISP_SCALE); + var split_menu = PANEL_MAIN.split_v(ui(40)); PANEL_MENU = new Panel_Menu(split_menu[0]); - var split_ins = split_menu[1].split_h(-400 * DISP_SCALE); + var split_ins = split_menu[1].split_h(ui(-400)); PANEL_INSPECTOR = new Panel_Inspector(split_ins[1]); switch(PREF_MAP[? "panel_layout"]) { case 0 : - var split_anim = split_ins[0].split_v(-48 * DISP_SCALE); + var split_anim = split_ins[0].split_v(ui(-48)); PANEL_ANIMATION = new Panel_Animation(split_anim[1]); - var split_prev = split_anim[0].split_v(-500 * DISP_SCALE); + var split_prev = split_anim[0].split_v(ui(-500)); PANEL_PREVIEW = new Panel_Preview(split_prev[0]); PANEL_GRAPH = new Panel_Graph(split_prev[1]); if(PREF_MAP[? "panel_collection"]) { - var pane = PANEL_GRAPH.panel.split_h(460 * DISP_SCALE); + var pane = PANEL_GRAPH.panel.split_h(ui(460)); if(pane == noone) break; pane[1].set(PANEL_GRAPH); PANEL_COLLECTION = new Panel_Collection(pane[0]); } break; case 1 : - var split_anim = split_ins[0].split_v(-300 * DISP_SCALE); + var split_anim = split_ins[0].split_v(ui(-300)); PANEL_ANIMATION = new Panel_Animation(split_anim[1]); - var split_prev = split_anim[0].split_h(400 * DISP_SCALE); + var split_prev = split_anim[0].split_h(ui(400)); PANEL_PREVIEW = new Panel_Preview(split_prev[0]); PANEL_GRAPH = new Panel_Graph(split_prev[1]); if(PREF_MAP[? "panel_collection"]) { - var pane = PANEL_ANIMATION.panel.split_h(500 * DISP_SCALE); + var pane = PANEL_ANIMATION.panel.split_h(ui(500)); if(pane == noone) break; pane[1].set(PANEL_ANIMATION); PANEL_COLLECTION = new Panel_Collection(pane[0]); diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 31c73e344..e136dc9bb 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -3,7 +3,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { scale = [ 0.25, 0.33, 0.5, 0.65, 0.8, 1, 1.2, 1.35, 1.5]; graph_s_index = 5; - graph_s = scale[graph_s_index]; + graph_s = ui(scale[graph_s_index]); graph_s_to = graph_s; graph_line_s = 32; grid_opacity = 0.5; @@ -57,8 +57,8 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { drag_key = mb_middle; minimap_show = false; - minimap_w = 160; - minimap_h = 160; + minimap_w = ui(160); + minimap_h = ui(160); minimap_surface = -1; minimap_panning = false; @@ -70,7 +70,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { drag_locking = false; - toolbar_height = 40; + toolbar_height = ui(40); toolbars = [ [ s_icon_center_canvas, @@ -101,7 +101,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { function() { return 0; }, function() { return "Grid setting" }, function(param) { - var gs = dialogCall(o_dialog_inspector_grid, param.x, param.y); + var gs = dialogCall(o_dialog_graph_grid, param.x, param.y); gs.anchor = ANCHOR.bottom | ANCHOR.left; } ], @@ -200,7 +200,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { } graph_x = round(w / 2 / graph_s - (minx + maxx) / 2); - graph_y = round(h / 2 / graph_s - (miny + maxy) / 2); + graph_y = round((h - toolbar_height) / 2 / graph_s - (miny + maxy) / 2); } function dragGraph() { @@ -240,11 +240,11 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { var _s = graph_s; if(mouse_wheel_down()) { graph_s_index = max(0, graph_s_index - 1); - graph_s_to = scale[graph_s_index]; + graph_s_to = ui(scale[graph_s_index]); } if(mouse_wheel_up()) { graph_s_index = min(array_length(scale) - 1, graph_s_index + 1); - graph_s_to = scale[graph_s_index]; + graph_s_to = ui(scale[graph_s_index]); } graph_s = lerp_float(graph_s, graph_s_to, 3); @@ -343,7 +343,7 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { var _y = (_node.y + graph_y) * graph_s; var _w = _node.w * graph_s; var _h = _node.h * graph_s; - + if(rectangle_inside_rectangle(fx0, fy0, fx1, fy1, _x, _y, _x + _w, _y + _h)) ds_list_add(nodes_select_list, _node); } @@ -940,7 +940,8 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { function drawContext() { draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); - var xx = 16, tt, tw, th; + var xx = ui(16), tt, tw, th; + var bh = toolbar_height - ui(10); var tbh = h - toolbar_height / 2; draw_set_color(c_ui_blue_ltgrey); @@ -956,12 +957,12 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { th = string_height(tt); if(i < ds_list_size(node_context) - 1) { - if(buttonInstant(s_button_hide_fill, xx - 6, tbh - 14, tw + 12, 26, [mx, my], FOCUS == panel, HOVER == panel) == 2) { + if(buttonInstant(s_button_hide_fill, xx - ui(6), tbh - bh / 2, tw + ui(12), bh, [mx, my], FOCUS == panel, HOVER == panel) == 2) { node_hover = noone; node_focus = noone; PANEL_PREVIEW.preview_node[0] = noone; PANEL_PREVIEW.preview_node[1] = noone; - + if(i == -1) { ds_list_clear(node_context); nodes_list = NODES; @@ -977,17 +978,19 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { } } - draw_sprite_ext(s_arrow_16, 0, xx + tw + 16, tbh, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_arrow_16, 0, xx + tw + ui(16), tbh, 1, c_ui_blue_grey); } + draw_set_alpha(i < ds_list_size(node_context) - 1? 0.5 : 1); draw_text(xx, tbh - 2, tt); draw_set_alpha(1); xx += tw; - xx += 32; + xx += ui(32); } } function drawToolBar() { + toolbar_height = ui(40); var ty = h - toolbar_height; if(point_in_rectangle(mx, my, 0, ty, w, h)) @@ -1010,31 +1013,31 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { var tbInd = tb[1](); var tbTooltip = tb[2](); - var b = buttonInstant(s_button_hide, tbx - 14, tby - 14, 28, 28, [mx, my], FOCUS == panel, HOVER == panel, tbTooltip, tbSpr, tbInd); - if(b == 2) tb[3]( { x: x + tbx - 14, y: y + tby - 14 } ); + var b = buttonInstant(s_button_hide, tbx - ui(14), tby - ui(14), ui(28), ui(28), [mx, my], FOCUS == panel, HOVER == panel, tbTooltip, tbSpr, tbInd); + if(b == 2) tb[3]( { x: x + tbx - ui(14), y: y + tby - ui(14) } ); - tbx -= 32; + tbx -= ui(32); } draw_set_color(c_ui_blue_dkblack); - draw_line_width(tbx + 12, tby - toolbar_height / 2 + 8, tbx + 12, tby + toolbar_height / 2 - 8, 2); + draw_line_width(tbx + ui(12), tby - toolbar_height / 2 + ui(8), tbx + ui(12), tby + toolbar_height / 2 - ui(8), 2); } function drawMinimap() { - var mx1 = w - 8; - var my1 = h - toolbar_height - 8; + var mx1 = w - ui(8); + var my1 = h - toolbar_height - ui(8); var mx0 = mx1 - minimap_w; var my0 = my1 - minimap_h; - minimap_w = min(minimap_w, w - 16); - minimap_h = min(minimap_h, h - 16 - toolbar_height); + minimap_w = min(minimap_w, w - ui(16)); + minimap_h = min(minimap_h, h - ui(16) - toolbar_height); if(point_in_rectangle(mx, my, mx0, my0, mx1, my1)) mouse_on_graph = false; - var hover = point_in_rectangle(mx, my, mx0, my0, mx1, my1) && !point_in_rectangle(mx, my, mx0, my0, mx0 + 16, my0 + 16) && !minimap_dragging; + var hover = point_in_rectangle(mx, my, mx0, my0, mx1, my1) && !point_in_rectangle(mx, my, mx0, my0, mx0 + ui(16), my0 + ui(16)) && !minimap_dragging; if(!is_surface(minimap_surface) || surface_get_width(minimap_surface) != minimap_w || surface_get_height(minimap_surface) != minimap_h) { - minimap_surface = surface_create(minimap_w, minimap_h); + minimap_surface = surface_create_valid(minimap_w, minimap_h); } surface_set_target(minimap_surface); @@ -1100,15 +1103,15 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { var sw = minimap_drag_sx + minimap_drag_mx - mx; var sh = minimap_drag_sy + minimap_drag_my - my; - minimap_w = max(64, sw); - minimap_h = max(64, sh); + minimap_w = max(ui(64), sw); + minimap_h = max(ui(64), sh); if(mouse_check_button_released(mb_left)) minimap_dragging = false; } - if(point_in_rectangle(mx, my, mx0, my0, mx0 + 16, my0 + 16)) { - draw_sprite_ext(s_node_resize, 0, mx0 + 2, my0 + 2, 1, 1, 180, c_white, 0.6); + if(point_in_rectangle(mx, my, mx0, my0, mx0 + ui(16), my0 + ui(16))) { + draw_sprite_ui(s_node_resize, 0, mx0 + ui(2), my0 + ui(2), 1, 1, 180, c_white, 0.6); if(mouse_check_button_pressed(mb_left)) { minimap_dragging = true; minimap_drag_sx = minimap_w; @@ -1117,13 +1120,13 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { minimap_drag_my = my; } } else - draw_sprite_ext(s_node_resize, 0, mx0 + 2, my0 + 2, 1, 1, 180, c_white, 0.3); + draw_sprite_ui(s_node_resize, 0, mx0 + ui(2), my0 + ui(2), 1, 1, 180, c_white, 0.3); } function addContext(node) { recordAction(ACTION_TYPE.var_modify, self, [nodes_list, "nodes_list"]); recordAction(ACTION_TYPE.list_insert, node_context, [node, ds_list_size(node_context)]); - + nodes_list = node.nodes; ds_list_add(node_context, node); @@ -1165,12 +1168,12 @@ function Panel_Graph(_panel) : PanelContent(_panel) constructor { if(show_grid) drawGrid(); draw_set_text(f_p0, fa_right, fa_top, c_ui_blue_ltgrey); - draw_text(w - 8, 08, "x" + string(graph_s_to)); + draw_text(w - ui(8), ui(8), "x" + string(graph_s_to)); if(UPDATE == RENDER_TYPE.full) - draw_text(w - 8, 28, "Rendering..."); + draw_text(w - ui(8), ui(28), "Rendering..."); else if(UPDATE == RENDER_TYPE.full) - draw_text(w - 8, 28, "Rendering partial..."); + draw_text(w - ui(8), ui(28), "Rendering partial..."); drawNodes(); drawJunctionConnect(); diff --git a/scripts/panel_inspector/panel_inspector.gml b/scripts/panel_inspector/panel_inspector.gml index b7d1ebdc3..69affbc84 100644 --- a/scripts/panel_inspector/panel_inspector.gml +++ b/scripts/panel_inspector/panel_inspector.gml @@ -7,18 +7,18 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { context_str = "Inspector"; inspecting = noone; - top_bar_h = 64; + top_bar_h = ui(64); prop_hover = noone; prop_selecting = noone; - content_w = w - 32; - content_h = h - top_bar_h - 24; + content_w = w - ui(32); + content_h = h - top_bar_h - ui(24); keyframe_dragging = noone; keyframe_drag_st = 0; - min_w = 160; + min_w = ui(160); lineBreak = true; tb_node_name = new textBox(TEXTBOX_INPUT.text, function(txt) { @@ -43,11 +43,11 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { prop_hover = noone; var jun; var amo = inspecting.input_display_list == -1? ds_list_size(inspecting.inputs) : array_length(inspecting.input_display_list); - var hh = 16; + var hh = ui(8); for(var i = 0; i < amo; i++) { var xc = con_w / 2; - var yy = 16 + hh + _y; + var yy = hh + _y; if(inspecting.input_display_list == -1) { jun = inspecting.inputs[| i]; @@ -57,20 +57,20 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { var txt = jun_disp[0]; var coll = jun_disp[1]; - if(HOVER == panel && point_in_rectangle(_m[0], _m[1], 0, yy, con_w, yy + 32)) { - draw_sprite_stretched_ext(s_node_name, 0, 0, yy, con_w, 32, c_ui_blue_white, 1); + if(HOVER == panel && point_in_rectangle(_m[0], _m[1], 0, yy, con_w, yy + ui(32))) { + draw_sprite_stretched_ext(s_node_name, 0, 0, yy, con_w, ui(32), c_ui_blue_white, 1); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { jun_disp[@ 1] = !coll; } } else - draw_sprite_stretched_ext(s_node_name, 0, 0, yy, con_w, 32, c_ui_blue_ltgrey, 1); + draw_sprite_stretched_ext(s_node_name, 0, 0, yy, con_w, ui(32), c_ui_blue_ltgrey, 1); - draw_sprite_ext(s_arrow_16, 0, 16, yy + 32 / 2, 1, 1, -90 + coll * 90, c_ui_blue_ltgrey, 1); + draw_sprite_ui(s_arrow_16, 0, ui(16), yy + ui(32) / 2, 1, 1, -90 + coll * 90, c_ui_blue_ltgrey, 1); draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_white); - draw_text(32, yy + 32 / 2, txt); + draw_text(ui(32), yy + ui(32) / 2, txt); - hh += 32 + 8 + 16 * !coll; + hh += ui(32 + 8); if(coll) { var j = i + 1; @@ -83,13 +83,13 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } i = j - 1; continue; - } else - continue; + } + continue; } else if(is_struct(jun_disp) && instanceof(jun_disp) == "Inspector_Custom_Renderer") { var hov = HOVER == panel; var foc = FOCUS == panel; - jun_disp.draw(6, yy, con_w - 12, _m, hov, foc); - hh += jun_disp.h + 20; + jun_disp.draw(ui(6), yy, con_w - ui(12), _m, hov, foc); + hh += jun_disp.h + ui(20); continue; } jun = inspecting.inputs[| inspecting.input_display_list[i]]; @@ -97,11 +97,14 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { if(!jun.show_in_inspector || jun.type == VALUE_TYPE.object) continue; - var butx = 16; + var lb_h = line_height(f_p0) + ui(8); + var lb_y = yy + lb_h / 2; + + var butx = ui(16); var index = jun.value_from == noone? jun.animator.is_anim : 2; - draw_sprite_ext(s_animate_clock, index, butx, yy, 1, 1, 0, c_white, 0.8); - if(HOVER == panel && point_in_circle(_m[0], _m[1], butx, yy, 10)) { - draw_sprite_ext(s_animate_clock, index, butx, yy, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_animate_clock, index, butx, lb_y, 1, c_white, 0.8); + if(HOVER == panel && point_in_circle(_m[0], _m[1], butx, lb_y, ui(10))) { + draw_sprite_ui_uniform(s_animate_clock, index, butx, lb_y, 1, c_white, 1); TOOLTIP = "Toggle animation"; if(mouse_check_button_pressed(mb_left)) { @@ -113,11 +116,11 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } } - butx += 20; + butx += ui(20); index = jun.visible; - draw_sprite_ext(s_junc_visible, index, butx, yy, 1, 1, 0, c_white, 0.8); - if(HOVER == panel && point_in_circle(_m[0], _m[1], butx, yy, 10)) { - draw_sprite_ext(s_junc_visible, index, butx, yy, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(s_junc_visible, index, butx, lb_y, 1, c_white, 0.8); + if(HOVER == panel && point_in_circle(_m[0], _m[1], butx, lb_y, ui(10))) { + draw_sprite_ui_uniform(s_junc_visible, index, butx, lb_y, 1, c_white, 1); TOOLTIP = "Visibility"; if(mouse_check_button_pressed(mb_left)) { @@ -126,14 +129,14 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text(56, yy, jun.name); - var labelStringWidth = string_width(jun.name) + 32; + draw_text(ui(56), lb_y - ui(2), jun.name); + var lb_w = string_width(jun.name) + ui(32); #region anim if(lineBreak && jun.animator.is_anim) { - var bx = w - 72; - var by = yy - 12; - if(buttonInstant(s_button_hide, bx, by, 24, 24, _m, FOCUS == panel, HOVER == panel, "", s_prop_keyframe, 2) == 2) { + var bx = w - ui(64); + var by = lb_y; + if(buttonInstant(s_button_hide, bx - ui(12), by - ui(12), ui(24), ui(24), _m, FOCUS == panel, HOVER == panel, "", s_prop_keyframe, 2) == 2) { for(var j = 0; j < ds_list_size(jun.animator.values); j++) { var _key = jun.animator.values[| j]; if(_key.time > ANIMATOR.current_frame) { @@ -144,7 +147,7 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } } - bx -= 26; + bx -= ui(26); var cc = c_ui_blue_grey; for(var j = 0; j < ds_list_size(jun.animator.values); j++) { if(jun.animator.values[| j].time == ANIMATOR.current_frame) { @@ -153,7 +156,7 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } } - if(buttonInstant(s_button_hide, bx, by, 24, 24, _m, FOCUS == panel, HOVER == panel, cc == c_ui_blue_grey? "Add keyframe" : "Remove keyframe", s_prop_keyframe, 1, cc) == 2) { + if(buttonInstant(s_button_hide, bx - ui(12), by - ui(12), ui(24), ui(24), _m, FOCUS == panel, HOVER == panel, cc == c_ui_blue_grey? "Add keyframe" : "Remove keyframe", s_prop_keyframe, 1, cc) == 2) { var _add = false; for(var j = 0; j < ds_list_size(jun.animator.values); j++) { var _key = jun.animator.values[| j]; @@ -171,8 +174,8 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { if(!_add) ds_list_add(jun.animator.values, new valueKey(ANIMATOR.current_frame, jun.getValue(), jun.animator)); } - bx -= 26; - if(buttonInstant(s_button_hide, bx, by, 24, 24, _m, FOCUS == panel, HOVER == panel, "", s_prop_keyframe, 0) == 2) { + bx -= ui(26); + if(buttonInstant(s_button_hide, bx - ui(12), by - ui(12), ui(24), ui(24), _m, FOCUS == panel, HOVER == panel, "", s_prop_keyframe, 0) == 2) { var _t = -1; for(var j = 0; j < ds_list_size(jun.animator.values); j++) { var _key = jun.animator.values[| j]; @@ -184,39 +187,39 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { ANIMATOR.is_scrubing = true; } + var lhf = lb_h / 2 - 4; draw_set_color(c_ui_blue_dkgrey); - draw_line(bx - 6, by + 4, bx - 6, by + 20); - + draw_line(bx - ui(20), by - lhf, bx - ui(20), by + lhf); + draw_set_color(c_ui_blue_dkgrey); - draw_line(bx - 6, by + 4, bx - 6, by + 20); + draw_line(bx - ui(20), by - lhf, bx - ui(20), by + lhf); - bx -= 26 + 12; - if(buttonInstant(s_button_hide, bx, by, 24, 24, _m, FOCUS == panel, HOVER == panel, "Looping mode " + ON_END_NAME[jun.on_end], s_prop_on_end, jun.on_end) == 2) + bx -= ui(26 + 12); + if(buttonInstant(s_button_hide, bx - ui(12), by - ui(12), ui(24), ui(24), _m, FOCUS == panel, HOVER == panel, "Looping mode " + ON_END_NAME[jun.on_end], s_prop_on_end, jun.on_end) == 2) jun.on_end = safe_mod(jun.on_end + 1, sprite_get_number(s_prop_on_end)); } #endregion - - var _hsx = 32; - var _hsy = yy + 20; - var _hex = _hsx + w - 80; - var _hey = _hsy + 34; - var padd = lineBreak? 48 : 28; - - var labelWidth = max(labelStringWidth, min(80 + w * 0.2, 200)); - var editBoxW = lineBreak? w - 80 : w - 80 - labelWidth; - var editBoxH = lineBreak? 34 : 30; - var editBoxX = lineBreak? 32 : 32 + labelWidth; - var editBoxY = lineBreak? _hsy : _hsy - 36; - - var widH = lineBreak? 34 : 16; - + + //TODO: Fix padding to be consistant to every widget + var _hsx = ui(32); + var _hsy = yy + lb_h; + var padd = ui(8); + + var labelWidth = max(lb_w, min(ui(80) + w * 0.2, ui(200))); + var editBoxW = w - ui(80) - !lineBreak * labelWidth; + var editBoxH = lineBreak? TEXTBOX_HEIGHT : lb_h; + var editBoxX = ui(32) + !lineBreak * labelWidth; + var editBoxY = lineBreak? _hsy : yy; + + var widH = lineBreak? editBoxH : 0; + if(jun.editWidget) { jun.editWidget.active = FOCUS == panel; jun.editWidget.hover = HOVER == panel; switch(jun.display_type) { case VALUE_DISPLAY.button : - jun.editWidget.draw(32, _hsy, w - 80, 34, _m); + jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, _m); break; default : switch(jun.type) { @@ -231,44 +234,36 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { break; case VALUE_DISPLAY.vector_range : jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.showValue(), _m); - widH = 68; break; case VALUE_DISPLAY.enum_scroll : - jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.display_data[jun.showValue()], _m, 16 + x, top_bar_h + y); + jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.display_data[jun.showValue()], _m, ui(16) + x, top_bar_h + y); break; case VALUE_DISPLAY.padding : - editBoxY = _hsy + 50; - jun.editWidget.draw(xc, editBoxY, jun.showValue(), jun.modifier, _m); - - padd = 48; - widH = 216; + jun.editWidget.draw(xc, _hsy + ui(32), jun.showValue(), jun.modifier, _m); + widH = ui(192); break; case VALUE_DISPLAY.rotation : case VALUE_DISPLAY.rotation_range : jun.editWidget.draw(xc, _hsy, jun.showValue(), _m); - padd = 48; - widH = 94; + widH = ui(96); break; case VALUE_DISPLAY.slider : case VALUE_DISPLAY.slider_range : jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.showValue(), _m); break; case VALUE_DISPLAY.area : - jun.editWidget.draw(xc, _hsy + 40, jun.showValue(), _m); - padd = 48; - widH = 200; + jun.editWidget.draw(xc, _hsy + ui(40), jun.showValue(), _m); + widH = ui(204); break; case VALUE_DISPLAY.puppet_control : - widH = jun.editWidget.draw(editBoxX, editBoxY, editBoxW, jun.showValue(), _m, 16 + x, top_bar_h + y); - padd = 48; + jun.editWidget.draw(editBoxX, editBoxY, editBoxW, jun.showValue(), _m, ui(16) + x, top_bar_h + y); + widH = ui(164); break; } - break; case VALUE_TYPE.boolean : editBoxX = lineBreak? editBoxX : (labelWidth + con_w) / 2; - jun.editWidget.draw(editBoxX, editBoxY, jun.showValue(), _m); - widH = lineBreak? 26 : 16; + jun.editWidget.draw(editBoxX, editBoxY, jun.showValue(), _m, editBoxH); break; case VALUE_TYPE.color : switch(jun.display_type) { @@ -290,25 +285,24 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { txt = val; jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, _m,, pathExist? c_white : c_ui_red); - var icx = editBoxX + editBoxW - 16; + var icx = editBoxX + editBoxW - ui(16); var icy = editBoxY + editBoxH / 2; - draw_sprite_ext(pathExist? s_button_path_icon : s_button_path_not_found_icon, 0, icx, icy, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(pathExist? s_button_path_icon : s_button_path_not_found_icon, 0, icx, icy, 1, c_white, 1); draw_set_text(f_p0, fa_left, fa_center, c_white); - draw_text_cut(editBoxX + 8, editBoxY + 17, txt, editBoxW - 60); + draw_text_cut(editBoxX + ui(8), editBoxY + editBoxH / 2, txt, editBoxW - ui(60)); - if(!pathExist && point_in_rectangle(_m[0], _m[1], icx - 17, icy - 17, icx + 17, icy + 17)) + if(!pathExist && point_in_rectangle(_m[0], _m[1], icx - ui(17), icy - ui(17), icx + ui(17), icy + ui(17))) TOOLTIP = "File not exist"; break; case VALUE_TYPE.surface : - editBoxH = 96; - jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.showValue(), _m, 16 + x, top_bar_h + y); - widH = editBoxH; + editBoxH = ui(96); + jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.showValue(), _m, ui(16) + x, top_bar_h + y); + widH = lineBreak? editBoxH : editBoxH - lb_h; break; case VALUE_TYPE.curve : - editBoxH = 160; - jun.editWidget.draw(32, _hsy, w - 80, editBoxH, jun.showValue(), _m); - widH = 136; - padd = 48; + editBoxH = ui(132); + jun.editWidget.draw(ui(32), _hsy, w - ui(80), editBoxH, jun.showValue(), _m); + widH = editBoxH; break; case VALUE_TYPE.text : var _hh = jun.editWidget.draw(editBoxX, editBoxY, editBoxW, editBoxH, jun.showValue(), _m, jun.display_type); @@ -318,23 +312,34 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } } else if(jun.display_type == VALUE_DISPLAY.label) { draw_set_text(f_p1, fa_left, fa_top, c_ui_blue_ltgrey); - draw_text(32, _hsy, jun.display_data); + draw_text(ui(32), _hsy, jun.display_data); widH = string_height(jun.display_data); } - _hey = _hsy + widH; - hh += widH + padd; + if(false) { + var __hsy = yy; + draw_set_alpha(0.5); + draw_set_color(c_ui_blue_grey); + draw_rectangle(ui(8), __hsy, contentPane.w - ui(16), __hsy + lb_h, 0); __hsy += lb_h; + draw_set_color(c_ui_orange); + draw_rectangle(ui(8), __hsy, contentPane.w - ui(16), __hsy + widH, 0); __hsy += widH; + draw_set_color(c_ui_lime); + draw_rectangle(ui(8), __hsy, contentPane.w - ui(16), __hsy + padd, 0); + draw_set_alpha(1); + } - var _selY = min(yy - 16, editBoxY - 4); - var _selY1 = max(yy + 20, editBoxY + widH + 4); + hh += lb_h + widH + padd; + + var _selY = yy - ui(0); + var _selY1 = max(yy + lb_h, editBoxY + widH + ui(4)); var _selH = _selY1 - _selY; if(prop_selecting == jun) - draw_sprite_stretched(s_prop_selecting, 1, 4, _selY, contentPane.surface_w - 8, _selH); + draw_sprite_stretched(s_prop_selecting, 1, 4, _selY, contentPane.surface_w - ui(8), _selH); - if(HOVER == panel && point_in_rectangle(_m[0], _m[1], 4, _selY, contentPane.surface_w - 4, _selY + _selH)) { - draw_sprite_stretched(s_prop_selecting, 0, 4, _selY, contentPane.surface_w - 8, _selH); + if(HOVER == panel && point_in_rectangle(_m[0], _m[1], 4, _selY, contentPane.surface_w - ui(4), _selY + _selH)) { + draw_sprite_stretched(s_prop_selecting, 0, 4, _selY, contentPane.surface_w - ui(8), _selH); prop_hover = jun; if(FOCUS == panel) { @@ -378,8 +383,8 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { } function onResize() { - content_w = w - 32; - content_h = h - top_bar_h - 24; + content_w = w - ui(32); + content_h = h - top_bar_h - ui(24); contentPane.resize(content_w, content_h); } @@ -390,21 +395,21 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { tb_node_name.active = FOCUS == panel; tb_node_name.hover = HOVER == panel; tb_node_name.align = fa_center; - tb_node_name.draw(64, 14, w - 128, 32, inspecting.name, [mx, my]); + tb_node_name.draw(ui(64), ui(14), w - ui(128), ui(32), inspecting.name, [mx, my]); if(!inspecting.auto_update) { - var bx = w - 44; - var by = 12; + var bx = w - ui(44); + var by = ui(12); - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Run node", s_sequence_control, 1) == 2) + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "Run node", s_sequence_control, 1) == 2) inspecting.doUpdate(); } if(inspecting.use_cache) { - var bx = 8; - var by = 12; + var bx = ui(8); + var by = ui(12); - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "This node cache output for performance.\nClick to clear all cached frames in this node.", s_cache) = 2) + if(buttonInstant(s_button_hide, bx, by, ui(32), ui(32), [mx, my], FOCUS == panel, HOVER == panel, "This node cache output for performance.\nClick to clear all cached frames in this node.", s_cache) = 2) inspecting.clearCache(); } } @@ -413,13 +418,13 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { draw_clear_alpha(c_ui_blue_black, 0); lineBreak = w < PREF_MAP[? "inspector_line_break_width"]; - draw_sprite_stretched(s_ui_panel_bg, 1, 8, top_bar_h - 8, w - 16, h - top_bar_h); + draw_sprite_stretched(s_ui_panel_bg, 1, ui(8), top_bar_h - ui(8), w - ui(16), h - top_bar_h); if(inspecting) drawInspectingNode(); contentPane.active = HOVER == panel; - contentPane.draw(16, top_bar_h, mx - 16, my - top_bar_h); + contentPane.draw(ui(16), top_bar_h, mx - ui(16), my - top_bar_h); if(PANEL_GRAPH.node_focus && inspecting != PANEL_GRAPH.node_focus) { inspecting = PANEL_GRAPH.node_focus; diff --git a/scripts/panel_menu/panel_menu.gml b/scripts/panel_menu/panel_menu.gml index b622538f0..7db706ab0 100644 --- a/scripts/panel_menu/panel_menu.gml +++ b/scripts/panel_menu/panel_menu.gml @@ -1,11 +1,7 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { draggable = false; - notification = ""; - noti_icon = 0; - noti_timeout = 0; - noti_extra = []; - noti_extra_current = []; + noti_flash = 0; static menus = [ ["File", [ @@ -16,7 +12,7 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { [ "Save", function() { SAVE(); }, ["", "Save"] ], [ "Save as...", function() { SAVE_AS(); }, ["", "Save as"] ], [ "Recent files", function(_x, _y, _depth) { - var dia = instance_create_depth(_x - 4, _y, _depth - 1, o_dialog_menubox); + var dia = instance_create_depth(_x - ui(4), _y, _depth - 1, o_dialog_menubox); var arr = []; for(var i = 0; i < min(10, ds_list_size(RECENT_FILES)); i++) { var _rec = RECENT_FILES[| i]; @@ -80,25 +76,12 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { ]], ] - function showNoti(str, icon = -1) { - notification = str; - noti_extra_current = noti_extra; - noti_extra = []; - noti_timeout = 60 + string_length(str) * 15; - - noti_icon = icon; - } - - function addNotiExtra(str) { - array_push(noti_extra, str); - } - function drawContent() { draw_clear_alpha(c_ui_blue_black, 0); - draw_sprite_ext(icon_24, 0, 20, 20, 1, 1, 0, c_white, 1); - var xx = 40; + draw_sprite_ui_uniform(icon_24, 0, h / 2, h / 2, 1, c_white); + var xx = h; - if(FOCUS == panel && point_in_rectangle(mx, my, 0, 0, 40, 32)) { + if(FOCUS == panel && point_in_rectangle(mx, my, 0, 0, ui(40), ui(32))) { if(mouse_check_button_pressed(mb_left)) { dialogCall(o_dialog_about); } @@ -106,12 +89,12 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { for(var i = 0; i < array_length(menus); i++) { draw_set_text(f_p1, fa_center, fa_center, c_white); - var ww = string_width(menus[i][0]) + 16; + var ww = string_width(menus[i][0]) + ui(16); var xc = xx + ww / 2; if(HOVER == panel) { if(point_in_rectangle(mx, my, xc - ww / 2, 0, xc + ww / 2, h)) { - draw_sprite_stretched(s_menu_button, 0, xc - ww / 2, 6, ww, h - 12); + draw_sprite_stretched(s_menu_button, 0, xc - ww / 2, ui(6), ww, h - ui(12)); if((FOCUS == panel && mouse_check_button_pressed(mb_left)) || instance_exists(o_dialog_menubox)) { var dia = dialogCall(o_dialog_menubox, x + xx, y + h); @@ -126,53 +109,68 @@ function Panel_Menu(_panel) : PanelContent(_panel) constructor { xx += ww + 8; } - if(notification != "") { - draw_set_text(f_p0, fa_left, fa_center, c_ui_orange); + #region notification + var warning_amo = ds_list_size(WARNING); + var error_amo = ds_list_size(ERRORS); - var n_str = notification; - var ex = array_length(noti_extra_current); - if(ex) n_str += " with " + string(ex) + " warning" + ((ex > 1)? "s." : "."); - - var nx0 = xx + 24; - var nw = string_width(n_str) + 32 + (noti_icon != -1) * 24; + var nx0 = xx + ui(24); var ny0 = y + h / 2; - draw_sprite_stretched_ext(s_ui_panel_bg, 1, nx0, ny0 - 16, nw, 32, c_white, 1); - if(noti_icon != -1) - draw_sprite(noti_icon, 0, nx0 + 24, ny0); - draw_text(nx0 + 16 + (noti_icon != -1) * 24, ny0, n_str); - if(point_in_rectangle(mx, my, nx0, ny0 - 16, nx0 + nw, ny0 + 16)) { - var tip = ""; - for( var i = 0; i < ex; i++ ) { - tip += noti_extra_current[i] + "\n"; + draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_ltgrey); + var wr_w = ui(20) + ui(8) + string_width(string(warning_amo)); + var er_w = ui(20) + ui(8) + string_width(string(error_amo)); + + var nw = ui(16) + wr_w + ui(16) + er_w; + var nh = ui(32); + + noti_flash = lerp_linear(noti_flash, 0, 0.02); + var ev = animation_curve_eval(ac_flash, noti_flash); + var cc = merge_color(c_white, c_ui_orange, ev); + + if(point_in_rectangle(mx, my, nx0, ny0 - nh / 2, nx0 + nw, ny0 + nh / 2)) { + draw_sprite_stretched_ext(s_menu_button, 0, nx0, ny0 - nh / 2, nw, nh, cc, 1); + if(mouse_check_button_pressed(mb_left)) { + var dia = dialogCall(o_dialog_notifications, nx0, ny0 + nh / 2 + ui(4)); + dia.anchor = ANCHOR.left | ANCHOR.top; } - TOOLTIP = tip; - } else if(noti_timeout-- < 0) { - notification = ""; - noti_extra = []; - } - } + + TOOLTIP = string(warning_amo) + " warnings " + string(error_amo) + " errors"; + } else + draw_sprite_stretched_ext(s_ui_panel_bg, 1, nx0, ny0 - nh / 2, nw, nh, cc, 1); + + gpu_set_blendmode(bm_add); + draw_sprite_stretched_ext(s_menu_button_mask, 0, nx0, ny0 - nh / 2, nw, nh, cc, ev / 2); + gpu_set_blendmode(bm_normal); + + var wr_x = nx0 + ui(8); + draw_sprite_ui_uniform(s_noti_icon_warning, warning_amo? 1 : 0, wr_x + ui(10), ny0); + draw_text(wr_x + ui(28), ny0, warning_amo); + + var er_x = nx0 + ui(8) + wr_w + ui(16); + draw_sprite_ui_uniform(s_noti_icon_error, error_amo? 1 : 0, er_x + ui(10), ny0); + draw_text(er_x + ui(28), ny0, error_amo); + #endregion draw_set_text(f_p0, fa_right, fa_center, c_ui_blue_grey); var txt = "v. " + string(VERSION_STRING); var ww = string_width(txt); - if(HOVER == panel && point_in_rectangle(mx, my, w - 16 - ww, 0, w - 16, h)) { - draw_sprite_stretched(s_menu_button, 0, w - 16 - ww - 6, 6, ww + 12, h - 12); + if(HOVER == panel && point_in_rectangle(mx, my, w - ui(16) - ww, 0, w - ui(16), h)) { + draw_sprite_stretched(s_menu_button, 0, w - ww - ui(22), ui(6), ww + ui(12), h - ui(12)); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { dialogCall(o_dialog_release_note); } } - draw_text(w - 16, h / 2, txt); + draw_text(w - ui(16), h / 2, txt); if(o_main.version_latest > VERSION) { - var xx = w - 88; + var xx = w - ui(88); draw_set_text(f_p0b, fa_right, fa_center, c_ui_lime); var txt = " Newer version available "; var ww = string_width(txt); if(HOVER == panel && point_in_rectangle(mx, my, xx - ww, 0, xx, h)) { - draw_sprite_stretched(s_menu_button, 0, xx - ww - 6, 6, ww + 12, h - 12); + draw_sprite_stretched(s_menu_button, 0, xx - ww - ui(6), ui(6), ww + ui(12), h - ui(12)); if(FOCUS == panel && mouse_check_button_pressed(mb_left)) { url_open("https://makham.itch.io/pixel-composer"); diff --git a/scripts/panel_preview/panel_preview.gml b/scripts/panel_preview/panel_preview.gml index 4fcf28689..5220e3aaf 100644 --- a/scripts/panel_preview/panel_preview.gml +++ b/scripts/panel_preview/panel_preview.gml @@ -3,11 +3,11 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { last_focus = noone; - canvas_x = w / 2 - 64; - canvas_y = h / 2 - 64; - canvas_s = 1; - canvas_w = 128; - canvas_h = 128; + canvas_x = w / 2 - ui(64); + canvas_y = h / 2 - ui(64); + canvas_s = ui(1); + canvas_w = ui(128); + canvas_h = ui(128); canvas_bg = -1; @@ -30,9 +30,11 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { _preview_sequence = preview_sequence; preview_rate = 10; - grid_show = false; - grid_width = 16; - grid_height = 16; + grid_show = false; + grid_width = 16; + grid_height = 16; + grid_opacity = 0.5; + grid_color = c_ui_blue_grey; tool_index = -1; tool_sub_index = 0; @@ -50,7 +52,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { splitViewStart = 0; splitViewMouse = 0; - toolbar_height = 40; + toolbar_height = ui(40); toolbars = [ [ s_icon_reset_when_preview, @@ -132,7 +134,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { preview_sequence[i] = value; else preview_surface[i] = value; - + if(preview_sequence[i] != 0) { if(array_length(preview_sequence[i]) == 0) return; preview_surface[i] = preview_sequence[i][safe_mod(node.preview_index, array_length(preview_sequence[i]))]; @@ -194,10 +196,10 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { canvas_h = surface_get_height(prevS); - var ss = min((w - 32) / canvas_w, (h - 32) / canvas_h); + var ss = min((w - 32) / canvas_w, (h - 32 - toolbar_height) / canvas_h); canvas_s = ss; canvas_x = w / 2 - canvas_w * canvas_s / 2; - canvas_y = h / 2 - canvas_h * canvas_s / 2; + canvas_y = (h - toolbar_height) / 2 - canvas_h * canvas_s / 2; if(PANEL_GRAPH.node_focus) { canvas_x -= PANEL_GRAPH.node_focus.preview_x * canvas_s; @@ -219,21 +221,21 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { if(ds_list_size(_node.outputs) < 2) return; var chName = []; - var ww = 96; - var hh = 28; + var ww = ui(96); + var hh = toolbar_height - ui(12); draw_set_text(f_p0, fa_center, fa_center, c_white); for( var i = 0; i < ds_list_size(_node.outputs); i++ ) { if(_node.outputs[| i].type != VALUE_TYPE.surface) continue; array_push(chName, _node.outputs[| i].name); - ww = max(ww, string_width(_node.outputs[| i].name) + 40); + ww = max(ww, string_width(_node.outputs[| i].name) + ui(40)); } sbChannel.data_list = chName; sbChannel.hover = HOVER == panel; sbChannel.active = FOCUS == panel; sbChannel.draw(_x - ww, _y - hh / 2, ww, hh, _node.outputs[| _node.preview_channel].name, [mx, my], panel.x, panel.y); - right_menu_y += 40; + right_menu_y += ui(40); } function drawNodePreview() { @@ -331,7 +333,9 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { var cx = canvas_x; var cy = canvas_y; - draw_set_color(c_ui_blue_grey); + draw_set_color(grid_color); + draw_set_alpha(grid_opacity); + for( var i = 1; i < gw; i++ ) { var _xx = cx + i * _gw; draw_line(_xx, cy, _xx, cy + pshd); @@ -341,6 +345,8 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { var _yy = cy + i * _gh; draw_line(cx, _yy, cx + pswd, _yy); } + + draw_set_alpha(1); } draw_set_color(c_ui_blue_grey); @@ -349,23 +355,23 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { } function drawPreviewOverlay() { + right_menu_y = ui(8); + draw_set_text(f_p0, fa_right, fa_top, c_ui_blue_ltgrey); + draw_text(w - ui(8), right_menu_y, "fps " + string(fps)); + right_menu_y += string_height("l"); + var _node = getNodePreview(); if(_node == noone) return; - right_menu_y = 8; draw_set_text(f_p0, fa_right, fa_top, c_ui_blue_ltgrey); - draw_text(w - 8, right_menu_y, "fps " + string(fps)); - right_menu_y += 20; + draw_text(w - ui(8), right_menu_y, "frame " + string(ANIMATOR.current_frame) + "/" + string(ANIMATOR.frames_total)); + right_menu_y += string_height("l"); + draw_text(w - ui(8), right_menu_y, string(canvas_w) + "x" + string(canvas_h) + "px"); + right_menu_y += string_height("l"); + draw_text(w - ui(8), right_menu_y, "x" + string(canvas_s)); + right_menu_y += string_height("l"); - draw_set_text(f_p0, fa_right, fa_top, c_ui_blue_ltgrey); - draw_text(w - 8, right_menu_y, "frame " + string(ANIMATOR.current_frame) + "/" + string(ANIMATOR.frames_total)); - right_menu_y += 20; - draw_text(w - 8, right_menu_y, string(canvas_w) + "x" + string(canvas_h) + "px"); - right_menu_y += 20; - draw_text(w - 8, right_menu_y, "x" + string(canvas_s)); - right_menu_y += 20; - - var prev_size = 48; + var prev_size = ui(48); preview_x = lerp_float(preview_x, preview_x_to, 5); var pseq = getNodePreviewSequence(); @@ -376,7 +382,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { preview_x_to = 0; } - if(HOVER == panel && my > h - prev_size - 16) { + if(HOVER == panel && my > h - toolbar_height - prev_size - ui(16)) { canvas_hover = false; if(mouse_wheel_down()) preview_x_to = clamp(preview_x_to - prev_size, - preview_x_max, 0); if(mouse_wheel_up()) preview_x_to = clamp(preview_x_to + prev_size, - preview_x_max, 0); @@ -384,8 +390,8 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { preview_x_max = 0; for(var i = 0; i < array_length(pseq); i++) { - var xx = preview_x + 8 + (prev_size + 8) * i; - var yy = h - toolbar_height - prev_size - 8; + var xx = preview_x + ui(8) + (prev_size + ui(8)) * i; + var yy = h - toolbar_height - prev_size - ui(8); var prev = pseq[i]; if(!is_surface(prev)) continue; @@ -415,30 +421,26 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { preview_x_max += prev_size + 8; } - preview_x_max = max(preview_x_max - 100, 0); + preview_x_max = max(preview_x_max - ui(100), 0); - var by = h - toolbar_height - prev_size - 56; - var bx = 10; + var by = h - toolbar_height - prev_size - ui(56); + var bx = ui(10); - var b = buttonInstant(s_button_hide, bx, by, 40, 40, [mx, my], FOCUS == panel, HOVER == panel); + var b = buttonInstant(s_button_hide, bx, by, ui(40), ui(40), [mx, my], FOCUS == panel, HOVER == panel); if(_node.preview_speed == 0) { if(b) { - draw_sprite_ext(s_sequence_control, 1, bx + 20, by + 20, 1, 1, 0, c_ui_blue_ltgrey, 1); + draw_sprite_ui_uniform(s_sequence_control, 1, bx + ui(20), by + ui(20), 1, c_ui_blue_ltgrey, 1); if(b == 2) _node.preview_speed = preview_rate / game_get_speed(gamespeed_fps); } - draw_sprite_ext(s_sequence_control, 1, bx + 20, by + 20, 1, 1, 0, c_ui_blue_ltgrey, 0.5); + draw_sprite_ui_uniform(s_sequence_control, 1, bx + ui(20), by + ui(20), 1, c_ui_blue_ltgrey, 0.5); } else { if(b) { - draw_sprite_ext(s_sequence_control, 0, bx + 20, by + 20, 1, 1, 0, c_ui_orange, 1); + draw_sprite_ui_uniform(s_sequence_control, 0, bx + ui(20), by + ui(20), 1, c_ui_orange, 1); if(b == 2) _node.preview_speed = 0; } - draw_sprite_ext(s_sequence_control, 0, bx + 20, by + 20, 1, 1, 0, c_ui_orange, .75); + draw_sprite_ui_uniform(s_sequence_control, 0, bx + ui(20), by + ui(20), 1, c_ui_orange, .75); } - - tb_framerate.active = FOCUS == panel; - tb_framerate.hover = HOVER == panel; - tb_framerate.draw(bx + 52, by + 4, 64, 32, preview_rate, [mx, my]); } } @@ -449,24 +451,24 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { var isHover = HOVER == panel && mouse_on_preview; if(_node.tools != -1) { - var xx = 16; - var yy = 16; + var xx = ui(16); + var yy = ui(16); for(var i = 0; i < array_length(_node.tools); i++) { - var b = buttonInstant(s_button, xx, yy, 40, 40, [_mx, _my], FOCUS == panel, isHover); + var b = buttonInstant(s_button, xx, yy, ui(40), ui(40), [_mx, _my], FOCUS == panel, isHover); if(b > 0) active = false; - yy += 48; + yy += ui(48); } } _node.drawOverlay(active && isHover, canvas_x + _node.preview_x * canvas_s, canvas_y + _node.preview_y * canvas_s, canvas_s, _mx, _my); if(_node.tools != -1) { - var xx = 16; - var yy = 16; + var xx = ui(16); + var yy = ui(16); for(var i = 0; i < array_length(_node.tools); i++) { - var b = buttonInstant(s_button, xx, yy, 40, 40, [_mx, _my], FOCUS == panel, isHover); + var b = buttonInstant(s_button, xx, yy, ui(40), ui(40), [_mx, _my], FOCUS == panel, isHover); var toggle = false; if(b == 1) TOOLTIP = _node.tools[i][0]; @@ -491,19 +493,20 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { } if(tool_index == i) - draw_sprite_stretched(s_button, 2, xx, yy, 40, 40); + draw_sprite_stretched(s_button, 2, xx, yy, ui(40), ui(40)); if(is_array(_node.tools[i][1])) { var _ind = tool_sub_index % array_length(_node.tools[i][1]); - draw_sprite_ext(_node.tools[i][1][_ind], 0, xx + 20, yy + 20, 1, 1, 0, c_white, 1); + draw_sprite_ui_uniform(_node.tools[i][1][_ind], 0, xx + ui(20), yy + ui(20)); } else - draw_sprite_ext(_node.tools[i][1], 0, xx + 20, yy + 20, 1, 1, 0, c_white, 1); - yy += 48; + draw_sprite_ui_uniform(_node.tools[i][1], 0, xx + ui(20), yy + ui(20)); + yy += ui(48); } } } function drawToolBar() { + toolbar_height = ui(40); var ty = h - toolbar_height; //draw_sprite_stretched_ext(s_toolbar_shadow, 0, 0, ty - 12 + 4, w, 12, c_white, 0.5); draw_set_color(c_ui_blue_black); @@ -521,10 +524,10 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { var tbInd = tb[1](); var tbTooltip = tb[2](); - var b = buttonInstant(s_button_hide, tbx - 14, tby - 14, 28, 28, [mx, my], FOCUS == panel, HOVER == panel, tbTooltip, tbSpr, tbInd); - if(b == 2) tb[3]( { x: x + tbx - 14, y: y + tby - 14 } ); + var b = buttonInstant(s_button_hide, tbx - ui(14), tby - ui(14), ui(28), ui(28), [mx, my], FOCUS == panel, HOVER == panel, tbTooltip, tbSpr, tbInd); + if(b == 2) tb[3]( { x: x + tbx - ui(14), y: y + tby - ui(14) } ); - tbx += 32; + tbx += ui(32); } tbx = w - toolbar_height / 2; @@ -533,14 +536,14 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { var tbSpr = tb[0]; var tbTooltip = tb[1]; - var b = buttonInstant(s_button_hide, tbx - 14, tby - 14, 28, 28, [mx, my], FOCUS == panel, HOVER == panel, tbTooltip, tbSpr, 0); + var b = buttonInstant(s_button_hide, tbx - ui(14), tby - ui(14), ui(28), ui(28), [mx, my], FOCUS == panel, HOVER == panel, tbTooltip, tbSpr, 0); if(b == 2) tb[2](); - tbx -= 32; + tbx -= ui(32); } draw_set_color(c_ui_blue_dkblack); - draw_line_width(tbx + 12, tby - toolbar_height / 2 + 8, tbx + 12, tby + toolbar_height / 2 - 8, 2); + draw_line_width(tbx + ui(12), tby - toolbar_height / 2 + ui(8), tbx + ui(12), tby + toolbar_height / 2 - ui(8), 2); drawNodeChannel(tbx, tby); } @@ -565,7 +568,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { if(splitView == 1) { var sx = w * splitPosition; - if(mouse_on_preview && point_in_rectangle(mx, my, sx - 4, 0, sx + 4, h)) { + if(mouse_on_preview && point_in_rectangle(mx, my, sx - ui(4), 0, sx + ui(4), h)) { draw_line_width(sx, 0, sx, h, 2); if(mouse_check_button_pressed(mb_left)) { splitViewDragging = true; @@ -575,8 +578,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { } else draw_line_width(sx, 0, sx, h, 1); - - draw_sprite(s_panel_active_split, 0, splitSelection? sx + 16 : sx - 16, 16); + draw_sprite_ui_uniform(s_panel_active_split, 0, splitSelection? sx + ui(16) : sx - ui(16), ui(16)); if(mouse_on_preview && mouse_check_button_pressed(mb_left)) { if(point_in_rectangle(mx, my, 0, 0, sx, h)) @@ -587,7 +589,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { } else { var sy = h * splitPosition; - if(mouse_on_preview && point_in_rectangle(mx, my, 0, sy - 4, w, sy + 4)) { + if(mouse_on_preview && point_in_rectangle(mx, my, 0, sy - ui(4), w, sy + ui(4))) { draw_line_width(0, sy, w, sy, 2); if(mouse_check_button_pressed(mb_left)) { splitViewDragging = true; @@ -596,7 +598,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { } } else draw_line_width(0, sy, w, sy, 1); - draw_sprite(s_panel_active_split, 0, 16, splitSelection? sy + 16 : sy - 16); + draw_sprite_ui_uniform(s_panel_active_split, 0, ui(16), splitSelection? sy + ui(16) : sy - ui(16)); if(mouse_on_preview && mouse_check_button_pressed(mb_left)) { if(point_in_rectangle(mx, my, 0, 0, w, sy)) @@ -636,7 +638,7 @@ function Panel_Preview(_panel) : PanelContent(_panel) constructor { if(FOCUS == panel) { if(mouse_check_button_pressed(mb_right)) { - var dia = dialogCall(o_dialog_menubox, mouse_mx + 8, mouse_my + 8); + var dia = dialogCall(o_dialog_menubox, mouse_mx + ui(8), mouse_my + ui(8)); dia.setMenu([ [ "Save current preview as...", function() { PANEL_PREVIEW.saveCurrentFrame(); } ], [ "Save all current previews as...", function() { PANEL_PREVIEW.saveAllCurrentFrames(); } ], diff --git a/scripts/rangeBox/rangeBox.gml b/scripts/rangeBox/rangeBox.gml index 63fa007f3..3898195bc 100644 --- a/scripts/rangeBox/rangeBox.gml +++ b/scripts/rangeBox/rangeBox.gml @@ -20,8 +20,8 @@ function rangeBox(_type, _onModify) constructor { extras.hover = hover; extras.active = active; - extras.draw(_x + _w - 32, _y + _h / 2 - 32 / 2, 32, 32, _m, s_button_hide); - _w -= 40; + extras.draw(_x + _w - ui(32), _y + _h / 2 - ui(32 / 2), ui(32), ui(32), _m, s_button_hide); + _w -= ui(40); } if(is_array(_data) && array_length(_data) >= 2) { @@ -31,10 +31,10 @@ function rangeBox(_type, _onModify) constructor { tb[i].active = active; var bx = _x + ww * i; - tb[i].draw(bx + 44, _y, ww - 44, _h, _data[i], _m); + tb[i].draw(bx + ui(44), _y, ww - ui(44), _h, _data[i], _m); draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_grey); - draw_text(bx + 8, _y + _h / 2, label[i]); + draw_text(bx + ui(8), _y + _h / 2, label[i]); } } diff --git a/scripts/rangeBox/rangeBox.yy b/scripts/rangeBox/rangeBox.yy index 75dfeeb30..64d091a3b 100644 --- a/scripts/rangeBox/rangeBox.yy +++ b/scripts/rangeBox/rangeBox.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "rangeBox", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "rangeBox", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/rotator/rotator.gml b/scripts/rotator/rotator.gml index bd478091d..58930a01d 100644 --- a/scripts/rotator/rotator.gml +++ b/scripts/rotator/rotator.gml @@ -13,19 +13,19 @@ function rotator(_onModify) constructor { tb_value = new textBox(TEXTBOX_INPUT.number, onModify); static draw = function(_x, _y, _data, _m) { - var knob_y = _y + 48; + var knob_y = _y + ui(48); tb_value.hover = hover; tb_value.active = active; - tb_value.draw(_x + 64, knob_y - 17, 64, 34, _data, _m); + tb_value.draw(_x + ui(64), knob_y - ui(17), ui(64), TEXTBOX_HEIGHT, _data, _m); draw_set_color(c_ui_blue_mdblack); - draw_rectangle(_x - 44, knob_y - 44, _x + 44, knob_y + 44, 0); + draw_rectangle(_x - ui(44), knob_y - ui(44), _x + ui(44), knob_y + ui(44), 0); - draw_sprite(s_rotator_bg, 0, _x, knob_y); + draw_sprite_ui_uniform(s_rotator_bg, 0, _x, knob_y); - var px = _x + lengthdir_x(36, _data); - var py = knob_y + lengthdir_y(36, _data); + var px = _x + lengthdir_x(ui(36), _data); + var py = knob_y + lengthdir_y(ui(36), _data); if(dragging) { var delta = angle_difference(point_direction(_x, knob_y, _m[0], _m[1]), drag_sa); @@ -37,7 +37,7 @@ function rotator(_onModify) constructor { else val = real_val; - draw_sprite(s_rotator_knob, 1, px, py); + draw_sprite_ui_uniform(s_rotator_knob, 1, px, py); if(val != drag_sv) { onModify(val); @@ -52,8 +52,8 @@ function rotator(_onModify) constructor { UNDO_HOLDING = false; } - } else if(hover && point_in_circle(_m[0], _m[1], _x, knob_y, 48)) { - draw_sprite(s_rotator_knob, 1, px, py); + } else if(hover && point_in_circle(_m[0], _m[1], _x, knob_y, ui(48))) { + draw_sprite_ui_uniform(s_rotator_knob, 1, px, py); if(active && mouse_check_button_pressed(mb_left)) { dragging = true; @@ -61,7 +61,7 @@ function rotator(_onModify) constructor { drag_sa = point_direction(_x, knob_y, _m[0], _m[1]); } } else { - draw_sprite(s_rotator_knob, 0, px, py); + draw_sprite_ui_uniform(s_rotator_knob, 0, px, py); } draw_set_text(f_p0, fa_center, fa_center, c_white); diff --git a/scripts/rotator/rotator.yy b/scripts/rotator/rotator.yy index b1e0e2d54..3dcc50660 100644 --- a/scripts/rotator/rotator.yy +++ b/scripts/rotator/rotator.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "rotator", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "rotator", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/rotatorRange/rotatorRange.gml b/scripts/rotatorRange/rotatorRange.gml index ce6e8dd02..3699bff6a 100644 --- a/scripts/rotatorRange/rotatorRange.gml +++ b/scripts/rotatorRange/rotatorRange.gml @@ -9,17 +9,17 @@ function rotatorRange(_onModify) constructor { drag_sa = 0; static draw = function(_x, _y, _data, _m) { - var knob_y = _y + 48; + var knob_y = _y + ui(48); draw_set_color(c_ui_blue_mdblack); - draw_rectangle(_x - 44, knob_y - 44, _x + 44, knob_y + 44, 0); + draw_rectangle(_x - ui(44), knob_y - ui(44), _x + ui(44), knob_y + ui(44), 0); - draw_sprite(s_rotator_bg, 0, _x, knob_y); + draw_sprite_ui_uniform(s_rotator_bg, 0, _x, knob_y); #region draw arc var hover_arc = false; var diss = point_distance(_m[0], _m[1], _x, knob_y); - if(diss >= 32 && diss <= 40 || dragging == 2) { + if(diss >= ui(32) && diss <= ui(40) || dragging == 2) { draw_set_color(c_ui_blue_ltgrey); hover_arc = true; } else @@ -34,23 +34,23 @@ function rotatorRange(_onModify) constructor { var as = ans + i * sign(diff); var ae = ans + (i + 4) * sign(diff); - var sx = _x + lengthdir_x(36, as); - var sy = knob_y + lengthdir_y(36, as); - var ex = _x + lengthdir_x(36, ae); - var ey = knob_y + lengthdir_y(36, ae); + var sx = _x + lengthdir_x(ui(36), as); + var sy = knob_y + lengthdir_y(ui(36), as); + var ex = _x + lengthdir_x(ui(36), ae); + var ey = knob_y + lengthdir_y(ui(36), ae); - draw_line_width(sx, sy, ex, ey, 8); - draw_circle(ex, ey, 4, 0); + draw_line_width(sx, sy, ex, ey, ui(8)); + draw_circle(ex, ey, ui(4), 0); } #endregion var px, py; for(var i = 0; i < 2; i++) { - px[i] = _x + lengthdir_x(36, _data[i]); - py[i] = knob_y + lengthdir_y(36, _data[i]); + px[i] = _x + lengthdir_x(ui(36), _data[i]); + py[i] = knob_y + lengthdir_y(ui(36), _data[i]); - draw_sprite(s_rotator_knob, 0, px[i], py[i]); + draw_sprite_ui_uniform(s_rotator_knob, 0, px[i], py[i]); } if(dragging > -1) { @@ -74,7 +74,7 @@ function rotatorRange(_onModify) constructor { real_val = round(delta + drag_sv); val = keyboard_check(vk_control)? round(real_val / 15) * 15 : real_val; - draw_sprite(s_rotator_knob, 1, px[dragging], py[dragging]); + draw_sprite_ui_uniform(s_rotator_knob, 1, px[dragging], py[dragging]); if(_data[dragging] != val) { onModify(dragging, val); @@ -93,8 +93,8 @@ function rotatorRange(_onModify) constructor { } } else if(hover) { for(var i = 0; i < 2; i++) { - if(point_in_circle(_m[0], _m[1], px[i], py[i], 10)) { - draw_sprite(s_rotator_knob, 1, px[i], py[i]); + if(point_in_circle(_m[0], _m[1], px[i], py[i], ui(10))) { + draw_sprite_ui_uniform(s_rotator_knob, 1, px[i], py[i]); if(active && mouse_check_button_pressed(mb_left)) { dragging = i; @@ -111,8 +111,8 @@ function rotatorRange(_onModify) constructor { } draw_set_text(f_p0, fa_center, fa_center, c_white); - draw_text(_x, knob_y - 12, string(_data[0])); - draw_text(_x, knob_y + 12, string(_data[1])); + draw_text(_x, knob_y - ui(12), string(_data[0])); + draw_text(_x, knob_y + ui(12), string(_data[1])); active = false; hover = false; diff --git a/scripts/save_function/save_function.gml b/scripts/save_function/save_function.gml index 51c2a25de..df59a8bda 100644 --- a/scripts/save_function/save_function.gml +++ b/scripts/save_function/save_function.gml @@ -72,7 +72,7 @@ function SAVE_AS() { path += ".pxc"; if(file_exists(path)) - PANEL_MENU.addNotiExtra("Overrided file : " + path); + noti_warning("Overrided file : " + path); SAVE_AT(path); SET_PATH(path); } @@ -88,7 +88,7 @@ function SAVE_AT(path) { MODIFIED = false; log_message("FILE", "save at " + path); - PANEL_MENU.showNoti("File saved", s_noti_icon_file_save); + noti_status("File saved", s_noti_icon_file_save); } function SAVE_COLLECTIONS(_list, _path, save_surface = true) { diff --git a/scripts/scrollBox/scrollBox.gml b/scripts/scrollBox/scrollBox.gml index cc97229a2..2d92962b7 100644 --- a/scripts/scrollBox/scrollBox.gml +++ b/scripts/scrollBox/scrollBox.gml @@ -28,10 +28,10 @@ function scrollBox(_data, _onModify) constructor { draw_set_text(f_p0, align, fa_center, c_white); if(align == fa_center) - draw_text(_x + _w / 2, _y + _h / 2, _text); + draw_text(_x + _w / 2, _y + _h / 2 - ui(2), _text); else if(align == fa_left) - draw_text(_x + 8, _y + _h / 2, _text); - draw_sprite_ext(s_scroll_box_arrow, 0, _x + _w - 20, _y + _h / 2, 1, 1, 0, c_ui_blue_grey, 1); + draw_text(_x + ui(8), _y + _h / 2 - ui(2), _text); + draw_sprite_ui_uniform(s_scroll_box_arrow, 0, _x + _w - 20, _y + _h / 2, 1, c_ui_blue_grey); } hover = false; diff --git a/scripts/scrollPane/scrollPane.gml b/scripts/scrollPane/scrollPane.gml index f54b587ec..218f609c6 100644 --- a/scripts/scrollPane/scrollPane.gml +++ b/scripts/scrollPane/scrollPane.gml @@ -5,9 +5,9 @@ function scrollPane(_w, _h, ondraw) constructor { w = _w; h = _h; - surface_w = _w - 8; + surface_w = _w - ui(8); surface_h = _h; - surface = surface_create(surface_w, surface_h); + surface = surface_create_valid(surface_w, surface_h); drawFunc = ondraw; @@ -21,14 +21,14 @@ function scrollPane(_w, _h, ondraw) constructor { static resize = function(_w, _h) { w = _w; h = _h; - surface_w = _w - 8; + surface_w = _w - ui(8); surface_h = _h; if(surface_w > 1 && surface_h > 1) { if(is_surface(surface)) surface_size_to(surface, surface_w, surface_h); else - surface = surface_create(surface_w, surface_h); + surface = surface_create_valid(surface_w, surface_h); } } @@ -36,11 +36,11 @@ function scrollPane(_w, _h, ondraw) constructor { var mx = _mx, my = _my; if(!point_in_rectangle(mx, my, 0, 0, w, h)) { - mx = -100; - my = -100; + mx = -100; + my = -100; } - if(!is_surface(surface)) surface = surface_create(surface_w, surface_h); + if(!is_surface(surface)) surface = surface_create_valid(surface_w, surface_h); surface_set_target(surface); draw_clear(c_ui_blue_black); content_h = max(0, drawFunc(scroll_y, [mx, my]) - surface_h); @@ -57,7 +57,7 @@ function scrollPane(_w, _h, ondraw) constructor { } if(abs(content_h) > 0) { - draw_scroll(x + surface_w + 6, y + 6, true, surface_h - 12, -scroll_y / content_h, surface_h / (surface_h + content_h), c_ui_blue_grey, c_ui_blue_white, x + _mx, y + _my); + draw_scroll(x + surface_w + ui(6), y + ui(6), true, surface_h - ui(12), -scroll_y / content_h, surface_h / (surface_h + content_h), c_ui_blue_grey, c_ui_blue_white, x + _mx, y + _my); } } @@ -67,17 +67,17 @@ function scrollPane(_w, _h, ondraw) constructor { var scr_w, scr_h, bar_w, bar_h, bar_x, bar_y; if(is_vert) { - scr_w = 4; + scr_w = ui(4); scr_h = scr_s; - bar_w = 4; + bar_w = ui(4); bar_h = scr_scale_s; bar_x = scr_x; bar_y = scr_y + scr_prog_s; } else { scr_w = scr_s; - scr_h = 4; + scr_h = ui(4); bar_w = scr_scale_s; - bar_h = 4; + bar_h = ui(4); bar_x = scr_x + scr_prog_s; bar_y = scr_y; } diff --git a/scripts/slider/slider.gml b/scripts/slider/slider.gml index 7837f7856..ddd738b84 100644 --- a/scripts/slider/slider.gml +++ b/scripts/slider/slider.gml @@ -9,8 +9,8 @@ function slider(_min, _max, _step, _onModify = noone, _onRelease = noone) constr onModify = _onModify; onRelease = _onRelease; onApply = function(val) { - onModify(val); - onRelease(); + if(onModify) onModify(val); + if(onRelease) onRelease(); } dragging = false; @@ -19,20 +19,32 @@ function slider(_min, _max, _step, _onModify = noone, _onRelease = noone) constr tb_value = new textBox(TEXTBOX_INPUT.float, onApply); - static draw = function(_x, _y, _w, _h, _data, _m, tb_w = 64) { - var sw = _w - (tb_w + 16); + static draw = function(_x, _y, _w, _h, _data, _m, tb_w = 64, halign = fa_left, valign = fa_top) { + switch(halign) { + case fa_left: _x = _x; break; + case fa_center: _x = _x - _w / 2; break; + case fa_right: _x = _x - _w; break; + } + + switch(valign) { + case fa_top: _y = _y; break; + case fa_center: _y = _y - _h / 2; break; + case fa_bottom: _y = _y - _h; break; + } + + var sw = _w - (tb_w + ui(16)); tb_value.hover = hover; tb_value.active = active; - tb_value.draw(_x + sw + 16, _y, tb_w, 34, _data, _m); + tb_value.draw(_x + sw + ui(16), _y, tb_w, _h, _data, _m); - draw_sprite_stretched(s_slider, 0, _x, _y + _h / 2 - 4, sw, 8); + draw_sprite_stretched(s_slider, 0, _x, _y + _h / 2 - ui(4), sw, ui(8)); var _kx = _x + clamp((_data - minn) / (maxx - minn), 0, 1) * sw; - draw_sprite_stretched(s_slider, 1, _kx - 10, _y, 20, _h); + draw_sprite_stretched(s_slider, 1, _kx - ui(10), _y, ui(20), _h); if(dragging) { - draw_sprite_stretched(s_slider, 3, _kx - 10, _y, 20, _h); + draw_sprite_stretched(s_slider, 3, _kx - ui(10), _y, ui(20), _h); var val = (_m[0] - _x) / sw * (maxx - minn) + minn; val = round(val / step) * step; @@ -46,8 +58,8 @@ function slider(_min, _max, _step, _onModify = noone, _onRelease = noone) constr onRelease(val); } } else { - if(hover && (point_in_rectangle(_m[0], _m[1], _x, _y, _x + sw, _y + _h) || point_in_rectangle(_m[0], _m[1], _kx - 10, _y, _kx + 10, _y + _h))) { - draw_sprite_stretched(s_slider, 2, _kx - 10, _y, 20, _h); + if(hover && (point_in_rectangle(_m[0], _m[1], _x, _y, _x + sw, _y + _h) || point_in_rectangle(_m[0], _m[1], _kx - ui(10), _y, _kx + ui(10), _y + _h))) { + draw_sprite_stretched(s_slider, 2, _kx - ui(10), _y, ui(20), _h); if(active && mouse_check_button_pressed(mb_left)) { dragging = true; diff --git a/scripts/sliderRange/sliderRange.gml b/scripts/sliderRange/sliderRange.gml index ee33f5f8f..22fd24177 100644 --- a/scripts/sliderRange/sliderRange.gml +++ b/scripts/sliderRange/sliderRange.gml @@ -16,32 +16,32 @@ function sliderRange(_min, _max, _step, _onModify) constructor { tb_value_max = new textBox(TEXTBOX_INPUT.float, function(val) { onModify(1, val); }); static draw = function(_x, _y, _w, _h, _data, _m) { - var tb_w = 64; - var sw = _w - (tb_w + 16) * 2; + var tb_w = ui(64); + var sw = _w - (tb_w + ui(16)) * 2; tb_value_min.hover = hover; tb_value_min.active = active; - tb_value_min.draw(_x, _y, tb_w, 34, _data[0], _m); + tb_value_min.draw(_x, _y, tb_w, TEXTBOX_HEIGHT, _data[0], _m); tb_value_max.hover = hover; tb_value_max.active = active; - tb_value_max.draw(_x + _w - tb_w, _y, tb_w, 34, _data[1], _m); + tb_value_max.draw(_x + _w - tb_w, _y, tb_w, TEXTBOX_HEIGHT, _data[1], _m); - var _x0 = _x + tb_w + 16; - draw_sprite_stretched(s_slider, 0, _x0, _y + _h / 2 - 4, sw, 8); + var _x0 = _x + tb_w + ui(16); + draw_sprite_stretched(s_slider, 0, _x0, _y + _h / 2 - ui(4), sw, ui(8)); var _slider_x0 = _x0 + clamp((_data[0] - minn) / (maxx - minn), 0, 1) * sw; var _slider_x1 = _x0 + clamp((_data[1] - minn) / (maxx - minn), 0, 1) * sw; - draw_sprite_stretched(s_slider, 4, min(_slider_x0, _slider_x1), _y + _h / 2 - 4, abs(_slider_x1 - _slider_x0), 8); - draw_sprite_stretched(s_slider, 1, _slider_x0 - 10, _y, 20, _h); - draw_sprite_stretched(s_slider, 1, _slider_x1 - 10, _y, 20, _h); + draw_sprite_stretched(s_slider, 4, min(_slider_x0, _slider_x1), _y + _h / 2 - ui(4), abs(_slider_x1 - _slider_x0), ui(8)); + draw_sprite_stretched(s_slider, 1, _slider_x0 - ui(10), _y, ui(20), _h); + draw_sprite_stretched(s_slider, 1, _slider_x1 - ui(10), _y, ui(20), _h); if(dragging > -1) { if(dragging == 0) - draw_sprite_stretched(s_slider, 3, _slider_x0 - 10, _y, 20, _h); + draw_sprite_stretched(s_slider, 3, _slider_x0 - ui(10), _y, ui(20), _h); else if(dragging == 1) - draw_sprite_stretched(s_slider, 3, _slider_x1 - 10, _y, 20, _h); + draw_sprite_stretched(s_slider, 3, _slider_x1 - ui(10), _y, ui(20), _h); var val = (_m[0] - _x0) / sw * (maxx - minn) + minn; val = round(val / step) * step; @@ -54,12 +54,12 @@ function sliderRange(_min, _max, _step, _onModify) constructor { if(hover) { var _hover = -1; - if(point_in_rectangle(_m[0], _m[1], _slider_x0 - 10, _y, _slider_x0 + 10, _y + _h)) { - draw_sprite_stretched(s_slider, 2, _slider_x0 - 10, _y, 20, _h); + if(point_in_rectangle(_m[0], _m[1], _slider_x0 - ui(10), _y, _slider_x0 + ui(10), _y + _h)) { + draw_sprite_stretched(s_slider, 2, _slider_x0 - ui(10), _y, ui(20), _h); _hover = 0; } - if(point_in_rectangle(_m[0], _m[1], _slider_x1 - 10, _y, _slider_x1 + 10, _y + _h)) { - draw_sprite_stretched(s_slider, 2, _slider_x1 - 10, _y, 20, _h); + if(point_in_rectangle(_m[0], _m[1], _slider_x1 - ui(10), _y, _slider_x1 + ui(10), _y + _h)) { + draw_sprite_stretched(s_slider, 2, _slider_x1 - ui(10), _y, ui(20), _h); _hover = 1; } diff --git a/scripts/sliderRange/sliderRange.yy b/scripts/sliderRange/sliderRange.yy index 3eedd3262..4a2f9e08f 100644 --- a/scripts/sliderRange/sliderRange.yy +++ b/scripts/sliderRange/sliderRange.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "sliderRange", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "sliderRange", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/surfaceBox/surfaceBox.gml b/scripts/surfaceBox/surfaceBox.gml index 24a55c2ee..21ba739cc 100644 --- a/scripts/surfaceBox/surfaceBox.gml +++ b/scripts/surfaceBox/surfaceBox.gml @@ -25,7 +25,7 @@ function surfaceBox(_onModify, def_path = "") constructor { draw_sprite_stretched(s_textbox, 0, _x, _y, _w, _h); } - var pad = 12; + var pad = ui(12); var sw = min(_w - pad, _h - pad); var sh = sw; @@ -50,7 +50,7 @@ function surfaceBox(_onModify, def_path = "") constructor { draw_surface_ext(_surface, _sx, _sy, ss, ss, 0, c_white, 1); } - draw_sprite_ext(s_scroll_box_arrow, 0, _x + _w - 20, _y + _h / 2, 1, 1, 0, c_ui_blue_grey, 1); + draw_sprite_ui_uniform(s_scroll_box_arrow, 0, _x + _w - ui(20), _y + _h / 2, 1, c_ui_blue_grey); } hover = false; diff --git a/scripts/surface_modify/surface_modify.gml b/scripts/surface_modify/surface_modify.gml index cc971720e..ee8053c22 100644 --- a/scripts/surface_modify/surface_modify.gml +++ b/scripts/surface_modify/surface_modify.gml @@ -29,7 +29,7 @@ function surface_size_to(surface, width, height) { } function surface_clone(surface) { - var s = surface_create(surface_get_width(surface), surface_get_height(surface)); + var s = surface_create_valid(surface_get_width(surface), surface_get_height(surface)); surface_set_target(s); draw_clear_alpha(0, 0); surface_reset_target(); @@ -72,7 +72,7 @@ function surface_create_from_sprite_ext(spr, ind) { var sw = sprite_get_width(spr); var sh = sprite_get_height(spr); - var s = surface_create(sw, sh); + var s = surface_create_valid(sw, sh); surface_set_target(s); BLEND_ADD draw_clear_alpha(0, 0); diff --git a/scripts/textArea/textArea.gml b/scripts/textArea/textArea.gml index 11533f4a6..6634b6d7d 100644 --- a/scripts/textArea/textArea.gml +++ b/scripts/textArea/textArea.gml @@ -238,13 +238,13 @@ function textArea(_input, _onModify) constructor { } static draw = function(_x, _y, _w, _h, _text, _m) { - var tx = _x + 8; + var tx = _x + ui(8); var hh = _h; - line_width = _w - 16; + line_width = _w - ui(16); draw_set_font(font); var c_h = string_height("l"); - hh = max(_h, 14 + c_h * array_length(_input_text_line)); + hh = max(_h, ui(14) + c_h * array_length(_input_text_line)); if(self == TEXTBOX_ACTIVE) { draw_sprite_stretched(s_textbox, 2, _x, _y, _w, hh); @@ -359,7 +359,7 @@ function textArea(_input, _onModify) constructor { #region draw cursor highlight var char_run = 0, _l, _str; var ch_x = tx; - var ch_y = _y + 7; + var ch_y = _y + ui(7); var ch_sel_min = -1; var ch_sel_max = -1; @@ -379,15 +379,15 @@ function textArea(_input, _onModify) constructor { var x1 = tx + string_width(string_copy(_str, 1, ch_sel_min - char_run)); var x2 = tx + string_width(string_copy(_str, 1, ch_sel_max - char_run)); - draw_roundrect_ext(x1, ch_y, x2, ch_y + c_h, 8, 8, 0); + draw_roundrect_ext(x1, ch_y, x2, ch_y + c_h, ui(8), ui(8), 0); } else if(char_run >= ch_sel_min && char_run + _l < ch_sel_max) { var x2 = tx + string_width(_str); - draw_roundrect_ext(tx, ch_y, x2, ch_y + c_h, 8, 8, 0); + draw_roundrect_ext(tx, ch_y, x2, ch_y + c_h, ui(8), ui(8), 0); } else if(char_run > ch_sel_min && char_run <= ch_sel_max && char_run + _l >= ch_sel_max) { var x2 = tx + string_width(string_copy(_str, 1, ch_sel_max - char_run)); - draw_roundrect_ext(tx, ch_y, x2, ch_y + c_h, 8, 8, 0); + draw_roundrect_ext(tx, ch_y, x2, ch_y + c_h, ui(8), ui(8), 0); } } @@ -412,7 +412,7 @@ function textArea(_input, _onModify) constructor { } draw_set_color(c_white); - display_text(tx, _y + 7, _input_text, _w - 4, _mx, _my); + display_text(tx, _y + ui(7), _input_text, _w - ui(4), _mx, _my); if(cursor_pos_y != 0 && cursor_pos_x != 0) { draw_set_color(c_ui_orange); draw_line_width(cursor_pos_x, cursor_pos_y, cursor_pos_x, cursor_pos_y + c_h, 2); @@ -444,7 +444,7 @@ function textArea(_input, _onModify) constructor { draw_sprite_stretched(s_textbox, 0, _x, _y, _w, hh); } - display_text(tx, _y + 7, string(_text), _w - 4); + display_text(tx, _y + ui(7), string(_text), _w - ui(4)); } hover = false; diff --git a/scripts/textBox/textBox.gml b/scripts/textBox/textBox.gml index b95b074e5..c7e7014d5 100644 --- a/scripts/textBox/textBox.gml +++ b/scripts/textBox/textBox.gml @@ -7,9 +7,9 @@ enum TEXTBOX_INPUT { function textBox(_input, _onModify) constructor { active = false; hover = false; - font = f_p0; align = fa_right; hide = false; + font = noone; no_empty = true; auto_update = false; @@ -158,11 +158,11 @@ function textBox(_input, _onModify) constructor { switch(_format) { case VALUE_DISPLAY._default : - draw_set_text(font, fa_left, fa_center, text_color); + draw_set_text(font == noone? f_p0 : font, fa_left, fa_center, text_color); draw_text(_x, _y, _text); break; case VALUE_DISPLAY.export_format : - draw_set_text(font, fa_left, fa_center, text_color); + draw_set_text(font == noone? f_p0 : font, fa_left, fa_center, text_color); var _x0 = _x, ch = "", len = string_length(_text), i = 1; var cc = draw_get_color(); var str = "", _comm = false; @@ -232,16 +232,27 @@ function textBox(_input, _onModify) constructor { } } - static draw = function(_x, _y, _w, _h, _text, _m, _format = VALUE_DISPLAY._default) { - var tx = _x; + static draw = function(_x, _y, _w, _h, _text, _m, _format = VALUE_DISPLAY._default, halign = fa_left, valign = fa_top) { + switch(halign) { + case fa_left: _x = _x; break; + case fa_center: _x = _x - _w / 2; break; + case fa_right: _x = _x - _w; break; + } - draw_set_text(font, fa_left, fa_top, c_white); + switch(valign) { + case fa_top: _y = _y; break; + case fa_center: _y = _y - _h / 2; break; + case fa_bottom: _y = _y - _h; break; + } + + draw_set_text(font == noone? f_p0 : font, fa_left, fa_top, c_white); var hh = _h; + var tx = _x; switch(align) { - case fa_left : tx = _x + 8; break; + case fa_left : tx = _x + ui(8); break; case fa_center : tx = _x + _w / 2; break; - case fa_right : tx = _x + _w - 8; break; + case fa_right : tx = _x + _w - ui(8); break; } if(sliding > 0) { @@ -301,11 +312,11 @@ function textBox(_input, _onModify) constructor { #endregion #region multiplier - if(_w > 80 && (input == TEXTBOX_INPUT.number || input == TEXTBOX_INPUT.float)) { + if(_w > ui(80) && (input == TEXTBOX_INPUT.number || input == TEXTBOX_INPUT.float)) { draw_set_text(f_p0b, fa_left, fa_center, c_ui_blue_ltgrey); draw_set_alpha(0.5); - if(point_in_rectangle(_m[0], _m[1], _x, _y, _x + 32, _y + hh)) { + if(point_in_rectangle(_m[0], _m[1], _x, _y, _x + ui(32), _y + hh)) { draw_set_alpha(1); if(active && mouse_check_button_pressed(mb_left)) { @@ -321,9 +332,9 @@ function textBox(_input, _onModify) constructor { } if(keyboard_check(vk_alt)) - draw_text(_x + 8, _y + hh / 2, "/2"); + draw_text(_x + ui(8), _y + hh / 2, "/2"); else - draw_text(_x + 8, _y + hh / 2, "x2"); + draw_text(_x + ui(8), _y + hh / 2, "x2"); draw_set_alpha(1); apply(); @@ -331,8 +342,8 @@ function textBox(_input, _onModify) constructor { #endregion #region draw - var ss = string_cut(_input_text, _w - 16); - draw_set_text(font, fa_left, fa_top, c_white); + var ss = string_cut(_input_text, _w - ui(16)); + draw_set_text(font == noone? f_p0 : font, fa_left, fa_top, c_white); var ww = string_width(ss); switch(align) { @@ -353,7 +364,7 @@ function textBox(_input, _onModify) constructor { draw_set_color(c_ui_blue_dkgrey); var x1 = tx + string_width(string_copy(_input_text, 1, cursor_select)); - draw_roundrect_ext(cursor_pos, c_y0, x1, c_y1, 8, 8, 0); + draw_roundrect_ext(cursor_pos, c_y0, x1, c_y1, ui(8), ui(8), 0); } var _mx = -1; @@ -364,7 +375,7 @@ function textBox(_input, _onModify) constructor { } draw_set_color(c_white); - display_text(tx, _y + _h / 2, ss, _w - 4, _format, _mx); + display_text(tx, _y + _h / 2, ss, _w - ui(4), _format, _mx); draw_set_color(c_ui_orange); draw_line_width(cursor_pos, c_y0, cursor_pos, c_y1, 2); #endregion @@ -375,7 +386,7 @@ function textBox(_input, _onModify) constructor { } } else { var ss = string_cut(string(_text), _w - 16); - draw_set_text(font, fa_left, fa_center, c_white); + draw_set_text(font == noone? f_p0 : font, fa_left, fa_center, c_white); var ww = string_width(ss); switch(align) { @@ -402,10 +413,10 @@ function textBox(_input, _onModify) constructor { draw_sprite_stretched(s_textbox, 0, _x, _y, _w, hh); } - display_text(tx, _y + _h / 2, ss, _w - 4, _format); + display_text(tx, _y + _h / 2, ss, _w - ui(4), _format); if(slidable) { - draw_sprite_ext(s_text_slider, 0, _x + 20, _y + hh / 2, 1, 1, 0, c_ui_blue_grey, 0.5); + draw_sprite_ui_uniform(s_text_slider, 0, _x + ui(20), _y + hh / 2, 1, c_ui_blue_grey, 0.5); if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh)) { if(active && mouse_check_button_pressed(mb_left)) { diff --git a/scripts/vectorBox/vectorBox.gml b/scripts/vectorBox/vectorBox.gml index bfa15c9bf..3b38b5850 100644 --- a/scripts/vectorBox/vectorBox.gml +++ b/scripts/vectorBox/vectorBox.gml @@ -23,8 +23,8 @@ function vectorBox(_size, _type, _onModify) constructor { extras.hover = hover; extras.active = active; - extras.draw(_x + _w - 32, _y + _h / 2 - 32 / 2, 32, 32, _m, s_button_hide); - _w -= 40; + extras.draw(_x + _w - ui(32), _y + _h / 2 - ui(32 / 2), ui(32), ui(32), _m, s_button_hide); + _w -= ui(40); } var ww = _w / size; @@ -33,10 +33,10 @@ function vectorBox(_size, _type, _onModify) constructor { tb[i].active = active; var bx = _x + ww * i; - tb[i].draw(bx + 24, _y, ww - 24, _h, _data[i], _m); + tb[i].draw(bx + ui(24), _y, ww - ui(24), _h, _data[i], _m); draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_grey); - draw_text(bx + 8, _y + _h / 2, axis[i]); + draw_text(bx + ui(8), _y + _h / 2, axis[i]); } hover = false; active = false; diff --git a/scripts/vectorBox/vectorBox.yy b/scripts/vectorBox/vectorBox.yy index 69f4d7af1..cdbd389f3 100644 --- a/scripts/vectorBox/vectorBox.yy +++ b/scripts/vectorBox/vectorBox.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "vectorBox", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "vectorBox", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/vectorRangeBox/vectorRangeBox.gml b/scripts/vectorRangeBox/vectorRangeBox.gml index 303436347..d0a1175d4 100644 --- a/scripts/vectorRangeBox/vectorRangeBox.gml +++ b/scripts/vectorRangeBox/vectorRangeBox.gml @@ -26,8 +26,8 @@ function vectorRangeBox(_size, _type, _onModify) constructor { extras.hover = hover; extras.active = active; - extras.draw(_x + _w - 32, _y + _h / 2 - 32 / 2, 32, 32, _m, s_button_hide); - _w -= 40; + extras.draw(_x + _w - ui(32), _y + _h / 2 - ui(32 / 2), ui(32), ui(32), _m, s_button_hide); + _w -= ui(40); } var ww = _w / size * 2; @@ -37,10 +37,10 @@ function vectorRangeBox(_size, _type, _onModify) constructor { var bx = _x + ww * floor(i / 2); var by = _y + i % 2 * 40; - tb[i].draw(bx + 56, by, ww - 56, 34, _data[i], _m); + tb[i].draw(bx + ui(56), by, ww - ui(56), TEXTBOX_HEIGHT, _data[i], _m); draw_set_text(f_p0, fa_left, fa_center, c_ui_blue_grey); - draw_text(bx + 8, by + _h / 2, label[i]); + draw_text(bx + ui(8), by + _h / 2, label[i]); } hover = false; active = false; diff --git a/scripts/vectorRangeBox/vectorRangeBox.yy b/scripts/vectorRangeBox/vectorRangeBox.yy index fd13bd137..bfd782c45 100644 --- a/scripts/vectorRangeBox/vectorRangeBox.yy +++ b/scripts/vectorRangeBox/vectorRangeBox.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "vectorRangeBox", "isDnD": false, "isCompatibility": false, "parent": { "name": "widgets", "path": "folders/widgets.yy", }, - "resourceVersion": "1.0", - "name": "vectorRangeBox", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/shaders/sh_color_adjust/sh_color_adjust.fsh b/shaders/sh_color_adjust/sh_color_adjust.fsh index e8998b51c..905a93355 100644 --- a/shaders/sh_color_adjust/sh_color_adjust.fsh +++ b/shaders/sh_color_adjust/sh_color_adjust.fsh @@ -9,6 +9,7 @@ uniform sampler2D mask; uniform float brightness; uniform float contrast; +uniform float exposure; uniform float hue; uniform float sat; uniform float val; @@ -36,15 +37,16 @@ void main() { vec4 col = texture2D( gm_BaseTexture, v_vTexcoord ); //contrast - float cont = contrast * contrast; - float c_factor = (1. + cont) / (1. - cont); - vec4 col_c = c_factor * (col - .5) + .5; + vec4 col_c = .5 + (contrast * 2.) * (col - .5); col_c = clamp(col_c, vec4(0.), vec4(1.)); //brightness vec4 col_cb = col_c + vec4(brightness, brightness, brightness, 0.0); col_cb = clamp(col_cb, vec4(0.), vec4(1.)); + //exposure + col_cb = clamp(col_cb * exposure, vec4(0.), vec4(1.)); + //hsv vec3 _hsv = rgb2hsv(col_cb.rgb); _hsv.x = clamp(_hsv.x + hue, -1., 1.); diff --git a/sprites/icon_24/71fc5f1d-af5e-4d7a-b3ac-5a51b2100652.png b/sprites/icon_24/71fc5f1d-af5e-4d7a-b3ac-5a51b2100652.png deleted file mode 100644 index 778403d88..000000000 Binary files a/sprites/icon_24/71fc5f1d-af5e-4d7a-b3ac-5a51b2100652.png and /dev/null differ diff --git a/sprites/icon_24/752310eb-db84-488a-9a58-3c8d82d561cc.png b/sprites/icon_24/752310eb-db84-488a-9a58-3c8d82d561cc.png new file mode 100644 index 000000000..c147cd763 Binary files /dev/null and b/sprites/icon_24/752310eb-db84-488a-9a58-3c8d82d561cc.png differ diff --git a/sprites/icon_24/icon_24.yy b/sprites/icon_24/icon_24.yy index 4469983aa..fd756b97f 100644 --- a/sprites/icon_24/icon_24.yy +++ b/sprites/icon_24/icon_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 2, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"71fc5f1d-af5e-4d7a-b3ac-5a51b2100652",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"752310eb-db84-488a-9a58-3c8d82d561cc",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7be96c06-726e-439c-b8f4-b4f15b76eb8b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"71fc5f1d-af5e-4d7a-b3ac-5a51b2100652","path":"sprites/icon_24/icon_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e2b96459-278e-4f8c-860f-eee4341ae985","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"752310eb-db84-488a-9a58-3c8d82d561cc","path":"sprites/icon_24/icon_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bfae931b-7560-4c87-b4ea-a2a447a2e2fc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a2fba583-6398-4037-81e1-4caead6f6b3d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/icon_24/layers/71fc5f1d-af5e-4d7a-b3ac-5a51b2100652/bfae931b-7560-4c87-b4ea-a2a447a2e2fc.png b/sprites/icon_24/layers/71fc5f1d-af5e-4d7a-b3ac-5a51b2100652/bfae931b-7560-4c87-b4ea-a2a447a2e2fc.png deleted file mode 100644 index 2d07326c5..000000000 Binary files a/sprites/icon_24/layers/71fc5f1d-af5e-4d7a-b3ac-5a51b2100652/bfae931b-7560-4c87-b4ea-a2a447a2e2fc.png and /dev/null differ diff --git a/sprites/icon_24/layers/752310eb-db84-488a-9a58-3c8d82d561cc/a2fba583-6398-4037-81e1-4caead6f6b3d.png b/sprites/icon_24/layers/752310eb-db84-488a-9a58-3c8d82d561cc/a2fba583-6398-4037-81e1-4caead6f6b3d.png new file mode 100644 index 000000000..c147cd763 Binary files /dev/null and b/sprites/icon_24/layers/752310eb-db84-488a-9a58-3c8d82d561cc/a2fba583-6398-4037-81e1-4caead6f6b3d.png differ diff --git a/sprites/icon_32/02b69bac-b59d-4daf-9238-a3fa58fbd751.png b/sprites/icon_32/02b69bac-b59d-4daf-9238-a3fa58fbd751.png new file mode 100644 index 000000000..d66cb423b Binary files /dev/null and b/sprites/icon_32/02b69bac-b59d-4daf-9238-a3fa58fbd751.png differ diff --git a/sprites/icon_32/d521922b-7bec-4a59-857f-303dbe4e6115.png b/sprites/icon_32/d521922b-7bec-4a59-857f-303dbe4e6115.png deleted file mode 100644 index 2b59bd582..000000000 Binary files a/sprites/icon_32/d521922b-7bec-4a59-857f-303dbe4e6115.png and /dev/null differ diff --git a/sprites/icon_32/icon_32.yy b/sprites/icon_32/icon_32.yy index b43f368a4..52fa28af8 100644 --- a/sprites/icon_32/icon_32.yy +++ b/sprites/icon_32/icon_32.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 2, + "bbox_right": 61, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d521922b-7bec-4a59-857f-303dbe4e6115",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"02b69bac-b59d-4daf-9238-a3fa58fbd751",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a7b188fb-93f0-4680-9cc1-c0f9486e23b9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d521922b-7bec-4a59-857f-303dbe4e6115","path":"sprites/icon_32/icon_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1117512d-1bb0-41e8-a4be-97cdac831702","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"02b69bac-b59d-4daf-9238-a3fa58fbd751","path":"sprites/icon_32/icon_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4152ad92-74de-4564-bb77-4f014e842938","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"12238bbf-d8aa-45db-ae00-b9961b98dd74","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/icon_32/layers/02b69bac-b59d-4daf-9238-a3fa58fbd751/12238bbf-d8aa-45db-ae00-b9961b98dd74.png b/sprites/icon_32/layers/02b69bac-b59d-4daf-9238-a3fa58fbd751/12238bbf-d8aa-45db-ae00-b9961b98dd74.png new file mode 100644 index 000000000..d66cb423b Binary files /dev/null and b/sprites/icon_32/layers/02b69bac-b59d-4daf-9238-a3fa58fbd751/12238bbf-d8aa-45db-ae00-b9961b98dd74.png differ diff --git a/sprites/icon_32/layers/d521922b-7bec-4a59-857f-303dbe4e6115/4152ad92-74de-4564-bb77-4f014e842938.png b/sprites/icon_32/layers/d521922b-7bec-4a59-857f-303dbe4e6115/4152ad92-74de-4564-bb77-4f014e842938.png deleted file mode 100644 index 3d8ed8c97..000000000 Binary files a/sprites/icon_32/layers/d521922b-7bec-4a59-857f-303dbe4e6115/4152ad92-74de-4564-bb77-4f014e842938.png and /dev/null differ diff --git a/sprites/icon_64/a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f.png b/sprites/icon_64/a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f.png new file mode 100644 index 000000000..7aead0db6 Binary files /dev/null and b/sprites/icon_64/a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f.png differ diff --git a/sprites/icon_64/d6c5775e-dca8-4578-bbe7-511bb9cbaf2e.png b/sprites/icon_64/d6c5775e-dca8-4578-bbe7-511bb9cbaf2e.png deleted file mode 100644 index 0afa678a0..000000000 Binary files a/sprites/icon_64/d6c5775e-dca8-4578-bbe7-511bb9cbaf2e.png and /dev/null differ diff --git a/sprites/icon_64/icon_64.yy b/sprites/icon_64/icon_64.yy index 59eb46ab1..9a1b8073f 100644 --- a/sprites/icon_64/icon_64.yy +++ b/sprites/icon_64/icon_64.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 62, - "bbox_top": 1, - "bbox_bottom": 62, + "bbox_left": 1, + "bbox_right": 125, + "bbox_top": 2, + "bbox_bottom": 125, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 64, - "height": 64, + "width": 128, + "height": 128, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6c5775e-dca8-4578-bbe7-511bb9cbaf2e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"20a953de-44b9-4de6-87d7-ea1f891feb8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6c5775e-dca8-4578-bbe7-511bb9cbaf2e","path":"sprites/icon_64/icon_64.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0886a0d1-eb75-4473-ba20-6c23776b20ef","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f","path":"sprites/icon_64/icon_64.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 32, - "yorigin": 32, + "xorigin": 64, + "yorigin": 64, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a0b68d21-37e8-41dc-8aaa-ba32e987413d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6b09d728-808c-4ac1-90a8-3fe68cdce749","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/icon_64/layers/a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f/6b09d728-808c-4ac1-90a8-3fe68cdce749.png b/sprites/icon_64/layers/a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f/6b09d728-808c-4ac1-90a8-3fe68cdce749.png new file mode 100644 index 000000000..7aead0db6 Binary files /dev/null and b/sprites/icon_64/layers/a4c4a278-2d11-4dfb-9c3f-c1a4ca2a592f/6b09d728-808c-4ac1-90a8-3fe68cdce749.png differ diff --git a/sprites/icon_64/layers/d6c5775e-dca8-4578-bbe7-511bb9cbaf2e/a0b68d21-37e8-41dc-8aaa-ba32e987413d.png b/sprites/icon_64/layers/d6c5775e-dca8-4578-bbe7-511bb9cbaf2e/a0b68d21-37e8-41dc-8aaa-ba32e987413d.png deleted file mode 100644 index 8934e9d48..000000000 Binary files a/sprites/icon_64/layers/d6c5775e-dca8-4578-bbe7-511bb9cbaf2e/a0b68d21-37e8-41dc-8aaa-ba32e987413d.png and /dev/null differ diff --git a/sprites/s_add_24/b6f7578c-93fb-4d6c-9eb9-7227de69a281.png b/sprites/s_add_24/b6f7578c-93fb-4d6c-9eb9-7227de69a281.png deleted file mode 100644 index bf97aacfc..000000000 Binary files a/sprites/s_add_24/b6f7578c-93fb-4d6c-9eb9-7227de69a281.png and /dev/null differ diff --git a/sprites/s_add_24/f75eda95-354e-4fd6-a35d-0b5ec2ad86a0.png b/sprites/s_add_24/f75eda95-354e-4fd6-a35d-0b5ec2ad86a0.png new file mode 100644 index 000000000..0c93bfaee Binary files /dev/null and b/sprites/s_add_24/f75eda95-354e-4fd6-a35d-0b5ec2ad86a0.png differ diff --git a/sprites/s_add_24/layers/b6f7578c-93fb-4d6c-9eb9-7227de69a281/2b25ada4-f0eb-48ef-858a-0fd75365e4e9.png b/sprites/s_add_24/layers/b6f7578c-93fb-4d6c-9eb9-7227de69a281/2b25ada4-f0eb-48ef-858a-0fd75365e4e9.png deleted file mode 100644 index bf97aacfc..000000000 Binary files a/sprites/s_add_24/layers/b6f7578c-93fb-4d6c-9eb9-7227de69a281/2b25ada4-f0eb-48ef-858a-0fd75365e4e9.png and /dev/null differ diff --git a/sprites/s_add_24/layers/f75eda95-354e-4fd6-a35d-0b5ec2ad86a0/61daa13a-988c-42ac-8b2f-1c6f31a575a9.png b/sprites/s_add_24/layers/f75eda95-354e-4fd6-a35d-0b5ec2ad86a0/61daa13a-988c-42ac-8b2f-1c6f31a575a9.png new file mode 100644 index 000000000..0c93bfaee Binary files /dev/null and b/sprites/s_add_24/layers/f75eda95-354e-4fd6-a35d-0b5ec2ad86a0/61daa13a-988c-42ac-8b2f-1c6f31a575a9.png differ diff --git a/sprites/s_add_24/s_add_24.yy b/sprites/s_add_24/s_add_24.yy index 3bafa57f8..b6cdc6b41 100644 --- a/sprites/s_add_24/s_add_24.yy +++ b/sprites/s_add_24/s_add_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 19, - "bbox_top": 4, - "bbox_bottom": 19, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 5, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6f7578c-93fb-4d6c-9eb9-7227de69a281",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f75eda95-354e-4fd6-a35d-0b5ec2ad86a0",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"77c32623-afd5-4d11-820e-ed3e01561977","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b6f7578c-93fb-4d6c-9eb9-7227de69a281","path":"sprites/s_add_24/s_add_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"471db221-b2d2-42e7-8b8c-7c14b2f89044","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f75eda95-354e-4fd6-a35d-0b5ec2ad86a0","path":"sprites/s_add_24/s_add_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2b25ada4-f0eb-48ef-858a-0fd75365e4e9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"61daa13a-988c-42ac-8b2f-1c6f31a575a9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_add_32/30cb0b72-cc23-4d2b-8579-59d387ded161.png b/sprites/s_add_32/30cb0b72-cc23-4d2b-8579-59d387ded161.png new file mode 100644 index 000000000..f7be7156f Binary files /dev/null and b/sprites/s_add_32/30cb0b72-cc23-4d2b-8579-59d387ded161.png differ diff --git a/sprites/s_add_32/c93976f1-54f4-482e-b57a-3dfd5b0154a8.png b/sprites/s_add_32/c93976f1-54f4-482e-b57a-3dfd5b0154a8.png deleted file mode 100644 index e69cd860b..000000000 Binary files a/sprites/s_add_32/c93976f1-54f4-482e-b57a-3dfd5b0154a8.png and /dev/null differ diff --git a/sprites/s_add_32/layers/30cb0b72-cc23-4d2b-8579-59d387ded161/933fca81-95f3-463a-b0c4-92c49d2c7c66.png b/sprites/s_add_32/layers/30cb0b72-cc23-4d2b-8579-59d387ded161/933fca81-95f3-463a-b0c4-92c49d2c7c66.png new file mode 100644 index 000000000..f7be7156f Binary files /dev/null and b/sprites/s_add_32/layers/30cb0b72-cc23-4d2b-8579-59d387ded161/933fca81-95f3-463a-b0c4-92c49d2c7c66.png differ diff --git a/sprites/s_add_32/layers/c93976f1-54f4-482e-b57a-3dfd5b0154a8/71a5aa7c-64f0-47c3-b06c-391a2d7dbaa6.png b/sprites/s_add_32/layers/c93976f1-54f4-482e-b57a-3dfd5b0154a8/71a5aa7c-64f0-47c3-b06c-391a2d7dbaa6.png deleted file mode 100644 index e69cd860b..000000000 Binary files a/sprites/s_add_32/layers/c93976f1-54f4-482e-b57a-3dfd5b0154a8/71a5aa7c-64f0-47c3-b06c-391a2d7dbaa6.png and /dev/null differ diff --git a/sprites/s_add_32/s_add_32.yy b/sprites/s_add_32/s_add_32.yy index afd47ad23..0db31e363 100644 --- a/sprites/s_add_32/s_add_32.yy +++ b/sprites/s_add_32/s_add_32.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 27, - "bbox_top": 4, - "bbox_bottom": 27, + "bbox_left": 5, + "bbox_right": 58, + "bbox_top": 5, + "bbox_bottom": 58, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c93976f1-54f4-482e-b57a-3dfd5b0154a8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"30cb0b72-cc23-4d2b-8579-59d387ded161",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"186792e1-0a7d-4f24-8410-9747e3b430f6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c93976f1-54f4-482e-b57a-3dfd5b0154a8","path":"sprites/s_add_32/s_add_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"39f29832-d05e-4980-bacf-e3da2f646a92","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"30cb0b72-cc23-4d2b-8579-59d387ded161","path":"sprites/s_add_32/s_add_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"71a5aa7c-64f0-47c3-b06c-391a2d7dbaa6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"933fca81-95f3-463a-b0c4-92c49d2c7c66","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_add_node_view/3e121a44-de05-4793-a49d-f6b35c5b255f.png b/sprites/s_add_node_view/3e121a44-de05-4793-a49d-f6b35c5b255f.png deleted file mode 100644 index 8125540bb..000000000 Binary files a/sprites/s_add_node_view/3e121a44-de05-4793-a49d-f6b35c5b255f.png and /dev/null differ diff --git a/sprites/s_add_node_view/5c6f42d1-11bd-464f-ad5b-93a676a46231.png b/sprites/s_add_node_view/5c6f42d1-11bd-464f-ad5b-93a676a46231.png new file mode 100644 index 000000000..a6b93eb1e Binary files /dev/null and b/sprites/s_add_node_view/5c6f42d1-11bd-464f-ad5b-93a676a46231.png differ diff --git a/sprites/s_add_node_view/d541db8f-79f7-4438-9866-4f55545912d6.png b/sprites/s_add_node_view/d541db8f-79f7-4438-9866-4f55545912d6.png deleted file mode 100644 index 720b9ec29..000000000 Binary files a/sprites/s_add_node_view/d541db8f-79f7-4438-9866-4f55545912d6.png and /dev/null differ diff --git a/sprites/s_add_node_view/e0c38147-c17b-46c2-813b-31d1433c6a15.png b/sprites/s_add_node_view/e0c38147-c17b-46c2-813b-31d1433c6a15.png new file mode 100644 index 000000000..b5a6c20e8 Binary files /dev/null and b/sprites/s_add_node_view/e0c38147-c17b-46c2-813b-31d1433c6a15.png differ diff --git a/sprites/s_add_node_view/layers/3e121a44-de05-4793-a49d-f6b35c5b255f/a68e0eee-213f-4607-94af-aaf64d16ea5c.png b/sprites/s_add_node_view/layers/3e121a44-de05-4793-a49d-f6b35c5b255f/a68e0eee-213f-4607-94af-aaf64d16ea5c.png deleted file mode 100644 index 8125540bb..000000000 Binary files a/sprites/s_add_node_view/layers/3e121a44-de05-4793-a49d-f6b35c5b255f/a68e0eee-213f-4607-94af-aaf64d16ea5c.png and /dev/null differ diff --git a/sprites/s_add_node_view/layers/5c6f42d1-11bd-464f-ad5b-93a676a46231/cf68bc5e-6252-439a-a8d7-38be63fe25e3.png b/sprites/s_add_node_view/layers/5c6f42d1-11bd-464f-ad5b-93a676a46231/cf68bc5e-6252-439a-a8d7-38be63fe25e3.png new file mode 100644 index 000000000..a6b93eb1e Binary files /dev/null and b/sprites/s_add_node_view/layers/5c6f42d1-11bd-464f-ad5b-93a676a46231/cf68bc5e-6252-439a-a8d7-38be63fe25e3.png differ diff --git a/sprites/s_add_node_view/layers/d541db8f-79f7-4438-9866-4f55545912d6/a68e0eee-213f-4607-94af-aaf64d16ea5c.png b/sprites/s_add_node_view/layers/d541db8f-79f7-4438-9866-4f55545912d6/a68e0eee-213f-4607-94af-aaf64d16ea5c.png deleted file mode 100644 index 720b9ec29..000000000 Binary files a/sprites/s_add_node_view/layers/d541db8f-79f7-4438-9866-4f55545912d6/a68e0eee-213f-4607-94af-aaf64d16ea5c.png and /dev/null differ diff --git a/sprites/s_add_node_view/layers/e0c38147-c17b-46c2-813b-31d1433c6a15/cf68bc5e-6252-439a-a8d7-38be63fe25e3.png b/sprites/s_add_node_view/layers/e0c38147-c17b-46c2-813b-31d1433c6a15/cf68bc5e-6252-439a-a8d7-38be63fe25e3.png new file mode 100644 index 000000000..b5a6c20e8 Binary files /dev/null and b/sprites/s_add_node_view/layers/e0c38147-c17b-46c2-813b-31d1433c6a15/cf68bc5e-6252-439a-a8d7-38be63fe25e3.png differ diff --git a/sprites/s_add_node_view/s_add_node_view.yy b/sprites/s_add_node_view/s_add_node_view.yy index 232b99888..f67f73018 100644 --- a/sprites/s_add_node_view/s_add_node_view.yy +++ b/sprites/s_add_node_view/s_add_node_view.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d541db8f-79f7-4438-9866-4f55545912d6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3e121a44-de05-4793-a49d-f6b35c5b255f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c6f42d1-11bd-464f-ad5b-93a676a46231",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e0c38147-c17b-46c2-813b-31d1433c6a15",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"462656b7-70aa-401d-9b5a-2724f3fa3e7b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d541db8f-79f7-4438-9866-4f55545912d6","path":"sprites/s_add_node_view/s_add_node_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"cec3e199-f990-4899-8aa8-66872b7ef6d0","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3e121a44-de05-4793-a49d-f6b35c5b255f","path":"sprites/s_add_node_view/s_add_node_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"07ed507a-6162-4cec-8a15-081ad953a0e0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5c6f42d1-11bd-464f-ad5b-93a676a46231","path":"sprites/s_add_node_view/s_add_node_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"eccfbf43-a963-4d8f-8210-59f0c6525470","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e0c38147-c17b-46c2-813b-31d1433c6a15","path":"sprites/s_add_node_view/s_add_node_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a68e0eee-213f-4607-94af-aaf64d16ea5c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cf68bc5e-6252-439a-a8d7-38be63fe25e3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_anchor/3c04598b-eaee-4eb7-a963-4fd2b78066c1.png b/sprites/s_anchor/3c04598b-eaee-4eb7-a963-4fd2b78066c1.png deleted file mode 100644 index 9981b0272..000000000 Binary files a/sprites/s_anchor/3c04598b-eaee-4eb7-a963-4fd2b78066c1.png and /dev/null differ diff --git a/sprites/s_anchor/77f879aa-c1e0-4644-b346-07961d995854.png b/sprites/s_anchor/77f879aa-c1e0-4644-b346-07961d995854.png new file mode 100644 index 000000000..af3422fd5 Binary files /dev/null and b/sprites/s_anchor/77f879aa-c1e0-4644-b346-07961d995854.png differ diff --git a/sprites/s_anchor/layers/3c04598b-eaee-4eb7-a963-4fd2b78066c1/ef3adb1d-5b63-4c0c-b5fe-d746e44bc31c.png b/sprites/s_anchor/layers/3c04598b-eaee-4eb7-a963-4fd2b78066c1/ef3adb1d-5b63-4c0c-b5fe-d746e44bc31c.png deleted file mode 100644 index d4166a791..000000000 Binary files a/sprites/s_anchor/layers/3c04598b-eaee-4eb7-a963-4fd2b78066c1/ef3adb1d-5b63-4c0c-b5fe-d746e44bc31c.png and /dev/null differ diff --git a/sprites/s_anchor/layers/77f879aa-c1e0-4644-b346-07961d995854/516cca1f-4f58-442c-be22-c9cc7bc81cbf.png b/sprites/s_anchor/layers/77f879aa-c1e0-4644-b346-07961d995854/516cca1f-4f58-442c-be22-c9cc7bc81cbf.png new file mode 100644 index 000000000..af3422fd5 Binary files /dev/null and b/sprites/s_anchor/layers/77f879aa-c1e0-4644-b346-07961d995854/516cca1f-4f58-442c-be22-c9cc7bc81cbf.png differ diff --git a/sprites/s_anchor/s_anchor.yy b/sprites/s_anchor/s_anchor.yy index 0eb9f9945..36df75414 100644 --- a/sprites/s_anchor/s_anchor.yy +++ b/sprites/s_anchor/s_anchor.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 18, - "bbox_top": 1, - "bbox_bottom": 18, + "bbox_left": 2, + "bbox_right": 37, + "bbox_top": 2, + "bbox_bottom": 37, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3c04598b-eaee-4eb7-a963-4fd2b78066c1",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"77f879aa-c1e0-4644-b346-07961d995854",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2b5fa96a-6da1-4d2a-911d-946305290bb8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3c04598b-eaee-4eb7-a963-4fd2b78066c1","path":"sprites/s_anchor/s_anchor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a6efdb37-3735-47c6-91af-66dde5bb5b49","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"77f879aa-c1e0-4644-b346-07961d995854","path":"sprites/s_anchor/s_anchor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ef3adb1d-5b63-4c0c-b5fe-d746e44bc31c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"516cca1f-4f58-442c-be22-c9cc7bc81cbf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_anchor_rotate/8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255.png b/sprites/s_anchor_rotate/8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255.png deleted file mode 100644 index 5f702867d..000000000 Binary files a/sprites/s_anchor_rotate/8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255.png and /dev/null differ diff --git a/sprites/s_anchor_rotate/8f4322fd-6b72-4165-82dc-965f100aa2cb.png b/sprites/s_anchor_rotate/8f4322fd-6b72-4165-82dc-965f100aa2cb.png new file mode 100644 index 000000000..37d08d4bf Binary files /dev/null and b/sprites/s_anchor_rotate/8f4322fd-6b72-4165-82dc-965f100aa2cb.png differ diff --git a/sprites/s_anchor_rotate/afe8c18f-a84f-4061-806a-2a57751bca1a.png b/sprites/s_anchor_rotate/afe8c18f-a84f-4061-806a-2a57751bca1a.png new file mode 100644 index 000000000..9ad911af5 Binary files /dev/null and b/sprites/s_anchor_rotate/afe8c18f-a84f-4061-806a-2a57751bca1a.png differ diff --git a/sprites/s_anchor_rotate/d86b9481-3deb-403f-a51c-749884026da3.png b/sprites/s_anchor_rotate/d86b9481-3deb-403f-a51c-749884026da3.png deleted file mode 100644 index 8db0c94d3..000000000 Binary files a/sprites/s_anchor_rotate/d86b9481-3deb-403f-a51c-749884026da3.png and /dev/null differ diff --git a/sprites/s_anchor_rotate/layers/8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255/f684be7c-acf3-4818-97af-62b62ede2163.png b/sprites/s_anchor_rotate/layers/8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255/f684be7c-acf3-4818-97af-62b62ede2163.png deleted file mode 100644 index 3485015aa..000000000 Binary files a/sprites/s_anchor_rotate/layers/8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255/f684be7c-acf3-4818-97af-62b62ede2163.png and /dev/null differ diff --git a/sprites/s_anchor_rotate/layers/8f4322fd-6b72-4165-82dc-965f100aa2cb/0cf0550a-efa0-40b6-940d-53bf34c69e6d.png b/sprites/s_anchor_rotate/layers/8f4322fd-6b72-4165-82dc-965f100aa2cb/0cf0550a-efa0-40b6-940d-53bf34c69e6d.png new file mode 100644 index 000000000..37d08d4bf Binary files /dev/null and b/sprites/s_anchor_rotate/layers/8f4322fd-6b72-4165-82dc-965f100aa2cb/0cf0550a-efa0-40b6-940d-53bf34c69e6d.png differ diff --git a/sprites/s_anchor_rotate/layers/afe8c18f-a84f-4061-806a-2a57751bca1a/0cf0550a-efa0-40b6-940d-53bf34c69e6d.png b/sprites/s_anchor_rotate/layers/afe8c18f-a84f-4061-806a-2a57751bca1a/0cf0550a-efa0-40b6-940d-53bf34c69e6d.png new file mode 100644 index 000000000..9ad911af5 Binary files /dev/null and b/sprites/s_anchor_rotate/layers/afe8c18f-a84f-4061-806a-2a57751bca1a/0cf0550a-efa0-40b6-940d-53bf34c69e6d.png differ diff --git a/sprites/s_anchor_rotate/layers/d86b9481-3deb-403f-a51c-749884026da3/f684be7c-acf3-4818-97af-62b62ede2163.png b/sprites/s_anchor_rotate/layers/d86b9481-3deb-403f-a51c-749884026da3/f684be7c-acf3-4818-97af-62b62ede2163.png deleted file mode 100644 index add10ffa7..000000000 Binary files a/sprites/s_anchor_rotate/layers/d86b9481-3deb-403f-a51c-749884026da3/f684be7c-acf3-4818-97af-62b62ede2163.png and /dev/null differ diff --git a/sprites/s_anchor_rotate/s_anchor_rotate.yy b/sprites/s_anchor_rotate/s_anchor_rotate.yy index 30a6ebf0b..b2ac8b074 100644 --- a/sprites/s_anchor_rotate/s_anchor_rotate.yy +++ b/sprites/s_anchor_rotate/s_anchor_rotate.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 23, - "bbox_top": 4, - "bbox_bottom": 19, + "bbox_left": 1, + "bbox_right": 46, + "bbox_top": 9, + "bbox_bottom": 38, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d86b9481-3deb-403f-a51c-749884026da3",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"afe8c18f-a84f-4061-806a-2a57751bca1a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8f4322fd-6b72-4165-82dc-965f100aa2cb",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6fe0b0b9-5d92-434a-b7fe-8b9d513bbdb4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d86b9481-3deb-403f-a51c-749884026da3","path":"sprites/s_anchor_rotate/s_anchor_rotate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"f0a5e7c2-e52a-47d3-a13b-e60a5f0b4bdb","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8d6d2fe0-ac80-4cbd-b8a4-13c8d45dc255","path":"sprites/s_anchor_rotate/s_anchor_rotate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2b9e9303-f2e9-4a63-aa23-33867628b2cd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"afe8c18f-a84f-4061-806a-2a57751bca1a","path":"sprites/s_anchor_rotate/s_anchor_rotate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"dfb408df-c72a-4097-b7c9-2ff18618e734","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8f4322fd-6b72-4165-82dc-965f100aa2cb","path":"sprites/s_anchor_rotate/s_anchor_rotate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f684be7c-acf3-4818-97af-62b62ede2163","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0cf0550a-efa0-40b6-940d-53bf34c69e6d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_anchor_scale/7404b46a-dffb-49ca-85ee-460000eba154.png b/sprites/s_anchor_scale/7404b46a-dffb-49ca-85ee-460000eba154.png new file mode 100644 index 000000000..b292cbf9e Binary files /dev/null and b/sprites/s_anchor_scale/7404b46a-dffb-49ca-85ee-460000eba154.png differ diff --git a/sprites/s_anchor_scale/7e81d7bf-beb9-4c04-aa8f-f5817b87cc57.png b/sprites/s_anchor_scale/7e81d7bf-beb9-4c04-aa8f-f5817b87cc57.png new file mode 100644 index 000000000..8096af99e Binary files /dev/null and b/sprites/s_anchor_scale/7e81d7bf-beb9-4c04-aa8f-f5817b87cc57.png differ diff --git a/sprites/s_anchor_scale/fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e.png b/sprites/s_anchor_scale/fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e.png deleted file mode 100644 index 26125b160..000000000 Binary files a/sprites/s_anchor_scale/fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e.png and /dev/null differ diff --git a/sprites/s_anchor_scale/fa671db9-69c3-43e5-9e63-7c73a1067628.png b/sprites/s_anchor_scale/fa671db9-69c3-43e5-9e63-7c73a1067628.png deleted file mode 100644 index e58780798..000000000 Binary files a/sprites/s_anchor_scale/fa671db9-69c3-43e5-9e63-7c73a1067628.png and /dev/null differ diff --git a/sprites/s_anchor_scale/layers/7404b46a-dffb-49ca-85ee-460000eba154/b9cea933-9ad4-45b2-a061-031a0d6d40af.png b/sprites/s_anchor_scale/layers/7404b46a-dffb-49ca-85ee-460000eba154/b9cea933-9ad4-45b2-a061-031a0d6d40af.png new file mode 100644 index 000000000..b292cbf9e Binary files /dev/null and b/sprites/s_anchor_scale/layers/7404b46a-dffb-49ca-85ee-460000eba154/b9cea933-9ad4-45b2-a061-031a0d6d40af.png differ diff --git a/sprites/s_anchor_scale/layers/7e81d7bf-beb9-4c04-aa8f-f5817b87cc57/b9cea933-9ad4-45b2-a061-031a0d6d40af.png b/sprites/s_anchor_scale/layers/7e81d7bf-beb9-4c04-aa8f-f5817b87cc57/b9cea933-9ad4-45b2-a061-031a0d6d40af.png new file mode 100644 index 000000000..8096af99e Binary files /dev/null and b/sprites/s_anchor_scale/layers/7e81d7bf-beb9-4c04-aa8f-f5817b87cc57/b9cea933-9ad4-45b2-a061-031a0d6d40af.png differ diff --git a/sprites/s_anchor_scale/layers/fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e/5782cfbc-3c30-49d8-8d3b-c36a281e02bb.png b/sprites/s_anchor_scale/layers/fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e/5782cfbc-3c30-49d8-8d3b-c36a281e02bb.png deleted file mode 100644 index 40dcfbc4b..000000000 Binary files a/sprites/s_anchor_scale/layers/fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e/5782cfbc-3c30-49d8-8d3b-c36a281e02bb.png and /dev/null differ diff --git a/sprites/s_anchor_scale/layers/fa671db9-69c3-43e5-9e63-7c73a1067628/5782cfbc-3c30-49d8-8d3b-c36a281e02bb.png b/sprites/s_anchor_scale/layers/fa671db9-69c3-43e5-9e63-7c73a1067628/5782cfbc-3c30-49d8-8d3b-c36a281e02bb.png deleted file mode 100644 index 61b4e2c40..000000000 Binary files a/sprites/s_anchor_scale/layers/fa671db9-69c3-43e5-9e63-7c73a1067628/5782cfbc-3c30-49d8-8d3b-c36a281e02bb.png and /dev/null differ diff --git a/sprites/s_anchor_scale/s_anchor_scale.yy b/sprites/s_anchor_scale/s_anchor_scale.yy index 57c9a62cd..496db687b 100644 --- a/sprites/s_anchor_scale/s_anchor_scale.yy +++ b/sprites/s_anchor_scale/s_anchor_scale.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 23, - "bbox_top": 0, - "bbox_bottom": 23, + "bbox_left": 1, + "bbox_right": 46, + "bbox_top": 1, + "bbox_bottom": 46, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fa671db9-69c3-43e5-9e63-7c73a1067628",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7404b46a-dffb-49ca-85ee-460000eba154",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7e81d7bf-beb9-4c04-aa8f-f5817b87cc57",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0907cdba-b53d-48af-a512-bc153bca97e8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fa0eeb4d-6f1c-4ecb-9362-30159a4bc47e","path":"sprites/s_anchor_scale/s_anchor_scale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"4ee361c3-b42e-4b91-af11-9ac9ae6da05f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fa671db9-69c3-43e5-9e63-7c73a1067628","path":"sprites/s_anchor_scale/s_anchor_scale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"842488db-08e5-494b-b9d0-2d6150926684","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7404b46a-dffb-49ca-85ee-460000eba154","path":"sprites/s_anchor_scale/s_anchor_scale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9c30304d-1fc1-4c1b-b188-7a9f1dc1954d","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7e81d7bf-beb9-4c04-aa8f-f5817b87cc57","path":"sprites/s_anchor_scale/s_anchor_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,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5782cfbc-3c30-49d8-8d3b-c36a281e02bb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b9cea933-9ad4-45b2-a061-031a0d6d40af","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_anchor_scale_hori/0f705735-673a-4c0f-bc47-c1473f348e76.png b/sprites/s_anchor_scale_hori/0f705735-673a-4c0f-bc47-c1473f348e76.png new file mode 100644 index 000000000..65e4c8feb Binary files /dev/null and b/sprites/s_anchor_scale_hori/0f705735-673a-4c0f-bc47-c1473f348e76.png differ diff --git a/sprites/s_anchor_scale_hori/29bf928c-20f3-42f8-8c58-9b49b787c566.png b/sprites/s_anchor_scale_hori/29bf928c-20f3-42f8-8c58-9b49b787c566.png deleted file mode 100644 index 4e5343380..000000000 Binary files a/sprites/s_anchor_scale_hori/29bf928c-20f3-42f8-8c58-9b49b787c566.png and /dev/null differ diff --git a/sprites/s_anchor_scale_hori/7bfe8464-c766-4402-b543-bd8564753b28.png b/sprites/s_anchor_scale_hori/7bfe8464-c766-4402-b543-bd8564753b28.png deleted file mode 100644 index 0aabf541b..000000000 Binary files a/sprites/s_anchor_scale_hori/7bfe8464-c766-4402-b543-bd8564753b28.png and /dev/null differ diff --git a/sprites/s_anchor_scale_hori/d6b1df0f-e1bb-47f2-a466-003cc3640ea4.png b/sprites/s_anchor_scale_hori/d6b1df0f-e1bb-47f2-a466-003cc3640ea4.png new file mode 100644 index 000000000..1a4c9fdab Binary files /dev/null and b/sprites/s_anchor_scale_hori/d6b1df0f-e1bb-47f2-a466-003cc3640ea4.png differ diff --git a/sprites/s_anchor_scale_hori/layers/0f705735-673a-4c0f-bc47-c1473f348e76/52f8f5ea-42a3-4130-99e2-719cf13e8b87.png b/sprites/s_anchor_scale_hori/layers/0f705735-673a-4c0f-bc47-c1473f348e76/52f8f5ea-42a3-4130-99e2-719cf13e8b87.png new file mode 100644 index 000000000..65e4c8feb Binary files /dev/null and b/sprites/s_anchor_scale_hori/layers/0f705735-673a-4c0f-bc47-c1473f348e76/52f8f5ea-42a3-4130-99e2-719cf13e8b87.png differ diff --git a/sprites/s_anchor_scale_hori/layers/29bf928c-20f3-42f8-8c58-9b49b787c566/0aec146d-a22f-4514-9114-25d77cf4af01.png b/sprites/s_anchor_scale_hori/layers/29bf928c-20f3-42f8-8c58-9b49b787c566/0aec146d-a22f-4514-9114-25d77cf4af01.png deleted file mode 100644 index ce95bf273..000000000 Binary files a/sprites/s_anchor_scale_hori/layers/29bf928c-20f3-42f8-8c58-9b49b787c566/0aec146d-a22f-4514-9114-25d77cf4af01.png and /dev/null differ diff --git a/sprites/s_anchor_scale_hori/layers/7bfe8464-c766-4402-b543-bd8564753b28/0aec146d-a22f-4514-9114-25d77cf4af01.png b/sprites/s_anchor_scale_hori/layers/7bfe8464-c766-4402-b543-bd8564753b28/0aec146d-a22f-4514-9114-25d77cf4af01.png deleted file mode 100644 index 758193dc9..000000000 Binary files a/sprites/s_anchor_scale_hori/layers/7bfe8464-c766-4402-b543-bd8564753b28/0aec146d-a22f-4514-9114-25d77cf4af01.png and /dev/null differ diff --git a/sprites/s_anchor_scale_hori/layers/d6b1df0f-e1bb-47f2-a466-003cc3640ea4/52f8f5ea-42a3-4130-99e2-719cf13e8b87.png b/sprites/s_anchor_scale_hori/layers/d6b1df0f-e1bb-47f2-a466-003cc3640ea4/52f8f5ea-42a3-4130-99e2-719cf13e8b87.png new file mode 100644 index 000000000..1a4c9fdab Binary files /dev/null and b/sprites/s_anchor_scale_hori/layers/d6b1df0f-e1bb-47f2-a466-003cc3640ea4/52f8f5ea-42a3-4130-99e2-719cf13e8b87.png differ diff --git a/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy b/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy index 910516336..e94c4fad8 100644 --- a/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy +++ b/sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 4, - "bbox_bottom": 19, + "bbox_right": 63, + "bbox_top": 9, + "bbox_bottom": 38, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 24, + "width": 64, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7bfe8464-c766-4402-b543-bd8564753b28",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29bf928c-20f3-42f8-8c58-9b49b787c566",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f705735-673a-4c0f-bc47-c1473f348e76",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6b1df0f-e1bb-47f2-a466-003cc3640ea4",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"eb0d0430-459f-4519-bc20-f492a7e8365b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7bfe8464-c766-4402-b543-bd8564753b28","path":"sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"6878a748-30cd-42f8-99c2-20b92dd0df32","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"29bf928c-20f3-42f8-8c58-9b49b787c566","path":"sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6c612bc5-6e8f-436a-98c8-b61f65b8d784","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f705735-673a-4c0f-bc47-c1473f348e76","path":"sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b06cb56c-7b36-413b-8b25-cc84f063cc45","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6b1df0f-e1bb-47f2-a466-003cc3640ea4","path":"sprites/s_anchor_scale_hori/s_anchor_scale_hori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 12, + "xorigin": 32, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0aec146d-a22f-4514-9114-25d77cf4af01","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"52f8f5ea-42a3-4130-99e2-719cf13e8b87","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_anchor_selector/365737dd-3715-4ddf-87ef-f760d9fbc45b.png b/sprites/s_anchor_selector/365737dd-3715-4ddf-87ef-f760d9fbc45b.png deleted file mode 100644 index b076a93f7..000000000 Binary files a/sprites/s_anchor_selector/365737dd-3715-4ddf-87ef-f760d9fbc45b.png and /dev/null differ diff --git a/sprites/s_anchor_selector/40b8e1f1-927e-49bb-9cff-73df26c3504f.png b/sprites/s_anchor_selector/40b8e1f1-927e-49bb-9cff-73df26c3504f.png deleted file mode 100644 index fb4428c6b..000000000 Binary files a/sprites/s_anchor_selector/40b8e1f1-927e-49bb-9cff-73df26c3504f.png and /dev/null differ diff --git a/sprites/s_anchor_selector/4daed0b9-73eb-43d2-86f3-d9a00a54bfa5.png b/sprites/s_anchor_selector/4daed0b9-73eb-43d2-86f3-d9a00a54bfa5.png new file mode 100644 index 000000000..6a737754b Binary files /dev/null and b/sprites/s_anchor_selector/4daed0b9-73eb-43d2-86f3-d9a00a54bfa5.png differ diff --git a/sprites/s_anchor_selector/795d8f99-8b59-478b-b9d2-76b674364ba0.png b/sprites/s_anchor_selector/795d8f99-8b59-478b-b9d2-76b674364ba0.png deleted file mode 100644 index 0ede3d0e2..000000000 Binary files a/sprites/s_anchor_selector/795d8f99-8b59-478b-b9d2-76b674364ba0.png and /dev/null differ diff --git a/sprites/s_anchor_selector/f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a.png b/sprites/s_anchor_selector/f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a.png new file mode 100644 index 000000000..558be45a5 Binary files /dev/null and b/sprites/s_anchor_selector/f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a.png differ diff --git a/sprites/s_anchor_selector/f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2.png b/sprites/s_anchor_selector/f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2.png new file mode 100644 index 000000000..7d62df373 Binary files /dev/null and b/sprites/s_anchor_selector/f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2.png differ diff --git a/sprites/s_anchor_selector/layers/365737dd-3715-4ddf-87ef-f760d9fbc45b/7071c060-80cc-4b76-94ae-3b2d000e5172.png b/sprites/s_anchor_selector/layers/365737dd-3715-4ddf-87ef-f760d9fbc45b/7071c060-80cc-4b76-94ae-3b2d000e5172.png deleted file mode 100644 index dce41de2e..000000000 Binary files a/sprites/s_anchor_selector/layers/365737dd-3715-4ddf-87ef-f760d9fbc45b/7071c060-80cc-4b76-94ae-3b2d000e5172.png and /dev/null differ diff --git a/sprites/s_anchor_selector/layers/40b8e1f1-927e-49bb-9cff-73df26c3504f/7071c060-80cc-4b76-94ae-3b2d000e5172.png b/sprites/s_anchor_selector/layers/40b8e1f1-927e-49bb-9cff-73df26c3504f/7071c060-80cc-4b76-94ae-3b2d000e5172.png deleted file mode 100644 index 2ef8bd9ea..000000000 Binary files a/sprites/s_anchor_selector/layers/40b8e1f1-927e-49bb-9cff-73df26c3504f/7071c060-80cc-4b76-94ae-3b2d000e5172.png and /dev/null differ diff --git a/sprites/s_anchor_selector/layers/4daed0b9-73eb-43d2-86f3-d9a00a54bfa5/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png b/sprites/s_anchor_selector/layers/4daed0b9-73eb-43d2-86f3-d9a00a54bfa5/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png new file mode 100644 index 000000000..6a737754b Binary files /dev/null and b/sprites/s_anchor_selector/layers/4daed0b9-73eb-43d2-86f3-d9a00a54bfa5/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png differ diff --git a/sprites/s_anchor_selector/layers/795d8f99-8b59-478b-b9d2-76b674364ba0/7071c060-80cc-4b76-94ae-3b2d000e5172.png b/sprites/s_anchor_selector/layers/795d8f99-8b59-478b-b9d2-76b674364ba0/7071c060-80cc-4b76-94ae-3b2d000e5172.png deleted file mode 100644 index edc9b89c5..000000000 Binary files a/sprites/s_anchor_selector/layers/795d8f99-8b59-478b-b9d2-76b674364ba0/7071c060-80cc-4b76-94ae-3b2d000e5172.png and /dev/null differ diff --git a/sprites/s_anchor_selector/layers/f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png b/sprites/s_anchor_selector/layers/f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png new file mode 100644 index 000000000..558be45a5 Binary files /dev/null and b/sprites/s_anchor_selector/layers/f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png differ diff --git a/sprites/s_anchor_selector/layers/f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png b/sprites/s_anchor_selector/layers/f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png new file mode 100644 index 000000000..7d62df373 Binary files /dev/null and b/sprites/s_anchor_selector/layers/f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2/5e1518a7-ffdf-4273-9d9b-f857cd6478ec.png differ diff --git a/sprites/s_anchor_selector/s_anchor_selector.yy b/sprites/s_anchor_selector/s_anchor_selector.yy index 2ad489e2b..a4e4216b2 100644 --- a/sprites/s_anchor_selector/s_anchor_selector.yy +++ b/sprites/s_anchor_selector/s_anchor_selector.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 17, - "bbox_top": 0, - "bbox_bottom": 17, + "bbox_left": 1, + "bbox_right": 34, + "bbox_top": 1, + "bbox_bottom": 34, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 18, - "height": 18, + "width": 36, + "height": 36, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"795d8f99-8b59-478b-b9d2-76b674364ba0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"40b8e1f1-927e-49bb-9cff-73df26c3504f",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"365737dd-3715-4ddf-87ef-f760d9fbc45b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4daed0b9-73eb-43d2-86f3-d9a00a54bfa5",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"15aae5db-f376-46b5-9dad-48c9ca9bdcb0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"795d8f99-8b59-478b-b9d2-76b674364ba0","path":"sprites/s_anchor_selector/s_anchor_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"112ef423-7b90-4a71-8be2-618e0748381c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"40b8e1f1-927e-49bb-9cff-73df26c3504f","path":"sprites/s_anchor_selector/s_anchor_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"6f0be7d5-fcac-4ff3-85d4-347a69a57217","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"365737dd-3715-4ddf-87ef-f760d9fbc45b","path":"sprites/s_anchor_selector/s_anchor_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"aebb6e39-c439-42dd-94b6-10267b06b84c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f2c251c3-c9ee-4e0f-9b44-7d76fe4e134a","path":"sprites/s_anchor_selector/s_anchor_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"97ee6e77-8589-4a4b-9da8-b44596f06fdc","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f76f1a0f-1ff4-40fd-8c53-e2eae88d28a2","path":"sprites/s_anchor_selector/s_anchor_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fd441315-3ce5-4579-b7d1-8f01c59a6330","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4daed0b9-73eb-43d2-86f3-d9a00a54bfa5","path":"sprites/s_anchor_selector/s_anchor_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,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 9, - "yorigin": 9, + "xorigin": 18, + "yorigin": 18, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7071c060-80cc-4b76-94ae-3b2d000e5172","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5e1518a7-ffdf-4273-9d9b-f857cd6478ec","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_animate_clock/5cd8af71-e0e6-4fcd-8b59-e79870bd20a6.png b/sprites/s_animate_clock/5cd8af71-e0e6-4fcd-8b59-e79870bd20a6.png new file mode 100644 index 000000000..3aa32f3d8 Binary files /dev/null and b/sprites/s_animate_clock/5cd8af71-e0e6-4fcd-8b59-e79870bd20a6.png differ diff --git a/sprites/s_animate_clock/6834d5b7-d54e-4c98-99b2-739ea2611aac.png b/sprites/s_animate_clock/6834d5b7-d54e-4c98-99b2-739ea2611aac.png deleted file mode 100644 index e5012c42c..000000000 Binary files a/sprites/s_animate_clock/6834d5b7-d54e-4c98-99b2-739ea2611aac.png and /dev/null differ diff --git a/sprites/s_animate_clock/815d2393-f810-4be3-959c-049e54282e54.png b/sprites/s_animate_clock/815d2393-f810-4be3-959c-049e54282e54.png deleted file mode 100644 index 2cbd30b27..000000000 Binary files a/sprites/s_animate_clock/815d2393-f810-4be3-959c-049e54282e54.png and /dev/null differ diff --git a/sprites/s_animate_clock/a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2.png b/sprites/s_animate_clock/a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2.png deleted file mode 100644 index 0a9dd07e4..000000000 Binary files a/sprites/s_animate_clock/a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2.png and /dev/null differ diff --git a/sprites/s_animate_clock/af258e0a-ef35-4f5c-8af1-f7808e0c081b.png b/sprites/s_animate_clock/af258e0a-ef35-4f5c-8af1-f7808e0c081b.png new file mode 100644 index 000000000..4d106f4da Binary files /dev/null and b/sprites/s_animate_clock/af258e0a-ef35-4f5c-8af1-f7808e0c081b.png differ diff --git a/sprites/s_animate_clock/b5ecf3cb-6099-4718-816c-20dc5c91c06b.png b/sprites/s_animate_clock/b5ecf3cb-6099-4718-816c-20dc5c91c06b.png new file mode 100644 index 000000000..04d7b2265 Binary files /dev/null and b/sprites/s_animate_clock/b5ecf3cb-6099-4718-816c-20dc5c91c06b.png differ diff --git a/sprites/s_animate_clock/layers/5cd8af71-e0e6-4fcd-8b59-e79870bd20a6/48813da3-9052-4f32-80fa-5bcc8269662c.png b/sprites/s_animate_clock/layers/5cd8af71-e0e6-4fcd-8b59-e79870bd20a6/48813da3-9052-4f32-80fa-5bcc8269662c.png new file mode 100644 index 000000000..3aa32f3d8 Binary files /dev/null and b/sprites/s_animate_clock/layers/5cd8af71-e0e6-4fcd-8b59-e79870bd20a6/48813da3-9052-4f32-80fa-5bcc8269662c.png differ diff --git a/sprites/s_animate_clock/layers/6834d5b7-d54e-4c98-99b2-739ea2611aac/238fe7b8-d41a-4828-8c7d-ab218160beb0.png b/sprites/s_animate_clock/layers/6834d5b7-d54e-4c98-99b2-739ea2611aac/238fe7b8-d41a-4828-8c7d-ab218160beb0.png deleted file mode 100644 index 357b7d8da..000000000 Binary files a/sprites/s_animate_clock/layers/6834d5b7-d54e-4c98-99b2-739ea2611aac/238fe7b8-d41a-4828-8c7d-ab218160beb0.png and /dev/null differ diff --git a/sprites/s_animate_clock/layers/815d2393-f810-4be3-959c-049e54282e54/238fe7b8-d41a-4828-8c7d-ab218160beb0.png b/sprites/s_animate_clock/layers/815d2393-f810-4be3-959c-049e54282e54/238fe7b8-d41a-4828-8c7d-ab218160beb0.png deleted file mode 100644 index 0a43d2550..000000000 Binary files a/sprites/s_animate_clock/layers/815d2393-f810-4be3-959c-049e54282e54/238fe7b8-d41a-4828-8c7d-ab218160beb0.png and /dev/null differ diff --git a/sprites/s_animate_clock/layers/a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2/238fe7b8-d41a-4828-8c7d-ab218160beb0.png b/sprites/s_animate_clock/layers/a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2/238fe7b8-d41a-4828-8c7d-ab218160beb0.png deleted file mode 100644 index 1daca896f..000000000 Binary files a/sprites/s_animate_clock/layers/a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2/238fe7b8-d41a-4828-8c7d-ab218160beb0.png and /dev/null differ diff --git a/sprites/s_animate_clock/layers/af258e0a-ef35-4f5c-8af1-f7808e0c081b/48813da3-9052-4f32-80fa-5bcc8269662c.png b/sprites/s_animate_clock/layers/af258e0a-ef35-4f5c-8af1-f7808e0c081b/48813da3-9052-4f32-80fa-5bcc8269662c.png new file mode 100644 index 000000000..4d106f4da Binary files /dev/null and b/sprites/s_animate_clock/layers/af258e0a-ef35-4f5c-8af1-f7808e0c081b/48813da3-9052-4f32-80fa-5bcc8269662c.png differ diff --git a/sprites/s_animate_clock/layers/b5ecf3cb-6099-4718-816c-20dc5c91c06b/48813da3-9052-4f32-80fa-5bcc8269662c.png b/sprites/s_animate_clock/layers/b5ecf3cb-6099-4718-816c-20dc5c91c06b/48813da3-9052-4f32-80fa-5bcc8269662c.png new file mode 100644 index 000000000..04d7b2265 Binary files /dev/null and b/sprites/s_animate_clock/layers/b5ecf3cb-6099-4718-816c-20dc5c91c06b/48813da3-9052-4f32-80fa-5bcc8269662c.png differ diff --git a/sprites/s_animate_clock/s_animate_clock.yy b/sprites/s_animate_clock/s_animate_clock.yy index eea6ab003..8ae799cbc 100644 --- a/sprites/s_animate_clock/s_animate_clock.yy +++ b/sprites/s_animate_clock/s_animate_clock.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bbox_bottom": 15, + "bbox_left": 1, + "bbox_right": 30, + "bbox_top": 1, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6834d5b7-d54e-4c98-99b2-739ea2611aac",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"815d2393-f810-4be3-959c-049e54282e54",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5cd8af71-e0e6-4fcd-8b59-e79870bd20a6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5ecf3cb-6099-4718-816c-20dc5c91c06b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"af258e0a-ef35-4f5c-8af1-f7808e0c081b",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"36578f09-a6ae-429f-9aea-0ac7e1e9aa6e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6834d5b7-d54e-4c98-99b2-739ea2611aac","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"85296612-feec-44af-9a58-162395422d98","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"815d2393-f810-4be3-959c-049e54282e54","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"11562036-922f-4a78-b7a9-1afa4df3f13a","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a9910c8e-7d8d-4bfd-a9bf-65e5b677bcb2","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e3c2e978-c2fb-4a36-a924-dd5de2f95f6d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5cd8af71-e0e6-4fcd-8b59-e79870bd20a6","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"18e01418-e8b5-4bef-a566-f7a352f13617","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b5ecf3cb-6099-4718-816c-20dc5c91c06b","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fc7488f8-6434-4c31-9c39-88788a9f7959","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"af258e0a-ef35-4f5c-8af1-f7808e0c081b","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"238fe7b8-d41a-4828-8c7d-ab218160beb0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"48813da3-9052-4f32-80fa-5bcc8269662c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_animate_node_go/a404530a-a2d8-4591-b762-b8703d80ce5b.png b/sprites/s_animate_node_go/a404530a-a2d8-4591-b762-b8703d80ce5b.png new file mode 100644 index 000000000..cfe84c4ff Binary files /dev/null and b/sprites/s_animate_node_go/a404530a-a2d8-4591-b762-b8703d80ce5b.png differ diff --git a/sprites/s_animate_node_go/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2.png b/sprites/s_animate_node_go/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2.png deleted file mode 100644 index a574cc91e..000000000 Binary files a/sprites/s_animate_node_go/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2.png and /dev/null differ diff --git a/sprites/s_animate_node_go/layers/a404530a-a2d8-4591-b762-b8703d80ce5b/5f320ef2-5f93-40f9-959f-3a8fa70852af.png b/sprites/s_animate_node_go/layers/a404530a-a2d8-4591-b762-b8703d80ce5b/5f320ef2-5f93-40f9-959f-3a8fa70852af.png new file mode 100644 index 000000000..cfe84c4ff Binary files /dev/null and b/sprites/s_animate_node_go/layers/a404530a-a2d8-4591-b762-b8703d80ce5b/5f320ef2-5f93-40f9-959f-3a8fa70852af.png differ diff --git a/sprites/s_animate_node_go/layers/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2/40566cbf-9d94-48b7-88b4-72ea813b2e39.png b/sprites/s_animate_node_go/layers/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2/40566cbf-9d94-48b7-88b4-72ea813b2e39.png deleted file mode 100644 index b8559e698..000000000 Binary files a/sprites/s_animate_node_go/layers/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2/40566cbf-9d94-48b7-88b4-72ea813b2e39.png and /dev/null differ diff --git a/sprites/s_animate_node_go/s_animate_node_go.yy b/sprites/s_animate_node_go/s_animate_node_go.yy index 14c890c65..1abba4f6e 100644 --- a/sprites/s_animate_node_go/s_animate_node_go.yy +++ b/sprites/s_animate_node_go/s_animate_node_go.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 9, + "bbox_right": 19, "bbox_top": 0, - "bbox_bottom": 9, + "bbox_bottom": 19, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 10, - "height": 10, + "width": 20, + "height": 20, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cd6ddb9e-a09d-4a61-9d57-835429d9c2d2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a404530a-a2d8-4591-b762-b8703d80ce5b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"51b2e4b8-65b0-46c4-988b-1c88c165a785","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cd6ddb9e-a09d-4a61-9d57-835429d9c2d2","path":"sprites/s_animate_node_go/s_animate_node_go.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d1411391-22cf-42b1-9b91-480a50b09774","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a404530a-a2d8-4591-b762-b8703d80ce5b","path":"sprites/s_animate_node_go/s_animate_node_go.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 5, - "yorigin": 5, + "xorigin": 10, + "yorigin": 10, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"40566cbf-9d94-48b7-88b4-72ea813b2e39","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5f320ef2-5f93-40f9-959f-3a8fa70852af","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_animation_setting/7eb9e04b-43ee-4426-ae7e-e3f372b5434d.png b/sprites/s_animation_setting/7eb9e04b-43ee-4426-ae7e-e3f372b5434d.png deleted file mode 100644 index e0d99b027..000000000 Binary files a/sprites/s_animation_setting/7eb9e04b-43ee-4426-ae7e-e3f372b5434d.png and /dev/null differ diff --git a/sprites/s_animation_setting/f90060bf-5c38-4a0f-8dd5-d3faedbe48a1.png b/sprites/s_animation_setting/f90060bf-5c38-4a0f-8dd5-d3faedbe48a1.png new file mode 100644 index 000000000..2129ceebc Binary files /dev/null and b/sprites/s_animation_setting/f90060bf-5c38-4a0f-8dd5-d3faedbe48a1.png differ diff --git a/sprites/s_animation_setting/layers/7eb9e04b-43ee-4426-ae7e-e3f372b5434d/33631190-45e5-48b4-a187-bdcc61666c0d.png b/sprites/s_animation_setting/layers/7eb9e04b-43ee-4426-ae7e-e3f372b5434d/33631190-45e5-48b4-a187-bdcc61666c0d.png deleted file mode 100644 index 104dcec64..000000000 Binary files a/sprites/s_animation_setting/layers/7eb9e04b-43ee-4426-ae7e-e3f372b5434d/33631190-45e5-48b4-a187-bdcc61666c0d.png and /dev/null differ diff --git a/sprites/s_animation_setting/layers/f90060bf-5c38-4a0f-8dd5-d3faedbe48a1/8df61d46-eb00-4ce9-96b6-7709630c5286.png b/sprites/s_animation_setting/layers/f90060bf-5c38-4a0f-8dd5-d3faedbe48a1/8df61d46-eb00-4ce9-96b6-7709630c5286.png new file mode 100644 index 000000000..2129ceebc Binary files /dev/null and b/sprites/s_animation_setting/layers/f90060bf-5c38-4a0f-8dd5-d3faedbe48a1/8df61d46-eb00-4ce9-96b6-7709630c5286.png differ diff --git a/sprites/s_animation_setting/s_animation_setting.yy b/sprites/s_animation_setting/s_animation_setting.yy index 7ad23869a..7006e5d4f 100644 --- a/sprites/s_animation_setting/s_animation_setting.yy +++ b/sprites/s_animation_setting/s_animation_setting.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 5, + "bbox_right": 45, + "bbox_top": 3, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7eb9e04b-43ee-4426-ae7e-e3f372b5434d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f90060bf-5c38-4a0f-8dd5-d3faedbe48a1",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f2610417-a463-4805-8dae-e4d61f67e62f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7eb9e04b-43ee-4426-ae7e-e3f372b5434d","path":"sprites/s_animation_setting/s_animation_setting.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4ff751fb-a403-44af-875f-fe28b1e56417","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f90060bf-5c38-4a0f-8dd5-d3faedbe48a1","path":"sprites/s_animation_setting/s_animation_setting.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"33631190-45e5-48b4-a187-bdcc61666c0d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8df61d46-eb00-4ce9-96b6-7709630c5286","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_animation_timing/3ad9e3f5-d553-4969-8073-e620d7b04bc0.png b/sprites/s_animation_timing/3ad9e3f5-d553-4969-8073-e620d7b04bc0.png new file mode 100644 index 000000000..1edd11750 Binary files /dev/null and b/sprites/s_animation_timing/3ad9e3f5-d553-4969-8073-e620d7b04bc0.png differ diff --git a/sprites/s_animation_timing/441bbc61-51ff-4822-9545-dc62a1ec7259.png b/sprites/s_animation_timing/441bbc61-51ff-4822-9545-dc62a1ec7259.png deleted file mode 100644 index 8fba59b97..000000000 Binary files a/sprites/s_animation_timing/441bbc61-51ff-4822-9545-dc62a1ec7259.png and /dev/null differ diff --git a/sprites/s_animation_timing/layers/3ad9e3f5-d553-4969-8073-e620d7b04bc0/22760c28-18e3-42aa-98cd-bcf08d2da8f2.png b/sprites/s_animation_timing/layers/3ad9e3f5-d553-4969-8073-e620d7b04bc0/22760c28-18e3-42aa-98cd-bcf08d2da8f2.png new file mode 100644 index 000000000..1edd11750 Binary files /dev/null and b/sprites/s_animation_timing/layers/3ad9e3f5-d553-4969-8073-e620d7b04bc0/22760c28-18e3-42aa-98cd-bcf08d2da8f2.png differ diff --git a/sprites/s_animation_timing/layers/441bbc61-51ff-4822-9545-dc62a1ec7259/ef0f70a6-68b8-47bb-815e-2665512a7edd.png b/sprites/s_animation_timing/layers/441bbc61-51ff-4822-9545-dc62a1ec7259/ef0f70a6-68b8-47bb-815e-2665512a7edd.png deleted file mode 100644 index de4b943b7..000000000 Binary files a/sprites/s_animation_timing/layers/441bbc61-51ff-4822-9545-dc62a1ec7259/ef0f70a6-68b8-47bb-815e-2665512a7edd.png and /dev/null differ diff --git a/sprites/s_animation_timing/s_animation_timing.yy b/sprites/s_animation_timing/s_animation_timing.yy index 30b2ad5f8..c0a518ac6 100644 --- a/sprites/s_animation_timing/s_animation_timing.yy +++ b/sprites/s_animation_timing/s_animation_timing.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 23, + "bbox_left": 2, + "bbox_right": 47, "bbox_top": 1, - "bbox_bottom": 22, + "bbox_bottom": 46, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"441bbc61-51ff-4822-9545-dc62a1ec7259",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3ad9e3f5-d553-4969-8073-e620d7b04bc0",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5bc15f05-9ddb-41e1-8dcc-5fd6fd8ff0d5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"441bbc61-51ff-4822-9545-dc62a1ec7259","path":"sprites/s_animation_timing/s_animation_timing.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a77b7a85-1819-4f77-8d0f-e217429b8462","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3ad9e3f5-d553-4969-8073-e620d7b04bc0","path":"sprites/s_animation_timing/s_animation_timing.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ef0f70a6-68b8-47bb-815e-2665512a7edd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"22760c28-18e3-42aa-98cd-bcf08d2da8f2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_arrow_16/0036fc84-2609-4ede-a1da-99fe455c93dc.png b/sprites/s_arrow_16/0036fc84-2609-4ede-a1da-99fe455c93dc.png deleted file mode 100644 index b57061198..000000000 Binary files a/sprites/s_arrow_16/0036fc84-2609-4ede-a1da-99fe455c93dc.png and /dev/null differ diff --git a/sprites/s_arrow_16/24985394-dff3-4e31-ab3e-ee3b268b01ca.png b/sprites/s_arrow_16/24985394-dff3-4e31-ab3e-ee3b268b01ca.png deleted file mode 100644 index 99543ffba..000000000 Binary files a/sprites/s_arrow_16/24985394-dff3-4e31-ab3e-ee3b268b01ca.png and /dev/null differ diff --git a/sprites/s_arrow_16/48c2cbdb-e084-4513-afb9-dfaf7b2f187b.png b/sprites/s_arrow_16/48c2cbdb-e084-4513-afb9-dfaf7b2f187b.png deleted file mode 100644 index 035f32e42..000000000 Binary files a/sprites/s_arrow_16/48c2cbdb-e084-4513-afb9-dfaf7b2f187b.png and /dev/null differ diff --git a/sprites/s_arrow_16/4a7dad1e-488c-4313-ab21-04571f213d22.png b/sprites/s_arrow_16/4a7dad1e-488c-4313-ab21-04571f213d22.png new file mode 100644 index 000000000..47c9fbf41 Binary files /dev/null and b/sprites/s_arrow_16/4a7dad1e-488c-4313-ab21-04571f213d22.png differ diff --git a/sprites/s_arrow_16/5d46e8ab-222a-4f57-9409-67bece808315.png b/sprites/s_arrow_16/5d46e8ab-222a-4f57-9409-67bece808315.png new file mode 100644 index 000000000..6388f7874 Binary files /dev/null and b/sprites/s_arrow_16/5d46e8ab-222a-4f57-9409-67bece808315.png differ diff --git a/sprites/s_arrow_16/708266d8-1921-4ec1-8fe9-4487d8028e42.png b/sprites/s_arrow_16/708266d8-1921-4ec1-8fe9-4487d8028e42.png new file mode 100644 index 000000000..8e214d081 Binary files /dev/null and b/sprites/s_arrow_16/708266d8-1921-4ec1-8fe9-4487d8028e42.png differ diff --git a/sprites/s_arrow_16/813a9917-5e51-4806-bce2-d79acad56d10.png b/sprites/s_arrow_16/813a9917-5e51-4806-bce2-d79acad56d10.png new file mode 100644 index 000000000..1df819b65 Binary files /dev/null and b/sprites/s_arrow_16/813a9917-5e51-4806-bce2-d79acad56d10.png differ diff --git a/sprites/s_arrow_16/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png b/sprites/s_arrow_16/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png deleted file mode 100644 index 72d04b6bf..000000000 Binary files a/sprites/s_arrow_16/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png and /dev/null differ diff --git a/sprites/s_arrow_16/layers/0036fc84-2609-4ede-a1da-99fe455c93dc/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png b/sprites/s_arrow_16/layers/0036fc84-2609-4ede-a1da-99fe455c93dc/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png deleted file mode 100644 index 994a2cf10..000000000 Binary files a/sprites/s_arrow_16/layers/0036fc84-2609-4ede-a1da-99fe455c93dc/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png and /dev/null differ diff --git a/sprites/s_arrow_16/layers/24985394-dff3-4e31-ab3e-ee3b268b01ca/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png b/sprites/s_arrow_16/layers/24985394-dff3-4e31-ab3e-ee3b268b01ca/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png deleted file mode 100644 index 737523145..000000000 Binary files a/sprites/s_arrow_16/layers/24985394-dff3-4e31-ab3e-ee3b268b01ca/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png and /dev/null differ diff --git a/sprites/s_arrow_16/layers/48c2cbdb-e084-4513-afb9-dfaf7b2f187b/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png b/sprites/s_arrow_16/layers/48c2cbdb-e084-4513-afb9-dfaf7b2f187b/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png deleted file mode 100644 index 2e609f8d6..000000000 Binary files a/sprites/s_arrow_16/layers/48c2cbdb-e084-4513-afb9-dfaf7b2f187b/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png and /dev/null differ diff --git a/sprites/s_arrow_16/layers/4a7dad1e-488c-4313-ab21-04571f213d22/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png b/sprites/s_arrow_16/layers/4a7dad1e-488c-4313-ab21-04571f213d22/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png new file mode 100644 index 000000000..47c9fbf41 Binary files /dev/null and b/sprites/s_arrow_16/layers/4a7dad1e-488c-4313-ab21-04571f213d22/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png differ diff --git a/sprites/s_arrow_16/layers/5d46e8ab-222a-4f57-9409-67bece808315/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png b/sprites/s_arrow_16/layers/5d46e8ab-222a-4f57-9409-67bece808315/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png new file mode 100644 index 000000000..6388f7874 Binary files /dev/null and b/sprites/s_arrow_16/layers/5d46e8ab-222a-4f57-9409-67bece808315/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png differ diff --git a/sprites/s_arrow_16/layers/708266d8-1921-4ec1-8fe9-4487d8028e42/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png b/sprites/s_arrow_16/layers/708266d8-1921-4ec1-8fe9-4487d8028e42/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png new file mode 100644 index 000000000..8e214d081 Binary files /dev/null and b/sprites/s_arrow_16/layers/708266d8-1921-4ec1-8fe9-4487d8028e42/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png differ diff --git a/sprites/s_arrow_16/layers/813a9917-5e51-4806-bce2-d79acad56d10/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png b/sprites/s_arrow_16/layers/813a9917-5e51-4806-bce2-d79acad56d10/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png new file mode 100644 index 000000000..1df819b65 Binary files /dev/null and b/sprites/s_arrow_16/layers/813a9917-5e51-4806-bce2-d79acad56d10/c94aac98-fd43-4fa0-87b4-f203f8ce2fd0.png differ diff --git a/sprites/s_arrow_16/layers/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png b/sprites/s_arrow_16/layers/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png deleted file mode 100644 index be5573e58..000000000 Binary files a/sprites/s_arrow_16/layers/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png and /dev/null differ diff --git a/sprites/s_arrow_16/s_arrow_16.yy b/sprites/s_arrow_16/s_arrow_16.yy index f4e6e98a0..9ce81a0cd 100644 --- a/sprites/s_arrow_16/s_arrow_16.yy +++ b/sprites/s_arrow_16/s_arrow_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 12, - "bbox_top": 3, - "bbox_bottom": 12, + "bbox_left": 6, + "bbox_right": 25, + "bbox_top": 6, + "bbox_bottom": 25, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,10 +28,10 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"48c2cbdb-e084-4513-afb9-dfaf7b2f187b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0036fc84-2609-4ede-a1da-99fe455c93dc",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"24985394-dff3-4e31-ab3e-ee3b268b01ca",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"813a9917-5e51-4806-bce2-d79acad56d10",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5d46e8ab-222a-4f57-9409-67bece808315",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4a7dad1e-488c-4313-ab21-04571f213d22",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"708266d8-1921-4ec1-8fe9-4487d8028e42",}, ], "sequence": { "resourceType": "GMSequence", @@ -48,10 +48,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"be70f7bf-ac8a-4b9c-9164-be1a6c8c1cfb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"48c2cbdb-e084-4513-afb9-dfaf7b2f187b","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"416f10bd-aa8d-47ff-a2ed-f224b35d5bfd","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0036fc84-2609-4ede-a1da-99fe455c93dc","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"a0d75675-156f-4d37-8d14-f219e7cd4f1b","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"f449c5c3-233f-4d9e-808a-81949b5c6566","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"24985394-dff3-4e31-ab3e-ee3b268b01ca","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3c943755-768e-4644-b8ff-4acd909c087d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"813a9917-5e51-4806-bce2-d79acad56d10","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"07d2a8ff-3402-45a1-87d6-4ca90e7247f5","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5d46e8ab-222a-4f57-9409-67bece808315","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"62bb4c6c-d95e-41b4-9d90-dc8fd472a2da","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4a7dad1e-488c-4313-ab21-04571f213d22","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3299ab7e-6955-4b0c-a9ee-198187d4af12","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"708266d8-1921-4ec1-8fe9-4487d8028e42","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -64,13 +64,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"919e42f6-cd99-49ff-957f-a63b9c5f81d1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c94aac98-fd43-4fa0-87b4-f203f8ce2fd0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_button_path_icon/5f6216ad-c5e7-4044-ac94-2ec0712be138.png b/sprites/s_button_path_icon/5f6216ad-c5e7-4044-ac94-2ec0712be138.png new file mode 100644 index 000000000..d700e8ede Binary files /dev/null and b/sprites/s_button_path_icon/5f6216ad-c5e7-4044-ac94-2ec0712be138.png differ diff --git a/sprites/s_button_path_icon/f7dd2617-905f-42d4-9cc8-6cec91d2b2e5.png b/sprites/s_button_path_icon/f7dd2617-905f-42d4-9cc8-6cec91d2b2e5.png deleted file mode 100644 index 29681a523..000000000 Binary files a/sprites/s_button_path_icon/f7dd2617-905f-42d4-9cc8-6cec91d2b2e5.png and /dev/null differ diff --git a/sprites/s_button_path_icon/layers/5f6216ad-c5e7-4044-ac94-2ec0712be138/6446d56e-cef9-4124-9b5a-f0db4f3dde03.png b/sprites/s_button_path_icon/layers/5f6216ad-c5e7-4044-ac94-2ec0712be138/6446d56e-cef9-4124-9b5a-f0db4f3dde03.png new file mode 100644 index 000000000..d700e8ede Binary files /dev/null and b/sprites/s_button_path_icon/layers/5f6216ad-c5e7-4044-ac94-2ec0712be138/6446d56e-cef9-4124-9b5a-f0db4f3dde03.png differ diff --git a/sprites/s_button_path_icon/layers/f7dd2617-905f-42d4-9cc8-6cec91d2b2e5/cb2b1c10-92fa-4af8-bcba-76a07beb4b92.png b/sprites/s_button_path_icon/layers/f7dd2617-905f-42d4-9cc8-6cec91d2b2e5/cb2b1c10-92fa-4af8-bcba-76a07beb4b92.png deleted file mode 100644 index c7c074366..000000000 Binary files a/sprites/s_button_path_icon/layers/f7dd2617-905f-42d4-9cc8-6cec91d2b2e5/cb2b1c10-92fa-4af8-bcba-76a07beb4b92.png and /dev/null differ diff --git a/sprites/s_button_path_icon/s_button_path_icon.yy b/sprites/s_button_path_icon/s_button_path_icon.yy index becfeb45f..ec40826f6 100644 --- a/sprites/s_button_path_icon/s_button_path_icon.yy +++ b/sprites/s_button_path_icon/s_button_path_icon.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 3, - "bbox_bottom": 21, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 6, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f7dd2617-905f-42d4-9cc8-6cec91d2b2e5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5f6216ad-c5e7-4044-ac94-2ec0712be138",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a6f79e69-1a0b-4d3e-857a-6d0736e28594","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f7dd2617-905f-42d4-9cc8-6cec91d2b2e5","path":"sprites/s_button_path_icon/s_button_path_icon.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ecad8c75-4383-4944-80a0-8a46bfc9cff2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5f6216ad-c5e7-4044-ac94-2ec0712be138","path":"sprites/s_button_path_icon/s_button_path_icon.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb2b1c10-92fa-4af8-bcba-76a07beb4b92","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6446d56e-cef9-4124-9b5a-f0db4f3dde03","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_button_path_not_found_icon/20bf0b30-087f-41ea-9f65-bab0ad8f6cf6.png b/sprites/s_button_path_not_found_icon/20bf0b30-087f-41ea-9f65-bab0ad8f6cf6.png deleted file mode 100644 index 8ad318f28..000000000 Binary files a/sprites/s_button_path_not_found_icon/20bf0b30-087f-41ea-9f65-bab0ad8f6cf6.png and /dev/null differ diff --git a/sprites/s_button_path_not_found_icon/c1021eeb-4c39-4a25-8e5a-8c842cacb78f.png b/sprites/s_button_path_not_found_icon/c1021eeb-4c39-4a25-8e5a-8c842cacb78f.png new file mode 100644 index 000000000..f604a999e Binary files /dev/null and b/sprites/s_button_path_not_found_icon/c1021eeb-4c39-4a25-8e5a-8c842cacb78f.png differ diff --git a/sprites/s_button_path_not_found_icon/layers/20bf0b30-087f-41ea-9f65-bab0ad8f6cf6/43bd08bf-5a27-4723-8af6-0df84c346384.png b/sprites/s_button_path_not_found_icon/layers/20bf0b30-087f-41ea-9f65-bab0ad8f6cf6/43bd08bf-5a27-4723-8af6-0df84c346384.png deleted file mode 100644 index 8ad318f28..000000000 Binary files a/sprites/s_button_path_not_found_icon/layers/20bf0b30-087f-41ea-9f65-bab0ad8f6cf6/43bd08bf-5a27-4723-8af6-0df84c346384.png and /dev/null differ diff --git a/sprites/s_button_path_not_found_icon/layers/c1021eeb-4c39-4a25-8e5a-8c842cacb78f/ec1b00a4-e8c4-4c54-ae02-b42d0dd077a6.png b/sprites/s_button_path_not_found_icon/layers/c1021eeb-4c39-4a25-8e5a-8c842cacb78f/ec1b00a4-e8c4-4c54-ae02-b42d0dd077a6.png new file mode 100644 index 000000000..f604a999e Binary files /dev/null and b/sprites/s_button_path_not_found_icon/layers/c1021eeb-4c39-4a25-8e5a-8c842cacb78f/ec1b00a4-e8c4-4c54-ae02-b42d0dd077a6.png differ diff --git a/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy b/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy index c3583ff05..b14f79af6 100644 --- a/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy +++ b/sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 23, - "bbox_top": 3, - "bbox_bottom": 22, + "bbox_left": 5, + "bbox_right": 47, + "bbox_top": 6, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"20bf0b30-087f-41ea-9f65-bab0ad8f6cf6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c1021eeb-4c39-4a25-8e5a-8c842cacb78f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fcd0eae0-37d1-464b-8779-bdd09d91ae56","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"20bf0b30-087f-41ea-9f65-bab0ad8f6cf6","path":"sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a7a33d94-3e5f-47d3-86ac-4c52c243e658","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c1021eeb-4c39-4a25-8e5a-8c842cacb78f","path":"sprites/s_button_path_not_found_icon/s_button_path_not_found_icon.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"43bd08bf-5a27-4723-8af6-0df84c346384","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ec1b00a4-e8c4-4c54-ae02-b42d0dd077a6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_cache/47727b85-4cb4-4500-bb61-5b768e7d7dec.png b/sprites/s_cache/47727b85-4cb4-4500-bb61-5b768e7d7dec.png deleted file mode 100644 index 93e2c05b5..000000000 Binary files a/sprites/s_cache/47727b85-4cb4-4500-bb61-5b768e7d7dec.png and /dev/null differ diff --git a/sprites/s_cache/e94867b4-90cf-43ae-8af6-5f546edbb26d.png b/sprites/s_cache/e94867b4-90cf-43ae-8af6-5f546edbb26d.png new file mode 100644 index 000000000..ec65ad1e5 Binary files /dev/null and b/sprites/s_cache/e94867b4-90cf-43ae-8af6-5f546edbb26d.png differ diff --git a/sprites/s_cache/layers/47727b85-4cb4-4500-bb61-5b768e7d7dec/2db96f2f-516f-45b1-91eb-4ee04a98525b.png b/sprites/s_cache/layers/47727b85-4cb4-4500-bb61-5b768e7d7dec/2db96f2f-516f-45b1-91eb-4ee04a98525b.png deleted file mode 100644 index 6172b5b35..000000000 Binary files a/sprites/s_cache/layers/47727b85-4cb4-4500-bb61-5b768e7d7dec/2db96f2f-516f-45b1-91eb-4ee04a98525b.png and /dev/null differ diff --git a/sprites/s_cache/layers/e94867b4-90cf-43ae-8af6-5f546edbb26d/daa37b9d-3390-4703-978e-1fd4682bb9a1.png b/sprites/s_cache/layers/e94867b4-90cf-43ae-8af6-5f546edbb26d/daa37b9d-3390-4703-978e-1fd4682bb9a1.png new file mode 100644 index 000000000..ec65ad1e5 Binary files /dev/null and b/sprites/s_cache/layers/e94867b4-90cf-43ae-8af6-5f546edbb26d/daa37b9d-3390-4703-978e-1fd4682bb9a1.png differ diff --git a/sprites/s_cache/s_cache.yy b/sprites/s_cache/s_cache.yy index 536207cd9..839988190 100644 --- a/sprites/s_cache/s_cache.yy +++ b/sprites/s_cache/s_cache.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 3, - "bbox_bottom": 21, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 6, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"47727b85-4cb4-4500-bb61-5b768e7d7dec",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e94867b4-90cf-43ae-8af6-5f546edbb26d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c4482ad3-5a0c-4aae-b27a-7074f46e1298","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"47727b85-4cb4-4500-bb61-5b768e7d7dec","path":"sprites/s_cache/s_cache.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"64b82f8b-4baa-488a-b3f4-2ee3a1e7d934","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e94867b4-90cf-43ae-8af6-5f546edbb26d","path":"sprites/s_cache/s_cache.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2db96f2f-516f-45b1-91eb-4ee04a98525b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"daa37b9d-3390-4703-978e-1fd4682bb9a1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_bucket/1122e252-dd16-4b4b-b76e-2d11e59aa1ca.png b/sprites/s_canvas_tools_bucket/1122e252-dd16-4b4b-b76e-2d11e59aa1ca.png deleted file mode 100644 index e518d0779..000000000 Binary files a/sprites/s_canvas_tools_bucket/1122e252-dd16-4b4b-b76e-2d11e59aa1ca.png and /dev/null differ diff --git a/sprites/s_canvas_tools_bucket/5f0284e9-e67a-4942-80ea-f13e80ff3452.png b/sprites/s_canvas_tools_bucket/5f0284e9-e67a-4942-80ea-f13e80ff3452.png new file mode 100644 index 000000000..202669ba3 Binary files /dev/null and b/sprites/s_canvas_tools_bucket/5f0284e9-e67a-4942-80ea-f13e80ff3452.png differ diff --git a/sprites/s_canvas_tools_bucket/layers/1122e252-dd16-4b4b-b76e-2d11e59aa1ca/3b9945bf-f7a4-4e58-9fe1-31da8ece991e.png b/sprites/s_canvas_tools_bucket/layers/1122e252-dd16-4b4b-b76e-2d11e59aa1ca/3b9945bf-f7a4-4e58-9fe1-31da8ece991e.png deleted file mode 100644 index d58a8278d..000000000 Binary files a/sprites/s_canvas_tools_bucket/layers/1122e252-dd16-4b4b-b76e-2d11e59aa1ca/3b9945bf-f7a4-4e58-9fe1-31da8ece991e.png and /dev/null differ diff --git a/sprites/s_canvas_tools_bucket/layers/5f0284e9-e67a-4942-80ea-f13e80ff3452/8ac8a61b-e66a-41ac-b6e4-1ba85f60c5c1.png b/sprites/s_canvas_tools_bucket/layers/5f0284e9-e67a-4942-80ea-f13e80ff3452/8ac8a61b-e66a-41ac-b6e4-1ba85f60c5c1.png new file mode 100644 index 000000000..202669ba3 Binary files /dev/null and b/sprites/s_canvas_tools_bucket/layers/5f0284e9-e67a-4942-80ea-f13e80ff3452/8ac8a61b-e66a-41ac-b6e4-1ba85f60c5c1.png differ diff --git a/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy b/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy index be365f4a2..524974a34 100644 --- a/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy +++ b/sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 2, - "bbox_bottom": 22, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 4, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1122e252-dd16-4b4b-b76e-2d11e59aa1ca",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5f0284e9-e67a-4942-80ea-f13e80ff3452",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9977e2ec-0dc7-424f-8e20-66c1b76d00f8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1122e252-dd16-4b4b-b76e-2d11e59aa1ca","path":"sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e9cd88be-72cb-4d28-9fc8-50927c0fad1c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5f0284e9-e67a-4942-80ea-f13e80ff3452","path":"sprites/s_canvas_tools_bucket/s_canvas_tools_bucket.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3b9945bf-f7a4-4e58-9fe1-31da8ece991e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8ac8a61b-e66a-41ac-b6e4-1ba85f60c5c1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_ellip/0a637c6f-33b2-49bb-98e8-82a8d41a4ca5.png b/sprites/s_canvas_tools_ellip/0a637c6f-33b2-49bb-98e8-82a8d41a4ca5.png new file mode 100644 index 000000000..8d3400c83 Binary files /dev/null and b/sprites/s_canvas_tools_ellip/0a637c6f-33b2-49bb-98e8-82a8d41a4ca5.png differ diff --git a/sprites/s_canvas_tools_ellip/fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66.png b/sprites/s_canvas_tools_ellip/fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66.png deleted file mode 100644 index 6bca9508d..000000000 Binary files a/sprites/s_canvas_tools_ellip/fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66.png and /dev/null differ diff --git a/sprites/s_canvas_tools_ellip/layers/0a637c6f-33b2-49bb-98e8-82a8d41a4ca5/666cf8a3-e611-4ddc-9959-b7aab8b74661.png b/sprites/s_canvas_tools_ellip/layers/0a637c6f-33b2-49bb-98e8-82a8d41a4ca5/666cf8a3-e611-4ddc-9959-b7aab8b74661.png new file mode 100644 index 000000000..8d3400c83 Binary files /dev/null and b/sprites/s_canvas_tools_ellip/layers/0a637c6f-33b2-49bb-98e8-82a8d41a4ca5/666cf8a3-e611-4ddc-9959-b7aab8b74661.png differ diff --git a/sprites/s_canvas_tools_ellip/layers/fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66/ba17e7a9-37e8-4536-a6bb-40cafacf0abb.png b/sprites/s_canvas_tools_ellip/layers/fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66/ba17e7a9-37e8-4536-a6bb-40cafacf0abb.png deleted file mode 100644 index a8cf23e66..000000000 Binary files a/sprites/s_canvas_tools_ellip/layers/fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66/ba17e7a9-37e8-4536-a6bb-40cafacf0abb.png and /dev/null differ diff --git a/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy b/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy index 1989a866f..61f3b2f57 100644 --- a/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy +++ b/sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0a637c6f-33b2-49bb-98e8-82a8d41a4ca5",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"44fd999d-afd6-43b5-bd3a-dafec94f05d1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fe0b08a4-71af-4a12-a83d-3e9ee6b4cf66","path":"sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"adf0e271-f26e-48c2-867b-c2d03684f4bd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0a637c6f-33b2-49bb-98e8-82a8d41a4ca5","path":"sprites/s_canvas_tools_ellip/s_canvas_tools_ellip.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ba17e7a9-37e8-4536-a6bb-40cafacf0abb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"666cf8a3-e611-4ddc-9959-b7aab8b74661","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_ellip_fill/62cfc4ff-0358-4aa6-a058-5672c6358098.png b/sprites/s_canvas_tools_ellip_fill/62cfc4ff-0358-4aa6-a058-5672c6358098.png new file mode 100644 index 000000000..72bd25cc5 Binary files /dev/null and b/sprites/s_canvas_tools_ellip_fill/62cfc4ff-0358-4aa6-a058-5672c6358098.png differ diff --git a/sprites/s_canvas_tools_ellip_fill/9799addf-8bf6-4563-b4c8-d645a9f4f8de.png b/sprites/s_canvas_tools_ellip_fill/9799addf-8bf6-4563-b4c8-d645a9f4f8de.png deleted file mode 100644 index 0a82f370d..000000000 Binary files a/sprites/s_canvas_tools_ellip_fill/9799addf-8bf6-4563-b4c8-d645a9f4f8de.png and /dev/null differ diff --git a/sprites/s_canvas_tools_ellip_fill/layers/62cfc4ff-0358-4aa6-a058-5672c6358098/dbc75e12-92af-4dbc-95a2-bf796f6cb1eb.png b/sprites/s_canvas_tools_ellip_fill/layers/62cfc4ff-0358-4aa6-a058-5672c6358098/dbc75e12-92af-4dbc-95a2-bf796f6cb1eb.png new file mode 100644 index 000000000..72bd25cc5 Binary files /dev/null and b/sprites/s_canvas_tools_ellip_fill/layers/62cfc4ff-0358-4aa6-a058-5672c6358098/dbc75e12-92af-4dbc-95a2-bf796f6cb1eb.png differ diff --git a/sprites/s_canvas_tools_ellip_fill/layers/9799addf-8bf6-4563-b4c8-d645a9f4f8de/4aa1709f-5969-41b7-aa14-eee764396bf1.png b/sprites/s_canvas_tools_ellip_fill/layers/9799addf-8bf6-4563-b4c8-d645a9f4f8de/4aa1709f-5969-41b7-aa14-eee764396bf1.png deleted file mode 100644 index 18e804718..000000000 Binary files a/sprites/s_canvas_tools_ellip_fill/layers/9799addf-8bf6-4563-b4c8-d645a9f4f8de/4aa1709f-5969-41b7-aa14-eee764396bf1.png and /dev/null differ diff --git a/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy b/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy index 6ec366826..ff452339f 100644 --- a/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy +++ b/sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9799addf-8bf6-4563-b4c8-d645a9f4f8de",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"62cfc4ff-0358-4aa6-a058-5672c6358098",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"97680bdf-2615-4d39-8726-0b33d7538601","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9799addf-8bf6-4563-b4c8-d645a9f4f8de","path":"sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"31b72873-48a7-4384-aee2-c94301f198e4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"62cfc4ff-0358-4aa6-a058-5672c6358098","path":"sprites/s_canvas_tools_ellip_fill/s_canvas_tools_ellip_fill.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4aa1709f-5969-41b7-aa14-eee764396bf1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dbc75e12-92af-4dbc-95a2-bf796f6cb1eb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_eraser/04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498.png b/sprites/s_canvas_tools_eraser/04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498.png new file mode 100644 index 000000000..8e77d3071 Binary files /dev/null and b/sprites/s_canvas_tools_eraser/04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498.png differ diff --git a/sprites/s_canvas_tools_eraser/b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17.png b/sprites/s_canvas_tools_eraser/b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17.png deleted file mode 100644 index 0d8732475..000000000 Binary files a/sprites/s_canvas_tools_eraser/b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17.png and /dev/null differ diff --git a/sprites/s_canvas_tools_eraser/layers/04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498/605e1c23-9ccd-474d-bfdb-c757a301b612.png b/sprites/s_canvas_tools_eraser/layers/04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498/605e1c23-9ccd-474d-bfdb-c757a301b612.png new file mode 100644 index 000000000..8e77d3071 Binary files /dev/null and b/sprites/s_canvas_tools_eraser/layers/04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498/605e1c23-9ccd-474d-bfdb-c757a301b612.png differ diff --git a/sprites/s_canvas_tools_eraser/layers/b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17/a9190875-32e1-418f-a8d5-c933f989a0f4.png b/sprites/s_canvas_tools_eraser/layers/b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17/a9190875-32e1-418f-a8d5-c933f989a0f4.png deleted file mode 100644 index 5906058d1..000000000 Binary files a/sprites/s_canvas_tools_eraser/layers/b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17/a9190875-32e1-418f-a8d5-c933f989a0f4.png and /dev/null differ diff --git a/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy b/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy index 6002570f0..317d660c8 100644 --- a/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy +++ b/sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 3, - "bbox_bottom": 21, + "bbox_left": 6, + "bbox_right": 41, + "bbox_top": 7, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6a1d08d9-60d8-42e8-aed6-21970af18e31","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b4c8c26c-8de1-4ceb-9a2d-bd25e4399a17","path":"sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9107f360-787b-4b63-9853-2371a251f9cb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"04b7bdd2-f6c4-4d1d-a5c3-82a0b93b8498","path":"sprites/s_canvas_tools_eraser/s_canvas_tools_eraser.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a9190875-32e1-418f-a8d5-c933f989a0f4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"605e1c23-9ccd-474d-bfdb-c757a301b612","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_pencil/5730d6a9-d739-4a4d-8f29-d152c4c6c766.png b/sprites/s_canvas_tools_pencil/5730d6a9-d739-4a4d-8f29-d152c4c6c766.png deleted file mode 100644 index 1ded0845b..000000000 Binary files a/sprites/s_canvas_tools_pencil/5730d6a9-d739-4a4d-8f29-d152c4c6c766.png and /dev/null differ diff --git a/sprites/s_canvas_tools_pencil/ba0afcad-7f01-4c23-a559-d6bee5b831e4.png b/sprites/s_canvas_tools_pencil/ba0afcad-7f01-4c23-a559-d6bee5b831e4.png new file mode 100644 index 000000000..18bca1ec6 Binary files /dev/null and b/sprites/s_canvas_tools_pencil/ba0afcad-7f01-4c23-a559-d6bee5b831e4.png differ diff --git a/sprites/s_canvas_tools_pencil/layers/5730d6a9-d739-4a4d-8f29-d152c4c6c766/b7231367-9374-4f68-8c6c-a773c2494196.png b/sprites/s_canvas_tools_pencil/layers/5730d6a9-d739-4a4d-8f29-d152c4c6c766/b7231367-9374-4f68-8c6c-a773c2494196.png deleted file mode 100644 index acfbb6caa..000000000 Binary files a/sprites/s_canvas_tools_pencil/layers/5730d6a9-d739-4a4d-8f29-d152c4c6c766/b7231367-9374-4f68-8c6c-a773c2494196.png and /dev/null differ diff --git a/sprites/s_canvas_tools_pencil/layers/ba0afcad-7f01-4c23-a559-d6bee5b831e4/91a57f1c-2517-4a49-9cdf-d5daf21872ce.png b/sprites/s_canvas_tools_pencil/layers/ba0afcad-7f01-4c23-a559-d6bee5b831e4/91a57f1c-2517-4a49-9cdf-d5daf21872ce.png new file mode 100644 index 000000000..18bca1ec6 Binary files /dev/null and b/sprites/s_canvas_tools_pencil/layers/ba0afcad-7f01-4c23-a559-d6bee5b831e4/91a57f1c-2517-4a49-9cdf-d5daf21872ce.png differ diff --git a/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy b/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy index 05340c9da..3aa8f9d77 100644 --- a/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy +++ b/sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5730d6a9-d739-4a4d-8f29-d152c4c6c766",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ba0afcad-7f01-4c23-a559-d6bee5b831e4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0724eb5e-e764-4275-ac20-81332c7feca2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5730d6a9-d739-4a4d-8f29-d152c4c6c766","path":"sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d931bc4a-eb03-4ee4-bc58-a0dcd4d3f3dd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ba0afcad-7f01-4c23-a559-d6bee5b831e4","path":"sprites/s_canvas_tools_pencil/s_canvas_tools_pencil.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b7231367-9374-4f68-8c6c-a773c2494196","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"91a57f1c-2517-4a49-9cdf-d5daf21872ce","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_rect/929d589e-6b6e-44e6-9f2f-6b495dfca999.png b/sprites/s_canvas_tools_rect/929d589e-6b6e-44e6-9f2f-6b495dfca999.png new file mode 100644 index 000000000..672c41fae Binary files /dev/null and b/sprites/s_canvas_tools_rect/929d589e-6b6e-44e6-9f2f-6b495dfca999.png differ diff --git a/sprites/s_canvas_tools_rect/e416f2c8-e573-48a1-b94b-b962ba4ff1da.png b/sprites/s_canvas_tools_rect/e416f2c8-e573-48a1-b94b-b962ba4ff1da.png deleted file mode 100644 index 291310de0..000000000 Binary files a/sprites/s_canvas_tools_rect/e416f2c8-e573-48a1-b94b-b962ba4ff1da.png and /dev/null differ diff --git a/sprites/s_canvas_tools_rect/layers/929d589e-6b6e-44e6-9f2f-6b495dfca999/e75a00d5-d5af-4c3f-a9a3-388ff2b8db32.png b/sprites/s_canvas_tools_rect/layers/929d589e-6b6e-44e6-9f2f-6b495dfca999/e75a00d5-d5af-4c3f-a9a3-388ff2b8db32.png new file mode 100644 index 000000000..672c41fae Binary files /dev/null and b/sprites/s_canvas_tools_rect/layers/929d589e-6b6e-44e6-9f2f-6b495dfca999/e75a00d5-d5af-4c3f-a9a3-388ff2b8db32.png differ diff --git a/sprites/s_canvas_tools_rect/layers/e416f2c8-e573-48a1-b94b-b962ba4ff1da/b194bbf4-f154-494b-8a94-063e665e37b5.png b/sprites/s_canvas_tools_rect/layers/e416f2c8-e573-48a1-b94b-b962ba4ff1da/b194bbf4-f154-494b-8a94-063e665e37b5.png deleted file mode 100644 index 403605ade..000000000 Binary files a/sprites/s_canvas_tools_rect/layers/e416f2c8-e573-48a1-b94b-b962ba4ff1da/b194bbf4-f154-494b-8a94-063e665e37b5.png and /dev/null differ diff --git a/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy b/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy index d53b7e30f..93c8bf1c3 100644 --- a/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy +++ b/sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 5, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e416f2c8-e573-48a1-b94b-b962ba4ff1da",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"929d589e-6b6e-44e6-9f2f-6b495dfca999",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d91c4302-e1a9-49b5-a500-f9866e857587","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e416f2c8-e573-48a1-b94b-b962ba4ff1da","path":"sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"db90aa57-2854-480a-9eeb-68b9be1e9ade","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"929d589e-6b6e-44e6-9f2f-6b495dfca999","path":"sprites/s_canvas_tools_rect/s_canvas_tools_rect.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b194bbf4-f154-494b-8a94-063e665e37b5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e75a00d5-d5af-4c3f-a9a3-388ff2b8db32","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_canvas_tools_rect_fill/12f529d4-bb98-430f-8ad6-31bc18db0c35.png b/sprites/s_canvas_tools_rect_fill/12f529d4-bb98-430f-8ad6-31bc18db0c35.png deleted file mode 100644 index f0f865509..000000000 Binary files a/sprites/s_canvas_tools_rect_fill/12f529d4-bb98-430f-8ad6-31bc18db0c35.png and /dev/null differ diff --git a/sprites/s_canvas_tools_rect_fill/1a257355-6b80-4dee-be3c-69282d3e7d6a.png b/sprites/s_canvas_tools_rect_fill/1a257355-6b80-4dee-be3c-69282d3e7d6a.png new file mode 100644 index 000000000..d9c603049 Binary files /dev/null and b/sprites/s_canvas_tools_rect_fill/1a257355-6b80-4dee-be3c-69282d3e7d6a.png differ diff --git a/sprites/s_canvas_tools_rect_fill/layers/12f529d4-bb98-430f-8ad6-31bc18db0c35/b89d43f4-a566-4dc8-82e4-b58679c33e53.png b/sprites/s_canvas_tools_rect_fill/layers/12f529d4-bb98-430f-8ad6-31bc18db0c35/b89d43f4-a566-4dc8-82e4-b58679c33e53.png deleted file mode 100644 index a72b06a59..000000000 Binary files a/sprites/s_canvas_tools_rect_fill/layers/12f529d4-bb98-430f-8ad6-31bc18db0c35/b89d43f4-a566-4dc8-82e4-b58679c33e53.png and /dev/null differ diff --git a/sprites/s_canvas_tools_rect_fill/layers/1a257355-6b80-4dee-be3c-69282d3e7d6a/a5ddd1df-d3fa-490c-bbd1-753b63b293ff.png b/sprites/s_canvas_tools_rect_fill/layers/1a257355-6b80-4dee-be3c-69282d3e7d6a/a5ddd1df-d3fa-490c-bbd1-753b63b293ff.png new file mode 100644 index 000000000..d9c603049 Binary files /dev/null and b/sprites/s_canvas_tools_rect_fill/layers/1a257355-6b80-4dee-be3c-69282d3e7d6a/a5ddd1df-d3fa-490c-bbd1-753b63b293ff.png differ diff --git a/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy b/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy index dbac1e621..8b224b373 100644 --- a/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy +++ b/sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 5, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"12f529d4-bb98-430f-8ad6-31bc18db0c35",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1a257355-6b80-4dee-be3c-69282d3e7d6a",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"eb7f2d06-c1a8-4bd9-885b-213e8797d632","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"12f529d4-bb98-430f-8ad6-31bc18db0c35","path":"sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"bd6feb67-4df8-4ea3-978e-1521723e8259","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1a257355-6b80-4dee-be3c-69282d3e7d6a","path":"sprites/s_canvas_tools_rect_fill/s_canvas_tools_rect_fill.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b89d43f4-a566-4dc8-82e4-b58679c33e53","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a5ddd1df-d3fa-490c-bbd1-753b63b293ff","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_circle_12/41f74b5d-fcb0-4367-83a0-071e86ae28bf.png b/sprites/s_circle_12/41f74b5d-fcb0-4367-83a0-071e86ae28bf.png new file mode 100644 index 000000000..5e77cec27 Binary files /dev/null and b/sprites/s_circle_12/41f74b5d-fcb0-4367-83a0-071e86ae28bf.png differ diff --git a/sprites/s_circle_12/6423615f-5917-453e-9374-1bcfd05b6a25.png b/sprites/s_circle_12/6423615f-5917-453e-9374-1bcfd05b6a25.png deleted file mode 100644 index 4306dda57..000000000 Binary files a/sprites/s_circle_12/6423615f-5917-453e-9374-1bcfd05b6a25.png and /dev/null differ diff --git a/sprites/s_circle_12/layers/41f74b5d-fcb0-4367-83a0-071e86ae28bf/d95930f8-536f-4d35-b360-9a0f767d8926.png b/sprites/s_circle_12/layers/41f74b5d-fcb0-4367-83a0-071e86ae28bf/d95930f8-536f-4d35-b360-9a0f767d8926.png new file mode 100644 index 000000000..5e77cec27 Binary files /dev/null and b/sprites/s_circle_12/layers/41f74b5d-fcb0-4367-83a0-071e86ae28bf/d95930f8-536f-4d35-b360-9a0f767d8926.png differ diff --git a/sprites/s_circle_12/layers/6423615f-5917-453e-9374-1bcfd05b6a25/794700ff-a9f8-465d-80a1-4c6a34f7aac0.png b/sprites/s_circle_12/layers/6423615f-5917-453e-9374-1bcfd05b6a25/794700ff-a9f8-465d-80a1-4c6a34f7aac0.png deleted file mode 100644 index 4306dda57..000000000 Binary files a/sprites/s_circle_12/layers/6423615f-5917-453e-9374-1bcfd05b6a25/794700ff-a9f8-465d-80a1-4c6a34f7aac0.png and /dev/null differ diff --git a/sprites/s_circle_12/s_circle_12.yy b/sprites/s_circle_12/s_circle_12.yy index 02dd7e49e..fc9a1b59c 100644 --- a/sprites/s_circle_12/s_circle_12.yy +++ b/sprites/s_circle_12/s_circle_12.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 9, - "bbox_top": 2, - "bbox_bottom": 9, + "bbox_left": 4, + "bbox_right": 19, + "bbox_top": 4, + "bbox_bottom": 19, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 12, - "height": 12, + "width": 24, + "height": 24, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6423615f-5917-453e-9374-1bcfd05b6a25",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"41f74b5d-fcb0-4367-83a0-071e86ae28bf",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2ad68a56-8352-49fc-8539-ea6d6a8ef953","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6423615f-5917-453e-9374-1bcfd05b6a25","path":"sprites/s_circle_12/s_circle_12.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4a2cb64a-c6cd-49f2-807f-3cc0444bdec1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"41f74b5d-fcb0-4367-83a0-071e86ae28bf","path":"sprites/s_circle_12/s_circle_12.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,15 +58,39 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 6, - "yorigin": 6, + "xorigin": 12, + "yorigin": 12, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"794700ff-a9f8-465d-80a1-4c6a34f7aac0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d95930f8-536f-4d35-b360-9a0f767d8926","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], - "nineSlice": null, + "nineSlice": { + "left": 0, + "top": 0, + "right": 0, + "bottom": 0, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "enabled": false, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "resourceVersion": "1.0", + "loadedVersion": null, + "resourceType": "GMNineSliceData", + }, "parent": { "name": "icon", "path": "folders/sprites/icon.yy", diff --git a/sprites/s_circle_16/6a3b5295-038d-43f4-919b-5c2beeeda46c.png b/sprites/s_circle_16/6a3b5295-038d-43f4-919b-5c2beeeda46c.png new file mode 100644 index 000000000..c31670c05 Binary files /dev/null and b/sprites/s_circle_16/6a3b5295-038d-43f4-919b-5c2beeeda46c.png differ diff --git a/sprites/s_circle_16/ac00e22e-05e7-4497-8a94-6635a0274a05.png b/sprites/s_circle_16/ac00e22e-05e7-4497-8a94-6635a0274a05.png deleted file mode 100644 index 46fc98d59..000000000 Binary files a/sprites/s_circle_16/ac00e22e-05e7-4497-8a94-6635a0274a05.png and /dev/null differ diff --git a/sprites/s_circle_16/layers/6a3b5295-038d-43f4-919b-5c2beeeda46c/8fa37611-aa00-4101-9fcf-77816a7fb56f.png b/sprites/s_circle_16/layers/6a3b5295-038d-43f4-919b-5c2beeeda46c/8fa37611-aa00-4101-9fcf-77816a7fb56f.png new file mode 100644 index 000000000..c31670c05 Binary files /dev/null and b/sprites/s_circle_16/layers/6a3b5295-038d-43f4-919b-5c2beeeda46c/8fa37611-aa00-4101-9fcf-77816a7fb56f.png differ diff --git a/sprites/s_circle_16/layers/ac00e22e-05e7-4497-8a94-6635a0274a05/9dba13e2-3c43-4d6d-85c9-38876c29da09.png b/sprites/s_circle_16/layers/ac00e22e-05e7-4497-8a94-6635a0274a05/9dba13e2-3c43-4d6d-85c9-38876c29da09.png deleted file mode 100644 index 46fc98d59..000000000 Binary files a/sprites/s_circle_16/layers/ac00e22e-05e7-4497-8a94-6635a0274a05/9dba13e2-3c43-4d6d-85c9-38876c29da09.png and /dev/null differ diff --git a/sprites/s_circle_16/s_circle_16.yy b/sprites/s_circle_16/s_circle_16.yy index 926d0e5cc..c00946f00 100644 --- a/sprites/s_circle_16/s_circle_16.yy +++ b/sprites/s_circle_16/s_circle_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 13, - "bbox_top": 2, - "bbox_bottom": 13, + "bbox_left": 4, + "bbox_right": 28, + "bbox_top": 4, + "bbox_bottom": 27, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ac00e22e-05e7-4497-8a94-6635a0274a05",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6a3b5295-038d-43f4-919b-5c2beeeda46c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f266384d-8f82-423d-8e8b-ffa7fd515244","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ac00e22e-05e7-4497-8a94-6635a0274a05","path":"sprites/s_circle_16/s_circle_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e0054fc6-25bc-4295-a318-2ac69aa87a75","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6a3b5295-038d-43f4-919b-5c2beeeda46c","path":"sprites/s_circle_16/s_circle_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9dba13e2-3c43-4d6d-85c9-38876c29da09","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8fa37611-aa00-4101-9fcf-77816a7fb56f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_color_picker_dropper/42aa5db8-bdeb-45f2-ad61-a585b2ed7629.png b/sprites/s_color_picker_dropper/42aa5db8-bdeb-45f2-ad61-a585b2ed7629.png new file mode 100644 index 000000000..36ae33e10 Binary files /dev/null and b/sprites/s_color_picker_dropper/42aa5db8-bdeb-45f2-ad61-a585b2ed7629.png differ diff --git a/sprites/s_color_picker_dropper/4d09768c-c152-4511-acb5-65834a712a9d.png b/sprites/s_color_picker_dropper/4d09768c-c152-4511-acb5-65834a712a9d.png deleted file mode 100644 index 4dc74eb69..000000000 Binary files a/sprites/s_color_picker_dropper/4d09768c-c152-4511-acb5-65834a712a9d.png and /dev/null differ diff --git a/sprites/s_color_picker_dropper/layers/42aa5db8-bdeb-45f2-ad61-a585b2ed7629/4512b5f7-e7d3-485f-a938-2d7c28d57186.png b/sprites/s_color_picker_dropper/layers/42aa5db8-bdeb-45f2-ad61-a585b2ed7629/4512b5f7-e7d3-485f-a938-2d7c28d57186.png new file mode 100644 index 000000000..36ae33e10 Binary files /dev/null and b/sprites/s_color_picker_dropper/layers/42aa5db8-bdeb-45f2-ad61-a585b2ed7629/4512b5f7-e7d3-485f-a938-2d7c28d57186.png differ diff --git a/sprites/s_color_picker_dropper/layers/4d09768c-c152-4511-acb5-65834a712a9d/56070c39-6742-4d39-bfea-116c9ec262c9.png b/sprites/s_color_picker_dropper/layers/4d09768c-c152-4511-acb5-65834a712a9d/56070c39-6742-4d39-bfea-116c9ec262c9.png deleted file mode 100644 index c7ec11e42..000000000 Binary files a/sprites/s_color_picker_dropper/layers/4d09768c-c152-4511-acb5-65834a712a9d/56070c39-6742-4d39-bfea-116c9ec262c9.png and /dev/null differ diff --git a/sprites/s_color_picker_dropper/s_color_picker_dropper.yy b/sprites/s_color_picker_dropper/s_color_picker_dropper.yy index cf031d07d..b950e48a1 100644 --- a/sprites/s_color_picker_dropper/s_color_picker_dropper.yy +++ b/sprites/s_color_picker_dropper/s_color_picker_dropper.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 3, + "bbox_right": 44, + "bbox_top": 3, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4d09768c-c152-4511-acb5-65834a712a9d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"42aa5db8-bdeb-45f2-ad61-a585b2ed7629",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f280b858-5231-4557-a58f-a4916ce860dc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4d09768c-c152-4511-acb5-65834a712a9d","path":"sprites/s_color_picker_dropper/s_color_picker_dropper.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"49a2a472-d834-4cff-ab0f-cdb7d3999d64","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"42aa5db8-bdeb-45f2-ad61-a585b2ed7629","path":"sprites/s_color_picker_dropper/s_color_picker_dropper.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"56070c39-6742-4d39-bfea-116c9ec262c9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4512b5f7-e7d3-485f-a938-2d7c28d57186","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_color_picker_sample/258ecaf0-f8a0-4036-887a-ea2f4df85e83.png b/sprites/s_color_picker_sample/258ecaf0-f8a0-4036-887a-ea2f4df85e83.png deleted file mode 100644 index d157e8909..000000000 Binary files a/sprites/s_color_picker_sample/258ecaf0-f8a0-4036-887a-ea2f4df85e83.png and /dev/null differ diff --git a/sprites/s_color_picker_sample/31a23365-c0e4-45ba-b3ec-01763b52671a.png b/sprites/s_color_picker_sample/31a23365-c0e4-45ba-b3ec-01763b52671a.png new file mode 100644 index 000000000..65d95490f Binary files /dev/null and b/sprites/s_color_picker_sample/31a23365-c0e4-45ba-b3ec-01763b52671a.png differ diff --git a/sprites/s_color_picker_sample/3402b892-fa70-40c2-988c-7c82039710c8.png b/sprites/s_color_picker_sample/3402b892-fa70-40c2-988c-7c82039710c8.png new file mode 100644 index 000000000..2483d4f21 Binary files /dev/null and b/sprites/s_color_picker_sample/3402b892-fa70-40c2-988c-7c82039710c8.png differ diff --git a/sprites/s_color_picker_sample/611cbd9e-5fb4-4ab2-ba50-75d538987afc.png b/sprites/s_color_picker_sample/611cbd9e-5fb4-4ab2-ba50-75d538987afc.png deleted file mode 100644 index 4eaa0d7ce..000000000 Binary files a/sprites/s_color_picker_sample/611cbd9e-5fb4-4ab2-ba50-75d538987afc.png and /dev/null differ diff --git a/sprites/s_color_picker_sample/layers/258ecaf0-f8a0-4036-887a-ea2f4df85e83/24c34164-5f0d-408c-bd05-10b5adb02faa.png b/sprites/s_color_picker_sample/layers/258ecaf0-f8a0-4036-887a-ea2f4df85e83/24c34164-5f0d-408c-bd05-10b5adb02faa.png deleted file mode 100644 index a564eb52d..000000000 Binary files a/sprites/s_color_picker_sample/layers/258ecaf0-f8a0-4036-887a-ea2f4df85e83/24c34164-5f0d-408c-bd05-10b5adb02faa.png and /dev/null differ diff --git a/sprites/s_color_picker_sample/layers/31a23365-c0e4-45ba-b3ec-01763b52671a/9e697906-f82c-4022-83fc-ced9956e3c6b.png b/sprites/s_color_picker_sample/layers/31a23365-c0e4-45ba-b3ec-01763b52671a/9e697906-f82c-4022-83fc-ced9956e3c6b.png new file mode 100644 index 000000000..65d95490f Binary files /dev/null and b/sprites/s_color_picker_sample/layers/31a23365-c0e4-45ba-b3ec-01763b52671a/9e697906-f82c-4022-83fc-ced9956e3c6b.png differ diff --git a/sprites/s_color_picker_sample/layers/3402b892-fa70-40c2-988c-7c82039710c8/9e697906-f82c-4022-83fc-ced9956e3c6b.png b/sprites/s_color_picker_sample/layers/3402b892-fa70-40c2-988c-7c82039710c8/9e697906-f82c-4022-83fc-ced9956e3c6b.png new file mode 100644 index 000000000..2483d4f21 Binary files /dev/null and b/sprites/s_color_picker_sample/layers/3402b892-fa70-40c2-988c-7c82039710c8/9e697906-f82c-4022-83fc-ced9956e3c6b.png differ diff --git a/sprites/s_color_picker_sample/layers/611cbd9e-5fb4-4ab2-ba50-75d538987afc/24c34164-5f0d-408c-bd05-10b5adb02faa.png b/sprites/s_color_picker_sample/layers/611cbd9e-5fb4-4ab2-ba50-75d538987afc/24c34164-5f0d-408c-bd05-10b5adb02faa.png deleted file mode 100644 index 46a4bf5ff..000000000 Binary files a/sprites/s_color_picker_sample/layers/611cbd9e-5fb4-4ab2-ba50-75d538987afc/24c34164-5f0d-408c-bd05-10b5adb02faa.png and /dev/null differ diff --git a/sprites/s_color_picker_sample/s_color_picker_sample.yy b/sprites/s_color_picker_sample/s_color_picker_sample.yy index 30d4fd48c..9937ccb3f 100644 --- a/sprites/s_color_picker_sample/s_color_picker_sample.yy +++ b/sprites/s_color_picker_sample/s_color_picker_sample.yy @@ -10,7 +10,7 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, + "bbox_left": 0, "bbox_right": 22, "bbox_top": 1, "bbox_bottom": 22, @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"258ecaf0-f8a0-4036-887a-ea2f4df85e83",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"611cbd9e-5fb4-4ab2-ba50-75d538987afc",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"31a23365-c0e4-45ba-b3ec-01763b52671a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3402b892-fa70-40c2-988c-7c82039710c8",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7303fd34-3827-46c8-ae43-0440e3802fcf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"258ecaf0-f8a0-4036-887a-ea2f4df85e83","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"ec88210e-c421-4ba5-9085-7c07746eb00b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"611cbd9e-5fb4-4ab2-ba50-75d538987afc","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"197df59c-6a36-43ac-9616-8ffd74ce1e00","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"31a23365-c0e4-45ba-b3ec-01763b52671a","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8178c04a-6d96-438e-a14d-fa4b4a87063a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3402b892-fa70-40c2-988c-7c82039710c8","path":"sprites/s_color_picker_sample/s_color_picker_sample.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -66,7 +66,7 @@ "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"24c34164-5f0d-408c-bd05-10b5adb02faa","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9e697906-f82c-4022-83fc-ced9956e3c6b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": { "left": 12, diff --git a/sprites/s_control_edit/b219a0e9-860c-4b78-b7c6-a277aa6a1e60.png b/sprites/s_control_edit/b219a0e9-860c-4b78-b7c6-a277aa6a1e60.png new file mode 100644 index 000000000..3643f39c7 Binary files /dev/null and b/sprites/s_control_edit/b219a0e9-860c-4b78-b7c6-a277aa6a1e60.png differ diff --git a/sprites/s_control_edit/bb7afe88-09fb-4672-abc3-550a761000f8.png b/sprites/s_control_edit/bb7afe88-09fb-4672-abc3-550a761000f8.png deleted file mode 100644 index d9df3dfbe..000000000 Binary files a/sprites/s_control_edit/bb7afe88-09fb-4672-abc3-550a761000f8.png and /dev/null differ diff --git a/sprites/s_control_edit/layers/b219a0e9-860c-4b78-b7c6-a277aa6a1e60/3ab7066e-400f-4727-975e-7d2eb24ad3f1.png b/sprites/s_control_edit/layers/b219a0e9-860c-4b78-b7c6-a277aa6a1e60/3ab7066e-400f-4727-975e-7d2eb24ad3f1.png new file mode 100644 index 000000000..3643f39c7 Binary files /dev/null and b/sprites/s_control_edit/layers/b219a0e9-860c-4b78-b7c6-a277aa6a1e60/3ab7066e-400f-4727-975e-7d2eb24ad3f1.png differ diff --git a/sprites/s_control_edit/layers/bb7afe88-09fb-4672-abc3-550a761000f8/30de73f1-6631-4537-a8ca-07a202b559b2.png b/sprites/s_control_edit/layers/bb7afe88-09fb-4672-abc3-550a761000f8/30de73f1-6631-4537-a8ca-07a202b559b2.png deleted file mode 100644 index 98884bcaf..000000000 Binary files a/sprites/s_control_edit/layers/bb7afe88-09fb-4672-abc3-550a761000f8/30de73f1-6631-4537-a8ca-07a202b559b2.png and /dev/null differ diff --git a/sprites/s_control_edit/s_control_edit.yy b/sprites/s_control_edit/s_control_edit.yy index bf51b42fa..ff7b26b35 100644 --- a/sprites/s_control_edit/s_control_edit.yy +++ b/sprites/s_control_edit/s_control_edit.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 21, - "bbox_top": 3, - "bbox_bottom": 21, + "bbox_left": 8, + "bbox_right": 43, + "bbox_top": 6, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bb7afe88-09fb-4672-abc3-550a761000f8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b219a0e9-860c-4b78-b7c6-a277aa6a1e60",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b123fe8f-cc96-49b8-ae0c-86982758e31b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bb7afe88-09fb-4672-abc3-550a761000f8","path":"sprites/s_control_edit/s_control_edit.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3088b4e9-d147-4a9f-8775-9909ae7c4e80","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b219a0e9-860c-4b78-b7c6-a277aa6a1e60","path":"sprites/s_control_edit/s_control_edit.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"30de73f1-6631-4537-a8ca-07a202b559b2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3ab7066e-400f-4727-975e-7d2eb24ad3f1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_control_pin/5e3fb7ab-4e3e-4876-b3c9-078486766e1a.png b/sprites/s_control_pin/5e3fb7ab-4e3e-4876-b3c9-078486766e1a.png deleted file mode 100644 index 9298cf591..000000000 Binary files a/sprites/s_control_pin/5e3fb7ab-4e3e-4876-b3c9-078486766e1a.png and /dev/null differ diff --git a/sprites/s_control_pin/5f3e3406-c1e5-49d2-9343-57262cff8167.png b/sprites/s_control_pin/5f3e3406-c1e5-49d2-9343-57262cff8167.png new file mode 100644 index 000000000..16bb20dec Binary files /dev/null and b/sprites/s_control_pin/5f3e3406-c1e5-49d2-9343-57262cff8167.png differ diff --git a/sprites/s_control_pin/layers/5e3fb7ab-4e3e-4876-b3c9-078486766e1a/b390e3b7-b72a-469f-bebf-9fa706f64a16.png b/sprites/s_control_pin/layers/5e3fb7ab-4e3e-4876-b3c9-078486766e1a/b390e3b7-b72a-469f-bebf-9fa706f64a16.png deleted file mode 100644 index 9298cf591..000000000 Binary files a/sprites/s_control_pin/layers/5e3fb7ab-4e3e-4876-b3c9-078486766e1a/b390e3b7-b72a-469f-bebf-9fa706f64a16.png and /dev/null differ diff --git a/sprites/s_control_pin/layers/5f3e3406-c1e5-49d2-9343-57262cff8167/cc59de3d-c095-4db7-9249-5589c31b5f2b.png b/sprites/s_control_pin/layers/5f3e3406-c1e5-49d2-9343-57262cff8167/cc59de3d-c095-4db7-9249-5589c31b5f2b.png new file mode 100644 index 000000000..16bb20dec Binary files /dev/null and b/sprites/s_control_pin/layers/5f3e3406-c1e5-49d2-9343-57262cff8167/cc59de3d-c095-4db7-9249-5589c31b5f2b.png differ diff --git a/sprites/s_control_pin/s_control_pin.yy b/sprites/s_control_pin/s_control_pin.yy index 253ec396a..bf4ca3b2d 100644 --- a/sprites/s_control_pin/s_control_pin.yy +++ b/sprites/s_control_pin/s_control_pin.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 45, + "bbox_top": 3, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5e3fb7ab-4e3e-4876-b3c9-078486766e1a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5f3e3406-c1e5-49d2-9343-57262cff8167",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c503bb0b-3f9b-4825-a0bd-1e1c93c4ecab","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5e3fb7ab-4e3e-4876-b3c9-078486766e1a","path":"sprites/s_control_pin/s_control_pin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a0065eea-cb25-4055-aba9-bd84f2dd1350","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5f3e3406-c1e5-49d2-9343-57262cff8167","path":"sprites/s_control_pin/s_control_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,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b390e3b7-b72a-469f-bebf-9fa706f64a16","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cc59de3d-c095-4db7-9249-5589c31b5f2b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_control_unpin/0e169e65-265d-400a-96c0-6080812bbf21.png b/sprites/s_control_unpin/0e169e65-265d-400a-96c0-6080812bbf21.png new file mode 100644 index 000000000..3ac25b45b Binary files /dev/null and b/sprites/s_control_unpin/0e169e65-265d-400a-96c0-6080812bbf21.png differ diff --git a/sprites/s_control_unpin/e2965e71-8c59-458a-8945-aef69af2f1a4.png b/sprites/s_control_unpin/e2965e71-8c59-458a-8945-aef69af2f1a4.png deleted file mode 100644 index 2244dfac4..000000000 Binary files a/sprites/s_control_unpin/e2965e71-8c59-458a-8945-aef69af2f1a4.png and /dev/null differ diff --git a/sprites/s_control_unpin/layers/0e169e65-265d-400a-96c0-6080812bbf21/7a71414c-f7b6-45ab-9b45-762fde14337e.png b/sprites/s_control_unpin/layers/0e169e65-265d-400a-96c0-6080812bbf21/7a71414c-f7b6-45ab-9b45-762fde14337e.png new file mode 100644 index 000000000..3ac25b45b Binary files /dev/null and b/sprites/s_control_unpin/layers/0e169e65-265d-400a-96c0-6080812bbf21/7a71414c-f7b6-45ab-9b45-762fde14337e.png differ diff --git a/sprites/s_control_unpin/layers/e2965e71-8c59-458a-8945-aef69af2f1a4/08994959-dcdd-4b21-b956-e70eef200465.png b/sprites/s_control_unpin/layers/e2965e71-8c59-458a-8945-aef69af2f1a4/08994959-dcdd-4b21-b956-e70eef200465.png deleted file mode 100644 index 2244dfac4..000000000 Binary files a/sprites/s_control_unpin/layers/e2965e71-8c59-458a-8945-aef69af2f1a4/08994959-dcdd-4b21-b956-e70eef200465.png and /dev/null differ diff --git a/sprites/s_control_unpin/s_control_unpin.yy b/sprites/s_control_unpin/s_control_unpin.yy index dc5bdc638..bd26d387b 100644 --- a/sprites/s_control_unpin/s_control_unpin.yy +++ b/sprites/s_control_unpin/s_control_unpin.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 45, + "bbox_top": 3, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e2965e71-8c59-458a-8945-aef69af2f1a4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0e169e65-265d-400a-96c0-6080812bbf21",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4fe17b7e-6e06-404e-b7a4-7854c414b3d9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e2965e71-8c59-458a-8945-aef69af2f1a4","path":"sprites/s_control_unpin/s_control_unpin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"df523c46-98da-4760-a21d-e1d4f5147400","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e169e65-265d-400a-96c0-6080812bbf21","path":"sprites/s_control_unpin/s_control_unpin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"08994959-dcdd-4b21-b956-e70eef200465","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7a71414c-f7b6-45ab-9b45-762fde14337e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_cursor_path_add/59582a8c-64dc-4282-82e1-2efb8be4368c.png b/sprites/s_cursor_path_add/59582a8c-64dc-4282-82e1-2efb8be4368c.png new file mode 100644 index 000000000..ea1a93902 Binary files /dev/null and b/sprites/s_cursor_path_add/59582a8c-64dc-4282-82e1-2efb8be4368c.png differ diff --git a/sprites/s_cursor_path_add/bd3b702c-197a-467c-88be-b77d6b30df14.png b/sprites/s_cursor_path_add/bd3b702c-197a-467c-88be-b77d6b30df14.png deleted file mode 100644 index 7d064c728..000000000 Binary files a/sprites/s_cursor_path_add/bd3b702c-197a-467c-88be-b77d6b30df14.png and /dev/null differ diff --git a/sprites/s_cursor_path_add/layers/59582a8c-64dc-4282-82e1-2efb8be4368c/d8bb26e1-1819-4554-a51b-c18cffd3b9d5.png b/sprites/s_cursor_path_add/layers/59582a8c-64dc-4282-82e1-2efb8be4368c/d8bb26e1-1819-4554-a51b-c18cffd3b9d5.png new file mode 100644 index 000000000..ea1a93902 Binary files /dev/null and b/sprites/s_cursor_path_add/layers/59582a8c-64dc-4282-82e1-2efb8be4368c/d8bb26e1-1819-4554-a51b-c18cffd3b9d5.png differ diff --git a/sprites/s_cursor_path_add/layers/bd3b702c-197a-467c-88be-b77d6b30df14/27c46b4e-6fbd-4481-9ff3-a77de7d0c69c.png b/sprites/s_cursor_path_add/layers/bd3b702c-197a-467c-88be-b77d6b30df14/27c46b4e-6fbd-4481-9ff3-a77de7d0c69c.png deleted file mode 100644 index 23ed4fa66..000000000 Binary files a/sprites/s_cursor_path_add/layers/bd3b702c-197a-467c-88be-b77d6b30df14/27c46b4e-6fbd-4481-9ff3-a77de7d0c69c.png and /dev/null differ diff --git a/sprites/s_cursor_path_add/s_cursor_path_add.yy b/sprites/s_cursor_path_add/s_cursor_path_add.yy index f7ba670a0..58090a895 100644 --- a/sprites/s_cursor_path_add/s_cursor_path_add.yy +++ b/sprites/s_cursor_path_add/s_cursor_path_add.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 26, - "bbox_top": 2, - "bbox_bottom": 26, + "bbox_left": 5, + "bbox_right": 53, + "bbox_top": 5, + "bbox_bottom": 53, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 29, - "height": 29, + "width": 58, + "height": 58, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bd3b702c-197a-467c-88be-b77d6b30df14",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"59582a8c-64dc-4282-82e1-2efb8be4368c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c945f2af-37e4-4c0e-a742-60d120713f9e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bd3b702c-197a-467c-88be-b77d6b30df14","path":"sprites/s_cursor_path_add/s_cursor_path_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"934ddb90-264e-44c6-a808-9f511db7b627","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"59582a8c-64dc-4282-82e1-2efb8be4368c","path":"sprites/s_cursor_path_add/s_cursor_path_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -64,7 +64,7 @@ "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"27c46b4e-6fbd-4481-9ff3-a77de7d0c69c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d8bb26e1-1819-4554-a51b-c18cffd3b9d5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_cursor_path_anchor/414c47f4-1106-4bda-9a84-6ee03aa8ef49.png b/sprites/s_cursor_path_anchor/414c47f4-1106-4bda-9a84-6ee03aa8ef49.png new file mode 100644 index 000000000..34e5ef94e Binary files /dev/null and b/sprites/s_cursor_path_anchor/414c47f4-1106-4bda-9a84-6ee03aa8ef49.png differ diff --git a/sprites/s_cursor_path_anchor/c3ff0dfa-8c8c-4594-89aa-6e93ce398494.png b/sprites/s_cursor_path_anchor/c3ff0dfa-8c8c-4594-89aa-6e93ce398494.png deleted file mode 100644 index d293136f4..000000000 Binary files a/sprites/s_cursor_path_anchor/c3ff0dfa-8c8c-4594-89aa-6e93ce398494.png and /dev/null differ diff --git a/sprites/s_cursor_path_anchor/layers/414c47f4-1106-4bda-9a84-6ee03aa8ef49/9e9819cf-31f3-480b-ae89-89ea3a1db9ec.png b/sprites/s_cursor_path_anchor/layers/414c47f4-1106-4bda-9a84-6ee03aa8ef49/9e9819cf-31f3-480b-ae89-89ea3a1db9ec.png new file mode 100644 index 000000000..34e5ef94e Binary files /dev/null and b/sprites/s_cursor_path_anchor/layers/414c47f4-1106-4bda-9a84-6ee03aa8ef49/9e9819cf-31f3-480b-ae89-89ea3a1db9ec.png differ diff --git a/sprites/s_cursor_path_anchor/layers/c3ff0dfa-8c8c-4594-89aa-6e93ce398494/d6f03e3f-b082-4645-8a15-be3dca7aa1ba.png b/sprites/s_cursor_path_anchor/layers/c3ff0dfa-8c8c-4594-89aa-6e93ce398494/d6f03e3f-b082-4645-8a15-be3dca7aa1ba.png deleted file mode 100644 index 4381cf669..000000000 Binary files a/sprites/s_cursor_path_anchor/layers/c3ff0dfa-8c8c-4594-89aa-6e93ce398494/d6f03e3f-b082-4645-8a15-be3dca7aa1ba.png and /dev/null differ diff --git a/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy b/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy index e439e4100..b324f3d80 100644 --- a/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy +++ b/sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 28, - "bbox_top": 2, - "bbox_bottom": 25, + "bbox_left": 5, + "bbox_right": 56, + "bbox_top": 5, + "bbox_bottom": 51, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 29, - "height": 29, + "width": 58, + "height": 58, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c3ff0dfa-8c8c-4594-89aa-6e93ce398494",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"414c47f4-1106-4bda-9a84-6ee03aa8ef49",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"81536e84-040c-49ed-8509-f4a56bd37bfc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c3ff0dfa-8c8c-4594-89aa-6e93ce398494","path":"sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7a545a8f-6d41-4464-9dd2-dfedb6454c0f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"414c47f4-1106-4bda-9a84-6ee03aa8ef49","path":"sprites/s_cursor_path_anchor/s_cursor_path_anchor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 14, - "yorigin": 14, + "xorigin": 29, + "yorigin": 29, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d6f03e3f-b082-4645-8a15-be3dca7aa1ba","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9e9819cf-31f3-480b-ae89-89ea3a1db9ec","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_cursor_path_move/9108b80a-fb06-4598-8a01-25ed553fe38f.png b/sprites/s_cursor_path_move/9108b80a-fb06-4598-8a01-25ed553fe38f.png new file mode 100644 index 000000000..4df4840ee Binary files /dev/null and b/sprites/s_cursor_path_move/9108b80a-fb06-4598-8a01-25ed553fe38f.png differ diff --git a/sprites/s_cursor_path_move/d7ca1e6c-48b2-4d64-8941-0b48bc6d3155.png b/sprites/s_cursor_path_move/d7ca1e6c-48b2-4d64-8941-0b48bc6d3155.png deleted file mode 100644 index 810c368ae..000000000 Binary files a/sprites/s_cursor_path_move/d7ca1e6c-48b2-4d64-8941-0b48bc6d3155.png and /dev/null differ diff --git a/sprites/s_cursor_path_move/layers/9108b80a-fb06-4598-8a01-25ed553fe38f/caf9f92d-b910-4fb9-b2fc-c382fb1d121b.png b/sprites/s_cursor_path_move/layers/9108b80a-fb06-4598-8a01-25ed553fe38f/caf9f92d-b910-4fb9-b2fc-c382fb1d121b.png new file mode 100644 index 000000000..4df4840ee Binary files /dev/null and b/sprites/s_cursor_path_move/layers/9108b80a-fb06-4598-8a01-25ed553fe38f/caf9f92d-b910-4fb9-b2fc-c382fb1d121b.png differ diff --git a/sprites/s_cursor_path_move/layers/d7ca1e6c-48b2-4d64-8941-0b48bc6d3155/e53f68f0-96f0-4771-8908-38b66700dff7.png b/sprites/s_cursor_path_move/layers/d7ca1e6c-48b2-4d64-8941-0b48bc6d3155/e53f68f0-96f0-4771-8908-38b66700dff7.png deleted file mode 100644 index 4da9e43d6..000000000 Binary files a/sprites/s_cursor_path_move/layers/d7ca1e6c-48b2-4d64-8941-0b48bc6d3155/e53f68f0-96f0-4771-8908-38b66700dff7.png and /dev/null differ diff --git a/sprites/s_cursor_path_move/s_cursor_path_move.yy b/sprites/s_cursor_path_move/s_cursor_path_move.yy index aeecfce26..c80e6c803 100644 --- a/sprites/s_cursor_path_move/s_cursor_path_move.yy +++ b/sprites/s_cursor_path_move/s_cursor_path_move.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 26, - "bbox_top": 2, - "bbox_bottom": 26, + "bbox_left": 5, + "bbox_right": 52, + "bbox_top": 5, + "bbox_bottom": 53, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 29, - "height": 29, + "width": 58, + "height": 58, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d7ca1e6c-48b2-4d64-8941-0b48bc6d3155",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9108b80a-fb06-4598-8a01-25ed553fe38f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"db61768f-e0cc-4103-9058-a4a440fff487","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d7ca1e6c-48b2-4d64-8941-0b48bc6d3155","path":"sprites/s_cursor_path_move/s_cursor_path_move.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2ea3094a-9a44-4439-a185-b8f44ec89917","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9108b80a-fb06-4598-8a01-25ed553fe38f","path":"sprites/s_cursor_path_move/s_cursor_path_move.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -64,7 +64,7 @@ "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e53f68f0-96f0-4771-8908-38b66700dff7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"caf9f92d-b910-4fb9-b2fc-c382fb1d121b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_cursor_path_remove/09f635f6-aed0-4066-a065-350ba48a083a.png b/sprites/s_cursor_path_remove/09f635f6-aed0-4066-a065-350ba48a083a.png new file mode 100644 index 000000000..8caa48c29 Binary files /dev/null and b/sprites/s_cursor_path_remove/09f635f6-aed0-4066-a065-350ba48a083a.png differ diff --git a/sprites/s_cursor_path_remove/9804e057-260e-4ce2-86dd-08c8a0d7269c.png b/sprites/s_cursor_path_remove/9804e057-260e-4ce2-86dd-08c8a0d7269c.png deleted file mode 100644 index d22c9d0c9..000000000 Binary files a/sprites/s_cursor_path_remove/9804e057-260e-4ce2-86dd-08c8a0d7269c.png and /dev/null differ diff --git a/sprites/s_cursor_path_remove/layers/09f635f6-aed0-4066-a065-350ba48a083a/4cb78a26-cb95-4a36-9fb6-4c9d21dc0382.png b/sprites/s_cursor_path_remove/layers/09f635f6-aed0-4066-a065-350ba48a083a/4cb78a26-cb95-4a36-9fb6-4c9d21dc0382.png new file mode 100644 index 000000000..8caa48c29 Binary files /dev/null and b/sprites/s_cursor_path_remove/layers/09f635f6-aed0-4066-a065-350ba48a083a/4cb78a26-cb95-4a36-9fb6-4c9d21dc0382.png differ diff --git a/sprites/s_cursor_path_remove/layers/9804e057-260e-4ce2-86dd-08c8a0d7269c/52a105fb-4fd2-4a9a-be9c-a809f8180e0f.png b/sprites/s_cursor_path_remove/layers/9804e057-260e-4ce2-86dd-08c8a0d7269c/52a105fb-4fd2-4a9a-be9c-a809f8180e0f.png deleted file mode 100644 index a3f82b0c6..000000000 Binary files a/sprites/s_cursor_path_remove/layers/9804e057-260e-4ce2-86dd-08c8a0d7269c/52a105fb-4fd2-4a9a-be9c-a809f8180e0f.png and /dev/null differ diff --git a/sprites/s_cursor_path_remove/s_cursor_path_remove.yy b/sprites/s_cursor_path_remove/s_cursor_path_remove.yy index ab93fbbc1..56d8de10e 100644 --- a/sprites/s_cursor_path_remove/s_cursor_path_remove.yy +++ b/sprites/s_cursor_path_remove/s_cursor_path_remove.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 27, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 5, + "bbox_right": 55, + "bbox_top": 5, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 29, - "height": 29, + "width": 58, + "height": 58, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9804e057-260e-4ce2-86dd-08c8a0d7269c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09f635f6-aed0-4066-a065-350ba48a083a",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4c567c1f-82f2-41ff-b60f-ed271291bcd9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9804e057-260e-4ce2-86dd-08c8a0d7269c","path":"sprites/s_cursor_path_remove/s_cursor_path_remove.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"144be97d-1283-45ec-afd8-d458b4ed217e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"09f635f6-aed0-4066-a065-350ba48a083a","path":"sprites/s_cursor_path_remove/s_cursor_path_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,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -64,7 +64,7 @@ "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"52a105fb-4fd2-4a9a-be9c-a809f8180e0f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4cb78a26-cb95-4a36-9fb6-4c9d21dc0382","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_delete_16/4b6b5c83-74b0-49ef-b842-a2d1de20a870.png b/sprites/s_delete_16/4b6b5c83-74b0-49ef-b842-a2d1de20a870.png new file mode 100644 index 000000000..c9f5d8376 Binary files /dev/null and b/sprites/s_delete_16/4b6b5c83-74b0-49ef-b842-a2d1de20a870.png differ diff --git a/sprites/s_delete_16/fbf2396c-f620-442e-a368-38d12d68715c.png b/sprites/s_delete_16/fbf2396c-f620-442e-a368-38d12d68715c.png deleted file mode 100644 index 74001653a..000000000 Binary files a/sprites/s_delete_16/fbf2396c-f620-442e-a368-38d12d68715c.png and /dev/null differ diff --git a/sprites/s_delete_16/layers/4b6b5c83-74b0-49ef-b842-a2d1de20a870/9addd9eb-1432-4f3d-85bd-66258293ec45.png b/sprites/s_delete_16/layers/4b6b5c83-74b0-49ef-b842-a2d1de20a870/9addd9eb-1432-4f3d-85bd-66258293ec45.png new file mode 100644 index 000000000..c9f5d8376 Binary files /dev/null and b/sprites/s_delete_16/layers/4b6b5c83-74b0-49ef-b842-a2d1de20a870/9addd9eb-1432-4f3d-85bd-66258293ec45.png differ diff --git a/sprites/s_delete_16/layers/fbf2396c-f620-442e-a368-38d12d68715c/6db6238c-a3f6-4641-8c05-5871d05de1ad.png b/sprites/s_delete_16/layers/fbf2396c-f620-442e-a368-38d12d68715c/6db6238c-a3f6-4641-8c05-5871d05de1ad.png deleted file mode 100644 index 74001653a..000000000 Binary files a/sprites/s_delete_16/layers/fbf2396c-f620-442e-a368-38d12d68715c/6db6238c-a3f6-4641-8c05-5871d05de1ad.png and /dev/null differ diff --git a/sprites/s_delete_16/s_delete_16.yy b/sprites/s_delete_16/s_delete_16.yy index 8ae5ea022..6ddb416f2 100644 --- a/sprites/s_delete_16/s_delete_16.yy +++ b/sprites/s_delete_16/s_delete_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 12, - "bbox_top": 1, - "bbox_bottom": 14, + "bbox_left": 6, + "bbox_right": 25, + "bbox_top": 2, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fbf2396c-f620-442e-a368-38d12d68715c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4b6b5c83-74b0-49ef-b842-a2d1de20a870",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e0504830-b015-4b9a-9c32-5e5c7dac48af","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fbf2396c-f620-442e-a368-38d12d68715c","path":"sprites/s_delete_16/s_delete_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"17be2a0c-4311-4b18-84fd-1276f78973dd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4b6b5c83-74b0-49ef-b842-a2d1de20a870","path":"sprites/s_delete_16/s_delete_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6db6238c-a3f6-4641-8c05-5871d05de1ad","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9addd9eb-1432-4f3d-85bd-66258293ec45","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_dialog_active/b4e78455-95b0-4465-922d-8fc04593526d.png b/sprites/s_dialog_active/b4e78455-95b0-4465-922d-8fc04593526d.png deleted file mode 100644 index 98ca16068..000000000 Binary files a/sprites/s_dialog_active/b4e78455-95b0-4465-922d-8fc04593526d.png and /dev/null differ diff --git a/sprites/s_dialog_active/c1a81238-024d-4d68-a798-8237f4f40a89.png b/sprites/s_dialog_active/c1a81238-024d-4d68-a798-8237f4f40a89.png new file mode 100644 index 000000000..ab52ae838 Binary files /dev/null and b/sprites/s_dialog_active/c1a81238-024d-4d68-a798-8237f4f40a89.png differ diff --git a/sprites/s_dialog_active/layers/b4e78455-95b0-4465-922d-8fc04593526d/69f068be-1298-48e2-8813-9dce96b66f2c.png b/sprites/s_dialog_active/layers/b4e78455-95b0-4465-922d-8fc04593526d/69f068be-1298-48e2-8813-9dce96b66f2c.png deleted file mode 100644 index 03b7479e7..000000000 Binary files a/sprites/s_dialog_active/layers/b4e78455-95b0-4465-922d-8fc04593526d/69f068be-1298-48e2-8813-9dce96b66f2c.png and /dev/null differ diff --git a/sprites/s_dialog_active/layers/c1a81238-024d-4d68-a798-8237f4f40a89/782d73a1-ac8a-4d2f-b8aa-ebc804be7543.png b/sprites/s_dialog_active/layers/c1a81238-024d-4d68-a798-8237f4f40a89/782d73a1-ac8a-4d2f-b8aa-ebc804be7543.png new file mode 100644 index 000000000..ab52ae838 Binary files /dev/null and b/sprites/s_dialog_active/layers/c1a81238-024d-4d68-a798-8237f4f40a89/782d73a1-ac8a-4d2f-b8aa-ebc804be7543.png differ diff --git a/sprites/s_dialog_active/s_dialog_active.yy b/sprites/s_dialog_active/s_dialog_active.yy index b28775ccc..555dcd67b 100644 --- a/sprites/s_dialog_active/s_dialog_active.yy +++ b/sprites/s_dialog_active/s_dialog_active.yy @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b4e78455-95b0-4465-922d-8fc04593526d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c1a81238-024d-4d68-a798-8237f4f40a89",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a1a0a666-e1a0-445c-92af-09ac01726367","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b4e78455-95b0-4465-922d-8fc04593526d","path":"sprites/s_dialog_active/s_dialog_active.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"cb100446-4ac8-40a9-a622-46e71e6fe556","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c1a81238-024d-4d68-a798-8237f4f40a89","path":"sprites/s_dialog_active/s_dialog_active.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -64,7 +64,7 @@ "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"69f068be-1298-48e2-8813-9dce96b66f2c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"782d73a1-ac8a-4d2f-b8aa-ebc804be7543","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": { "left": 9, diff --git a/sprites/s_file/054fd811-dd2c-4be4-8b72-487d434c09e3.png b/sprites/s_file/054fd811-dd2c-4be4-8b72-487d434c09e3.png new file mode 100644 index 000000000..757044881 Binary files /dev/null and b/sprites/s_file/054fd811-dd2c-4be4-8b72-487d434c09e3.png differ diff --git a/sprites/s_file/b870dcdc-360d-4556-9bdc-a0a4d6b1308f.png b/sprites/s_file/b870dcdc-360d-4556-9bdc-a0a4d6b1308f.png deleted file mode 100644 index 5fb41b622..000000000 Binary files a/sprites/s_file/b870dcdc-360d-4556-9bdc-a0a4d6b1308f.png and /dev/null differ diff --git a/sprites/s_file/layers/054fd811-dd2c-4be4-8b72-487d434c09e3/cea40b13-0cc6-402f-ae60-329cf6acf887.png b/sprites/s_file/layers/054fd811-dd2c-4be4-8b72-487d434c09e3/cea40b13-0cc6-402f-ae60-329cf6acf887.png new file mode 100644 index 000000000..757044881 Binary files /dev/null and b/sprites/s_file/layers/054fd811-dd2c-4be4-8b72-487d434c09e3/cea40b13-0cc6-402f-ae60-329cf6acf887.png differ diff --git a/sprites/s_file/layers/b870dcdc-360d-4556-9bdc-a0a4d6b1308f/113958dc-762f-4738-bf61-2ffe45472be2.png b/sprites/s_file/layers/b870dcdc-360d-4556-9bdc-a0a4d6b1308f/113958dc-762f-4738-bf61-2ffe45472be2.png deleted file mode 100644 index 973f85517..000000000 Binary files a/sprites/s_file/layers/b870dcdc-360d-4556-9bdc-a0a4d6b1308f/113958dc-762f-4738-bf61-2ffe45472be2.png and /dev/null differ diff --git a/sprites/s_file/s_file.yy b/sprites/s_file/s_file.yy index 0b276fa4a..36acb58aa 100644 --- a/sprites/s_file/s_file.yy +++ b/sprites/s_file/s_file.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 18, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 10, + "bbox_right": 37, + "bbox_top": 6, + "bbox_bottom": 41, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b870dcdc-360d-4556-9bdc-a0a4d6b1308f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"054fd811-dd2c-4be4-8b72-487d434c09e3",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ce1b79cf-1634-42eb-9d8a-2840f3f8251a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b870dcdc-360d-4556-9bdc-a0a4d6b1308f","path":"sprites/s_file/s_file.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d5c4d7e3-d8f5-49e2-8d4b-6de785e08907","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"054fd811-dd2c-4be4-8b72-487d434c09e3","path":"sprites/s_file/s_file.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"113958dc-762f-4738-bf61-2ffe45472be2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cea40b13-0cc6-402f-ae60-329cf6acf887","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_fill_16/51a3eea1-cd33-469f-895f-9ab00d94a99b.png b/sprites/s_fill_16/51a3eea1-cd33-469f-895f-9ab00d94a99b.png deleted file mode 100644 index 123297ed7..000000000 Binary files a/sprites/s_fill_16/51a3eea1-cd33-469f-895f-9ab00d94a99b.png and /dev/null differ diff --git a/sprites/s_fill_16/62a2f3d0-e1f0-4348-8e65-a2c1249ca88d.png b/sprites/s_fill_16/62a2f3d0-e1f0-4348-8e65-a2c1249ca88d.png new file mode 100644 index 000000000..cd84fda00 Binary files /dev/null and b/sprites/s_fill_16/62a2f3d0-e1f0-4348-8e65-a2c1249ca88d.png differ diff --git a/sprites/s_fill_16/layers/51a3eea1-cd33-469f-895f-9ab00d94a99b/735b6f9e-00d8-41e3-a77c-4def6b6056b2.png b/sprites/s_fill_16/layers/51a3eea1-cd33-469f-895f-9ab00d94a99b/735b6f9e-00d8-41e3-a77c-4def6b6056b2.png deleted file mode 100644 index cc586a920..000000000 Binary files a/sprites/s_fill_16/layers/51a3eea1-cd33-469f-895f-9ab00d94a99b/735b6f9e-00d8-41e3-a77c-4def6b6056b2.png and /dev/null differ diff --git a/sprites/s_fill_16/layers/62a2f3d0-e1f0-4348-8e65-a2c1249ca88d/33893702-39ab-430b-bad3-bf5b5ecb95d4.png b/sprites/s_fill_16/layers/62a2f3d0-e1f0-4348-8e65-a2c1249ca88d/33893702-39ab-430b-bad3-bf5b5ecb95d4.png new file mode 100644 index 000000000..cd84fda00 Binary files /dev/null and b/sprites/s_fill_16/layers/62a2f3d0-e1f0-4348-8e65-a2c1249ca88d/33893702-39ab-430b-bad3-bf5b5ecb95d4.png differ diff --git a/sprites/s_fill_16/s_fill_16.yy b/sprites/s_fill_16/s_fill_16.yy index 45af21d15..7ad885340 100644 --- a/sprites/s_fill_16/s_fill_16.yy +++ b/sprites/s_fill_16/s_fill_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 14, - "bbox_top": 1, - "bbox_bottom": 14, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 2, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"51a3eea1-cd33-469f-895f-9ab00d94a99b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"62a2f3d0-e1f0-4348-8e65-a2c1249ca88d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"133653d4-04ac-4a43-940a-9357017dd7ea","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"51a3eea1-cd33-469f-895f-9ab00d94a99b","path":"sprites/s_fill_16/s_fill_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5c5a8e39-d916-4e11-8fe2-9b554f035046","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"62a2f3d0-e1f0-4348-8e65-a2c1249ca88d","path":"sprites/s_fill_16/s_fill_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"735b6f9e-00d8-41e3-a77c-4def6b6056b2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"33893702-39ab-430b-bad3-bf5b5ecb95d4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": { "left": 0, diff --git a/sprites/s_folder_24/9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b.png b/sprites/s_folder_24/9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b.png deleted file mode 100644 index a8561bb59..000000000 Binary files a/sprites/s_folder_24/9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b.png and /dev/null differ diff --git a/sprites/s_folder_24/ae1924e4-2740-406e-81b9-947df007a320.png b/sprites/s_folder_24/ae1924e4-2740-406e-81b9-947df007a320.png new file mode 100644 index 000000000..78b4805bc Binary files /dev/null and b/sprites/s_folder_24/ae1924e4-2740-406e-81b9-947df007a320.png differ diff --git a/sprites/s_folder_24/layers/9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b/eca43fc5-02f1-41f5-aae1-27b10d4d271e.png b/sprites/s_folder_24/layers/9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b/eca43fc5-02f1-41f5-aae1-27b10d4d271e.png deleted file mode 100644 index 813dff2aa..000000000 Binary files a/sprites/s_folder_24/layers/9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b/eca43fc5-02f1-41f5-aae1-27b10d4d271e.png and /dev/null differ diff --git a/sprites/s_folder_24/layers/ae1924e4-2740-406e-81b9-947df007a320/e513233c-c0b0-49f4-bedd-b209c6a43d5f.png b/sprites/s_folder_24/layers/ae1924e4-2740-406e-81b9-947df007a320/e513233c-c0b0-49f4-bedd-b209c6a43d5f.png new file mode 100644 index 000000000..78b4805bc Binary files /dev/null and b/sprites/s_folder_24/layers/ae1924e4-2740-406e-81b9-947df007a320/e513233c-c0b0-49f4-bedd-b209c6a43d5f.png differ diff --git a/sprites/s_folder_24/s_folder_24.yy b/sprites/s_folder_24/s_folder_24.yy index 27af20942..471990893 100644 --- a/sprites/s_folder_24/s_folder_24.yy +++ b/sprites/s_folder_24/s_folder_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 4, - "bbox_bottom": 20, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 8, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ae1924e4-2740-406e-81b9-947df007a320",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3a3cb5bf-b577-4be4-bc9c-6eae6a4f6e52","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9e36eb9b-4ee7-4bba-b2e8-0f2077b4f40b","path":"sprites/s_folder_24/s_folder_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e9ae22fb-497e-48c1-ac25-3625babaf1d4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ae1924e4-2740-406e-81b9-947df007a320","path":"sprites/s_folder_24/s_folder_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"eca43fc5-02f1-41f5-aae1-27b10d4d271e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e513233c-c0b0-49f4-bedd-b209c6a43d5f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_folder_add/81621459-68b1-49f5-b583-74b216452971.png b/sprites/s_folder_add/81621459-68b1-49f5-b583-74b216452971.png deleted file mode 100644 index 72da6bc74..000000000 Binary files a/sprites/s_folder_add/81621459-68b1-49f5-b583-74b216452971.png and /dev/null differ diff --git a/sprites/s_folder_add/acef319e-6582-4e67-b4c2-66b0220b5b22.png b/sprites/s_folder_add/acef319e-6582-4e67-b4c2-66b0220b5b22.png new file mode 100644 index 000000000..31fead0a7 Binary files /dev/null and b/sprites/s_folder_add/acef319e-6582-4e67-b4c2-66b0220b5b22.png differ diff --git a/sprites/s_folder_add/ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06.png b/sprites/s_folder_add/ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06.png deleted file mode 100644 index f403c1d21..000000000 Binary files a/sprites/s_folder_add/ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06.png and /dev/null differ diff --git a/sprites/s_folder_add/ea763e7b-721f-46cd-9645-c0896b60d7a9.png b/sprites/s_folder_add/ea763e7b-721f-46cd-9645-c0896b60d7a9.png new file mode 100644 index 000000000..b58b97127 Binary files /dev/null and b/sprites/s_folder_add/ea763e7b-721f-46cd-9645-c0896b60d7a9.png differ diff --git a/sprites/s_folder_add/layers/81621459-68b1-49f5-b583-74b216452971/3694d797-6ef9-4906-85b7-b2afad527ceb.png b/sprites/s_folder_add/layers/81621459-68b1-49f5-b583-74b216452971/3694d797-6ef9-4906-85b7-b2afad527ceb.png deleted file mode 100644 index dc4fd9b6b..000000000 Binary files a/sprites/s_folder_add/layers/81621459-68b1-49f5-b583-74b216452971/3694d797-6ef9-4906-85b7-b2afad527ceb.png and /dev/null differ diff --git a/sprites/s_folder_add/layers/acef319e-6582-4e67-b4c2-66b0220b5b22/8ca5688e-fd2b-4b8e-8044-b05fb9f037cc.png b/sprites/s_folder_add/layers/acef319e-6582-4e67-b4c2-66b0220b5b22/8ca5688e-fd2b-4b8e-8044-b05fb9f037cc.png new file mode 100644 index 000000000..31fead0a7 Binary files /dev/null and b/sprites/s_folder_add/layers/acef319e-6582-4e67-b4c2-66b0220b5b22/8ca5688e-fd2b-4b8e-8044-b05fb9f037cc.png differ diff --git a/sprites/s_folder_add/layers/ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06/3694d797-6ef9-4906-85b7-b2afad527ceb.png b/sprites/s_folder_add/layers/ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06/3694d797-6ef9-4906-85b7-b2afad527ceb.png deleted file mode 100644 index 0043dd4f1..000000000 Binary files a/sprites/s_folder_add/layers/ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06/3694d797-6ef9-4906-85b7-b2afad527ceb.png and /dev/null differ diff --git a/sprites/s_folder_add/layers/ea763e7b-721f-46cd-9645-c0896b60d7a9/8ca5688e-fd2b-4b8e-8044-b05fb9f037cc.png b/sprites/s_folder_add/layers/ea763e7b-721f-46cd-9645-c0896b60d7a9/8ca5688e-fd2b-4b8e-8044-b05fb9f037cc.png new file mode 100644 index 000000000..b58b97127 Binary files /dev/null and b/sprites/s_folder_add/layers/ea763e7b-721f-46cd-9645-c0896b60d7a9/8ca5688e-fd2b-4b8e-8044-b05fb9f037cc.png differ diff --git a/sprites/s_folder_add/s_folder_add.yy b/sprites/s_folder_add/s_folder_add.yy index 84ce360c0..78937d505 100644 --- a/sprites/s_folder_add/s_folder_add.yy +++ b/sprites/s_folder_add/s_folder_add.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 4, - "bbox_bottom": 20, + "bbox_left": 5, + "bbox_right": 44, + "bbox_top": 8, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"81621459-68b1-49f5-b583-74b216452971",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ea763e7b-721f-46cd-9645-c0896b60d7a9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"acef319e-6582-4e67-b4c2-66b0220b5b22",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"bbd70ef9-fce8-4409-a3ef-7a77611868e2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"81621459-68b1-49f5-b583-74b216452971","path":"sprites/s_folder_add/s_folder_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"745a7381-e3d7-4dc8-a807-c405de873367","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ae3ce883-0d86-4fbe-a2d8-d54e6bb45b06","path":"sprites/s_folder_add/s_folder_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f4786140-2c21-40c4-84ae-6596a45bb8f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ea763e7b-721f-46cd-9645-c0896b60d7a9","path":"sprites/s_folder_add/s_folder_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e5708e87-d731-4f57-8674-5a7b7d77e4ad","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"acef319e-6582-4e67-b4c2-66b0220b5b22","path":"sprites/s_folder_add/s_folder_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3694d797-6ef9-4906-85b7-b2afad527ceb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8ca5688e-fd2b-4b8e-8044-b05fb9f037cc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_folder_content_24/087b63df-395b-442a-9541-13c1b948a89e.png b/sprites/s_folder_content_24/087b63df-395b-442a-9541-13c1b948a89e.png deleted file mode 100644 index 85b1b87f1..000000000 Binary files a/sprites/s_folder_content_24/087b63df-395b-442a-9541-13c1b948a89e.png and /dev/null differ diff --git a/sprites/s_folder_content_24/0ec837f4-c965-4ce4-9bd4-a26981b5a266.png b/sprites/s_folder_content_24/0ec837f4-c965-4ce4-9bd4-a26981b5a266.png new file mode 100644 index 000000000..034f035f3 Binary files /dev/null and b/sprites/s_folder_content_24/0ec837f4-c965-4ce4-9bd4-a26981b5a266.png differ diff --git a/sprites/s_folder_content_24/2e9558da-b7b7-4282-a7c0-28bef0ab2f58.png b/sprites/s_folder_content_24/2e9558da-b7b7-4282-a7c0-28bef0ab2f58.png new file mode 100644 index 000000000..e15ebaca1 Binary files /dev/null and b/sprites/s_folder_content_24/2e9558da-b7b7-4282-a7c0-28bef0ab2f58.png differ diff --git a/sprites/s_folder_content_24/e370d044-47b2-4385-b536-765d62658b53.png b/sprites/s_folder_content_24/e370d044-47b2-4385-b536-765d62658b53.png deleted file mode 100644 index fa92cee41..000000000 Binary files a/sprites/s_folder_content_24/e370d044-47b2-4385-b536-765d62658b53.png and /dev/null differ diff --git a/sprites/s_folder_content_24/layers/087b63df-395b-442a-9541-13c1b948a89e/1b3ed37a-f867-49ee-9b1f-1668f53c9a96.png b/sprites/s_folder_content_24/layers/087b63df-395b-442a-9541-13c1b948a89e/1b3ed37a-f867-49ee-9b1f-1668f53c9a96.png deleted file mode 100644 index e4c0ade6b..000000000 Binary files a/sprites/s_folder_content_24/layers/087b63df-395b-442a-9541-13c1b948a89e/1b3ed37a-f867-49ee-9b1f-1668f53c9a96.png and /dev/null differ diff --git a/sprites/s_folder_content_24/layers/0ec837f4-c965-4ce4-9bd4-a26981b5a266/0920da65-cc12-4178-bd41-17ae32df5114.png b/sprites/s_folder_content_24/layers/0ec837f4-c965-4ce4-9bd4-a26981b5a266/0920da65-cc12-4178-bd41-17ae32df5114.png new file mode 100644 index 000000000..034f035f3 Binary files /dev/null and b/sprites/s_folder_content_24/layers/0ec837f4-c965-4ce4-9bd4-a26981b5a266/0920da65-cc12-4178-bd41-17ae32df5114.png differ diff --git a/sprites/s_folder_content_24/layers/2e9558da-b7b7-4282-a7c0-28bef0ab2f58/0920da65-cc12-4178-bd41-17ae32df5114.png b/sprites/s_folder_content_24/layers/2e9558da-b7b7-4282-a7c0-28bef0ab2f58/0920da65-cc12-4178-bd41-17ae32df5114.png new file mode 100644 index 000000000..e15ebaca1 Binary files /dev/null and b/sprites/s_folder_content_24/layers/2e9558da-b7b7-4282-a7c0-28bef0ab2f58/0920da65-cc12-4178-bd41-17ae32df5114.png differ diff --git a/sprites/s_folder_content_24/layers/e370d044-47b2-4385-b536-765d62658b53/1b3ed37a-f867-49ee-9b1f-1668f53c9a96.png b/sprites/s_folder_content_24/layers/e370d044-47b2-4385-b536-765d62658b53/1b3ed37a-f867-49ee-9b1f-1668f53c9a96.png deleted file mode 100644 index 8d48c2db3..000000000 Binary files a/sprites/s_folder_content_24/layers/e370d044-47b2-4385-b536-765d62658b53/1b3ed37a-f867-49ee-9b1f-1668f53c9a96.png and /dev/null differ diff --git a/sprites/s_folder_content_24/s_folder_content_24.yy b/sprites/s_folder_content_24/s_folder_content_24.yy index 7e9534d44..a1f722412 100644 --- a/sprites/s_folder_content_24/s_folder_content_24.yy +++ b/sprites/s_folder_content_24/s_folder_content_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 4, - "bbox_bottom": 20, + "bbox_left": 5, + "bbox_right": 42, + "bbox_top": 8, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e370d044-47b2-4385-b536-765d62658b53",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"087b63df-395b-442a-9541-13c1b948a89e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0ec837f4-c965-4ce4-9bd4-a26981b5a266",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2e9558da-b7b7-4282-a7c0-28bef0ab2f58",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c2ac1835-866f-41f9-acbf-d9cc2ef24d8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e370d044-47b2-4385-b536-765d62658b53","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"841150bf-ecfb-4047-b2cc-6b2c2de7cbae","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"087b63df-395b-442a-9541-13c1b948a89e","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8bba943b-484e-4815-a011-512b540dd054","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0ec837f4-c965-4ce4-9bd4-a26981b5a266","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"61a67151-0e3d-4398-b00c-14f94889911f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2e9558da-b7b7-4282-a7c0-28bef0ab2f58","path":"sprites/s_folder_content_24/s_folder_content_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1b3ed37a-f867-49ee-9b1f-1668f53c9a96","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0920da65-cc12-4178-bd41-17ae32df5114","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_gear_24/5d9723f8-d4ff-42b5-9cd5-34934e074021.png b/sprites/s_gear_24/5d9723f8-d4ff-42b5-9cd5-34934e074021.png new file mode 100644 index 000000000..9b0581a72 Binary files /dev/null and b/sprites/s_gear_24/5d9723f8-d4ff-42b5-9cd5-34934e074021.png differ diff --git a/sprites/s_gear_24/a958894a-9531-481a-9762-e52778bcacc3.png b/sprites/s_gear_24/a958894a-9531-481a-9762-e52778bcacc3.png deleted file mode 100644 index 8a62f5cd4..000000000 Binary files a/sprites/s_gear_24/a958894a-9531-481a-9762-e52778bcacc3.png and /dev/null differ diff --git a/sprites/s_gear_24/layers/5d9723f8-d4ff-42b5-9cd5-34934e074021/317b2544-1148-4ed7-83e4-77272f922084.png b/sprites/s_gear_24/layers/5d9723f8-d4ff-42b5-9cd5-34934e074021/317b2544-1148-4ed7-83e4-77272f922084.png new file mode 100644 index 000000000..9b0581a72 Binary files /dev/null and b/sprites/s_gear_24/layers/5d9723f8-d4ff-42b5-9cd5-34934e074021/317b2544-1148-4ed7-83e4-77272f922084.png differ diff --git a/sprites/s_gear_24/layers/a958894a-9531-481a-9762-e52778bcacc3/cee74fd8-b2dd-455d-a082-de59739183ca.png b/sprites/s_gear_24/layers/a958894a-9531-481a-9762-e52778bcacc3/cee74fd8-b2dd-455d-a082-de59739183ca.png deleted file mode 100644 index 02ab6b27e..000000000 Binary files a/sprites/s_gear_24/layers/a958894a-9531-481a-9762-e52778bcacc3/cee74fd8-b2dd-455d-a082-de59739183ca.png and /dev/null differ diff --git a/sprites/s_gear_24/s_gear_24.yy b/sprites/s_gear_24/s_gear_24.yy index 1158a9d34..f65b3a4fa 100644 --- a/sprites/s_gear_24/s_gear_24.yy +++ b/sprites/s_gear_24/s_gear_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 23, - "bbox_top": 0, - "bbox_bottom": 23, + "bbox_left": 1, + "bbox_right": 46, + "bbox_top": 1, + "bbox_bottom": 46, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a958894a-9531-481a-9762-e52778bcacc3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5d9723f8-d4ff-42b5-9cd5-34934e074021",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fd37e4f5-1f0d-40bb-9506-26a32f1bb3ce","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a958894a-9531-481a-9762-e52778bcacc3","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3af99525-7a48-4ba9-ad7c-4ed95624d150","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5d9723f8-d4ff-42b5-9cd5-34934e074021","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee74fd8-b2dd-455d-a082-de59739183ca","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"317b2544-1148-4ed7-83e4-77272f922084","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_grad_blend/0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4.png b/sprites/s_grad_blend/0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4.png new file mode 100644 index 000000000..d25669b55 Binary files /dev/null and b/sprites/s_grad_blend/0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4.png differ diff --git a/sprites/s_grad_blend/6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc.png b/sprites/s_grad_blend/6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc.png deleted file mode 100644 index 31b8e813d..000000000 Binary files a/sprites/s_grad_blend/6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc.png and /dev/null differ diff --git a/sprites/s_grad_blend/layers/0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4/89893b68-f696-4fec-bc3b-40bb26220395.png b/sprites/s_grad_blend/layers/0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4/89893b68-f696-4fec-bc3b-40bb26220395.png new file mode 100644 index 000000000..d25669b55 Binary files /dev/null and b/sprites/s_grad_blend/layers/0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4/89893b68-f696-4fec-bc3b-40bb26220395.png differ diff --git a/sprites/s_grad_blend/layers/6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc/c2e535e4-d783-4c41-a789-a451557b0771.png b/sprites/s_grad_blend/layers/6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc/c2e535e4-d783-4c41-a789-a451557b0771.png deleted file mode 100644 index ccf7974e6..000000000 Binary files a/sprites/s_grad_blend/layers/6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc/c2e535e4-d783-4c41-a789-a451557b0771.png and /dev/null differ diff --git a/sprites/s_grad_blend/s_grad_blend.yy b/sprites/s_grad_blend/s_grad_blend.yy index cd322d44d..0b27cd82a 100644 --- a/sprites/s_grad_blend/s_grad_blend.yy +++ b/sprites/s_grad_blend/s_grad_blend.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 4, + "bbox_right": 44, + "bbox_top": 3, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e71717d9-bd99-44fb-9e1e-422f1d681fb3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6e2ee755-9e9c-4af7-9cec-cdbf5c9d46bc","path":"sprites/s_grad_blend/s_grad_blend.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fc48b91a-46d2-42aa-8266-38fba78e92b0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0d4397cd-d2f2-4f0f-8da4-f8c0ee2264b4","path":"sprites/s_grad_blend/s_grad_blend.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c2e535e4-d783-4c41-a789-a451557b0771","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"89893b68-f696-4fec-bc3b-40bb26220395","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_graph/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png b/sprites/s_graph/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png deleted file mode 100644 index 247dc2c4e..000000000 Binary files a/sprites/s_graph/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png and /dev/null differ diff --git a/sprites/s_graph/e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5.png b/sprites/s_graph/e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5.png new file mode 100644 index 000000000..8a3a6ff0c Binary files /dev/null and b/sprites/s_graph/e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5.png differ diff --git a/sprites/s_graph/layers/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689/81560a61-2258-4310-85ff-da3c8deae9f3.png b/sprites/s_graph/layers/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689/81560a61-2258-4310-85ff-da3c8deae9f3.png deleted file mode 100644 index b82ae6a7c..000000000 Binary files a/sprites/s_graph/layers/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689/81560a61-2258-4310-85ff-da3c8deae9f3.png and /dev/null differ diff --git a/sprites/s_graph/layers/e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5/e7466e17-1c11-4bab-84e6-0fce0e29766f.png b/sprites/s_graph/layers/e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5/e7466e17-1c11-4bab-84e6-0fce0e29766f.png new file mode 100644 index 000000000..8a3a6ff0c Binary files /dev/null and b/sprites/s_graph/layers/e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5/e7466e17-1c11-4bab-84e6-0fce0e29766f.png differ diff --git a/sprites/s_graph/s_graph.yy b/sprites/s_graph/s_graph.yy index c620d8059..c41c79b78 100644 --- a/sprites/s_graph/s_graph.yy +++ b/sprites/s_graph/s_graph.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 22, + "bbox_left": 3, + "bbox_right": 42, + "bbox_top": 5, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e9a4d706-ad57-401d-9cd4-c595eb87f10f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"18dc3efd-3339-4c8f-a202-27fae4041f41","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e1a7ae2f-1f50-4f71-a10c-2d0e16c918f5","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"81560a61-2258-4310-85ff-da3c8deae9f3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e7466e17-1c11-4bab-84e6-0fce0e29766f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_group_16/a6f0225a-56e5-4a85-8396-7ebb46b1742b.png b/sprites/s_group_16/a6f0225a-56e5-4a85-8396-7ebb46b1742b.png deleted file mode 100644 index 903b095b9..000000000 Binary files a/sprites/s_group_16/a6f0225a-56e5-4a85-8396-7ebb46b1742b.png and /dev/null differ diff --git a/sprites/s_group_16/b2bdc31c-545e-40a2-a075-577c90406dd2.png b/sprites/s_group_16/b2bdc31c-545e-40a2-a075-577c90406dd2.png new file mode 100644 index 000000000..85778863c Binary files /dev/null and b/sprites/s_group_16/b2bdc31c-545e-40a2-a075-577c90406dd2.png differ diff --git a/sprites/s_group_16/layers/a6f0225a-56e5-4a85-8396-7ebb46b1742b/ab31de2e-696d-457d-a36f-fe4bcae937c9.png b/sprites/s_group_16/layers/a6f0225a-56e5-4a85-8396-7ebb46b1742b/ab31de2e-696d-457d-a36f-fe4bcae937c9.png deleted file mode 100644 index b8faf4b81..000000000 Binary files a/sprites/s_group_16/layers/a6f0225a-56e5-4a85-8396-7ebb46b1742b/ab31de2e-696d-457d-a36f-fe4bcae937c9.png and /dev/null differ diff --git a/sprites/s_group_16/layers/b2bdc31c-545e-40a2-a075-577c90406dd2/d3181e60-8c35-4d09-9972-927bd25feb04.png b/sprites/s_group_16/layers/b2bdc31c-545e-40a2-a075-577c90406dd2/d3181e60-8c35-4d09-9972-927bd25feb04.png new file mode 100644 index 000000000..85778863c Binary files /dev/null and b/sprites/s_group_16/layers/b2bdc31c-545e-40a2-a075-577c90406dd2/d3181e60-8c35-4d09-9972-927bd25feb04.png differ diff --git a/sprites/s_group_16/s_group_16.yy b/sprites/s_group_16/s_group_16.yy index 8075e4f7f..953d2d965 100644 --- a/sprites/s_group_16/s_group_16.yy +++ b/sprites/s_group_16/s_group_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 14, - "bbox_top": 1, - "bbox_bottom": 14, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 2, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a6f0225a-56e5-4a85-8396-7ebb46b1742b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b2bdc31c-545e-40a2-a075-577c90406dd2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"29c09a65-15de-4a7d-aef7-1cd24ba4ecb9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a6f0225a-56e5-4a85-8396-7ebb46b1742b","path":"sprites/s_group_16/s_group_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fe8039e1-d93f-489a-a152-eec185626fae","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b2bdc31c-545e-40a2-a075-577c90406dd2","path":"sprites/s_group_16/s_group_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ab31de2e-696d-457d-a36f-fe4bcae937c9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d3181e60-8c35-4d09-9972-927bd25feb04","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_group_24/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1.png b/sprites/s_group_24/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1.png deleted file mode 100644 index fe7f3ab32..000000000 Binary files a/sprites/s_group_24/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1.png and /dev/null differ diff --git a/sprites/s_group_24/8a316087-cf0e-4f7f-8494-b84d8a927737.png b/sprites/s_group_24/8a316087-cf0e-4f7f-8494-b84d8a927737.png new file mode 100644 index 000000000..4975fe1da Binary files /dev/null and b/sprites/s_group_24/8a316087-cf0e-4f7f-8494-b84d8a927737.png differ diff --git a/sprites/s_group_24/layers/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1/5b8efdb4-6fc1-4ab4-a02a-9923a0842082.png b/sprites/s_group_24/layers/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1/5b8efdb4-6fc1-4ab4-a02a-9923a0842082.png deleted file mode 100644 index 661f2d1ac..000000000 Binary files a/sprites/s_group_24/layers/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1/5b8efdb4-6fc1-4ab4-a02a-9923a0842082.png and /dev/null differ diff --git a/sprites/s_group_24/layers/8a316087-cf0e-4f7f-8494-b84d8a927737/480e9c5e-9eac-48c7-b6d9-0843fbb8320d.png b/sprites/s_group_24/layers/8a316087-cf0e-4f7f-8494-b84d8a927737/480e9c5e-9eac-48c7-b6d9-0843fbb8320d.png new file mode 100644 index 000000000..4975fe1da Binary files /dev/null and b/sprites/s_group_24/layers/8a316087-cf0e-4f7f-8494-b84d8a927737/480e9c5e-9eac-48c7-b6d9-0843fbb8320d.png differ diff --git a/sprites/s_group_24/s_group_24.yy b/sprites/s_group_24/s_group_24.yy index b65d042a1..01b1729b4 100644 --- a/sprites/s_group_24/s_group_24.yy +++ b/sprites/s_group_24/s_group_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1fedd5b4-7de3-4a3f-897f-75acde1f0fd1",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8a316087-cf0e-4f7f-8494-b84d8a927737",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c3a8af3b-b170-4405-8f73-d232533b4645","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1fedd5b4-7de3-4a3f-897f-75acde1f0fd1","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2aefb2f6-bb16-499c-b3b8-187ff1a59ccc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8a316087-cf0e-4f7f-8494-b84d8a927737","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5b8efdb4-6fc1-4ab4-a02a-9923a0842082","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"480e9c5e-9eac-48c7-b6d9-0843fbb8320d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_hamburger/90e5e0dc-691f-42cc-9f7a-6987ec947066.png b/sprites/s_hamburger/90e5e0dc-691f-42cc-9f7a-6987ec947066.png new file mode 100644 index 000000000..5a0e14cf0 Binary files /dev/null and b/sprites/s_hamburger/90e5e0dc-691f-42cc-9f7a-6987ec947066.png differ diff --git a/sprites/s_hamburger/ed46d614-073e-485e-8542-2e61e3ee9bfb.png b/sprites/s_hamburger/ed46d614-073e-485e-8542-2e61e3ee9bfb.png deleted file mode 100644 index c33819779..000000000 Binary files a/sprites/s_hamburger/ed46d614-073e-485e-8542-2e61e3ee9bfb.png and /dev/null differ diff --git a/sprites/s_hamburger/layers/90e5e0dc-691f-42cc-9f7a-6987ec947066/d272a273-76ae-416d-8098-5849b8eeb561.png b/sprites/s_hamburger/layers/90e5e0dc-691f-42cc-9f7a-6987ec947066/d272a273-76ae-416d-8098-5849b8eeb561.png new file mode 100644 index 000000000..5a0e14cf0 Binary files /dev/null and b/sprites/s_hamburger/layers/90e5e0dc-691f-42cc-9f7a-6987ec947066/d272a273-76ae-416d-8098-5849b8eeb561.png differ diff --git a/sprites/s_hamburger/layers/ed46d614-073e-485e-8542-2e61e3ee9bfb/66cf796b-b986-4a52-8abb-86687d72bcdf.png b/sprites/s_hamburger/layers/ed46d614-073e-485e-8542-2e61e3ee9bfb/66cf796b-b986-4a52-8abb-86687d72bcdf.png deleted file mode 100644 index c4c8ae32a..000000000 Binary files a/sprites/s_hamburger/layers/ed46d614-073e-485e-8542-2e61e3ee9bfb/66cf796b-b986-4a52-8abb-86687d72bcdf.png and /dev/null differ diff --git a/sprites/s_hamburger/s_hamburger.yy b/sprites/s_hamburger/s_hamburger.yy index f160d536c..312907138 100644 --- a/sprites/s_hamburger/s_hamburger.yy +++ b/sprites/s_hamburger/s_hamburger.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ed46d614-073e-485e-8542-2e61e3ee9bfb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"90e5e0dc-691f-42cc-9f7a-6987ec947066",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a77191f2-fcd5-4939-a9bb-6214139ab935","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ed46d614-073e-485e-8542-2e61e3ee9bfb","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"980d82d3-a51e-4f7c-937a-79824ac65adf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"90e5e0dc-691f-42cc-9f7a-6987ec947066","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"66cf796b-b986-4a52-8abb-86687d72bcdf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d272a273-76ae-416d-8098-5849b8eeb561","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_hamburger_16/476131df-9104-463f-b9ce-d292e1b61842.png b/sprites/s_hamburger_16/476131df-9104-463f-b9ce-d292e1b61842.png new file mode 100644 index 000000000..fcd2f0bf0 Binary files /dev/null and b/sprites/s_hamburger_16/476131df-9104-463f-b9ce-d292e1b61842.png differ diff --git a/sprites/s_hamburger_16/75110183-e53f-42ea-84e7-7f16f90c2d1a.png b/sprites/s_hamburger_16/75110183-e53f-42ea-84e7-7f16f90c2d1a.png deleted file mode 100644 index aa72a8278..000000000 Binary files a/sprites/s_hamburger_16/75110183-e53f-42ea-84e7-7f16f90c2d1a.png and /dev/null differ diff --git a/sprites/s_hamburger_16/layers/476131df-9104-463f-b9ce-d292e1b61842/39b0da7d-b44f-47f8-b299-fdd9877279bf.png b/sprites/s_hamburger_16/layers/476131df-9104-463f-b9ce-d292e1b61842/39b0da7d-b44f-47f8-b299-fdd9877279bf.png new file mode 100644 index 000000000..fcd2f0bf0 Binary files /dev/null and b/sprites/s_hamburger_16/layers/476131df-9104-463f-b9ce-d292e1b61842/39b0da7d-b44f-47f8-b299-fdd9877279bf.png differ diff --git a/sprites/s_hamburger_16/layers/75110183-e53f-42ea-84e7-7f16f90c2d1a/b2bb01cb-dccd-4cd7-80d5-24a272de46e9.png b/sprites/s_hamburger_16/layers/75110183-e53f-42ea-84e7-7f16f90c2d1a/b2bb01cb-dccd-4cd7-80d5-24a272de46e9.png deleted file mode 100644 index aa72a8278..000000000 Binary files a/sprites/s_hamburger_16/layers/75110183-e53f-42ea-84e7-7f16f90c2d1a/b2bb01cb-dccd-4cd7-80d5-24a272de46e9.png and /dev/null differ diff --git a/sprites/s_hamburger_16/s_hamburger_16.yy b/sprites/s_hamburger_16/s_hamburger_16.yy index 0a7a73d5c..39bdb349f 100644 --- a/sprites/s_hamburger_16/s_hamburger_16.yy +++ b/sprites/s_hamburger_16/s_hamburger_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 13, - "bbox_top": 3, - "bbox_bottom": 12, + "bbox_left": 4, + "bbox_right": 27, + "bbox_top": 6, + "bbox_bottom": 25, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"75110183-e53f-42ea-84e7-7f16f90c2d1a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"476131df-9104-463f-b9ce-d292e1b61842",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a7134dc0-a9d3-451f-8f00-5f84e4ae199a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"75110183-e53f-42ea-84e7-7f16f90c2d1a","path":"sprites/s_hamburger_16/s_hamburger_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f5e4bdde-841f-4be8-bfa7-0ac36bbf24ba","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"476131df-9104-463f-b9ce-d292e1b61842","path":"sprites/s_hamburger_16/s_hamburger_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b2bb01cb-dccd-4cd7-80d5-24a272de46e9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"39b0da7d-b44f-47f8-b299-fdd9877279bf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_accept_24/d81ce6ec-d8c5-4874-a478-d68ed22d42b3.png b/sprites/s_icon_accept_24/d81ce6ec-d8c5-4874-a478-d68ed22d42b3.png deleted file mode 100644 index 2cd753c9f..000000000 Binary files a/sprites/s_icon_accept_24/d81ce6ec-d8c5-4874-a478-d68ed22d42b3.png and /dev/null differ diff --git a/sprites/s_icon_accept_24/fab19184-24bb-4872-a2c8-bda0db7d847d.png b/sprites/s_icon_accept_24/fab19184-24bb-4872-a2c8-bda0db7d847d.png new file mode 100644 index 000000000..ed57bf2b8 Binary files /dev/null and b/sprites/s_icon_accept_24/fab19184-24bb-4872-a2c8-bda0db7d847d.png differ diff --git a/sprites/s_icon_accept_24/layers/d81ce6ec-d8c5-4874-a478-d68ed22d42b3/b445d5d4-5159-4b55-8eaa-e56394769183.png b/sprites/s_icon_accept_24/layers/d81ce6ec-d8c5-4874-a478-d68ed22d42b3/b445d5d4-5159-4b55-8eaa-e56394769183.png deleted file mode 100644 index 38a1a9a24..000000000 Binary files a/sprites/s_icon_accept_24/layers/d81ce6ec-d8c5-4874-a478-d68ed22d42b3/b445d5d4-5159-4b55-8eaa-e56394769183.png and /dev/null differ diff --git a/sprites/s_icon_accept_24/layers/fab19184-24bb-4872-a2c8-bda0db7d847d/8dafa70c-3f26-49d2-b518-eebd4f3f8573.png b/sprites/s_icon_accept_24/layers/fab19184-24bb-4872-a2c8-bda0db7d847d/8dafa70c-3f26-49d2-b518-eebd4f3f8573.png new file mode 100644 index 000000000..ed57bf2b8 Binary files /dev/null and b/sprites/s_icon_accept_24/layers/fab19184-24bb-4872-a2c8-bda0db7d847d/8dafa70c-3f26-49d2-b518-eebd4f3f8573.png differ diff --git a/sprites/s_icon_accept_24/s_icon_accept_24.yy b/sprites/s_icon_accept_24/s_icon_accept_24.yy index 8bf7ff6bb..3710e00cc 100644 --- a/sprites/s_icon_accept_24/s_icon_accept_24.yy +++ b/sprites/s_icon_accept_24/s_icon_accept_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 3, - "bbox_bottom": 19, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 5, + "bbox_bottom": 41, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d81ce6ec-d8c5-4874-a478-d68ed22d42b3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fab19184-24bb-4872-a2c8-bda0db7d847d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"870a6028-c61b-4f73-86be-42f340e429e8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d81ce6ec-d8c5-4874-a478-d68ed22d42b3","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"46af8b18-7c4a-4d8e-b844-c77a04a85106","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fab19184-24bb-4872-a2c8-bda0db7d847d","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b445d5d4-5159-4b55-8eaa-e56394769183","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8dafa70c-3f26-49d2-b518-eebd4f3f8573","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_accept_32/12f5d6c2-95e3-410c-9d0d-ea175604d044.png b/sprites/s_icon_accept_32/12f5d6c2-95e3-410c-9d0d-ea175604d044.png deleted file mode 100644 index 20a2ad606..000000000 Binary files a/sprites/s_icon_accept_32/12f5d6c2-95e3-410c-9d0d-ea175604d044.png and /dev/null differ diff --git a/sprites/s_icon_accept_32/6a0e1b04-15bc-431d-9883-b5176cf85f3e.png b/sprites/s_icon_accept_32/6a0e1b04-15bc-431d-9883-b5176cf85f3e.png new file mode 100644 index 000000000..2735b433f Binary files /dev/null and b/sprites/s_icon_accept_32/6a0e1b04-15bc-431d-9883-b5176cf85f3e.png differ diff --git a/sprites/s_icon_accept_32/layers/12f5d6c2-95e3-410c-9d0d-ea175604d044/a811c0f6-b35f-4da0-bb08-62eb8e388829.png b/sprites/s_icon_accept_32/layers/12f5d6c2-95e3-410c-9d0d-ea175604d044/a811c0f6-b35f-4da0-bb08-62eb8e388829.png deleted file mode 100644 index bf6a45169..000000000 Binary files a/sprites/s_icon_accept_32/layers/12f5d6c2-95e3-410c-9d0d-ea175604d044/a811c0f6-b35f-4da0-bb08-62eb8e388829.png and /dev/null differ diff --git a/sprites/s_icon_accept_32/layers/6a0e1b04-15bc-431d-9883-b5176cf85f3e/c55c57bf-7a1e-4174-abe6-52ee73ed2f7f.png b/sprites/s_icon_accept_32/layers/6a0e1b04-15bc-431d-9883-b5176cf85f3e/c55c57bf-7a1e-4174-abe6-52ee73ed2f7f.png new file mode 100644 index 000000000..2735b433f Binary files /dev/null and b/sprites/s_icon_accept_32/layers/6a0e1b04-15bc-431d-9883-b5176cf85f3e/c55c57bf-7a1e-4174-abe6-52ee73ed2f7f.png differ diff --git a/sprites/s_icon_accept_32/s_icon_accept_32.yy b/sprites/s_icon_accept_32/s_icon_accept_32.yy index 1f6f4790d..0dae9c0c7 100644 --- a/sprites/s_icon_accept_32/s_icon_accept_32.yy +++ b/sprites/s_icon_accept_32/s_icon_accept_32.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 3, - "bbox_bottom": 27, + "bbox_left": 2, + "bbox_right": 61, + "bbox_top": 7, + "bbox_bottom": 55, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"12f5d6c2-95e3-410c-9d0d-ea175604d044",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6a0e1b04-15bc-431d-9883-b5176cf85f3e",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"04d0cf70-1d71-4bd0-9443-35fd4a3fc151","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"12f5d6c2-95e3-410c-9d0d-ea175604d044","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2b7a4bcd-60fd-45a8-a976-5c3c58135670","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6a0e1b04-15bc-431d-9883-b5176cf85f3e","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a811c0f6-b35f-4da0-bb08-62eb8e388829","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c55c57bf-7a1e-4174-abe6-52ee73ed2f7f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_center_canvas/531efc3e-504c-45a6-9725-1ba64f8e23ac.png b/sprites/s_icon_center_canvas/531efc3e-504c-45a6-9725-1ba64f8e23ac.png deleted file mode 100644 index 2fc30686e..000000000 Binary files a/sprites/s_icon_center_canvas/531efc3e-504c-45a6-9725-1ba64f8e23ac.png and /dev/null differ diff --git a/sprites/s_icon_center_canvas/d39ed15c-ffa6-445b-a3a3-c6037f139a89.png b/sprites/s_icon_center_canvas/d39ed15c-ffa6-445b-a3a3-c6037f139a89.png new file mode 100644 index 000000000..07d8719dd Binary files /dev/null and b/sprites/s_icon_center_canvas/d39ed15c-ffa6-445b-a3a3-c6037f139a89.png differ diff --git a/sprites/s_icon_center_canvas/layers/531efc3e-504c-45a6-9725-1ba64f8e23ac/6ce7236a-cc07-4536-8c2e-8a75a8a043b5.png b/sprites/s_icon_center_canvas/layers/531efc3e-504c-45a6-9725-1ba64f8e23ac/6ce7236a-cc07-4536-8c2e-8a75a8a043b5.png deleted file mode 100644 index 2fc30686e..000000000 Binary files a/sprites/s_icon_center_canvas/layers/531efc3e-504c-45a6-9725-1ba64f8e23ac/6ce7236a-cc07-4536-8c2e-8a75a8a043b5.png and /dev/null differ diff --git a/sprites/s_icon_center_canvas/layers/d39ed15c-ffa6-445b-a3a3-c6037f139a89/6bd74f0b-521b-48d1-8430-54087976f1e2.png b/sprites/s_icon_center_canvas/layers/d39ed15c-ffa6-445b-a3a3-c6037f139a89/6bd74f0b-521b-48d1-8430-54087976f1e2.png new file mode 100644 index 000000000..07d8719dd Binary files /dev/null and b/sprites/s_icon_center_canvas/layers/d39ed15c-ffa6-445b-a3a3-c6037f139a89/6bd74f0b-521b-48d1-8430-54087976f1e2.png differ diff --git a/sprites/s_icon_center_canvas/s_icon_center_canvas.yy b/sprites/s_icon_center_canvas/s_icon_center_canvas.yy index dc1429c05..03c39c5b9 100644 --- a/sprites/s_icon_center_canvas/s_icon_center_canvas.yy +++ b/sprites/s_icon_center_canvas/s_icon_center_canvas.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 2, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"531efc3e-504c-45a6-9725-1ba64f8e23ac",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d39ed15c-ffa6-445b-a3a3-c6037f139a89",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"cee1e1ce-dd41-4fd7-8d63-9d8a4ff2c878","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"531efc3e-504c-45a6-9725-1ba64f8e23ac","path":"sprites/s_icon_center_canvas/s_icon_center_canvas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"05fe0ce7-98c0-4fc3-a9b0-bcea23be1bc3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d39ed15c-ffa6-445b-a3a3-c6037f139a89","path":"sprites/s_icon_center_canvas/s_icon_center_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,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6ce7236a-cc07-4536-8c2e-8a75a8a043b5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6bd74f0b-521b-48d1-8430-54087976f1e2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_curve_connection/29280dff-2238-476f-b94e-7d6916cf2982.png b/sprites/s_icon_curve_connection/29280dff-2238-476f-b94e-7d6916cf2982.png deleted file mode 100644 index a9a0a3544..000000000 Binary files a/sprites/s_icon_curve_connection/29280dff-2238-476f-b94e-7d6916cf2982.png and /dev/null differ diff --git a/sprites/s_icon_curve_connection/49d66bb5-b41f-4136-aa3a-14aad0420d0e.png b/sprites/s_icon_curve_connection/49d66bb5-b41f-4136-aa3a-14aad0420d0e.png new file mode 100644 index 000000000..89e022176 Binary files /dev/null and b/sprites/s_icon_curve_connection/49d66bb5-b41f-4136-aa3a-14aad0420d0e.png differ diff --git a/sprites/s_icon_curve_connection/aa46db7c-55b8-4171-a5e2-fa6b53ed70dd.png b/sprites/s_icon_curve_connection/aa46db7c-55b8-4171-a5e2-fa6b53ed70dd.png new file mode 100644 index 000000000..7874e1c4e Binary files /dev/null and b/sprites/s_icon_curve_connection/aa46db7c-55b8-4171-a5e2-fa6b53ed70dd.png differ diff --git a/sprites/s_icon_curve_connection/bacad772-513e-4f36-9d08-c851ac9dd976.png b/sprites/s_icon_curve_connection/bacad772-513e-4f36-9d08-c851ac9dd976.png new file mode 100644 index 000000000..401dfb78b Binary files /dev/null and b/sprites/s_icon_curve_connection/bacad772-513e-4f36-9d08-c851ac9dd976.png differ diff --git a/sprites/s_icon_curve_connection/c8000df2-0508-47ae-909b-da8f32b31261.png b/sprites/s_icon_curve_connection/c8000df2-0508-47ae-909b-da8f32b31261.png deleted file mode 100644 index 26ea97466..000000000 Binary files a/sprites/s_icon_curve_connection/c8000df2-0508-47ae-909b-da8f32b31261.png and /dev/null differ diff --git a/sprites/s_icon_curve_connection/ddf259ae-2d79-49ab-85cb-e70f810c3088.png b/sprites/s_icon_curve_connection/ddf259ae-2d79-49ab-85cb-e70f810c3088.png deleted file mode 100644 index ce251e2dd..000000000 Binary files a/sprites/s_icon_curve_connection/ddf259ae-2d79-49ab-85cb-e70f810c3088.png and /dev/null differ diff --git a/sprites/s_icon_curve_connection/layers/29280dff-2238-476f-b94e-7d6916cf2982/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png b/sprites/s_icon_curve_connection/layers/29280dff-2238-476f-b94e-7d6916cf2982/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png deleted file mode 100644 index a9a0a3544..000000000 Binary files a/sprites/s_icon_curve_connection/layers/29280dff-2238-476f-b94e-7d6916cf2982/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png and /dev/null differ diff --git a/sprites/s_icon_curve_connection/layers/49d66bb5-b41f-4136-aa3a-14aad0420d0e/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png b/sprites/s_icon_curve_connection/layers/49d66bb5-b41f-4136-aa3a-14aad0420d0e/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png new file mode 100644 index 000000000..89e022176 Binary files /dev/null and b/sprites/s_icon_curve_connection/layers/49d66bb5-b41f-4136-aa3a-14aad0420d0e/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png differ diff --git a/sprites/s_icon_curve_connection/layers/aa46db7c-55b8-4171-a5e2-fa6b53ed70dd/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png b/sprites/s_icon_curve_connection/layers/aa46db7c-55b8-4171-a5e2-fa6b53ed70dd/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png new file mode 100644 index 000000000..7874e1c4e Binary files /dev/null and b/sprites/s_icon_curve_connection/layers/aa46db7c-55b8-4171-a5e2-fa6b53ed70dd/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png differ diff --git a/sprites/s_icon_curve_connection/layers/bacad772-513e-4f36-9d08-c851ac9dd976/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png b/sprites/s_icon_curve_connection/layers/bacad772-513e-4f36-9d08-c851ac9dd976/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png new file mode 100644 index 000000000..401dfb78b Binary files /dev/null and b/sprites/s_icon_curve_connection/layers/bacad772-513e-4f36-9d08-c851ac9dd976/434305d3-c4e8-4b25-b6aa-38a15d3bcff7.png differ diff --git a/sprites/s_icon_curve_connection/layers/c8000df2-0508-47ae-909b-da8f32b31261/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png b/sprites/s_icon_curve_connection/layers/c8000df2-0508-47ae-909b-da8f32b31261/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png deleted file mode 100644 index 26ea97466..000000000 Binary files a/sprites/s_icon_curve_connection/layers/c8000df2-0508-47ae-909b-da8f32b31261/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png and /dev/null differ diff --git a/sprites/s_icon_curve_connection/layers/ddf259ae-2d79-49ab-85cb-e70f810c3088/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png b/sprites/s_icon_curve_connection/layers/ddf259ae-2d79-49ab-85cb-e70f810c3088/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png deleted file mode 100644 index ce251e2dd..000000000 Binary files a/sprites/s_icon_curve_connection/layers/ddf259ae-2d79-49ab-85cb-e70f810c3088/0f64d5b3-940e-48ac-b865-d1e4b0dc1f92.png and /dev/null differ diff --git a/sprites/s_icon_curve_connection/s_icon_curve_connection.yy b/sprites/s_icon_curve_connection/s_icon_curve_connection.yy index 90539988a..1264f8377 100644 --- a/sprites/s_icon_curve_connection/s_icon_curve_connection.yy +++ b/sprites/s_icon_curve_connection/s_icon_curve_connection.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 6, + "bbox_right": 41, + "bbox_top": 6, + "bbox_bottom": 41, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29280dff-2238-476f-b94e-7d6916cf2982",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c8000df2-0508-47ae-909b-da8f32b31261",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ddf259ae-2d79-49ab-85cb-e70f810c3088",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49d66bb5-b41f-4136-aa3a-14aad0420d0e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aa46db7c-55b8-4171-a5e2-fa6b53ed70dd",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bacad772-513e-4f36-9d08-c851ac9dd976",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4c45638b-7b76-4859-b9ef-de045e46bc5a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"29280dff-2238-476f-b94e-7d6916cf2982","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"eb6b47b5-0523-45e8-9ef2-cc69d8f54fbb","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c8000df2-0508-47ae-909b-da8f32b31261","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"fda3589e-2ec9-4e4c-899a-61d8bafa522b","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ddf259ae-2d79-49ab-85cb-e70f810c3088","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"148eaa21-bd42-46e6-9975-275ca0ff189e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"49d66bb5-b41f-4136-aa3a-14aad0420d0e","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9a5605f2-c7c0-44a7-a125-8037802cf0ad","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aa46db7c-55b8-4171-a5e2-fa6b53ed70dd","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"80bae77d-a320-4b6e-b992-8c8a36445c20","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bacad772-513e-4f36-9d08-c851ac9dd976","path":"sprites/s_icon_curve_connection/s_icon_curve_connection.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0f64d5b3-940e-48ac-b865-d1e4b0dc1f92","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"434305d3-c4e8-4b25-b6aa-38a15d3bcff7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_grid/1b76012f-7dd7-4112-9f48-1131f840219d.png b/sprites/s_icon_grid/1b76012f-7dd7-4112-9f48-1131f840219d.png new file mode 100644 index 000000000..7cf772c52 Binary files /dev/null and b/sprites/s_icon_grid/1b76012f-7dd7-4112-9f48-1131f840219d.png differ diff --git a/sprites/s_icon_grid/7c53a0e9-4bcf-4d42-9940-4ec236a2941c.png b/sprites/s_icon_grid/7c53a0e9-4bcf-4d42-9940-4ec236a2941c.png deleted file mode 100644 index dd84f93ad..000000000 Binary files a/sprites/s_icon_grid/7c53a0e9-4bcf-4d42-9940-4ec236a2941c.png and /dev/null differ diff --git a/sprites/s_icon_grid/829dbead-adf5-403b-8d23-f13645cd9e87.png b/sprites/s_icon_grid/829dbead-adf5-403b-8d23-f13645cd9e87.png deleted file mode 100644 index 81e8cd67e..000000000 Binary files a/sprites/s_icon_grid/829dbead-adf5-403b-8d23-f13645cd9e87.png and /dev/null differ diff --git a/sprites/s_icon_grid/dd9f3566-b2f0-4e39-a5ee-5839724159d8.png b/sprites/s_icon_grid/dd9f3566-b2f0-4e39-a5ee-5839724159d8.png new file mode 100644 index 000000000..38205a750 Binary files /dev/null and b/sprites/s_icon_grid/dd9f3566-b2f0-4e39-a5ee-5839724159d8.png differ diff --git a/sprites/s_icon_grid/layers/1b76012f-7dd7-4112-9f48-1131f840219d/a548b798-baf8-4e94-8450-418f17072e93.png b/sprites/s_icon_grid/layers/1b76012f-7dd7-4112-9f48-1131f840219d/a548b798-baf8-4e94-8450-418f17072e93.png new file mode 100644 index 000000000..7cf772c52 Binary files /dev/null and b/sprites/s_icon_grid/layers/1b76012f-7dd7-4112-9f48-1131f840219d/a548b798-baf8-4e94-8450-418f17072e93.png differ diff --git a/sprites/s_icon_grid/layers/7c53a0e9-4bcf-4d42-9940-4ec236a2941c/547a8bd8-41c6-4404-84f4-347f4a85626c.png b/sprites/s_icon_grid/layers/7c53a0e9-4bcf-4d42-9940-4ec236a2941c/547a8bd8-41c6-4404-84f4-347f4a85626c.png deleted file mode 100644 index dd84f93ad..000000000 Binary files a/sprites/s_icon_grid/layers/7c53a0e9-4bcf-4d42-9940-4ec236a2941c/547a8bd8-41c6-4404-84f4-347f4a85626c.png and /dev/null differ diff --git a/sprites/s_icon_grid/layers/829dbead-adf5-403b-8d23-f13645cd9e87/547a8bd8-41c6-4404-84f4-347f4a85626c.png b/sprites/s_icon_grid/layers/829dbead-adf5-403b-8d23-f13645cd9e87/547a8bd8-41c6-4404-84f4-347f4a85626c.png deleted file mode 100644 index 81e8cd67e..000000000 Binary files a/sprites/s_icon_grid/layers/829dbead-adf5-403b-8d23-f13645cd9e87/547a8bd8-41c6-4404-84f4-347f4a85626c.png and /dev/null differ diff --git a/sprites/s_icon_grid/layers/dd9f3566-b2f0-4e39-a5ee-5839724159d8/a548b798-baf8-4e94-8450-418f17072e93.png b/sprites/s_icon_grid/layers/dd9f3566-b2f0-4e39-a5ee-5839724159d8/a548b798-baf8-4e94-8450-418f17072e93.png new file mode 100644 index 000000000..38205a750 Binary files /dev/null and b/sprites/s_icon_grid/layers/dd9f3566-b2f0-4e39-a5ee-5839724159d8/a548b798-baf8-4e94-8450-418f17072e93.png differ diff --git a/sprites/s_icon_grid/s_icon_grid.yy b/sprites/s_icon_grid/s_icon_grid.yy index 53715fa62..45cfa86a8 100644 --- a/sprites/s_icon_grid/s_icon_grid.yy +++ b/sprites/s_icon_grid/s_icon_grid.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 7, + "bbox_right": 40, + "bbox_top": 7, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7c53a0e9-4bcf-4d42-9940-4ec236a2941c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"829dbead-adf5-403b-8d23-f13645cd9e87",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dd9f3566-b2f0-4e39-a5ee-5839724159d8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b76012f-7dd7-4112-9f48-1131f840219d",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1710f466-41f7-4863-8891-27e1c0635abf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7c53a0e9-4bcf-4d42-9940-4ec236a2941c","path":"sprites/s_icon_grid/s_icon_grid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"b4686259-dabe-4ffb-9f84-5cf73c3baf2b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"829dbead-adf5-403b-8d23-f13645cd9e87","path":"sprites/s_icon_grid/s_icon_grid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c6438ac4-19cb-4cc0-a249-f09d10e0eb47","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dd9f3566-b2f0-4e39-a5ee-5839724159d8","path":"sprites/s_icon_grid/s_icon_grid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"03dfb104-89fb-4046-873a-afc7a835f134","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1b76012f-7dd7-4112-9f48-1131f840219d","path":"sprites/s_icon_grid/s_icon_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,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"547a8bd8-41c6-4404-84f4-347f4a85626c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a548b798-baf8-4e94-8450-418f17072e93","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_grid_setting/1e1b8add-4ada-461a-a3f1-5a9897b59477.png b/sprites/s_icon_grid_setting/1e1b8add-4ada-461a-a3f1-5a9897b59477.png deleted file mode 100644 index ca1a93031..000000000 Binary files a/sprites/s_icon_grid_setting/1e1b8add-4ada-461a-a3f1-5a9897b59477.png and /dev/null differ diff --git a/sprites/s_icon_grid_setting/38b20634-89a6-4e36-b1cc-9a76ac718b90.png b/sprites/s_icon_grid_setting/38b20634-89a6-4e36-b1cc-9a76ac718b90.png new file mode 100644 index 000000000..107d75218 Binary files /dev/null and b/sprites/s_icon_grid_setting/38b20634-89a6-4e36-b1cc-9a76ac718b90.png differ diff --git a/sprites/s_icon_grid_setting/layers/1e1b8add-4ada-461a-a3f1-5a9897b59477/9ab82c7f-51e7-45a0-8142-b08600b45183.png b/sprites/s_icon_grid_setting/layers/1e1b8add-4ada-461a-a3f1-5a9897b59477/9ab82c7f-51e7-45a0-8142-b08600b45183.png deleted file mode 100644 index ca1a93031..000000000 Binary files a/sprites/s_icon_grid_setting/layers/1e1b8add-4ada-461a-a3f1-5a9897b59477/9ab82c7f-51e7-45a0-8142-b08600b45183.png and /dev/null differ diff --git a/sprites/s_icon_grid_setting/layers/38b20634-89a6-4e36-b1cc-9a76ac718b90/72941df6-dc5b-4048-9beb-feb8c4eeb934.png b/sprites/s_icon_grid_setting/layers/38b20634-89a6-4e36-b1cc-9a76ac718b90/72941df6-dc5b-4048-9beb-feb8c4eeb934.png new file mode 100644 index 000000000..107d75218 Binary files /dev/null and b/sprites/s_icon_grid_setting/layers/38b20634-89a6-4e36-b1cc-9a76ac718b90/72941df6-dc5b-4048-9beb-feb8c4eeb934.png differ diff --git a/sprites/s_icon_grid_setting/s_icon_grid_setting.yy b/sprites/s_icon_grid_setting/s_icon_grid_setting.yy index a5a2f22d6..69c1e2255 100644 --- a/sprites/s_icon_grid_setting/s_icon_grid_setting.yy +++ b/sprites/s_icon_grid_setting/s_icon_grid_setting.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 23, - "bbox_top": 3, - "bbox_bottom": 23, + "bbox_left": 7, + "bbox_right": 47, + "bbox_top": 7, + "bbox_bottom": 47, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1e1b8add-4ada-461a-a3f1-5a9897b59477",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"38b20634-89a6-4e36-b1cc-9a76ac718b90",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0db67510-20c4-46a7-9064-d3fb16b736cd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1e1b8add-4ada-461a-a3f1-5a9897b59477","path":"sprites/s_icon_grid_setting/s_icon_grid_setting.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"105f36d0-10c8-4f72-8257-d8634e16685c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"38b20634-89a6-4e36-b1cc-9a76ac718b90","path":"sprites/s_icon_grid_setting/s_icon_grid_setting.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9ab82c7f-51e7-45a0-8142-b08600b45183","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"72941df6-dc5b-4048-9beb-feb8c4eeb934","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_minimap/1517b626-47ad-40c1-892c-1da95d33bcf3.png b/sprites/s_icon_minimap/1517b626-47ad-40c1-892c-1da95d33bcf3.png deleted file mode 100644 index 3c39ac7e5..000000000 Binary files a/sprites/s_icon_minimap/1517b626-47ad-40c1-892c-1da95d33bcf3.png and /dev/null differ diff --git a/sprites/s_icon_minimap/4dbcec8b-a9d7-45df-91e9-e82ec2c30b48.png b/sprites/s_icon_minimap/4dbcec8b-a9d7-45df-91e9-e82ec2c30b48.png deleted file mode 100644 index 5946f66ee..000000000 Binary files a/sprites/s_icon_minimap/4dbcec8b-a9d7-45df-91e9-e82ec2c30b48.png and /dev/null differ diff --git a/sprites/s_icon_minimap/7b28399b-fcb3-4a82-a596-83e61d29077a.png b/sprites/s_icon_minimap/7b28399b-fcb3-4a82-a596-83e61d29077a.png new file mode 100644 index 000000000..3c08cb30d Binary files /dev/null and b/sprites/s_icon_minimap/7b28399b-fcb3-4a82-a596-83e61d29077a.png differ diff --git a/sprites/s_icon_minimap/b70098c9-0903-40e0-8e3b-a83327c11f2a.png b/sprites/s_icon_minimap/b70098c9-0903-40e0-8e3b-a83327c11f2a.png new file mode 100644 index 000000000..b70ff9d8a Binary files /dev/null and b/sprites/s_icon_minimap/b70098c9-0903-40e0-8e3b-a83327c11f2a.png differ diff --git a/sprites/s_icon_minimap/layers/1517b626-47ad-40c1-892c-1da95d33bcf3/8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4.png b/sprites/s_icon_minimap/layers/1517b626-47ad-40c1-892c-1da95d33bcf3/8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4.png deleted file mode 100644 index 3c39ac7e5..000000000 Binary files a/sprites/s_icon_minimap/layers/1517b626-47ad-40c1-892c-1da95d33bcf3/8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4.png and /dev/null differ diff --git a/sprites/s_icon_minimap/layers/4dbcec8b-a9d7-45df-91e9-e82ec2c30b48/8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4.png b/sprites/s_icon_minimap/layers/4dbcec8b-a9d7-45df-91e9-e82ec2c30b48/8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4.png deleted file mode 100644 index 5946f66ee..000000000 Binary files a/sprites/s_icon_minimap/layers/4dbcec8b-a9d7-45df-91e9-e82ec2c30b48/8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4.png and /dev/null differ diff --git a/sprites/s_icon_minimap/layers/7b28399b-fcb3-4a82-a596-83e61d29077a/f775435b-3472-4806-9582-ba1e8446b056.png b/sprites/s_icon_minimap/layers/7b28399b-fcb3-4a82-a596-83e61d29077a/f775435b-3472-4806-9582-ba1e8446b056.png new file mode 100644 index 000000000..3c08cb30d Binary files /dev/null and b/sprites/s_icon_minimap/layers/7b28399b-fcb3-4a82-a596-83e61d29077a/f775435b-3472-4806-9582-ba1e8446b056.png differ diff --git a/sprites/s_icon_minimap/layers/b70098c9-0903-40e0-8e3b-a83327c11f2a/f775435b-3472-4806-9582-ba1e8446b056.png b/sprites/s_icon_minimap/layers/b70098c9-0903-40e0-8e3b-a83327c11f2a/f775435b-3472-4806-9582-ba1e8446b056.png new file mode 100644 index 000000000..b70ff9d8a Binary files /dev/null and b/sprites/s_icon_minimap/layers/b70098c9-0903-40e0-8e3b-a83327c11f2a/f775435b-3472-4806-9582-ba1e8446b056.png differ diff --git a/sprites/s_icon_minimap/s_icon_minimap.yy b/sprites/s_icon_minimap/s_icon_minimap.yy index 040736a8e..33e734673 100644 --- a/sprites/s_icon_minimap/s_icon_minimap.yy +++ b/sprites/s_icon_minimap/s_icon_minimap.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 7, + "bbox_right": 40, + "bbox_top": 7, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4dbcec8b-a9d7-45df-91e9-e82ec2c30b48",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1517b626-47ad-40c1-892c-1da95d33bcf3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7b28399b-fcb3-4a82-a596-83e61d29077a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b70098c9-0903-40e0-8e3b-a83327c11f2a",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,11 +46,11 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9030deb2-dfb2-4446-8f0b-7a95c79f298a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4dbcec8b-a9d7-45df-91e9-e82ec2c30b48","path":"sprites/s_icon_minimap/s_icon_minimap.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"b26eb7d5-269c-4e15-8902-d856cc53ec84","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1517b626-47ad-40c1-892c-1da95d33bcf3","path":"sprites/s_icon_minimap/s_icon_minimap.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b4af68ff-70ad-4529-9803-90c18062e582","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7b28399b-fcb3-4a82-a596-83e61d29077a","path":"sprites/s_icon_minimap/s_icon_minimap.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"09f26298-d6a5-45a8-8f77-964e7217ff3a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b70098c9-0903-40e0-8e3b-a83327c11f2a","path":"sprites/s_icon_minimap/s_icon_minimap.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8a6cca5e-ab0c-42b8-b01f-e6a80c81dac4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f775435b-3472-4806-9582-ba1e8446b056","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_preview_export/5ca9eb4d-f34d-4984-bd14-25b160f6c01b.png b/sprites/s_icon_preview_export/5ca9eb4d-f34d-4984-bd14-25b160f6c01b.png new file mode 100644 index 000000000..59ad2662f Binary files /dev/null and b/sprites/s_icon_preview_export/5ca9eb4d-f34d-4984-bd14-25b160f6c01b.png differ diff --git a/sprites/s_icon_preview_export/8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b.png b/sprites/s_icon_preview_export/8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b.png deleted file mode 100644 index 182eca818..000000000 Binary files a/sprites/s_icon_preview_export/8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b.png and /dev/null differ diff --git a/sprites/s_icon_preview_export/layers/5ca9eb4d-f34d-4984-bd14-25b160f6c01b/8cf2cede-3ba2-4a0c-a2be-8bd207bb5a35.png b/sprites/s_icon_preview_export/layers/5ca9eb4d-f34d-4984-bd14-25b160f6c01b/8cf2cede-3ba2-4a0c-a2be-8bd207bb5a35.png new file mode 100644 index 000000000..59ad2662f Binary files /dev/null and b/sprites/s_icon_preview_export/layers/5ca9eb4d-f34d-4984-bd14-25b160f6c01b/8cf2cede-3ba2-4a0c-a2be-8bd207bb5a35.png differ diff --git a/sprites/s_icon_preview_export/layers/8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b/119d1eb4-aaf1-4f9b-8aa2-7b9a4ef3b0a0.png b/sprites/s_icon_preview_export/layers/8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b/119d1eb4-aaf1-4f9b-8aa2-7b9a4ef3b0a0.png deleted file mode 100644 index 182eca818..000000000 Binary files a/sprites/s_icon_preview_export/layers/8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b/119d1eb4-aaf1-4f9b-8aa2-7b9a4ef3b0a0.png and /dev/null differ diff --git a/sprites/s_icon_preview_export/s_icon_preview_export.yy b/sprites/s_icon_preview_export/s_icon_preview_export.yy index 727a87f25..725d1546f 100644 --- a/sprites/s_icon_preview_export/s_icon_preview_export.yy +++ b/sprites/s_icon_preview_export/s_icon_preview_export.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 20, - "bbox_top": 2, - "bbox_bottom": 20, + "bbox_left": 7, + "bbox_right": 41, + "bbox_top": 4, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5ca9eb4d-f34d-4984-bd14-25b160f6c01b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"52b045ea-74fd-4ab8-bbdb-8667f74f42d5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8e9e7e13-cf8a-42a2-88f8-6c7b65c7616b","path":"sprites/s_icon_preview_export/s_icon_preview_export.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f68a910f-625b-480e-8b67-ea083da832b8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5ca9eb4d-f34d-4984-bd14-25b160f6c01b","path":"sprites/s_icon_preview_export/s_icon_preview_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,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"119d1eb4-aaf1-4f9b-8aa2-7b9a4ef3b0a0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8cf2cede-3ba2-4a0c-a2be-8bd207bb5a35","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_reset_when_preview/08890e6c-605a-4b5f-83bf-5de29d527c7f.png b/sprites/s_icon_reset_when_preview/08890e6c-605a-4b5f-83bf-5de29d527c7f.png deleted file mode 100644 index a8843e306..000000000 Binary files a/sprites/s_icon_reset_when_preview/08890e6c-605a-4b5f-83bf-5de29d527c7f.png and /dev/null differ diff --git a/sprites/s_icon_reset_when_preview/dfc47a62-6592-431d-9531-2edcf2a9afbe.png b/sprites/s_icon_reset_when_preview/dfc47a62-6592-431d-9531-2edcf2a9afbe.png new file mode 100644 index 000000000..3f0fced10 Binary files /dev/null and b/sprites/s_icon_reset_when_preview/dfc47a62-6592-431d-9531-2edcf2a9afbe.png differ diff --git a/sprites/s_icon_reset_when_preview/ee70a3a5-c198-43fe-b6e5-93fa00c69606.png b/sprites/s_icon_reset_when_preview/ee70a3a5-c198-43fe-b6e5-93fa00c69606.png deleted file mode 100644 index bcc722e79..000000000 Binary files a/sprites/s_icon_reset_when_preview/ee70a3a5-c198-43fe-b6e5-93fa00c69606.png and /dev/null differ diff --git a/sprites/s_icon_reset_when_preview/layers/08890e6c-605a-4b5f-83bf-5de29d527c7f/8e754e7e-2198-410a-9d32-3659f257adc3.png b/sprites/s_icon_reset_when_preview/layers/08890e6c-605a-4b5f-83bf-5de29d527c7f/8e754e7e-2198-410a-9d32-3659f257adc3.png deleted file mode 100644 index a8843e306..000000000 Binary files a/sprites/s_icon_reset_when_preview/layers/08890e6c-605a-4b5f-83bf-5de29d527c7f/8e754e7e-2198-410a-9d32-3659f257adc3.png and /dev/null differ diff --git a/sprites/s_icon_reset_when_preview/layers/dfc47a62-6592-431d-9531-2edcf2a9afbe/6fcb7305-9d8d-4058-97c8-117a52bb8589.png b/sprites/s_icon_reset_when_preview/layers/dfc47a62-6592-431d-9531-2edcf2a9afbe/6fcb7305-9d8d-4058-97c8-117a52bb8589.png new file mode 100644 index 000000000..3f0fced10 Binary files /dev/null and b/sprites/s_icon_reset_when_preview/layers/dfc47a62-6592-431d-9531-2edcf2a9afbe/6fcb7305-9d8d-4058-97c8-117a52bb8589.png differ diff --git a/sprites/s_icon_reset_when_preview/layers/ee70a3a5-c198-43fe-b6e5-93fa00c69606/8e754e7e-2198-410a-9d32-3659f257adc3.png b/sprites/s_icon_reset_when_preview/layers/ee70a3a5-c198-43fe-b6e5-93fa00c69606/8e754e7e-2198-410a-9d32-3659f257adc3.png deleted file mode 100644 index bcc722e79..000000000 Binary files a/sprites/s_icon_reset_when_preview/layers/ee70a3a5-c198-43fe-b6e5-93fa00c69606/8e754e7e-2198-410a-9d32-3659f257adc3.png and /dev/null differ diff --git a/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy b/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy index 7ef41c738..70efe1643 100644 --- a/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy +++ b/sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 23, - "bbox_top": 3, - "bbox_bottom": 22, + "bbox_left": 7, + "bbox_right": 47, + "bbox_top": 7, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ee70a3a5-c198-43fe-b6e5-93fa00c69606",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"08890e6c-605a-4b5f-83bf-5de29d527c7f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dfc47a62-6592-431d-9531-2edcf2a9afbe",}, ], "sequence": { "resourceType": "GMSequence", @@ -41,13 +40,12 @@ "playbackSpeedType": 0, "autoRecord": true, "volume": 1.0, - "length": 2.0, + "length": 1.0, "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"aaea1d6c-10be-490d-b2d1-d36caf6ac279","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ee70a3a5-c198-43fe-b6e5-93fa00c69606","path":"sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"925bcd2b-f906-411b-ac78-8212ddcc5ef8","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"08890e6c-605a-4b5f-83bf-5de29d527c7f","path":"sprites/s_icon_reset_when_preview/s_icon_reset_when_preview.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"77de023e-45c8-4682-96f5-49805da53b0c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dfc47a62-6592-431d-9531-2edcf2a9afbe","path":"sprites/s_icon_reset_when_preview/s_icon_reset_when_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,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8e754e7e-2198-410a-9d32-3659f257adc3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6fcb7305-9d8d-4058-97c8-117a52bb8589","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_spalsh_show_on_start/943dad36-574c-4404-ab58-0b940258d501.png b/sprites/s_icon_spalsh_show_on_start/943dad36-574c-4404-ab58-0b940258d501.png deleted file mode 100644 index 91393999c..000000000 Binary files a/sprites/s_icon_spalsh_show_on_start/943dad36-574c-4404-ab58-0b940258d501.png and /dev/null differ diff --git a/sprites/s_icon_spalsh_show_on_start/bcf948d2-a01b-486f-9ede-12bbcc458249.png b/sprites/s_icon_spalsh_show_on_start/bcf948d2-a01b-486f-9ede-12bbcc458249.png deleted file mode 100644 index 44085fd7e..000000000 Binary files a/sprites/s_icon_spalsh_show_on_start/bcf948d2-a01b-486f-9ede-12bbcc458249.png and /dev/null differ diff --git a/sprites/s_icon_spalsh_show_on_start/layers/943dad36-574c-4404-ab58-0b940258d501/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png b/sprites/s_icon_spalsh_show_on_start/layers/943dad36-574c-4404-ab58-0b940258d501/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png deleted file mode 100644 index 91393999c..000000000 Binary files a/sprites/s_icon_spalsh_show_on_start/layers/943dad36-574c-4404-ab58-0b940258d501/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png and /dev/null differ diff --git a/sprites/s_icon_spalsh_show_on_start/layers/bcf948d2-a01b-486f-9ede-12bbcc458249/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png b/sprites/s_icon_spalsh_show_on_start/layers/bcf948d2-a01b-486f-9ede-12bbcc458249/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png deleted file mode 100644 index 44085fd7e..000000000 Binary files a/sprites/s_icon_spalsh_show_on_start/layers/bcf948d2-a01b-486f-9ede-12bbcc458249/e25cfe5b-d245-48ac-80c0-e1dc71267b9b.png and /dev/null differ diff --git a/sprites/s_icon_splash_show_on_start/56661844-47af-4991-a7cb-11e6b013e4d1.png b/sprites/s_icon_splash_show_on_start/56661844-47af-4991-a7cb-11e6b013e4d1.png new file mode 100644 index 000000000..8a5c34431 Binary files /dev/null and b/sprites/s_icon_splash_show_on_start/56661844-47af-4991-a7cb-11e6b013e4d1.png differ diff --git a/sprites/s_icon_splash_show_on_start/6906b837-9504-4d94-acb8-7fff744b84f6.png b/sprites/s_icon_splash_show_on_start/6906b837-9504-4d94-acb8-7fff744b84f6.png new file mode 100644 index 000000000..f6f71f723 Binary files /dev/null and b/sprites/s_icon_splash_show_on_start/6906b837-9504-4d94-acb8-7fff744b84f6.png differ diff --git a/sprites/s_icon_splash_show_on_start/layers/56661844-47af-4991-a7cb-11e6b013e4d1/69215830-85eb-4966-a254-6225497963f8.png b/sprites/s_icon_splash_show_on_start/layers/56661844-47af-4991-a7cb-11e6b013e4d1/69215830-85eb-4966-a254-6225497963f8.png new file mode 100644 index 000000000..8a5c34431 Binary files /dev/null and b/sprites/s_icon_splash_show_on_start/layers/56661844-47af-4991-a7cb-11e6b013e4d1/69215830-85eb-4966-a254-6225497963f8.png differ diff --git a/sprites/s_icon_splash_show_on_start/layers/6906b837-9504-4d94-acb8-7fff744b84f6/69215830-85eb-4966-a254-6225497963f8.png b/sprites/s_icon_splash_show_on_start/layers/6906b837-9504-4d94-acb8-7fff744b84f6/69215830-85eb-4966-a254-6225497963f8.png new file mode 100644 index 000000000..f6f71f723 Binary files /dev/null and b/sprites/s_icon_splash_show_on_start/layers/6906b837-9504-4d94-acb8-7fff744b84f6/69215830-85eb-4966-a254-6225497963f8.png differ diff --git a/sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy b/sprites/s_icon_splash_show_on_start/s_icon_splash_show_on_start.yy similarity index 71% rename from sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy rename to sprites/s_icon_splash_show_on_start/s_icon_splash_show_on_start.yy index 3ce57e768..57e1d3a0d 100644 --- a/sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy +++ b/sprites/s_icon_splash_show_on_start/s_icon_splash_show_on_start.yy @@ -1,7 +1,7 @@ { "resourceType": "GMSprite", "resourceVersion": "1.0", - "name": "s_icon_spalsh_show_on_start", + "name": "s_icon_splash_show_on_start", "bboxMode": 0, "collisionKind": 1, "type": 0, @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 23, - "bbox_top": 5, - "bbox_bottom": 22, + "bbox_left": 4, + "bbox_right": 46, + "bbox_top": 10, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,13 +28,13 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bcf948d2-a01b-486f-9ede-12bbcc458249",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"943dad36-574c-4404-ab58-0b940258d501",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6906b837-9504-4d94-acb8-7fff744b84f6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"56661844-47af-4991-a7cb-11e6b013e4d1",}, ], "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", - "name": "s_icon_spalsh_show_on_start", + "name": "s_icon_splash_show_on_start", "timeUnits": 1, "playback": 1, "playbackSpeed": 30.0, @@ -46,11 +46,11 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"423f4c40-7cc2-49be-aafe-b5eaca9c3e57","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bcf948d2-a01b-486f-9ede-12bbcc458249","path":"sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"0f2a7da8-7a57-4ba8-bdfe-bde579beec8b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"943dad36-574c-4404-ab58-0b940258d501","path":"sprites/s_icon_spalsh_show_on_start/s_icon_spalsh_show_on_start.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ff5d56b4-e39b-4e43-95f8-ca582cb6b194","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6906b837-9504-4d94-acb8-7fff744b84f6","path":"sprites/s_icon_splash_show_on_start/s_icon_splash_show_on_start.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fc792010-d830-4205-a90f-d55312123aed","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"56661844-47af-4991-a7cb-11e6b013e4d1","path":"sprites/s_icon_splash_show_on_start/s_icon_splash_show_on_start.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e25cfe5b-d245-48ac-80c0-e1dc71267b9b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"69215830-85eb-4966-a254-6225497963f8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_split_view/11f816bc-9cb1-4ba3-b981-a962cf350775.png b/sprites/s_icon_split_view/11f816bc-9cb1-4ba3-b981-a962cf350775.png deleted file mode 100644 index ba3662ea0..000000000 Binary files a/sprites/s_icon_split_view/11f816bc-9cb1-4ba3-b981-a962cf350775.png and /dev/null differ diff --git a/sprites/s_icon_split_view/1b7692f8-948e-471b-9dc8-305524b42b81.png b/sprites/s_icon_split_view/1b7692f8-948e-471b-9dc8-305524b42b81.png new file mode 100644 index 000000000..f8bc4c225 Binary files /dev/null and b/sprites/s_icon_split_view/1b7692f8-948e-471b-9dc8-305524b42b81.png differ diff --git a/sprites/s_icon_split_view/4e442ff6-96d9-49b6-8b0c-6ff356f28df5.png b/sprites/s_icon_split_view/4e442ff6-96d9-49b6-8b0c-6ff356f28df5.png new file mode 100644 index 000000000..8a6c89b8d Binary files /dev/null and b/sprites/s_icon_split_view/4e442ff6-96d9-49b6-8b0c-6ff356f28df5.png differ diff --git a/sprites/s_icon_split_view/9dcf2c89-5897-4c82-a391-4fd709ee151a.png b/sprites/s_icon_split_view/9dcf2c89-5897-4c82-a391-4fd709ee151a.png deleted file mode 100644 index db7c87cf1..000000000 Binary files a/sprites/s_icon_split_view/9dcf2c89-5897-4c82-a391-4fd709ee151a.png and /dev/null differ diff --git a/sprites/s_icon_split_view/b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c.png b/sprites/s_icon_split_view/b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c.png deleted file mode 100644 index 1c819d564..000000000 Binary files a/sprites/s_icon_split_view/b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c.png and /dev/null differ diff --git a/sprites/s_icon_split_view/d27395f2-5d37-4ed2-878a-9668887eacb0.png b/sprites/s_icon_split_view/d27395f2-5d37-4ed2-878a-9668887eacb0.png new file mode 100644 index 000000000..93af1119f Binary files /dev/null and b/sprites/s_icon_split_view/d27395f2-5d37-4ed2-878a-9668887eacb0.png differ diff --git a/sprites/s_icon_split_view/layers/11f816bc-9cb1-4ba3-b981-a962cf350775/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png b/sprites/s_icon_split_view/layers/11f816bc-9cb1-4ba3-b981-a962cf350775/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png deleted file mode 100644 index ba3662ea0..000000000 Binary files a/sprites/s_icon_split_view/layers/11f816bc-9cb1-4ba3-b981-a962cf350775/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png and /dev/null differ diff --git a/sprites/s_icon_split_view/layers/1b7692f8-948e-471b-9dc8-305524b42b81/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png b/sprites/s_icon_split_view/layers/1b7692f8-948e-471b-9dc8-305524b42b81/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png new file mode 100644 index 000000000..f8bc4c225 Binary files /dev/null and b/sprites/s_icon_split_view/layers/1b7692f8-948e-471b-9dc8-305524b42b81/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png differ diff --git a/sprites/s_icon_split_view/layers/4e442ff6-96d9-49b6-8b0c-6ff356f28df5/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png b/sprites/s_icon_split_view/layers/4e442ff6-96d9-49b6-8b0c-6ff356f28df5/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png new file mode 100644 index 000000000..8a6c89b8d Binary files /dev/null and b/sprites/s_icon_split_view/layers/4e442ff6-96d9-49b6-8b0c-6ff356f28df5/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png differ diff --git a/sprites/s_icon_split_view/layers/9dcf2c89-5897-4c82-a391-4fd709ee151a/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png b/sprites/s_icon_split_view/layers/9dcf2c89-5897-4c82-a391-4fd709ee151a/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png deleted file mode 100644 index db7c87cf1..000000000 Binary files a/sprites/s_icon_split_view/layers/9dcf2c89-5897-4c82-a391-4fd709ee151a/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png and /dev/null differ diff --git a/sprites/s_icon_split_view/layers/b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png b/sprites/s_icon_split_view/layers/b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png deleted file mode 100644 index 1c819d564..000000000 Binary files a/sprites/s_icon_split_view/layers/b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c/8ab751e1-9e4c-4388-8196-50ca6f5267bf.png and /dev/null differ diff --git a/sprites/s_icon_split_view/layers/d27395f2-5d37-4ed2-878a-9668887eacb0/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png b/sprites/s_icon_split_view/layers/d27395f2-5d37-4ed2-878a-9668887eacb0/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png new file mode 100644 index 000000000..93af1119f Binary files /dev/null and b/sprites/s_icon_split_view/layers/d27395f2-5d37-4ed2-878a-9668887eacb0/98b1c000-da2e-484c-9aea-f7eb0c7a94cf.png differ diff --git a/sprites/s_icon_split_view/s_icon_split_view.yy b/sprites/s_icon_split_view/s_icon_split_view.yy index b9bd3df9b..a9274a730 100644 --- a/sprites/s_icon_split_view/s_icon_split_view.yy +++ b/sprites/s_icon_split_view/s_icon_split_view.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 2, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9dcf2c89-5897-4c82-a391-4fd709ee151a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"11f816bc-9cb1-4ba3-b981-a962cf350775",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4e442ff6-96d9-49b6-8b0c-6ff356f28df5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b7692f8-948e-471b-9dc8-305524b42b81",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d27395f2-5d37-4ed2-878a-9668887eacb0",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d517b82f-16cc-434c-abb8-c99ec67a4a1b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9dcf2c89-5897-4c82-a391-4fd709ee151a","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"9a5e5f5f-2de0-4831-9760-3a2115dacfce","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"11f816bc-9cb1-4ba3-b981-a962cf350775","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"cb387a52-5a2c-409f-876c-aeec26b48af3","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b2ad206d-e2f6-43ae-ad62-25fdfef4bb5c","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7b96edc8-7c63-48f3-8b44-a0871a3b404f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4e442ff6-96d9-49b6-8b0c-6ff356f28df5","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"30540482-16b0-4efd-bbf5-8ccf7905dd85","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1b7692f8-948e-471b-9dc8-305524b42b81","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6b0880b7-37be-42c3-950f-3510f3a5758d","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d27395f2-5d37-4ed2-878a-9668887eacb0","path":"sprites/s_icon_split_view/s_icon_split_view.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8ab751e1-9e4c-4388-8196-50ca6f5267bf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"98b1c000-da2e-484c-9aea-f7eb0c7a94cf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_inspector_area/1109450b-d1cd-42d6-a9ba-d2f1821626fa.png b/sprites/s_inspector_area/1109450b-d1cd-42d6-a9ba-d2f1821626fa.png new file mode 100644 index 000000000..6c27a7b94 Binary files /dev/null and b/sprites/s_inspector_area/1109450b-d1cd-42d6-a9ba-d2f1821626fa.png differ diff --git a/sprites/s_inspector_area/1c9c4be7-3d3c-4437-902f-dea6f80c1f4b.png b/sprites/s_inspector_area/1c9c4be7-3d3c-4437-902f-dea6f80c1f4b.png new file mode 100644 index 000000000..8a0f977cb Binary files /dev/null and b/sprites/s_inspector_area/1c9c4be7-3d3c-4437-902f-dea6f80c1f4b.png differ diff --git a/sprites/s_inspector_area/5b9ee280-2624-435d-93c9-87b367e3769f.png b/sprites/s_inspector_area/5b9ee280-2624-435d-93c9-87b367e3769f.png deleted file mode 100644 index bba4e48c6..000000000 Binary files a/sprites/s_inspector_area/5b9ee280-2624-435d-93c9-87b367e3769f.png and /dev/null differ diff --git a/sprites/s_inspector_area/c6fc763d-5f08-4172-9b12-30ef872f3202.png b/sprites/s_inspector_area/c6fc763d-5f08-4172-9b12-30ef872f3202.png deleted file mode 100644 index f39253bed..000000000 Binary files a/sprites/s_inspector_area/c6fc763d-5f08-4172-9b12-30ef872f3202.png and /dev/null differ diff --git a/sprites/s_inspector_area/layers/1109450b-d1cd-42d6-a9ba-d2f1821626fa/f0830582-6a4a-4c5a-b75e-dd41e211f6e0.png b/sprites/s_inspector_area/layers/1109450b-d1cd-42d6-a9ba-d2f1821626fa/f0830582-6a4a-4c5a-b75e-dd41e211f6e0.png new file mode 100644 index 000000000..6c27a7b94 Binary files /dev/null and b/sprites/s_inspector_area/layers/1109450b-d1cd-42d6-a9ba-d2f1821626fa/f0830582-6a4a-4c5a-b75e-dd41e211f6e0.png differ diff --git a/sprites/s_inspector_area/layers/1c9c4be7-3d3c-4437-902f-dea6f80c1f4b/f0830582-6a4a-4c5a-b75e-dd41e211f6e0.png b/sprites/s_inspector_area/layers/1c9c4be7-3d3c-4437-902f-dea6f80c1f4b/f0830582-6a4a-4c5a-b75e-dd41e211f6e0.png new file mode 100644 index 000000000..8a0f977cb Binary files /dev/null and b/sprites/s_inspector_area/layers/1c9c4be7-3d3c-4437-902f-dea6f80c1f4b/f0830582-6a4a-4c5a-b75e-dd41e211f6e0.png differ diff --git a/sprites/s_inspector_area/layers/5b9ee280-2624-435d-93c9-87b367e3769f/3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6.png b/sprites/s_inspector_area/layers/5b9ee280-2624-435d-93c9-87b367e3769f/3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6.png deleted file mode 100644 index 9930d2062..000000000 Binary files a/sprites/s_inspector_area/layers/5b9ee280-2624-435d-93c9-87b367e3769f/3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6.png and /dev/null differ diff --git a/sprites/s_inspector_area/layers/c6fc763d-5f08-4172-9b12-30ef872f3202/3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6.png b/sprites/s_inspector_area/layers/c6fc763d-5f08-4172-9b12-30ef872f3202/3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6.png deleted file mode 100644 index 773ca91b1..000000000 Binary files a/sprites/s_inspector_area/layers/c6fc763d-5f08-4172-9b12-30ef872f3202/3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6.png and /dev/null differ diff --git a/sprites/s_inspector_area/s_inspector_area.yy b/sprites/s_inspector_area/s_inspector_area.yy index 5308be1dc..220e01856 100644 --- a/sprites/s_inspector_area/s_inspector_area.yy +++ b/sprites/s_inspector_area/s_inspector_area.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 70, - "bbox_top": 1, - "bbox_bottom": 70, + "bbox_left": 2, + "bbox_right": 140, + "bbox_top": 2, + "bbox_bottom": 141, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 72, - "height": 72, + "width": 144, + "height": 144, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5b9ee280-2624-435d-93c9-87b367e3769f",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c6fc763d-5f08-4172-9b12-30ef872f3202",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1c9c4be7-3d3c-4437-902f-dea6f80c1f4b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1109450b-d1cd-42d6-a9ba-d2f1821626fa",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"109b5aaf-7fc2-41cd-af87-8ca784d722d1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5b9ee280-2624-435d-93c9-87b367e3769f","path":"sprites/s_inspector_area/s_inspector_area.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"25a5a205-b78e-4771-9aaa-9f42c7e62ce1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c6fc763d-5f08-4172-9b12-30ef872f3202","path":"sprites/s_inspector_area/s_inspector_area.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5a01fe92-ec4d-42a1-b033-74b22f42bf6c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1c9c4be7-3d3c-4437-902f-dea6f80c1f4b","path":"sprites/s_inspector_area/s_inspector_area.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"af8d2b61-dd52-455e-a7fa-6fd4900b4a41","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1109450b-d1cd-42d6-a9ba-d2f1821626fa","path":"sprites/s_inspector_area/s_inspector_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,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 36, - "yorigin": 36, + "xorigin": 72, + "yorigin": 72, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3a406f8e-f0b6-4f4f-8f6d-41be56cf3ed6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f0830582-6a4a-4c5a-b75e-dd41e211f6e0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_inspector_padding/99049f25-bf98-4d9b-9105-bca6a98d3dfc.png b/sprites/s_inspector_padding/99049f25-bf98-4d9b-9105-bca6a98d3dfc.png deleted file mode 100644 index c37b3724e..000000000 Binary files a/sprites/s_inspector_padding/99049f25-bf98-4d9b-9105-bca6a98d3dfc.png and /dev/null differ diff --git a/sprites/s_inspector_padding/f089712b-b52a-4361-9f41-34566dde0e29.png b/sprites/s_inspector_padding/f089712b-b52a-4361-9f41-34566dde0e29.png new file mode 100644 index 000000000..7ac938e62 Binary files /dev/null and b/sprites/s_inspector_padding/f089712b-b52a-4361-9f41-34566dde0e29.png differ diff --git a/sprites/s_inspector_padding/layers/99049f25-bf98-4d9b-9105-bca6a98d3dfc/fa9c8ba9-5a71-4598-a6f9-a4337a9470ef.png b/sprites/s_inspector_padding/layers/99049f25-bf98-4d9b-9105-bca6a98d3dfc/fa9c8ba9-5a71-4598-a6f9-a4337a9470ef.png deleted file mode 100644 index 4826e21b1..000000000 Binary files a/sprites/s_inspector_padding/layers/99049f25-bf98-4d9b-9105-bca6a98d3dfc/fa9c8ba9-5a71-4598-a6f9-a4337a9470ef.png and /dev/null differ diff --git a/sprites/s_inspector_padding/layers/f089712b-b52a-4361-9f41-34566dde0e29/d40012a7-7e6e-451a-bfdf-ded8b3b6bdd4.png b/sprites/s_inspector_padding/layers/f089712b-b52a-4361-9f41-34566dde0e29/d40012a7-7e6e-451a-bfdf-ded8b3b6bdd4.png new file mode 100644 index 000000000..7ac938e62 Binary files /dev/null and b/sprites/s_inspector_padding/layers/f089712b-b52a-4361-9f41-34566dde0e29/d40012a7-7e6e-451a-bfdf-ded8b3b6bdd4.png differ diff --git a/sprites/s_inspector_padding/s_inspector_padding.yy b/sprites/s_inspector_padding/s_inspector_padding.yy index a85524bad..0719a5335 100644 --- a/sprites/s_inspector_padding/s_inspector_padding.yy +++ b/sprites/s_inspector_padding/s_inspector_padding.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 92, - "bbox_top": 3, - "bbox_bottom": 92, + "bbox_left": 6, + "bbox_right": 185, + "bbox_top": 6, + "bbox_bottom": 185, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 96, - "height": 96, + "width": 192, + "height": 192, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"99049f25-bf98-4d9b-9105-bca6a98d3dfc",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f089712b-b52a-4361-9f41-34566dde0e29",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fe122874-285e-4bbf-85c4-673594562c06","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99049f25-bf98-4d9b-9105-bca6a98d3dfc","path":"sprites/s_inspector_padding/s_inspector_padding.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"404a1356-6281-46f0-9308-634f81c4c857","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f089712b-b52a-4361-9f41-34566dde0e29","path":"sprites/s_inspector_padding/s_inspector_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,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 48, - "yorigin": 48, + "xorigin": 96, + "yorigin": 96, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fa9c8ba9-5a71-4598-a6f9-a4337a9470ef","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d40012a7-7e6e-451a-bfdf-ded8b3b6bdd4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_inspector_text_halign/0f9f08e3-5f36-45c8-be91-0341c8f7fb0e.png b/sprites/s_inspector_text_halign/0f9f08e3-5f36-45c8-be91-0341c8f7fb0e.png deleted file mode 100644 index f956f3093..000000000 Binary files a/sprites/s_inspector_text_halign/0f9f08e3-5f36-45c8-be91-0341c8f7fb0e.png and /dev/null differ diff --git a/sprites/s_inspector_text_halign/295b40e3-9e76-4e9e-ad0c-3e8f44a107d3.png b/sprites/s_inspector_text_halign/295b40e3-9e76-4e9e-ad0c-3e8f44a107d3.png new file mode 100644 index 000000000..4890ae9e4 Binary files /dev/null and b/sprites/s_inspector_text_halign/295b40e3-9e76-4e9e-ad0c-3e8f44a107d3.png differ diff --git a/sprites/s_inspector_text_halign/712b649b-3da6-4419-ba95-f82e9376fe83.png b/sprites/s_inspector_text_halign/712b649b-3da6-4419-ba95-f82e9376fe83.png deleted file mode 100644 index c49b59cbf..000000000 Binary files a/sprites/s_inspector_text_halign/712b649b-3da6-4419-ba95-f82e9376fe83.png and /dev/null differ diff --git a/sprites/s_inspector_text_halign/ad2ab1f4-1a15-408c-b790-74e1c23f37f4.png b/sprites/s_inspector_text_halign/ad2ab1f4-1a15-408c-b790-74e1c23f37f4.png deleted file mode 100644 index 5aa399865..000000000 Binary files a/sprites/s_inspector_text_halign/ad2ab1f4-1a15-408c-b790-74e1c23f37f4.png and /dev/null differ diff --git a/sprites/s_inspector_text_halign/cb7ff46c-bb8d-4c0e-aa33-fe409118dd99.png b/sprites/s_inspector_text_halign/cb7ff46c-bb8d-4c0e-aa33-fe409118dd99.png new file mode 100644 index 000000000..d2c99e540 Binary files /dev/null and b/sprites/s_inspector_text_halign/cb7ff46c-bb8d-4c0e-aa33-fe409118dd99.png differ diff --git a/sprites/s_inspector_text_halign/e7a90b23-903f-45e5-b220-bab8d9f3e5ff.png b/sprites/s_inspector_text_halign/e7a90b23-903f-45e5-b220-bab8d9f3e5ff.png new file mode 100644 index 000000000..c3f5d5e7e Binary files /dev/null and b/sprites/s_inspector_text_halign/e7a90b23-903f-45e5-b220-bab8d9f3e5ff.png differ diff --git a/sprites/s_inspector_text_halign/layers/0f9f08e3-5f36-45c8-be91-0341c8f7fb0e/33df37d8-4e1c-40e7-8e54-05b033597ae6.png b/sprites/s_inspector_text_halign/layers/0f9f08e3-5f36-45c8-be91-0341c8f7fb0e/33df37d8-4e1c-40e7-8e54-05b033597ae6.png deleted file mode 100644 index b40de3b7a..000000000 Binary files a/sprites/s_inspector_text_halign/layers/0f9f08e3-5f36-45c8-be91-0341c8f7fb0e/33df37d8-4e1c-40e7-8e54-05b033597ae6.png and /dev/null differ diff --git a/sprites/s_inspector_text_halign/layers/295b40e3-9e76-4e9e-ad0c-3e8f44a107d3/1e082255-e605-4ad1-b180-90246dae05dc.png b/sprites/s_inspector_text_halign/layers/295b40e3-9e76-4e9e-ad0c-3e8f44a107d3/1e082255-e605-4ad1-b180-90246dae05dc.png new file mode 100644 index 000000000..4890ae9e4 Binary files /dev/null and b/sprites/s_inspector_text_halign/layers/295b40e3-9e76-4e9e-ad0c-3e8f44a107d3/1e082255-e605-4ad1-b180-90246dae05dc.png differ diff --git a/sprites/s_inspector_text_halign/layers/712b649b-3da6-4419-ba95-f82e9376fe83/33df37d8-4e1c-40e7-8e54-05b033597ae6.png b/sprites/s_inspector_text_halign/layers/712b649b-3da6-4419-ba95-f82e9376fe83/33df37d8-4e1c-40e7-8e54-05b033597ae6.png deleted file mode 100644 index 3fbb2e0d4..000000000 Binary files a/sprites/s_inspector_text_halign/layers/712b649b-3da6-4419-ba95-f82e9376fe83/33df37d8-4e1c-40e7-8e54-05b033597ae6.png and /dev/null differ diff --git a/sprites/s_inspector_text_halign/layers/ad2ab1f4-1a15-408c-b790-74e1c23f37f4/33df37d8-4e1c-40e7-8e54-05b033597ae6.png b/sprites/s_inspector_text_halign/layers/ad2ab1f4-1a15-408c-b790-74e1c23f37f4/33df37d8-4e1c-40e7-8e54-05b033597ae6.png deleted file mode 100644 index ba2bc05a2..000000000 Binary files a/sprites/s_inspector_text_halign/layers/ad2ab1f4-1a15-408c-b790-74e1c23f37f4/33df37d8-4e1c-40e7-8e54-05b033597ae6.png and /dev/null differ diff --git a/sprites/s_inspector_text_halign/layers/cb7ff46c-bb8d-4c0e-aa33-fe409118dd99/1e082255-e605-4ad1-b180-90246dae05dc.png b/sprites/s_inspector_text_halign/layers/cb7ff46c-bb8d-4c0e-aa33-fe409118dd99/1e082255-e605-4ad1-b180-90246dae05dc.png new file mode 100644 index 000000000..d2c99e540 Binary files /dev/null and b/sprites/s_inspector_text_halign/layers/cb7ff46c-bb8d-4c0e-aa33-fe409118dd99/1e082255-e605-4ad1-b180-90246dae05dc.png differ diff --git a/sprites/s_inspector_text_halign/layers/e7a90b23-903f-45e5-b220-bab8d9f3e5ff/1e082255-e605-4ad1-b180-90246dae05dc.png b/sprites/s_inspector_text_halign/layers/e7a90b23-903f-45e5-b220-bab8d9f3e5ff/1e082255-e605-4ad1-b180-90246dae05dc.png new file mode 100644 index 000000000..c3f5d5e7e Binary files /dev/null and b/sprites/s_inspector_text_halign/layers/e7a90b23-903f-45e5-b220-bab8d9f3e5ff/1e082255-e605-4ad1-b180-90246dae05dc.png differ diff --git a/sprites/s_inspector_text_halign/s_inspector_text_halign.yy b/sprites/s_inspector_text_halign/s_inspector_text_halign.yy index 0889244ba..2fb3032dd 100644 --- a/sprites/s_inspector_text_halign/s_inspector_text_halign.yy +++ b/sprites/s_inspector_text_halign/s_inspector_text_halign.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 6, + "bbox_bottom": 41, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ad2ab1f4-1a15-408c-b790-74e1c23f37f4",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f9f08e3-5f36-45c8-be91-0341c8f7fb0e",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"712b649b-3da6-4419-ba95-f82e9376fe83",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e7a90b23-903f-45e5-b220-bab8d9f3e5ff",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"295b40e3-9e76-4e9e-ad0c-3e8f44a107d3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cb7ff46c-bb8d-4c0e-aa33-fe409118dd99",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"12d46900-d0a1-4622-9f59-01feeea96f4b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ad2ab1f4-1a15-408c-b790-74e1c23f37f4","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"cceeac01-7797-4ba1-b386-c38895a5fe00","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f9f08e3-5f36-45c8-be91-0341c8f7fb0e","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"5061afd6-f983-4f22-b493-ab83032c66e6","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"712b649b-3da6-4419-ba95-f82e9376fe83","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2e0da5f8-360d-40db-8fa7-2652444a9a75","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e7a90b23-903f-45e5-b220-bab8d9f3e5ff","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8cd65e45-a1f5-4422-893c-b6458bd196ae","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"295b40e3-9e76-4e9e-ad0c-3e8f44a107d3","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"87fc0614-cc2d-4677-8c24-61023ebca123","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cb7ff46c-bb8d-4c0e-aa33-fe409118dd99","path":"sprites/s_inspector_text_halign/s_inspector_text_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"33df37d8-4e1c-40e7-8e54-05b033597ae6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1e082255-e605-4ad1-b180-90246dae05dc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_inspector_text_valign/8414f3e0-3f01-4f58-addb-3bf44a4e8a55.png b/sprites/s_inspector_text_valign/8414f3e0-3f01-4f58-addb-3bf44a4e8a55.png deleted file mode 100644 index 14379266b..000000000 Binary files a/sprites/s_inspector_text_valign/8414f3e0-3f01-4f58-addb-3bf44a4e8a55.png and /dev/null differ diff --git a/sprites/s_inspector_text_valign/8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0.png b/sprites/s_inspector_text_valign/8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0.png deleted file mode 100644 index d7e435d68..000000000 Binary files a/sprites/s_inspector_text_valign/8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0.png and /dev/null differ diff --git a/sprites/s_inspector_text_valign/cc80e1ec-6749-4825-a83f-150476a89ed4.png b/sprites/s_inspector_text_valign/cc80e1ec-6749-4825-a83f-150476a89ed4.png new file mode 100644 index 000000000..24459f61b Binary files /dev/null and b/sprites/s_inspector_text_valign/cc80e1ec-6749-4825-a83f-150476a89ed4.png differ diff --git a/sprites/s_inspector_text_valign/cdeba340-8443-4523-9a7b-9be001965b5c.png b/sprites/s_inspector_text_valign/cdeba340-8443-4523-9a7b-9be001965b5c.png deleted file mode 100644 index c42400a79..000000000 Binary files a/sprites/s_inspector_text_valign/cdeba340-8443-4523-9a7b-9be001965b5c.png and /dev/null differ diff --git a/sprites/s_inspector_text_valign/e04cab12-3467-4800-9801-7a2f39fa43ec.png b/sprites/s_inspector_text_valign/e04cab12-3467-4800-9801-7a2f39fa43ec.png new file mode 100644 index 000000000..23bf02bf4 Binary files /dev/null and b/sprites/s_inspector_text_valign/e04cab12-3467-4800-9801-7a2f39fa43ec.png differ diff --git a/sprites/s_inspector_text_valign/f2c98711-399d-4c92-9776-c79d334292f8.png b/sprites/s_inspector_text_valign/f2c98711-399d-4c92-9776-c79d334292f8.png new file mode 100644 index 000000000..f6f0ad284 Binary files /dev/null and b/sprites/s_inspector_text_valign/f2c98711-399d-4c92-9776-c79d334292f8.png differ diff --git a/sprites/s_inspector_text_valign/layers/8414f3e0-3f01-4f58-addb-3bf44a4e8a55/98caa5f9-0981-4767-aa8e-e5f759cadde7.png b/sprites/s_inspector_text_valign/layers/8414f3e0-3f01-4f58-addb-3bf44a4e8a55/98caa5f9-0981-4767-aa8e-e5f759cadde7.png deleted file mode 100644 index 686ff6568..000000000 Binary files a/sprites/s_inspector_text_valign/layers/8414f3e0-3f01-4f58-addb-3bf44a4e8a55/98caa5f9-0981-4767-aa8e-e5f759cadde7.png and /dev/null differ diff --git a/sprites/s_inspector_text_valign/layers/8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0/98caa5f9-0981-4767-aa8e-e5f759cadde7.png b/sprites/s_inspector_text_valign/layers/8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0/98caa5f9-0981-4767-aa8e-e5f759cadde7.png deleted file mode 100644 index 2a1e91d80..000000000 Binary files a/sprites/s_inspector_text_valign/layers/8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0/98caa5f9-0981-4767-aa8e-e5f759cadde7.png and /dev/null differ diff --git a/sprites/s_inspector_text_valign/layers/cc80e1ec-6749-4825-a83f-150476a89ed4/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png b/sprites/s_inspector_text_valign/layers/cc80e1ec-6749-4825-a83f-150476a89ed4/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png new file mode 100644 index 000000000..24459f61b Binary files /dev/null and b/sprites/s_inspector_text_valign/layers/cc80e1ec-6749-4825-a83f-150476a89ed4/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png differ diff --git a/sprites/s_inspector_text_valign/layers/cdeba340-8443-4523-9a7b-9be001965b5c/98caa5f9-0981-4767-aa8e-e5f759cadde7.png b/sprites/s_inspector_text_valign/layers/cdeba340-8443-4523-9a7b-9be001965b5c/98caa5f9-0981-4767-aa8e-e5f759cadde7.png deleted file mode 100644 index dba396abb..000000000 Binary files a/sprites/s_inspector_text_valign/layers/cdeba340-8443-4523-9a7b-9be001965b5c/98caa5f9-0981-4767-aa8e-e5f759cadde7.png and /dev/null differ diff --git a/sprites/s_inspector_text_valign/layers/e04cab12-3467-4800-9801-7a2f39fa43ec/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png b/sprites/s_inspector_text_valign/layers/e04cab12-3467-4800-9801-7a2f39fa43ec/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png new file mode 100644 index 000000000..23bf02bf4 Binary files /dev/null and b/sprites/s_inspector_text_valign/layers/e04cab12-3467-4800-9801-7a2f39fa43ec/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png differ diff --git a/sprites/s_inspector_text_valign/layers/f2c98711-399d-4c92-9776-c79d334292f8/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png b/sprites/s_inspector_text_valign/layers/f2c98711-399d-4c92-9776-c79d334292f8/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png new file mode 100644 index 000000000..f6f0ad284 Binary files /dev/null and b/sprites/s_inspector_text_valign/layers/f2c98711-399d-4c92-9776-c79d334292f8/b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb.png differ diff --git a/sprites/s_inspector_text_valign/s_inspector_text_valign.yy b/sprites/s_inspector_text_valign/s_inspector_text_valign.yy index 4e6333096..ba2583423 100644 --- a/sprites/s_inspector_text_valign/s_inspector_text_valign.yy +++ b/sprites/s_inspector_text_valign/s_inspector_text_valign.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8414f3e0-3f01-4f58-addb-3bf44a4e8a55",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cdeba340-8443-4523-9a7b-9be001965b5c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e04cab12-3467-4800-9801-7a2f39fa43ec",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cc80e1ec-6749-4825-a83f-150476a89ed4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f2c98711-399d-4c92-9776-c79d334292f8",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fdf04286-37f6-48ea-8fee-b996a72dddea","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8a2e43e6-d82d-4f60-8ba8-55b6c8403bd0","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"14966d7a-147a-45c6-9005-d9dfd616f511","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8414f3e0-3f01-4f58-addb-3bf44a4e8a55","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"3d5ec92a-a8fd-47c0-864b-67d57db5f40c","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cdeba340-8443-4523-9a7b-9be001965b5c","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"bdf394bc-2c71-40c0-9d9c-a4a4c56185ce","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e04cab12-3467-4800-9801-7a2f39fa43ec","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e0a0ed5b-3f41-414c-bdad-af55bc489305","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cc80e1ec-6749-4825-a83f-150476a89ed4","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e61c781f-1707-4c99-8679-235cbf947987","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f2c98711-399d-4c92-9776-c79d334292f8","path":"sprites/s_inspector_text_valign/s_inspector_text_valign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"98caa5f9-0981-4767-aa8e-e5f759cadde7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b3a87c48-65e9-406e-9a11-cc9ffcb4d0fb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_junc_visible/2aec8337-fa69-4cc9-ad49-ef3a5acb72e4.png b/sprites/s_junc_visible/2aec8337-fa69-4cc9-ad49-ef3a5acb72e4.png new file mode 100644 index 000000000..37f24ba74 Binary files /dev/null and b/sprites/s_junc_visible/2aec8337-fa69-4cc9-ad49-ef3a5acb72e4.png differ diff --git a/sprites/s_junc_visible/4536a553-1295-4dbf-a520-f10485ad8056.png b/sprites/s_junc_visible/4536a553-1295-4dbf-a520-f10485ad8056.png deleted file mode 100644 index 182309943..000000000 Binary files a/sprites/s_junc_visible/4536a553-1295-4dbf-a520-f10485ad8056.png and /dev/null differ diff --git a/sprites/s_junc_visible/529d651f-f15f-435a-880d-1e5c113f7e3a.png b/sprites/s_junc_visible/529d651f-f15f-435a-880d-1e5c113f7e3a.png new file mode 100644 index 000000000..7080ddf68 Binary files /dev/null and b/sprites/s_junc_visible/529d651f-f15f-435a-880d-1e5c113f7e3a.png differ diff --git a/sprites/s_junc_visible/8963602a-2c88-4466-86ab-6911f4050d53.png b/sprites/s_junc_visible/8963602a-2c88-4466-86ab-6911f4050d53.png deleted file mode 100644 index eb682c623..000000000 Binary files a/sprites/s_junc_visible/8963602a-2c88-4466-86ab-6911f4050d53.png and /dev/null differ diff --git a/sprites/s_junc_visible/layers/2aec8337-fa69-4cc9-ad49-ef3a5acb72e4/a9b5a85c-42e4-46d7-af5d-b05ff36e66b8.png b/sprites/s_junc_visible/layers/2aec8337-fa69-4cc9-ad49-ef3a5acb72e4/a9b5a85c-42e4-46d7-af5d-b05ff36e66b8.png new file mode 100644 index 000000000..37f24ba74 Binary files /dev/null and b/sprites/s_junc_visible/layers/2aec8337-fa69-4cc9-ad49-ef3a5acb72e4/a9b5a85c-42e4-46d7-af5d-b05ff36e66b8.png differ diff --git a/sprites/s_junc_visible/layers/4536a553-1295-4dbf-a520-f10485ad8056/1d2670d2-a943-4d80-a05a-9bb92dcb98d4.png b/sprites/s_junc_visible/layers/4536a553-1295-4dbf-a520-f10485ad8056/1d2670d2-a943-4d80-a05a-9bb92dcb98d4.png deleted file mode 100644 index d2db4903d..000000000 Binary files a/sprites/s_junc_visible/layers/4536a553-1295-4dbf-a520-f10485ad8056/1d2670d2-a943-4d80-a05a-9bb92dcb98d4.png and /dev/null differ diff --git a/sprites/s_junc_visible/layers/529d651f-f15f-435a-880d-1e5c113f7e3a/a9b5a85c-42e4-46d7-af5d-b05ff36e66b8.png b/sprites/s_junc_visible/layers/529d651f-f15f-435a-880d-1e5c113f7e3a/a9b5a85c-42e4-46d7-af5d-b05ff36e66b8.png new file mode 100644 index 000000000..7080ddf68 Binary files /dev/null and b/sprites/s_junc_visible/layers/529d651f-f15f-435a-880d-1e5c113f7e3a/a9b5a85c-42e4-46d7-af5d-b05ff36e66b8.png differ diff --git a/sprites/s_junc_visible/layers/8963602a-2c88-4466-86ab-6911f4050d53/1d2670d2-a943-4d80-a05a-9bb92dcb98d4.png b/sprites/s_junc_visible/layers/8963602a-2c88-4466-86ab-6911f4050d53/1d2670d2-a943-4d80-a05a-9bb92dcb98d4.png deleted file mode 100644 index 55c87b0a1..000000000 Binary files a/sprites/s_junc_visible/layers/8963602a-2c88-4466-86ab-6911f4050d53/1d2670d2-a943-4d80-a05a-9bb92dcb98d4.png and /dev/null differ diff --git a/sprites/s_junc_visible/s_junc_visible.yy b/sprites/s_junc_visible/s_junc_visible.yy index d15346eff..07edd4485 100644 --- a/sprites/s_junc_visible/s_junc_visible.yy +++ b/sprites/s_junc_visible/s_junc_visible.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 14, - "bbox_top": 1, - "bbox_bottom": 14, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 2, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4536a553-1295-4dbf-a520-f10485ad8056",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8963602a-2c88-4466-86ab-6911f4050d53",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2aec8337-fa69-4cc9-ad49-ef3a5acb72e4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"529d651f-f15f-435a-880d-1e5c113f7e3a",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2a9c7b03-fac9-4fcb-b096-0710be705c46","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4536a553-1295-4dbf-a520-f10485ad8056","path":"sprites/s_junc_visible/s_junc_visible.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"e642c227-8b7c-4d19-b76c-edfdaf485e84","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8963602a-2c88-4466-86ab-6911f4050d53","path":"sprites/s_junc_visible/s_junc_visible.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"999177be-085b-4051-ab1d-4d0b31e0925f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2aec8337-fa69-4cc9-ad49-ef3a5acb72e4","path":"sprites/s_junc_visible/s_junc_visible.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"be093174-8272-48cc-ac14-e5012376cba2","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"529d651f-f15f-435a-880d-1e5c113f7e3a","path":"sprites/s_junc_visible/s_junc_visible.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1d2670d2-a943-4d80-a05a-9bb92dcb98d4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a9b5a85c-42e4-46d7-af5d-b05ff36e66b8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_loading/3b2045b0-1b4b-4276-bf02-98eed25a882e.png b/sprites/s_loading/3b2045b0-1b4b-4276-bf02-98eed25a882e.png deleted file mode 100644 index cad901ac9..000000000 Binary files a/sprites/s_loading/3b2045b0-1b4b-4276-bf02-98eed25a882e.png and /dev/null differ diff --git a/sprites/s_loading/a8d3f700-9dbf-4a0c-97f4-6c2f5035b848.png b/sprites/s_loading/a8d3f700-9dbf-4a0c-97f4-6c2f5035b848.png new file mode 100644 index 000000000..a6a04e722 Binary files /dev/null and b/sprites/s_loading/a8d3f700-9dbf-4a0c-97f4-6c2f5035b848.png differ diff --git a/sprites/s_loading/layers/3b2045b0-1b4b-4276-bf02-98eed25a882e/8edf7a08-e6b8-4d1f-8dd1-713885a07828.png b/sprites/s_loading/layers/3b2045b0-1b4b-4276-bf02-98eed25a882e/8edf7a08-e6b8-4d1f-8dd1-713885a07828.png deleted file mode 100644 index 0ef0ba99f..000000000 Binary files a/sprites/s_loading/layers/3b2045b0-1b4b-4276-bf02-98eed25a882e/8edf7a08-e6b8-4d1f-8dd1-713885a07828.png and /dev/null differ diff --git a/sprites/s_loading/layers/a8d3f700-9dbf-4a0c-97f4-6c2f5035b848/863c1648-8ad0-4ba3-95e9-12567881a9b0.png b/sprites/s_loading/layers/a8d3f700-9dbf-4a0c-97f4-6c2f5035b848/863c1648-8ad0-4ba3-95e9-12567881a9b0.png new file mode 100644 index 000000000..a6a04e722 Binary files /dev/null and b/sprites/s_loading/layers/a8d3f700-9dbf-4a0c-97f4-6c2f5035b848/863c1648-8ad0-4ba3-95e9-12567881a9b0.png differ diff --git a/sprites/s_loading/s_loading.yy b/sprites/s_loading/s_loading.yy index 1d5ee2aad..754a6d849 100644 --- a/sprites/s_loading/s_loading.yy +++ b/sprites/s_loading/s_loading.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 7, - "bbox_right": 56, - "bbox_top": 7, - "bbox_bottom": 34, + "bbox_left": 15, + "bbox_right": 112, + "bbox_top": 15, + "bbox_bottom": 68, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 64, - "height": 64, + "width": 128, + "height": 128, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3b2045b0-1b4b-4276-bf02-98eed25a882e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a8d3f700-9dbf-4a0c-97f4-6c2f5035b848",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"947d7309-4dcf-49c0-8fcf-06d1e291e88c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3b2045b0-1b4b-4276-bf02-98eed25a882e","path":"sprites/s_loading/s_loading.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"905721c4-c7ec-486f-8ab8-05e86860c975","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a8d3f700-9dbf-4a0c-97f4-6c2f5035b848","path":"sprites/s_loading/s_loading.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 32, - "yorigin": 32, + "xorigin": 64, + "yorigin": 64, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8edf7a08-e6b8-4d1f-8dd1-713885a07828","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"863c1648-8ad0-4ba3-95e9-12567881a9b0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_loop_16/038196d8-9456-4a12-8307-e18e9d017872.png b/sprites/s_loop_16/038196d8-9456-4a12-8307-e18e9d017872.png new file mode 100644 index 000000000..7ebab8f5b Binary files /dev/null and b/sprites/s_loop_16/038196d8-9456-4a12-8307-e18e9d017872.png differ diff --git a/sprites/s_loop_16/0ff91268-551a-43dc-bc3d-d9e818243db3.png b/sprites/s_loop_16/0ff91268-551a-43dc-bc3d-d9e818243db3.png deleted file mode 100644 index 056d05952..000000000 Binary files a/sprites/s_loop_16/0ff91268-551a-43dc-bc3d-d9e818243db3.png and /dev/null differ diff --git a/sprites/s_loop_16/layers/038196d8-9456-4a12-8307-e18e9d017872/bbcdaa67-a3a9-4cbe-9db1-4cd92e56552b.png b/sprites/s_loop_16/layers/038196d8-9456-4a12-8307-e18e9d017872/bbcdaa67-a3a9-4cbe-9db1-4cd92e56552b.png new file mode 100644 index 000000000..7ebab8f5b Binary files /dev/null and b/sprites/s_loop_16/layers/038196d8-9456-4a12-8307-e18e9d017872/bbcdaa67-a3a9-4cbe-9db1-4cd92e56552b.png differ diff --git a/sprites/s_loop_16/layers/0ff91268-551a-43dc-bc3d-d9e818243db3/21a80121-fea0-4064-b3d6-1ddb4f32484e.png b/sprites/s_loop_16/layers/0ff91268-551a-43dc-bc3d-d9e818243db3/21a80121-fea0-4064-b3d6-1ddb4f32484e.png deleted file mode 100644 index 12b8de797..000000000 Binary files a/sprites/s_loop_16/layers/0ff91268-551a-43dc-bc3d-d9e818243db3/21a80121-fea0-4064-b3d6-1ddb4f32484e.png and /dev/null differ diff --git a/sprites/s_loop_16/s_loop_16.yy b/sprites/s_loop_16/s_loop_16.yy index 02492d0d5..9ad24b6d1 100644 --- a/sprites/s_loop_16/s_loop_16.yy +++ b/sprites/s_loop_16/s_loop_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 14, - "bbox_top": 2, - "bbox_bottom": 13, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 4, + "bbox_bottom": 27, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0ff91268-551a-43dc-bc3d-d9e818243db3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"038196d8-9456-4a12-8307-e18e9d017872",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c9be4502-4a18-4d72-929d-5fd95e0d6a55","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0ff91268-551a-43dc-bc3d-d9e818243db3","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2a4873da-b82d-4c4a-b4cf-d42100a0b9c9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"038196d8-9456-4a12-8307-e18e9d017872","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"21a80121-fea0-4064-b3d6-1ddb4f32484e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bbcdaa67-a3a9-4cbe-9db1-4cd92e56552b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_menu_button/91525eb3-9913-4a6d-a5ff-09b88e491725.png b/sprites/s_menu_button/91525eb3-9913-4a6d-a5ff-09b88e491725.png index f96895f17..58201b962 100644 Binary files a/sprites/s_menu_button/91525eb3-9913-4a6d-a5ff-09b88e491725.png and b/sprites/s_menu_button/91525eb3-9913-4a6d-a5ff-09b88e491725.png differ diff --git a/sprites/s_menu_button/layers/91525eb3-9913-4a6d-a5ff-09b88e491725/9ffda7f5-bd4d-4054-b32b-e40334901b81.png b/sprites/s_menu_button/layers/91525eb3-9913-4a6d-a5ff-09b88e491725/9ffda7f5-bd4d-4054-b32b-e40334901b81.png index f96895f17..58201b962 100644 Binary files a/sprites/s_menu_button/layers/91525eb3-9913-4a6d-a5ff-09b88e491725/9ffda7f5-bd4d-4054-b32b-e40334901b81.png and b/sprites/s_menu_button/layers/91525eb3-9913-4a6d-a5ff-09b88e491725/9ffda7f5-bd4d-4054-b32b-e40334901b81.png differ diff --git a/sprites/s_menu_button/s_menu_button.yy b/sprites/s_menu_button/s_menu_button.yy index 2e2e33ba1..7f9d5f934 100644 --- a/sprites/s_menu_button/s_menu_button.yy +++ b/sprites/s_menu_button/s_menu_button.yy @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"133f0c63-9746-4f25-b900-3575d2ee6a5c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"91525eb3-9913-4a6d-a5ff-09b88e491725","path":"sprites/s_menu_button/s_menu_button.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2003e237-03d5-4d5c-8971-43cb35810ffb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"91525eb3-9913-4a6d-a5ff-09b88e491725","path":"sprites/s_menu_button/s_menu_button.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, diff --git a/sprites/s_menu_button_mask/0f0760b7-8e7e-4e6f-a437-3066082b20b8.png b/sprites/s_menu_button_mask/0f0760b7-8e7e-4e6f-a437-3066082b20b8.png new file mode 100644 index 000000000..7ab5a4baa Binary files /dev/null and b/sprites/s_menu_button_mask/0f0760b7-8e7e-4e6f-a437-3066082b20b8.png differ diff --git a/sprites/s_menu_button_mask/layers/0f0760b7-8e7e-4e6f-a437-3066082b20b8/6ed1d704-7a92-4a37-b2c4-7a093f6bcb77.png b/sprites/s_menu_button_mask/layers/0f0760b7-8e7e-4e6f-a437-3066082b20b8/6ed1d704-7a92-4a37-b2c4-7a093f6bcb77.png new file mode 100644 index 000000000..7ab5a4baa Binary files /dev/null and b/sprites/s_menu_button_mask/layers/0f0760b7-8e7e-4e6f-a437-3066082b20b8/6ed1d704-7a92-4a37-b2c4-7a093f6bcb77.png differ diff --git a/sprites/s_menu_button_mask/s_menu_button_mask.yy b/sprites/s_menu_button_mask/s_menu_button_mask.yy new file mode 100644 index 000000000..8135ec0e4 --- /dev/null +++ b/sprites/s_menu_button_mask/s_menu_button_mask.yy @@ -0,0 +1,98 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "s_menu_button_mask", + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 23, + "bbox_top": 0, + "bbox_bottom": 23, + "HTile": false, + "VTile": false, + "For3D": false, + "DynamicTexturePage": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f0760b7-8e7e-4e6f-a437-3066082b20b8",}, + ], + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "s_menu_button_mask", + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"a7472968-5d98-4557-abb4-d3fd8b00f4d0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f0760b7-8e7e-4e6f-a437-3066082b20b8","path":"sprites/s_menu_button_mask/s_menu_button_mask.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + }, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6ed1d704-7a92-4a37-b2c4-7a093f6bcb77","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + ], + "nineSlice": { + "left": 6, + "top": 6, + "right": 6, + "bottom": 6, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "enabled": true, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "resourceVersion": "1.0", + "loadedVersion": null, + "resourceType": "GMNineSliceData", + }, + "parent": { + "name": "panels", + "path": "folders/sprites/panels.yy", + }, +} \ No newline at end of file diff --git a/sprites/s_minus_24/752ea78b-87ee-4e3f-9ab5-09f2d560fe2c.png b/sprites/s_minus_24/752ea78b-87ee-4e3f-9ab5-09f2d560fe2c.png deleted file mode 100644 index d532a54fc..000000000 Binary files a/sprites/s_minus_24/752ea78b-87ee-4e3f-9ab5-09f2d560fe2c.png and /dev/null differ diff --git a/sprites/s_minus_24/90cf094c-94c9-40cc-bc7c-a4629311a43a.png b/sprites/s_minus_24/90cf094c-94c9-40cc-bc7c-a4629311a43a.png new file mode 100644 index 000000000..176c92801 Binary files /dev/null and b/sprites/s_minus_24/90cf094c-94c9-40cc-bc7c-a4629311a43a.png differ diff --git a/sprites/s_minus_24/layers/752ea78b-87ee-4e3f-9ab5-09f2d560fe2c/3325cf7d-5d13-4e6c-9f02-9a60783ff27d.png b/sprites/s_minus_24/layers/752ea78b-87ee-4e3f-9ab5-09f2d560fe2c/3325cf7d-5d13-4e6c-9f02-9a60783ff27d.png deleted file mode 100644 index 8ded55e9a..000000000 Binary files a/sprites/s_minus_24/layers/752ea78b-87ee-4e3f-9ab5-09f2d560fe2c/3325cf7d-5d13-4e6c-9f02-9a60783ff27d.png and /dev/null differ diff --git a/sprites/s_minus_24/layers/90cf094c-94c9-40cc-bc7c-a4629311a43a/dc13dcc1-ff20-4715-a104-1cdb221c9b77.png b/sprites/s_minus_24/layers/90cf094c-94c9-40cc-bc7c-a4629311a43a/dc13dcc1-ff20-4715-a104-1cdb221c9b77.png new file mode 100644 index 000000000..176c92801 Binary files /dev/null and b/sprites/s_minus_24/layers/90cf094c-94c9-40cc-bc7c-a4629311a43a/dc13dcc1-ff20-4715-a104-1cdb221c9b77.png differ diff --git a/sprites/s_minus_24/s_minus_24.yy b/sprites/s_minus_24/s_minus_24.yy index 05fefd067..c98b47f44 100644 --- a/sprites/s_minus_24/s_minus_24.yy +++ b/sprites/s_minus_24/s_minus_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 10, - "bbox_bottom": 13, + "bbox_left": 6, + "bbox_right": 41, + "bbox_top": 20, + "bbox_bottom": 27, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"752ea78b-87ee-4e3f-9ab5-09f2d560fe2c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"90cf094c-94c9-40cc-bc7c-a4629311a43a",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9c100bb7-da9a-4570-8f00-87517e0a595e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"752ea78b-87ee-4e3f-9ab5-09f2d560fe2c","path":"sprites/s_minus_24/s_minus_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8acd45d0-751c-46e9-9ae7-6a382859aa2f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"90cf094c-94c9-40cc-bc7c-a4629311a43a","path":"sprites/s_minus_24/s_minus_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3325cf7d-5d13-4e6c-9f02-9a60783ff27d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dc13dcc1-ff20-4715-a104-1cdb221c9b77","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_2d_light/153fea53-f7c3-4be3-a874-0530070d7f8c.png b/sprites/s_node_2d_light/153fea53-f7c3-4be3-a874-0530070d7f8c.png deleted file mode 100644 index d4d38f717..000000000 Binary files a/sprites/s_node_2d_light/153fea53-f7c3-4be3-a874-0530070d7f8c.png and /dev/null differ diff --git a/sprites/s_node_2d_light/210f065e-15eb-48cc-977e-30b1696cc1aa.png b/sprites/s_node_2d_light/210f065e-15eb-48cc-977e-30b1696cc1aa.png new file mode 100644 index 000000000..78e355c0a Binary files /dev/null and b/sprites/s_node_2d_light/210f065e-15eb-48cc-977e-30b1696cc1aa.png differ diff --git a/sprites/s_node_2d_light/layers/153fea53-f7c3-4be3-a874-0530070d7f8c/57321160-fc31-4569-b96d-cd0ec3f4b9a4.png b/sprites/s_node_2d_light/layers/153fea53-f7c3-4be3-a874-0530070d7f8c/57321160-fc31-4569-b96d-cd0ec3f4b9a4.png deleted file mode 100644 index e879c2bef..000000000 Binary files a/sprites/s_node_2d_light/layers/153fea53-f7c3-4be3-a874-0530070d7f8c/57321160-fc31-4569-b96d-cd0ec3f4b9a4.png and /dev/null differ diff --git a/sprites/s_node_2d_light/layers/210f065e-15eb-48cc-977e-30b1696cc1aa/fbe98d4c-ee11-4553-8d01-6255d9a23ed1.png b/sprites/s_node_2d_light/layers/210f065e-15eb-48cc-977e-30b1696cc1aa/fbe98d4c-ee11-4553-8d01-6255d9a23ed1.png new file mode 100644 index 000000000..78e355c0a Binary files /dev/null and b/sprites/s_node_2d_light/layers/210f065e-15eb-48cc-977e-30b1696cc1aa/fbe98d4c-ee11-4553-8d01-6255d9a23ed1.png 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 72ace0a38..000cee1d5 100644 --- a/sprites/s_node_2d_light/s_node_2d_light.yy +++ b/sprites/s_node_2d_light/s_node_2d_light.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"153fea53-f7c3-4be3-a874-0530070d7f8c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"210f065e-15eb-48cc-977e-30b1696cc1aa",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"55cb8a81-be84-42a4-98ba-462d8e9d4329","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"153fea53-f7c3-4be3-a874-0530070d7f8c","path":"sprites/s_node_2d_light/s_node_2d_light.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"30989221-8e89-44c9-b6d0-11df47d18d14","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"210f065e-15eb-48cc-977e-30b1696cc1aa","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,"modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"57321160-fc31-4569-b96d-cd0ec3f4b9a4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fbe98d4c-ee11-4553-8d01-6255d9a23ed1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_cube/60603b8c-9043-4b68-a0b3-a8863a482f3f.png b/sprites/s_node_3d_cube/60603b8c-9043-4b68-a0b3-a8863a482f3f.png deleted file mode 100644 index ff4fcfc55..000000000 Binary files a/sprites/s_node_3d_cube/60603b8c-9043-4b68-a0b3-a8863a482f3f.png and /dev/null differ diff --git a/sprites/s_node_3d_cube/87cbc2a1-3d66-4a10-b553-00ed4cda7c41.png b/sprites/s_node_3d_cube/87cbc2a1-3d66-4a10-b553-00ed4cda7c41.png new file mode 100644 index 000000000..f2dc2682e Binary files /dev/null and b/sprites/s_node_3d_cube/87cbc2a1-3d66-4a10-b553-00ed4cda7c41.png differ diff --git a/sprites/s_node_3d_cube/layers/60603b8c-9043-4b68-a0b3-a8863a482f3f/5c9700b8-fc3c-4255-a6ac-1107bda8337f.png b/sprites/s_node_3d_cube/layers/60603b8c-9043-4b68-a0b3-a8863a482f3f/5c9700b8-fc3c-4255-a6ac-1107bda8337f.png deleted file mode 100644 index 4b4b47925..000000000 Binary files a/sprites/s_node_3d_cube/layers/60603b8c-9043-4b68-a0b3-a8863a482f3f/5c9700b8-fc3c-4255-a6ac-1107bda8337f.png and /dev/null differ diff --git a/sprites/s_node_3d_cube/layers/87cbc2a1-3d66-4a10-b553-00ed4cda7c41/ca52c6d2-2c97-42bf-947d-6834ee978efb.png b/sprites/s_node_3d_cube/layers/87cbc2a1-3d66-4a10-b553-00ed4cda7c41/ca52c6d2-2c97-42bf-947d-6834ee978efb.png new file mode 100644 index 000000000..f2dc2682e Binary files /dev/null and b/sprites/s_node_3d_cube/layers/87cbc2a1-3d66-4a10-b553-00ed4cda7c41/ca52c6d2-2c97-42bf-947d-6834ee978efb.png 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 c622cf460..f65f775cf 100644 --- a/sprites/s_node_3d_cube/s_node_3d_cube.yy +++ b/sprites/s_node_3d_cube/s_node_3d_cube.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 6, - "bbox_right": 25, - "bbox_top": 2, - "bbox_bottom": 31, + "bbox_left": 12, + "bbox_right": 51, + "bbox_top": 4, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"60603b8c-9043-4b68-a0b3-a8863a482f3f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87cbc2a1-3d66-4a10-b553-00ed4cda7c41",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ec7e9b6e-e343-4e14-8c60-0926417d31f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"60603b8c-9043-4b68-a0b3-a8863a482f3f","path":"sprites/s_node_3d_cube/s_node_3d_cube.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ab6de7bd-5c60-49fd-a0aa-262c96ca3da1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"87cbc2a1-3d66-4a10-b553-00ed4cda7c41","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5c9700b8-fc3c-4255-a6ac-1107bda8337f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ca52c6d2-2c97-42bf-947d-6834ee978efb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_cylinder/594f3a6b-01e1-4b08-8ee0-046ab52f4443.png b/sprites/s_node_3d_cylinder/594f3a6b-01e1-4b08-8ee0-046ab52f4443.png deleted file mode 100644 index 3293d02fe..000000000 Binary files a/sprites/s_node_3d_cylinder/594f3a6b-01e1-4b08-8ee0-046ab52f4443.png and /dev/null differ diff --git a/sprites/s_node_3d_cylinder/aa7f4412-ca30-43fa-b906-82b4de801c54.png b/sprites/s_node_3d_cylinder/aa7f4412-ca30-43fa-b906-82b4de801c54.png new file mode 100644 index 000000000..eaef89a5d Binary files /dev/null and b/sprites/s_node_3d_cylinder/aa7f4412-ca30-43fa-b906-82b4de801c54.png differ diff --git a/sprites/s_node_3d_cylinder/layers/594f3a6b-01e1-4b08-8ee0-046ab52f4443/d7b08ee9-1a16-448c-b0f1-1d4bc01e2586.png b/sprites/s_node_3d_cylinder/layers/594f3a6b-01e1-4b08-8ee0-046ab52f4443/d7b08ee9-1a16-448c-b0f1-1d4bc01e2586.png deleted file mode 100644 index c3e4f8bf6..000000000 Binary files a/sprites/s_node_3d_cylinder/layers/594f3a6b-01e1-4b08-8ee0-046ab52f4443/d7b08ee9-1a16-448c-b0f1-1d4bc01e2586.png and /dev/null differ diff --git a/sprites/s_node_3d_cylinder/layers/aa7f4412-ca30-43fa-b906-82b4de801c54/57e502a6-a6cc-4ffa-a36c-5e077b8e640b.png b/sprites/s_node_3d_cylinder/layers/aa7f4412-ca30-43fa-b906-82b4de801c54/57e502a6-a6cc-4ffa-a36c-5e077b8e640b.png new file mode 100644 index 000000000..eaef89a5d Binary files /dev/null and b/sprites/s_node_3d_cylinder/layers/aa7f4412-ca30-43fa-b906-82b4de801c54/57e502a6-a6cc-4ffa-a36c-5e077b8e640b.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 ffe9636ba..4625a24dc 100644 --- a/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy +++ b/sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 7, - "bbox_right": 24, - "bbox_top": 2, - "bbox_bottom": 31, + "bbox_left": 14, + "bbox_right": 49, + "bbox_top": 4, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"594f3a6b-01e1-4b08-8ee0-046ab52f4443",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aa7f4412-ca30-43fa-b906-82b4de801c54",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e3b8b5ec-9840-4900-bede-72b5535a4317","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"594f3a6b-01e1-4b08-8ee0-046ab52f4443","path":"sprites/s_node_3d_cylinder/s_node_3d_cylinder.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"10a70eba-5479-442f-abd1-af39fa20258b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aa7f4412-ca30-43fa-b906-82b4de801c54","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d7b08ee9-1a16-448c-b0f1-1d4bc01e2586","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"57e502a6-a6cc-4ffa-a36c-5e077b8e640b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_obj/3fa83952-1f29-4ebf-96cf-9544766f2bc7.png b/sprites/s_node_3d_obj/3fa83952-1f29-4ebf-96cf-9544766f2bc7.png new file mode 100644 index 000000000..f7a29e3c4 Binary files /dev/null and b/sprites/s_node_3d_obj/3fa83952-1f29-4ebf-96cf-9544766f2bc7.png differ diff --git a/sprites/s_node_3d_obj/82bb74e1-deef-4553-bcdd-9d3dbb953d0d.png b/sprites/s_node_3d_obj/82bb74e1-deef-4553-bcdd-9d3dbb953d0d.png deleted file mode 100644 index da2abadc6..000000000 Binary files a/sprites/s_node_3d_obj/82bb74e1-deef-4553-bcdd-9d3dbb953d0d.png and /dev/null differ diff --git a/sprites/s_node_3d_obj/layers/3fa83952-1f29-4ebf-96cf-9544766f2bc7/5f0bca6f-68bc-46bb-93e2-ea266db4ed20.png b/sprites/s_node_3d_obj/layers/3fa83952-1f29-4ebf-96cf-9544766f2bc7/5f0bca6f-68bc-46bb-93e2-ea266db4ed20.png new file mode 100644 index 000000000..f7a29e3c4 Binary files /dev/null and b/sprites/s_node_3d_obj/layers/3fa83952-1f29-4ebf-96cf-9544766f2bc7/5f0bca6f-68bc-46bb-93e2-ea266db4ed20.png differ diff --git a/sprites/s_node_3d_obj/layers/82bb74e1-deef-4553-bcdd-9d3dbb953d0d/7ea0b29b-9330-4256-af0b-8fdfab4e40ef.png b/sprites/s_node_3d_obj/layers/82bb74e1-deef-4553-bcdd-9d3dbb953d0d/7ea0b29b-9330-4256-af0b-8fdfab4e40ef.png deleted file mode 100644 index e0fbdcd0d..000000000 Binary files a/sprites/s_node_3d_obj/layers/82bb74e1-deef-4553-bcdd-9d3dbb953d0d/7ea0b29b-9330-4256-af0b-8fdfab4e40ef.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 b247a00cc..cb02ec784 100644 --- a/sprites/s_node_3d_obj/s_node_3d_obj.yy +++ b/sprites/s_node_3d_obj/s_node_3d_obj.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 24, - "bbox_top": 1, - "bbox_bottom": 31, + "bbox_left": 10, + "bbox_right": 49, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"82bb74e1-deef-4553-bcdd-9d3dbb953d0d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3fa83952-1f29-4ebf-96cf-9544766f2bc7",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ad97c061-1266-4424-9b9b-504c6b5487e0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"82bb74e1-deef-4553-bcdd-9d3dbb953d0d","path":"sprites/s_node_3d_obj/s_node_3d_obj.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"176a1f77-133c-47fd-806e-302c97a50a97","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3fa83952-1f29-4ebf-96cf-9544766f2bc7","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7ea0b29b-9330-4256-af0b-8fdfab4e40ef","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5f0bca6f-68bc-46bb-93e2-ea266db4ed20","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_3d_transform/7232eec6-e886-4a07-ae94-edd2b8818684.png b/sprites/s_node_3d_transform/7232eec6-e886-4a07-ae94-edd2b8818684.png new file mode 100644 index 000000000..377f5106f Binary files /dev/null and b/sprites/s_node_3d_transform/7232eec6-e886-4a07-ae94-edd2b8818684.png differ diff --git a/sprites/s_node_3d_transform/ba5a6276-7678-4d0d-bda7-bbcd313fd481.png b/sprites/s_node_3d_transform/ba5a6276-7678-4d0d-bda7-bbcd313fd481.png deleted file mode 100644 index d1c2fef18..000000000 Binary files a/sprites/s_node_3d_transform/ba5a6276-7678-4d0d-bda7-bbcd313fd481.png and /dev/null differ diff --git a/sprites/s_node_3d_transform/layers/7232eec6-e886-4a07-ae94-edd2b8818684/f3a22dc0-8388-4a29-81e5-01cdbfedcd1d.png b/sprites/s_node_3d_transform/layers/7232eec6-e886-4a07-ae94-edd2b8818684/f3a22dc0-8388-4a29-81e5-01cdbfedcd1d.png new file mode 100644 index 000000000..377f5106f Binary files /dev/null and b/sprites/s_node_3d_transform/layers/7232eec6-e886-4a07-ae94-edd2b8818684/f3a22dc0-8388-4a29-81e5-01cdbfedcd1d.png differ diff --git a/sprites/s_node_3d_transform/layers/ba5a6276-7678-4d0d-bda7-bbcd313fd481/d908a49b-9d3e-4a40-b811-01f6ba518dac.png b/sprites/s_node_3d_transform/layers/ba5a6276-7678-4d0d-bda7-bbcd313fd481/d908a49b-9d3e-4a40-b811-01f6ba518dac.png deleted file mode 100644 index 5e851f4ee..000000000 Binary files a/sprites/s_node_3d_transform/layers/ba5a6276-7678-4d0d-bda7-bbcd313fd481/d908a49b-9d3e-4a40-b811-01f6ba518dac.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 069d6921d..b328b3d6c 100644 --- a/sprites/s_node_3d_transform/s_node_3d_transform.yy +++ b/sprites/s_node_3d_transform/s_node_3d_transform.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 27, - "bbox_top": 4, - "bbox_bottom": 29, + "bbox_left": 8, + "bbox_right": 55, + "bbox_top": 7, + "bbox_bottom": 57, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ba5a6276-7678-4d0d-bda7-bbcd313fd481",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7232eec6-e886-4a07-ae94-edd2b8818684",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1f6a7ac0-2560-45ce-a8a5-f0b0885edceb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ba5a6276-7678-4d0d-bda7-bbcd313fd481","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"949040b5-2871-4def-8f02-44c43bf1080d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7232eec6-e886-4a07-ae94-edd2b8818684","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d908a49b-9d3e-4a40-b811-01f6ba518dac","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f3a22dc0-8388-4a29-81e5-01cdbfedcd1d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_9patch/380054c2-0eb9-4d44-a5fb-400d21d09aca.png b/sprites/s_node_9patch/380054c2-0eb9-4d44-a5fb-400d21d09aca.png deleted file mode 100644 index 90688ded4..000000000 Binary files a/sprites/s_node_9patch/380054c2-0eb9-4d44-a5fb-400d21d09aca.png and /dev/null differ diff --git a/sprites/s_node_9patch/f7d9e796-b83c-4d23-9859-2f4d189075a0.png b/sprites/s_node_9patch/f7d9e796-b83c-4d23-9859-2f4d189075a0.png new file mode 100644 index 000000000..61f6cf3d8 Binary files /dev/null and b/sprites/s_node_9patch/f7d9e796-b83c-4d23-9859-2f4d189075a0.png differ diff --git a/sprites/s_node_9patch/layers/380054c2-0eb9-4d44-a5fb-400d21d09aca/0ad38aa6-92ce-400f-8bd5-326bc45c4342.png b/sprites/s_node_9patch/layers/380054c2-0eb9-4d44-a5fb-400d21d09aca/0ad38aa6-92ce-400f-8bd5-326bc45c4342.png deleted file mode 100644 index e4b7ec880..000000000 Binary files a/sprites/s_node_9patch/layers/380054c2-0eb9-4d44-a5fb-400d21d09aca/0ad38aa6-92ce-400f-8bd5-326bc45c4342.png and /dev/null differ diff --git a/sprites/s_node_9patch/layers/f7d9e796-b83c-4d23-9859-2f4d189075a0/05b9fb0d-4043-49f4-b9ee-99d6a7ef2146.png b/sprites/s_node_9patch/layers/f7d9e796-b83c-4d23-9859-2f4d189075a0/05b9fb0d-4043-49f4-b9ee-99d6a7ef2146.png new file mode 100644 index 000000000..61f6cf3d8 Binary files /dev/null and b/sprites/s_node_9patch/layers/f7d9e796-b83c-4d23-9859-2f4d189075a0/05b9fb0d-4043-49f4-b9ee-99d6a7ef2146.png differ diff --git a/sprites/s_node_9patch/s_node_9patch.yy b/sprites/s_node_9patch/s_node_9patch.yy index 28ac678b6..5f4f44d6d 100644 --- a/sprites/s_node_9patch/s_node_9patch.yy +++ b/sprites/s_node_9patch/s_node_9patch.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"380054c2-0eb9-4d44-a5fb-400d21d09aca",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f7d9e796-b83c-4d23-9859-2f4d189075a0",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5fad8d0d-c832-4909-9088-f8f65036111e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"380054c2-0eb9-4d44-a5fb-400d21d09aca","path":"sprites/s_node_9patch/s_node_9patch.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"402bdf82-7f4e-4e3a-acf5-67b3b16a367a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f7d9e796-b83c-4d23-9859-2f4d189075a0","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0ad38aa6-92ce-400f-8bd5-326bc45c4342","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"05b9fb0d-4043-49f4-b9ee-99d6a7ef2146","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_BW/5720ba2c-fc66-4cff-9252-04042f73fbef.png b/sprites/s_node_BW/5720ba2c-fc66-4cff-9252-04042f73fbef.png deleted file mode 100644 index 34844f99b..000000000 Binary files a/sprites/s_node_BW/5720ba2c-fc66-4cff-9252-04042f73fbef.png and /dev/null differ diff --git a/sprites/s_node_BW/fd5fbc35-8bdf-4919-b559-d060bc97d6f3.png b/sprites/s_node_BW/fd5fbc35-8bdf-4919-b559-d060bc97d6f3.png new file mode 100644 index 000000000..9c5b4495d Binary files /dev/null and b/sprites/s_node_BW/fd5fbc35-8bdf-4919-b559-d060bc97d6f3.png differ diff --git a/sprites/s_node_BW/layers/5720ba2c-fc66-4cff-9252-04042f73fbef/6a8f5951-9121-48e2-9ed9-3f68eb89eae0.png b/sprites/s_node_BW/layers/5720ba2c-fc66-4cff-9252-04042f73fbef/6a8f5951-9121-48e2-9ed9-3f68eb89eae0.png deleted file mode 100644 index 292f34896..000000000 Binary files a/sprites/s_node_BW/layers/5720ba2c-fc66-4cff-9252-04042f73fbef/6a8f5951-9121-48e2-9ed9-3f68eb89eae0.png and /dev/null differ diff --git a/sprites/s_node_BW/layers/fd5fbc35-8bdf-4919-b559-d060bc97d6f3/6559d8af-bed6-45cd-8a2b-5f162941dbed.png b/sprites/s_node_BW/layers/fd5fbc35-8bdf-4919-b559-d060bc97d6f3/6559d8af-bed6-45cd-8a2b-5f162941dbed.png new file mode 100644 index 000000000..9c5b4495d Binary files /dev/null and b/sprites/s_node_BW/layers/fd5fbc35-8bdf-4919-b559-d060bc97d6f3/6559d8af-bed6-45cd-8a2b-5f162941dbed.png differ diff --git a/sprites/s_node_BW/s_node_BW.yy b/sprites/s_node_BW/s_node_BW.yy index 1cb78c312..4b446d5f2 100644 --- a/sprites/s_node_BW/s_node_BW.yy +++ b/sprites/s_node_BW/s_node_BW.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5720ba2c-fc66-4cff-9252-04042f73fbef",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fd5fbc35-8bdf-4919-b559-d060bc97d6f3",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"77005672-876d-489a-b8c9-ad89c67cc3e3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5720ba2c-fc66-4cff-9252-04042f73fbef","path":"sprites/s_node_BW/s_node_BW.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"361c5e00-cd4d-4a43-82cf-52b6604670e5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd5fbc35-8bdf-4919-b559-d060bc97d6f3","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6a8f5951-9121-48e2-9ed9-3f68eb89eae0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6559d8af-bed6-45cd-8a2b-5f162941dbed","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_RGB/14cc478c-7ce6-4452-bd02-c57bcf7f4f22.png b/sprites/s_node_RGB/14cc478c-7ce6-4452-bd02-c57bcf7f4f22.png deleted file mode 100644 index 679ef2c94..000000000 Binary files a/sprites/s_node_RGB/14cc478c-7ce6-4452-bd02-c57bcf7f4f22.png and /dev/null differ diff --git a/sprites/s_node_RGB/e0025d7b-aad7-48ea-82f3-11da4acea563.png b/sprites/s_node_RGB/e0025d7b-aad7-48ea-82f3-11da4acea563.png new file mode 100644 index 000000000..6572d40c9 Binary files /dev/null and b/sprites/s_node_RGB/e0025d7b-aad7-48ea-82f3-11da4acea563.png differ diff --git a/sprites/s_node_RGB/layers/14cc478c-7ce6-4452-bd02-c57bcf7f4f22/f8dc51ac-b298-4411-a65d-0219f6be07a1.png b/sprites/s_node_RGB/layers/14cc478c-7ce6-4452-bd02-c57bcf7f4f22/f8dc51ac-b298-4411-a65d-0219f6be07a1.png deleted file mode 100644 index 5cb751aeb..000000000 Binary files a/sprites/s_node_RGB/layers/14cc478c-7ce6-4452-bd02-c57bcf7f4f22/f8dc51ac-b298-4411-a65d-0219f6be07a1.png and /dev/null differ diff --git a/sprites/s_node_RGB/layers/e0025d7b-aad7-48ea-82f3-11da4acea563/a3e0c962-ce4d-4935-a007-c487c48e962d.png b/sprites/s_node_RGB/layers/e0025d7b-aad7-48ea-82f3-11da4acea563/a3e0c962-ce4d-4935-a007-c487c48e962d.png new file mode 100644 index 000000000..6572d40c9 Binary files /dev/null and b/sprites/s_node_RGB/layers/e0025d7b-aad7-48ea-82f3-11da4acea563/a3e0c962-ce4d-4935-a007-c487c48e962d.png differ diff --git a/sprites/s_node_RGB/s_node_RGB.yy b/sprites/s_node_RGB/s_node_RGB.yy index 1f91b0a8a..c4b3f747d 100644 --- a/sprites/s_node_RGB/s_node_RGB.yy +++ b/sprites/s_node_RGB/s_node_RGB.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"14cc478c-7ce6-4452-bd02-c57bcf7f4f22",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e0025d7b-aad7-48ea-82f3-11da4acea563",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0f3ad194-7aa2-45ca-88b5-937014b7cc03","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"14cc478c-7ce6-4452-bd02-c57bcf7f4f22","path":"sprites/s_node_RGB/s_node_RGB.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f6e21505-8293-4f87-a16e-d68b6959c562","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e0025d7b-aad7-48ea-82f3-11da4acea563","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f8dc51ac-b298-4411-a65d-0219f6be07a1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a3e0c962-ce4d-4935-a007-c487c48e962d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_alpha_cut/040235ab-d950-4454-9532-db54d5125f81.png b/sprites/s_node_alpha_cut/040235ab-d950-4454-9532-db54d5125f81.png new file mode 100644 index 000000000..9b0e97437 Binary files /dev/null and b/sprites/s_node_alpha_cut/040235ab-d950-4454-9532-db54d5125f81.png differ diff --git a/sprites/s_node_alpha_cut/418621ca-5a27-4e9c-9a17-109daf7c32d9.png b/sprites/s_node_alpha_cut/418621ca-5a27-4e9c-9a17-109daf7c32d9.png deleted file mode 100644 index 3211bde84..000000000 Binary files a/sprites/s_node_alpha_cut/418621ca-5a27-4e9c-9a17-109daf7c32d9.png and /dev/null differ diff --git a/sprites/s_node_alpha_cut/layers/040235ab-d950-4454-9532-db54d5125f81/2e34af23-0d3b-4490-998b-203a92f1fbc9.png b/sprites/s_node_alpha_cut/layers/040235ab-d950-4454-9532-db54d5125f81/2e34af23-0d3b-4490-998b-203a92f1fbc9.png new file mode 100644 index 000000000..9b0e97437 Binary files /dev/null and b/sprites/s_node_alpha_cut/layers/040235ab-d950-4454-9532-db54d5125f81/2e34af23-0d3b-4490-998b-203a92f1fbc9.png differ diff --git a/sprites/s_node_alpha_cut/layers/418621ca-5a27-4e9c-9a17-109daf7c32d9/a2cd1185-7de5-4c55-9a27-63aef79ffbef.png b/sprites/s_node_alpha_cut/layers/418621ca-5a27-4e9c-9a17-109daf7c32d9/a2cd1185-7de5-4c55-9a27-63aef79ffbef.png deleted file mode 100644 index 27d9978d0..000000000 Binary files a/sprites/s_node_alpha_cut/layers/418621ca-5a27-4e9c-9a17-109daf7c32d9/a2cd1185-7de5-4c55-9a27-63aef79ffbef.png and /dev/null 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 1acc05c67..d8a09f6e7 100644 --- a/sprites/s_node_alpha_cut/s_node_alpha_cut.yy +++ b/sprites/s_node_alpha_cut/s_node_alpha_cut.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"418621ca-5a27-4e9c-9a17-109daf7c32d9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"040235ab-d950-4454-9532-db54d5125f81",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fa39a8a6-6093-4dac-8c93-61adf1eafdbf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"418621ca-5a27-4e9c-9a17-109daf7c32d9","path":"sprites/s_node_alpha_cut/s_node_alpha_cut.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"876ffd3e-5ed7-43ce-b95f-03d6a82cef8b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"040235ab-d950-4454-9532-db54d5125f81","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a2cd1185-7de5-4c55-9a27-63aef79ffbef","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2e34af23-0d3b-4490-998b-203a92f1fbc9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_alpha_grey/cd93a0e8-d125-4067-8dcf-992e4c342a77.png b/sprites/s_node_alpha_grey/cd93a0e8-d125-4067-8dcf-992e4c342a77.png new file mode 100644 index 000000000..8e25b156f Binary files /dev/null and b/sprites/s_node_alpha_grey/cd93a0e8-d125-4067-8dcf-992e4c342a77.png differ diff --git a/sprites/s_node_alpha_grey/f80b62fe-fdc5-42c5-a4ad-dd94c23fe703.png b/sprites/s_node_alpha_grey/f80b62fe-fdc5-42c5-a4ad-dd94c23fe703.png deleted file mode 100644 index 5b156d35c..000000000 Binary files a/sprites/s_node_alpha_grey/f80b62fe-fdc5-42c5-a4ad-dd94c23fe703.png and /dev/null differ diff --git a/sprites/s_node_alpha_grey/layers/cd93a0e8-d125-4067-8dcf-992e4c342a77/861dc6ef-29ec-42a5-8687-8182e5dee537.png b/sprites/s_node_alpha_grey/layers/cd93a0e8-d125-4067-8dcf-992e4c342a77/861dc6ef-29ec-42a5-8687-8182e5dee537.png new file mode 100644 index 000000000..8e25b156f Binary files /dev/null and b/sprites/s_node_alpha_grey/layers/cd93a0e8-d125-4067-8dcf-992e4c342a77/861dc6ef-29ec-42a5-8687-8182e5dee537.png differ diff --git a/sprites/s_node_alpha_grey/layers/f80b62fe-fdc5-42c5-a4ad-dd94c23fe703/946683ae-4233-430d-932b-e9b58a677c05.png b/sprites/s_node_alpha_grey/layers/f80b62fe-fdc5-42c5-a4ad-dd94c23fe703/946683ae-4233-430d-932b-e9b58a677c05.png deleted file mode 100644 index 9a46b810b..000000000 Binary files a/sprites/s_node_alpha_grey/layers/f80b62fe-fdc5-42c5-a4ad-dd94c23fe703/946683ae-4233-430d-932b-e9b58a677c05.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 3c87cc8cd..7a4287bf3 100644 --- a/sprites/s_node_alpha_grey/s_node_alpha_grey.yy +++ b/sprites/s_node_alpha_grey/s_node_alpha_grey.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f80b62fe-fdc5-42c5-a4ad-dd94c23fe703",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cd93a0e8-d125-4067-8dcf-992e4c342a77",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5d74adb9-f7e3-4269-b01d-e4e3bcb33f79","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f80b62fe-fdc5-42c5-a4ad-dd94c23fe703","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"02f6b7d8-2a6e-4254-8717-abdf6a02534c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cd93a0e8-d125-4067-8dcf-992e4c342a77","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"946683ae-4233-430d-932b-e9b58a677c05","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"861dc6ef-29ec-42a5-8687-8182e5dee537","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_area/30909c74-b653-45b4-9f04-a7f2b749c68c.png b/sprites/s_node_area/30909c74-b653-45b4-9f04-a7f2b749c68c.png new file mode 100644 index 000000000..5986d086a Binary files /dev/null and b/sprites/s_node_area/30909c74-b653-45b4-9f04-a7f2b749c68c.png differ diff --git a/sprites/s_node_area/e428adaa-d24d-4842-be5b-a446c0f6733f.png b/sprites/s_node_area/e428adaa-d24d-4842-be5b-a446c0f6733f.png deleted file mode 100644 index b6d1a5901..000000000 Binary files a/sprites/s_node_area/e428adaa-d24d-4842-be5b-a446c0f6733f.png and /dev/null differ diff --git a/sprites/s_node_area/layers/30909c74-b653-45b4-9f04-a7f2b749c68c/d7799d68-8ce7-430f-8140-380809d8c162.png b/sprites/s_node_area/layers/30909c74-b653-45b4-9f04-a7f2b749c68c/d7799d68-8ce7-430f-8140-380809d8c162.png new file mode 100644 index 000000000..5986d086a Binary files /dev/null and b/sprites/s_node_area/layers/30909c74-b653-45b4-9f04-a7f2b749c68c/d7799d68-8ce7-430f-8140-380809d8c162.png differ diff --git a/sprites/s_node_area/layers/e428adaa-d24d-4842-be5b-a446c0f6733f/b442103c-992c-4565-8836-c964f2e92f7c.png b/sprites/s_node_area/layers/e428adaa-d24d-4842-be5b-a446c0f6733f/b442103c-992c-4565-8836-c964f2e92f7c.png deleted file mode 100644 index 328faf832..000000000 Binary files a/sprites/s_node_area/layers/e428adaa-d24d-4842-be5b-a446c0f6733f/b442103c-992c-4565-8836-c964f2e92f7c.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 dc3a00521..871b22df2 100644 --- a/sprites/s_node_area/s_node_area.yy +++ b/sprites/s_node_area/s_node_area.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e428adaa-d24d-4842-be5b-a446c0f6733f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"30909c74-b653-45b4-9f04-a7f2b749c68c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"cac8f562-7ea9-4d8c-b220-aae6310a9679","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e428adaa-d24d-4842-be5b-a446c0f6733f","path":"sprites/s_node_area/s_node_area.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5eddf3dc-11da-4fbb-9080-5d6a97592117","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"30909c74-b653-45b4-9f04-a7f2b749c68c","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b442103c-992c-4565-8836-c964f2e92f7c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d7799d68-8ce7-430f-8140-380809d8c162","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_array/2c944e74-0c90-4578-88b9-7e8a618e68e6.png b/sprites/s_node_array/2c944e74-0c90-4578-88b9-7e8a618e68e6.png new file mode 100644 index 000000000..66c9910cc Binary files /dev/null and b/sprites/s_node_array/2c944e74-0c90-4578-88b9-7e8a618e68e6.png differ diff --git a/sprites/s_node_array/92055b76-f6b1-4a0a-af57-1cebeb47264d.png b/sprites/s_node_array/92055b76-f6b1-4a0a-af57-1cebeb47264d.png deleted file mode 100644 index eee798fdf..000000000 Binary files a/sprites/s_node_array/92055b76-f6b1-4a0a-af57-1cebeb47264d.png and /dev/null differ diff --git a/sprites/s_node_array/layers/2c944e74-0c90-4578-88b9-7e8a618e68e6/9633ade6-140f-4e23-80db-0803b6885974.png b/sprites/s_node_array/layers/2c944e74-0c90-4578-88b9-7e8a618e68e6/9633ade6-140f-4e23-80db-0803b6885974.png new file mode 100644 index 000000000..66c9910cc Binary files /dev/null and b/sprites/s_node_array/layers/2c944e74-0c90-4578-88b9-7e8a618e68e6/9633ade6-140f-4e23-80db-0803b6885974.png differ diff --git a/sprites/s_node_array/layers/92055b76-f6b1-4a0a-af57-1cebeb47264d/51f5cd47-b628-44cd-9afa-6769019f59f2.png b/sprites/s_node_array/layers/92055b76-f6b1-4a0a-af57-1cebeb47264d/51f5cd47-b628-44cd-9afa-6769019f59f2.png deleted file mode 100644 index 20dd44add..000000000 Binary files a/sprites/s_node_array/layers/92055b76-f6b1-4a0a-af57-1cebeb47264d/51f5cd47-b628-44cd-9afa-6769019f59f2.png and /dev/null differ diff --git a/sprites/s_node_array/s_node_array.yy b/sprites/s_node_array/s_node_array.yy index 8be50e672..1b5e4d9a8 100644 --- a/sprites/s_node_array/s_node_array.yy +++ b/sprites/s_node_array/s_node_array.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 22, + "bbox_right": 63, + "bbox_top": 18, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"92055b76-f6b1-4a0a-af57-1cebeb47264d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2c944e74-0c90-4578-88b9-7e8a618e68e6",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8051b85d-d471-42d8-a1c9-9645be7c2fb1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"92055b76-f6b1-4a0a-af57-1cebeb47264d","path":"sprites/s_node_array/s_node_array.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"eab82be7-e237-4728-8fc8-902dadff05c6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2c944e74-0c90-4578-88b9-7e8a618e68e6","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"51f5cd47-b628-44cd-9afa-6769019f59f2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9633ade6-140f-4e23-80db-0803b6885974","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_array_get/042f5070-97b7-4820-9159-7efd0e37efd3.png b/sprites/s_node_array_get/042f5070-97b7-4820-9159-7efd0e37efd3.png deleted file mode 100644 index 0905c8651..000000000 Binary files a/sprites/s_node_array_get/042f5070-97b7-4820-9159-7efd0e37efd3.png and /dev/null differ diff --git a/sprites/s_node_array_get/3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd.png b/sprites/s_node_array_get/3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd.png new file mode 100644 index 000000000..986ed9b1b Binary files /dev/null and b/sprites/s_node_array_get/3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd.png differ diff --git a/sprites/s_node_array_get/layers/042f5070-97b7-4820-9159-7efd0e37efd3/8670a590-9e0a-412a-b885-b32b174a30ed.png b/sprites/s_node_array_get/layers/042f5070-97b7-4820-9159-7efd0e37efd3/8670a590-9e0a-412a-b885-b32b174a30ed.png deleted file mode 100644 index bbac563ad..000000000 Binary files a/sprites/s_node_array_get/layers/042f5070-97b7-4820-9159-7efd0e37efd3/8670a590-9e0a-412a-b885-b32b174a30ed.png and /dev/null differ diff --git a/sprites/s_node_array_get/layers/3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd/979936b1-12b1-4871-9b32-643b7a636499.png b/sprites/s_node_array_get/layers/3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd/979936b1-12b1-4871-9b32-643b7a636499.png new file mode 100644 index 000000000..986ed9b1b Binary files /dev/null and b/sprites/s_node_array_get/layers/3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd/979936b1-12b1-4871-9b32-643b7a636499.png differ diff --git a/sprites/s_node_array_get/s_node_array_get.yy b/sprites/s_node_array_get/s_node_array_get.yy index ff9f53355..19876ed5f 100644 --- a/sprites/s_node_array_get/s_node_array_get.yy +++ b/sprites/s_node_array_get/s_node_array_get.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 6, - "bbox_bottom": 25, + "bbox_right": 63, + "bbox_top": 12, + "bbox_bottom": 51, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"042f5070-97b7-4820-9159-7efd0e37efd3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f0a8ad85-ebb2-4c90-973f-11b3920b4722","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"042f5070-97b7-4820-9159-7efd0e37efd3","path":"sprites/s_node_array_get/s_node_array_get.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"24d5d0ae-ef1a-4da9-8e0e-6bc8a7617b2d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3fcc0732-e7ef-4fdb-8688-de9a9f55e9dd","path":"sprites/s_node_array_get/s_node_array_get.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8670a590-9e0a-412a-b885-b32b174a30ed","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"979936b1-12b1-4871-9b32-643b7a636499","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_array_length/2ebbbf1e-efc5-439e-a4f6-26883410c22d.png b/sprites/s_node_array_length/2ebbbf1e-efc5-439e-a4f6-26883410c22d.png new file mode 100644 index 000000000..720939b0f Binary files /dev/null and b/sprites/s_node_array_length/2ebbbf1e-efc5-439e-a4f6-26883410c22d.png differ diff --git a/sprites/s_node_array_length/8d6cb199-924c-48d4-b847-39e312ffce0b.png b/sprites/s_node_array_length/8d6cb199-924c-48d4-b847-39e312ffce0b.png deleted file mode 100644 index d1f811030..000000000 Binary files a/sprites/s_node_array_length/8d6cb199-924c-48d4-b847-39e312ffce0b.png and /dev/null differ diff --git a/sprites/s_node_array_length/layers/2ebbbf1e-efc5-439e-a4f6-26883410c22d/25ab943b-0b48-48c9-b673-1eb5e25f6dac.png b/sprites/s_node_array_length/layers/2ebbbf1e-efc5-439e-a4f6-26883410c22d/25ab943b-0b48-48c9-b673-1eb5e25f6dac.png new file mode 100644 index 000000000..720939b0f Binary files /dev/null and b/sprites/s_node_array_length/layers/2ebbbf1e-efc5-439e-a4f6-26883410c22d/25ab943b-0b48-48c9-b673-1eb5e25f6dac.png differ diff --git a/sprites/s_node_array_length/layers/8d6cb199-924c-48d4-b847-39e312ffce0b/d855adeb-3cf9-4828-ab12-707020914b99.png b/sprites/s_node_array_length/layers/8d6cb199-924c-48d4-b847-39e312ffce0b/d855adeb-3cf9-4828-ab12-707020914b99.png deleted file mode 100644 index 5508aff6c..000000000 Binary files a/sprites/s_node_array_length/layers/8d6cb199-924c-48d4-b847-39e312ffce0b/d855adeb-3cf9-4828-ab12-707020914b99.png and /dev/null 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 c962d919f..147650ced 100644 --- a/sprites/s_node_array_length/s_node_array_length.yy +++ b/sprites/s_node_array_length/s_node_array_length.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 5, - "bbox_bottom": 26, + "bbox_right": 63, + "bbox_top": 10, + "bbox_bottom": 53, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d6cb199-924c-48d4-b847-39e312ffce0b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2ebbbf1e-efc5-439e-a4f6-26883410c22d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a7d12497-9d19-406a-b908-c1743d0aacd8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8d6cb199-924c-48d4-b847-39e312ffce0b","path":"sprites/s_node_array_length/s_node_array_length.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7e291243-299a-4195-a3fd-8094ffb6b9fd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2ebbbf1e-efc5-439e-a4f6-26883410c22d","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d855adeb-3cf9-4828-ab12-707020914b99","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"25ab943b-0b48-48c9-b673-1eb5e25f6dac","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_atlas/b79bce28-2ca2-48d5-be73-451d088aec42.png b/sprites/s_node_atlas/b79bce28-2ca2-48d5-be73-451d088aec42.png deleted file mode 100644 index 9ae9ea9ac..000000000 Binary files a/sprites/s_node_atlas/b79bce28-2ca2-48d5-be73-451d088aec42.png and /dev/null differ diff --git a/sprites/s_node_atlas/f4768c75-fe16-474e-8f46-c6c6c09b67b4.png b/sprites/s_node_atlas/f4768c75-fe16-474e-8f46-c6c6c09b67b4.png new file mode 100644 index 000000000..86b0b9b6c Binary files /dev/null and b/sprites/s_node_atlas/f4768c75-fe16-474e-8f46-c6c6c09b67b4.png differ diff --git a/sprites/s_node_atlas/layers/b79bce28-2ca2-48d5-be73-451d088aec42/cda0f15e-af99-4c8c-b754-45924c75edaf.png b/sprites/s_node_atlas/layers/b79bce28-2ca2-48d5-be73-451d088aec42/cda0f15e-af99-4c8c-b754-45924c75edaf.png deleted file mode 100644 index 1fc183a72..000000000 Binary files a/sprites/s_node_atlas/layers/b79bce28-2ca2-48d5-be73-451d088aec42/cda0f15e-af99-4c8c-b754-45924c75edaf.png and /dev/null differ diff --git a/sprites/s_node_atlas/layers/f4768c75-fe16-474e-8f46-c6c6c09b67b4/73096c53-a38a-47bf-8f8a-4025e22ade33.png b/sprites/s_node_atlas/layers/f4768c75-fe16-474e-8f46-c6c6c09b67b4/73096c53-a38a-47bf-8f8a-4025e22ade33.png new file mode 100644 index 000000000..86b0b9b6c Binary files /dev/null and b/sprites/s_node_atlas/layers/f4768c75-fe16-474e-8f46-c6c6c09b67b4/73096c53-a38a-47bf-8f8a-4025e22ade33.png differ diff --git a/sprites/s_node_atlas/s_node_atlas.yy b/sprites/s_node_atlas/s_node_atlas.yy index c7cf13edc..a39bfa471 100644 --- a/sprites/s_node_atlas/s_node_atlas.yy +++ b/sprites/s_node_atlas/s_node_atlas.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b79bce28-2ca2-48d5-be73-451d088aec42",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f4768c75-fe16-474e-8f46-c6c6c09b67b4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c1c08b82-7ec0-4cf5-9479-fc3882f1a1ed","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b79bce28-2ca2-48d5-be73-451d088aec42","path":"sprites/s_node_atlas/s_node_atlas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3a9d17db-4809-4f35-a44a-5586a70ccb18","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f4768c75-fe16-474e-8f46-c6c6c09b67b4","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cda0f15e-af99-4c8c-b754-45924c75edaf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"73096c53-a38a-47bf-8f8a-4025e22ade33","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_bevel/1c40fa09-d2f8-4297-9281-66a97d080cea.png b/sprites/s_node_bevel/1c40fa09-d2f8-4297-9281-66a97d080cea.png new file mode 100644 index 000000000..a43edb861 Binary files /dev/null and b/sprites/s_node_bevel/1c40fa09-d2f8-4297-9281-66a97d080cea.png differ diff --git a/sprites/s_node_bevel/8b4b0263-ab46-46e7-97c9-4ef191e0ddbb.png b/sprites/s_node_bevel/8b4b0263-ab46-46e7-97c9-4ef191e0ddbb.png deleted file mode 100644 index b7afa42df..000000000 Binary files a/sprites/s_node_bevel/8b4b0263-ab46-46e7-97c9-4ef191e0ddbb.png and /dev/null differ diff --git a/sprites/s_node_bevel/layers/1c40fa09-d2f8-4297-9281-66a97d080cea/cb118761-33a6-49b7-98a4-1cfb80e7ea19.png b/sprites/s_node_bevel/layers/1c40fa09-d2f8-4297-9281-66a97d080cea/cb118761-33a6-49b7-98a4-1cfb80e7ea19.png new file mode 100644 index 000000000..a43edb861 Binary files /dev/null and b/sprites/s_node_bevel/layers/1c40fa09-d2f8-4297-9281-66a97d080cea/cb118761-33a6-49b7-98a4-1cfb80e7ea19.png differ diff --git a/sprites/s_node_bevel/layers/8b4b0263-ab46-46e7-97c9-4ef191e0ddbb/a57e00e8-dfa6-435d-b069-25d7543a3e23.png b/sprites/s_node_bevel/layers/8b4b0263-ab46-46e7-97c9-4ef191e0ddbb/a57e00e8-dfa6-435d-b069-25d7543a3e23.png deleted file mode 100644 index 6e2110cd2..000000000 Binary files a/sprites/s_node_bevel/layers/8b4b0263-ab46-46e7-97c9-4ef191e0ddbb/a57e00e8-dfa6-435d-b069-25d7543a3e23.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 d52c79bcb..df2725e07 100644 --- a/sprites/s_node_bevel/s_node_bevel.yy +++ b/sprites/s_node_bevel/s_node_bevel.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 32, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8b4b0263-ab46-46e7-97c9-4ef191e0ddbb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1c40fa09-d2f8-4297-9281-66a97d080cea",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3ead15c7-f955-4736-9897-97cab7d16707","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8b4b0263-ab46-46e7-97c9-4ef191e0ddbb","path":"sprites/s_node_bevel/s_node_bevel.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"dec7a5bf-86d4-43a2-a9c3-308ff6a61a22","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1c40fa09-d2f8-4297-9281-66a97d080cea","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a57e00e8-dfa6-435d-b069-25d7543a3e23","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb118761-33a6-49b7-98a4-1cfb80e7ea19","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blend/04db2e78-d0b6-483a-a777-cae0e0c3ad04.png b/sprites/s_node_blend/04db2e78-d0b6-483a-a777-cae0e0c3ad04.png deleted file mode 100644 index 329553908..000000000 Binary files a/sprites/s_node_blend/04db2e78-d0b6-483a-a777-cae0e0c3ad04.png and /dev/null differ diff --git a/sprites/s_node_blend/a94150d8-976c-410b-be83-687f9decb097.png b/sprites/s_node_blend/a94150d8-976c-410b-be83-687f9decb097.png new file mode 100644 index 000000000..a83c3b328 Binary files /dev/null and b/sprites/s_node_blend/a94150d8-976c-410b-be83-687f9decb097.png differ diff --git a/sprites/s_node_blend/layers/04db2e78-d0b6-483a-a777-cae0e0c3ad04/d2b545af-966b-4955-ba69-22ecb1203081.png b/sprites/s_node_blend/layers/04db2e78-d0b6-483a-a777-cae0e0c3ad04/d2b545af-966b-4955-ba69-22ecb1203081.png deleted file mode 100644 index 6f23860e6..000000000 Binary files a/sprites/s_node_blend/layers/04db2e78-d0b6-483a-a777-cae0e0c3ad04/d2b545af-966b-4955-ba69-22ecb1203081.png and /dev/null differ diff --git a/sprites/s_node_blend/layers/a94150d8-976c-410b-be83-687f9decb097/fb86308d-81ef-42b3-a8f6-a11fa897eafc.png b/sprites/s_node_blend/layers/a94150d8-976c-410b-be83-687f9decb097/fb86308d-81ef-42b3-a8f6-a11fa897eafc.png new file mode 100644 index 000000000..a83c3b328 Binary files /dev/null and b/sprites/s_node_blend/layers/a94150d8-976c-410b-be83-687f9decb097/fb86308d-81ef-42b3-a8f6-a11fa897eafc.png differ diff --git a/sprites/s_node_blend/s_node_blend.yy b/sprites/s_node_blend/s_node_blend.yy index dd938a077..5e07bf2ea 100644 --- a/sprites/s_node_blend/s_node_blend.yy +++ b/sprites/s_node_blend/s_node_blend.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"04db2e78-d0b6-483a-a777-cae0e0c3ad04",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a94150d8-976c-410b-be83-687f9decb097",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"42cf90c4-e1df-4d9b-ae89-89ce95605f60","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"04db2e78-d0b6-483a-a777-cae0e0c3ad04","path":"sprites/s_node_blend/s_node_blend.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"80d6f74b-4cf6-46ed-b362-998288d97192","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a94150d8-976c-410b-be83-687f9decb097","path":"sprites/s_node_blend/s_node_blend.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d2b545af-966b-4955-ba69-22ecb1203081","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fb86308d-81ef-42b3-a8f6-a11fa897eafc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_bloom/24016986-96ce-4a1b-a3be-32e7d5b83f31.png b/sprites/s_node_bloom/24016986-96ce-4a1b-a3be-32e7d5b83f31.png deleted file mode 100644 index c7aeb42bf..000000000 Binary files a/sprites/s_node_bloom/24016986-96ce-4a1b-a3be-32e7d5b83f31.png and /dev/null differ diff --git a/sprites/s_node_bloom/3ae9844b-3198-47dd-a06f-6c9ba729c9f4.png b/sprites/s_node_bloom/3ae9844b-3198-47dd-a06f-6c9ba729c9f4.png new file mode 100644 index 000000000..86a96f1f8 Binary files /dev/null and b/sprites/s_node_bloom/3ae9844b-3198-47dd-a06f-6c9ba729c9f4.png differ diff --git a/sprites/s_node_bloom/layers/24016986-96ce-4a1b-a3be-32e7d5b83f31/f5283ffc-b77b-4a1c-a8cd-d9bbfc3e662b.png b/sprites/s_node_bloom/layers/24016986-96ce-4a1b-a3be-32e7d5b83f31/f5283ffc-b77b-4a1c-a8cd-d9bbfc3e662b.png deleted file mode 100644 index 19118c96f..000000000 Binary files a/sprites/s_node_bloom/layers/24016986-96ce-4a1b-a3be-32e7d5b83f31/f5283ffc-b77b-4a1c-a8cd-d9bbfc3e662b.png and /dev/null differ diff --git a/sprites/s_node_bloom/layers/3ae9844b-3198-47dd-a06f-6c9ba729c9f4/f84ded99-08ae-46a3-be55-d43e642c0701.png b/sprites/s_node_bloom/layers/3ae9844b-3198-47dd-a06f-6c9ba729c9f4/f84ded99-08ae-46a3-be55-d43e642c0701.png new file mode 100644 index 000000000..86a96f1f8 Binary files /dev/null and b/sprites/s_node_bloom/layers/3ae9844b-3198-47dd-a06f-6c9ba729c9f4/f84ded99-08ae-46a3-be55-d43e642c0701.png differ diff --git a/sprites/s_node_bloom/s_node_bloom.yy b/sprites/s_node_bloom/s_node_bloom.yy index 13cd6b2aa..9908f8de4 100644 --- a/sprites/s_node_bloom/s_node_bloom.yy +++ b/sprites/s_node_bloom/s_node_bloom.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"24016986-96ce-4a1b-a3be-32e7d5b83f31",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3ae9844b-3198-47dd-a06f-6c9ba729c9f4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c5ffee38-e465-44b9-bcfa-17cb5291cc94","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"24016986-96ce-4a1b-a3be-32e7d5b83f31","path":"sprites/s_node_bloom/s_node_bloom.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"677e7167-2780-450f-a16f-8c5d23313b22","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3ae9844b-3198-47dd-a06f-6c9ba729c9f4","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f5283ffc-b77b-4a1c-a8cd-d9bbfc3e662b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f84ded99-08ae-46a3-be55-d43e642c0701","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blur/41201093-8bac-4497-9920-55d73a0ce05c.png b/sprites/s_node_blur/41201093-8bac-4497-9920-55d73a0ce05c.png deleted file mode 100644 index d908254cb..000000000 Binary files a/sprites/s_node_blur/41201093-8bac-4497-9920-55d73a0ce05c.png and /dev/null differ diff --git a/sprites/s_node_blur/87594811-a41a-416b-af72-365297c3f345.png b/sprites/s_node_blur/87594811-a41a-416b-af72-365297c3f345.png new file mode 100644 index 000000000..7634b048a Binary files /dev/null and b/sprites/s_node_blur/87594811-a41a-416b-af72-365297c3f345.png differ diff --git a/sprites/s_node_blur/layers/41201093-8bac-4497-9920-55d73a0ce05c/e0bc2238-8f22-4f82-9f73-7aa2688ff1d0.png b/sprites/s_node_blur/layers/41201093-8bac-4497-9920-55d73a0ce05c/e0bc2238-8f22-4f82-9f73-7aa2688ff1d0.png deleted file mode 100644 index 0c1cbe22e..000000000 Binary files a/sprites/s_node_blur/layers/41201093-8bac-4497-9920-55d73a0ce05c/e0bc2238-8f22-4f82-9f73-7aa2688ff1d0.png and /dev/null differ diff --git a/sprites/s_node_blur/layers/87594811-a41a-416b-af72-365297c3f345/d68b759c-af47-43e6-a1de-a7fdc5fc7c43.png b/sprites/s_node_blur/layers/87594811-a41a-416b-af72-365297c3f345/d68b759c-af47-43e6-a1de-a7fdc5fc7c43.png new file mode 100644 index 000000000..7634b048a Binary files /dev/null and b/sprites/s_node_blur/layers/87594811-a41a-416b-af72-365297c3f345/d68b759c-af47-43e6-a1de-a7fdc5fc7c43.png differ diff --git a/sprites/s_node_blur/s_node_blur.yy b/sprites/s_node_blur/s_node_blur.yy index 3542f867d..268259c7b 100644 --- a/sprites/s_node_blur/s_node_blur.yy +++ b/sprites/s_node_blur/s_node_blur.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"41201093-8bac-4497-9920-55d73a0ce05c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87594811-a41a-416b-af72-365297c3f345",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7228d1c5-d2eb-4846-9f54-70b6ae22d3f4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"41201093-8bac-4497-9920-55d73a0ce05c","path":"sprites/s_node_blur/s_node_blur.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f4b912fc-e0e0-4b24-8532-fe5ac3c5f88b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"87594811-a41a-416b-af72-365297c3f345","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e0bc2238-8f22-4f82-9f73-7aa2688ff1d0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d68b759c-af47-43e6-a1de-a7fdc5fc7c43","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blur_contrast/03dc0b37-147c-4319-9c0c-197faf30b0c9.png b/sprites/s_node_blur_contrast/03dc0b37-147c-4319-9c0c-197faf30b0c9.png deleted file mode 100644 index e7bf71533..000000000 Binary files a/sprites/s_node_blur_contrast/03dc0b37-147c-4319-9c0c-197faf30b0c9.png and /dev/null differ diff --git a/sprites/s_node_blur_contrast/d04de192-6228-44b9-b6bd-104670db50c2.png b/sprites/s_node_blur_contrast/d04de192-6228-44b9-b6bd-104670db50c2.png new file mode 100644 index 000000000..b7513c7eb Binary files /dev/null and b/sprites/s_node_blur_contrast/d04de192-6228-44b9-b6bd-104670db50c2.png differ diff --git a/sprites/s_node_blur_contrast/layers/03dc0b37-147c-4319-9c0c-197faf30b0c9/fdf980fc-4823-4f3d-939d-910a415cb9f7.png b/sprites/s_node_blur_contrast/layers/03dc0b37-147c-4319-9c0c-197faf30b0c9/fdf980fc-4823-4f3d-939d-910a415cb9f7.png deleted file mode 100644 index 91d87fcb9..000000000 Binary files a/sprites/s_node_blur_contrast/layers/03dc0b37-147c-4319-9c0c-197faf30b0c9/fdf980fc-4823-4f3d-939d-910a415cb9f7.png and /dev/null differ diff --git a/sprites/s_node_blur_contrast/layers/d04de192-6228-44b9-b6bd-104670db50c2/eeeab64e-74f6-4f70-a10e-84f217bdcc1c.png b/sprites/s_node_blur_contrast/layers/d04de192-6228-44b9-b6bd-104670db50c2/eeeab64e-74f6-4f70-a10e-84f217bdcc1c.png new file mode 100644 index 000000000..b7513c7eb Binary files /dev/null and b/sprites/s_node_blur_contrast/layers/d04de192-6228-44b9-b6bd-104670db50c2/eeeab64e-74f6-4f70-a10e-84f217bdcc1c.png 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 40e93196d..ab841085b 100644 --- a/sprites/s_node_blur_contrast/s_node_blur_contrast.yy +++ b/sprites/s_node_blur_contrast/s_node_blur_contrast.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"03dc0b37-147c-4319-9c0c-197faf30b0c9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d04de192-6228-44b9-b6bd-104670db50c2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e713ee40-cdf8-4551-9aff-d2a5a9524f3c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"03dc0b37-147c-4319-9c0c-197faf30b0c9","path":"sprites/s_node_blur_contrast/s_node_blur_contrast.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7d2e1bc0-40ed-4f57-95ec-4370a4779d40","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d04de192-6228-44b9-b6bd-104670db50c2","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fdf980fc-4823-4f3d-939d-910a415cb9f7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"eeeab64e-74f6-4f70-a10e-84f217bdcc1c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_blur_directional/244931ae-8011-4838-9241-7a1221bbeb93.png b/sprites/s_node_blur_directional/244931ae-8011-4838-9241-7a1221bbeb93.png deleted file mode 100644 index 01daa7f87..000000000 Binary files a/sprites/s_node_blur_directional/244931ae-8011-4838-9241-7a1221bbeb93.png and /dev/null differ diff --git a/sprites/s_node_blur_directional/24555265-4cc9-465a-969d-69c085d90aa7.png b/sprites/s_node_blur_directional/24555265-4cc9-465a-969d-69c085d90aa7.png new file mode 100644 index 000000000..04f42a049 Binary files /dev/null and b/sprites/s_node_blur_directional/24555265-4cc9-465a-969d-69c085d90aa7.png differ diff --git a/sprites/s_node_blur_directional/layers/244931ae-8011-4838-9241-7a1221bbeb93/befbd0fd-fe8d-45e1-8cac-a2a9d85e2abe.png b/sprites/s_node_blur_directional/layers/244931ae-8011-4838-9241-7a1221bbeb93/befbd0fd-fe8d-45e1-8cac-a2a9d85e2abe.png deleted file mode 100644 index d1ff62d7f..000000000 Binary files a/sprites/s_node_blur_directional/layers/244931ae-8011-4838-9241-7a1221bbeb93/befbd0fd-fe8d-45e1-8cac-a2a9d85e2abe.png and /dev/null differ diff --git a/sprites/s_node_blur_directional/layers/24555265-4cc9-465a-969d-69c085d90aa7/81d81d7d-fbb3-4cfa-a060-b0502ba57df1.png b/sprites/s_node_blur_directional/layers/24555265-4cc9-465a-969d-69c085d90aa7/81d81d7d-fbb3-4cfa-a060-b0502ba57df1.png new file mode 100644 index 000000000..04f42a049 Binary files /dev/null and b/sprites/s_node_blur_directional/layers/24555265-4cc9-465a-969d-69c085d90aa7/81d81d7d-fbb3-4cfa-a060-b0502ba57df1.png differ 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 0d8a52b22..2abb31790 100644 --- a/sprites/s_node_blur_directional/s_node_blur_directional.yy +++ b/sprites/s_node_blur_directional/s_node_blur_directional.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 1, - "bbox_right": 31, - "bbox_top": 6, - "bbox_bottom": 25, + "bbox_right": 63, + "bbox_top": 12, + "bbox_bottom": 51, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"244931ae-8011-4838-9241-7a1221bbeb93",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"24555265-4cc9-465a-969d-69c085d90aa7",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"07590ca8-7b7e-4224-a10b-8e67044b82fe","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"244931ae-8011-4838-9241-7a1221bbeb93","path":"sprites/s_node_blur_directional/s_node_blur_directional.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4509b399-e170-4be1-84d2-b4ee1f7543dd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"24555265-4cc9-465a-969d-69c085d90aa7","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,"modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"befbd0fd-fe8d-45e1-8cac-a2a9d85e2abe","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"81d81d7d-fbb3-4cfa-a060-b0502ba57df1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_border/7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed.png b/sprites/s_node_border/7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed.png deleted file mode 100644 index d4b0ca818..000000000 Binary files a/sprites/s_node_border/7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed.png and /dev/null differ diff --git a/sprites/s_node_border/8649c726-cb02-4c09-8f08-2f5b2f9873dd.png b/sprites/s_node_border/8649c726-cb02-4c09-8f08-2f5b2f9873dd.png new file mode 100644 index 000000000..8d9aac5c0 Binary files /dev/null and b/sprites/s_node_border/8649c726-cb02-4c09-8f08-2f5b2f9873dd.png differ diff --git a/sprites/s_node_border/layers/7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed/4ad7473f-781d-48ae-9e18-6cf20d8d5e7c.png b/sprites/s_node_border/layers/7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed/4ad7473f-781d-48ae-9e18-6cf20d8d5e7c.png deleted file mode 100644 index e412e5ff4..000000000 Binary files a/sprites/s_node_border/layers/7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed/4ad7473f-781d-48ae-9e18-6cf20d8d5e7c.png and /dev/null differ diff --git a/sprites/s_node_border/layers/8649c726-cb02-4c09-8f08-2f5b2f9873dd/f29b1e07-3681-4c02-8edb-b43608875f05.png b/sprites/s_node_border/layers/8649c726-cb02-4c09-8f08-2f5b2f9873dd/f29b1e07-3681-4c02-8edb-b43608875f05.png new file mode 100644 index 000000000..8d9aac5c0 Binary files /dev/null and b/sprites/s_node_border/layers/8649c726-cb02-4c09-8f08-2f5b2f9873dd/f29b1e07-3681-4c02-8edb-b43608875f05.png differ diff --git a/sprites/s_node_border/s_node_border.yy b/sprites/s_node_border/s_node_border.yy index b446af7c7..1de644550 100644 --- a/sprites/s_node_border/s_node_border.yy +++ b/sprites/s_node_border/s_node_border.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8649c726-cb02-4c09-8f08-2f5b2f9873dd",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"dd61a731-8ff4-4e7d-8d50-f8bec194cba5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7e5b0f3a-4a48-478a-b8d5-d1e3a0d6e0ed","path":"sprites/s_node_border/s_node_border.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"51ae86e5-ba6f-4f87-bdfd-cbc3c1fe96e9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8649c726-cb02-4c09-8f08-2f5b2f9873dd","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4ad7473f-781d-48ae-9e18-6cf20d8d5e7c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f29b1e07-3681-4c02-8edb-b43608875f05","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_canvas/573dea60-14a3-40e2-ab32-11efc45f7adf.png b/sprites/s_node_canvas/573dea60-14a3-40e2-ab32-11efc45f7adf.png new file mode 100644 index 000000000..5cf518cd7 Binary files /dev/null and b/sprites/s_node_canvas/573dea60-14a3-40e2-ab32-11efc45f7adf.png differ diff --git a/sprites/s_node_canvas/8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20.png b/sprites/s_node_canvas/8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20.png deleted file mode 100644 index bdcbe1a6e..000000000 Binary files a/sprites/s_node_canvas/8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20.png and /dev/null differ diff --git a/sprites/s_node_canvas/layers/573dea60-14a3-40e2-ab32-11efc45f7adf/0830b400-4830-45b9-b948-fe222ad25d88.png b/sprites/s_node_canvas/layers/573dea60-14a3-40e2-ab32-11efc45f7adf/0830b400-4830-45b9-b948-fe222ad25d88.png new file mode 100644 index 000000000..5cf518cd7 Binary files /dev/null and b/sprites/s_node_canvas/layers/573dea60-14a3-40e2-ab32-11efc45f7adf/0830b400-4830-45b9-b948-fe222ad25d88.png differ diff --git a/sprites/s_node_canvas/layers/8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20/dd19ddbe-ef1f-4b9a-bc2b-7296c3d49645.png b/sprites/s_node_canvas/layers/8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20/dd19ddbe-ef1f-4b9a-bc2b-7296c3d49645.png deleted file mode 100644 index 00141690f..000000000 Binary files a/sprites/s_node_canvas/layers/8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20/dd19ddbe-ef1f-4b9a-bc2b-7296c3d49645.png and /dev/null differ diff --git a/sprites/s_node_canvas/s_node_canvas.yy b/sprites/s_node_canvas/s_node_canvas.yy index fed16fde1..9254f9dd9 100644 --- a/sprites/s_node_canvas/s_node_canvas.yy +++ b/sprites/s_node_canvas/s_node_canvas.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"573dea60-14a3-40e2-ab32-11efc45f7adf",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6733bed8-906e-4d5f-a5c8-77d08766d207","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8c0f769f-e824-4b3e-8c7c-bedb8a7e1e20","path":"sprites/s_node_canvas/s_node_canvas.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"993376ac-202c-4b2b-91f8-8384aaab5960","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"573dea60-14a3-40e2-ab32-11efc45f7adf","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd19ddbe-ef1f-4b9a-bc2b-7296c3d49645","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0830b400-4830-45b9-b948-fe222ad25d88","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_character/99d50204-8ed2-4b23-9d05-2d0c4041b38e.png b/sprites/s_node_character/99d50204-8ed2-4b23-9d05-2d0c4041b38e.png deleted file mode 100644 index 7c3b4534c..000000000 Binary files a/sprites/s_node_character/99d50204-8ed2-4b23-9d05-2d0c4041b38e.png and /dev/null differ diff --git a/sprites/s_node_character/fe3681d7-2044-41e6-91cb-5d80e4c58d1a.png b/sprites/s_node_character/fe3681d7-2044-41e6-91cb-5d80e4c58d1a.png new file mode 100644 index 000000000..2f4e7707c Binary files /dev/null and b/sprites/s_node_character/fe3681d7-2044-41e6-91cb-5d80e4c58d1a.png differ diff --git a/sprites/s_node_character/layers/99d50204-8ed2-4b23-9d05-2d0c4041b38e/87ddc744-bcde-4d92-bde6-035c10dbb107.png b/sprites/s_node_character/layers/99d50204-8ed2-4b23-9d05-2d0c4041b38e/87ddc744-bcde-4d92-bde6-035c10dbb107.png deleted file mode 100644 index 70ac121af..000000000 Binary files a/sprites/s_node_character/layers/99d50204-8ed2-4b23-9d05-2d0c4041b38e/87ddc744-bcde-4d92-bde6-035c10dbb107.png and /dev/null differ diff --git a/sprites/s_node_character/layers/fe3681d7-2044-41e6-91cb-5d80e4c58d1a/6e4b16bf-196a-4d23-b4b6-d9b030f983b5.png b/sprites/s_node_character/layers/fe3681d7-2044-41e6-91cb-5d80e4c58d1a/6e4b16bf-196a-4d23-b4b6-d9b030f983b5.png new file mode 100644 index 000000000..2f4e7707c Binary files /dev/null and b/sprites/s_node_character/layers/fe3681d7-2044-41e6-91cb-5d80e4c58d1a/6e4b16bf-196a-4d23-b4b6-d9b030f983b5.png differ diff --git a/sprites/s_node_character/s_node_character.yy b/sprites/s_node_character/s_node_character.yy index 007fe6d77..1b8766802 100644 --- a/sprites/s_node_character/s_node_character.yy +++ b/sprites/s_node_character/s_node_character.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 9, - "bbox_bottom": 22, + "bbox_left": 7, + "bbox_right": 57, + "bbox_top": 19, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"99d50204-8ed2-4b23-9d05-2d0c4041b38e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fe3681d7-2044-41e6-91cb-5d80e4c58d1a",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5f9592ec-a57d-4963-9465-643f386ccff0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99d50204-8ed2-4b23-9d05-2d0c4041b38e","path":"sprites/s_node_character/s_node_character.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"435f7821-cb7d-49c4-93e6-1c0ed3fa3cd4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fe3681d7-2044-41e6-91cb-5d80e4c58d1a","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"87ddc744-bcde-4d92-bde6-035c10dbb107","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6e4b16bf-196a-4d23-b4b6-d9b030f983b5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_checker/6c60a04e-ceb2-4f7e-addd-92695b7be6d9.png b/sprites/s_node_checker/6c60a04e-ceb2-4f7e-addd-92695b7be6d9.png new file mode 100644 index 000000000..89ba9793c Binary files /dev/null and b/sprites/s_node_checker/6c60a04e-ceb2-4f7e-addd-92695b7be6d9.png differ diff --git a/sprites/s_node_checker/d2570eac-dbd8-4758-8570-0c0c863ec115.png b/sprites/s_node_checker/d2570eac-dbd8-4758-8570-0c0c863ec115.png deleted file mode 100644 index 8ed3f9b39..000000000 Binary files a/sprites/s_node_checker/d2570eac-dbd8-4758-8570-0c0c863ec115.png and /dev/null differ diff --git a/sprites/s_node_checker/layers/6c60a04e-ceb2-4f7e-addd-92695b7be6d9/3ac24081-80df-4e00-9afd-9dfd0f0f78d3.png b/sprites/s_node_checker/layers/6c60a04e-ceb2-4f7e-addd-92695b7be6d9/3ac24081-80df-4e00-9afd-9dfd0f0f78d3.png new file mode 100644 index 000000000..89ba9793c Binary files /dev/null and b/sprites/s_node_checker/layers/6c60a04e-ceb2-4f7e-addd-92695b7be6d9/3ac24081-80df-4e00-9afd-9dfd0f0f78d3.png differ diff --git a/sprites/s_node_checker/layers/d2570eac-dbd8-4758-8570-0c0c863ec115/872466f7-ca21-4214-9071-191532f0d382.png b/sprites/s_node_checker/layers/d2570eac-dbd8-4758-8570-0c0c863ec115/872466f7-ca21-4214-9071-191532f0d382.png deleted file mode 100644 index abd2bd9cd..000000000 Binary files a/sprites/s_node_checker/layers/d2570eac-dbd8-4758-8570-0c0c863ec115/872466f7-ca21-4214-9071-191532f0d382.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 881bf6214..447b2864e 100644 --- a/sprites/s_node_checker/s_node_checker.yy +++ b/sprites/s_node_checker/s_node_checker.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2570eac-dbd8-4758-8570-0c0c863ec115",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6c60a04e-ceb2-4f7e-addd-92695b7be6d9",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8a11ca78-7fd3-46cd-afc4-23545be2ad23","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d2570eac-dbd8-4758-8570-0c0c863ec115","path":"sprites/s_node_checker/s_node_checker.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1255133a-e1d2-4ecd-90fc-6115fd375510","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6c60a04e-ceb2-4f7e-addd-92695b7be6d9","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"872466f7-ca21-4214-9071-191532f0d382","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3ac24081-80df-4e00-9afd-9dfd0f0f78d3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_chromatic_abarration/0544c990-a138-4a61-a742-3c249ab9977b.png b/sprites/s_node_chromatic_abarration/0544c990-a138-4a61-a742-3c249ab9977b.png deleted file mode 100644 index ede1e0b33..000000000 Binary files a/sprites/s_node_chromatic_abarration/0544c990-a138-4a61-a742-3c249ab9977b.png and /dev/null differ diff --git a/sprites/s_node_chromatic_abarration/1e7df46e-3d34-44b1-9d4e-4df7e645e62f.png b/sprites/s_node_chromatic_abarration/1e7df46e-3d34-44b1-9d4e-4df7e645e62f.png new file mode 100644 index 000000000..b47659e72 Binary files /dev/null and b/sprites/s_node_chromatic_abarration/1e7df46e-3d34-44b1-9d4e-4df7e645e62f.png differ diff --git a/sprites/s_node_chromatic_abarration/layers/0544c990-a138-4a61-a742-3c249ab9977b/e204a4ed-3887-44fe-ae83-703ea92e1f8f.png b/sprites/s_node_chromatic_abarration/layers/0544c990-a138-4a61-a742-3c249ab9977b/e204a4ed-3887-44fe-ae83-703ea92e1f8f.png deleted file mode 100644 index ede1e0b33..000000000 Binary files a/sprites/s_node_chromatic_abarration/layers/0544c990-a138-4a61-a742-3c249ab9977b/e204a4ed-3887-44fe-ae83-703ea92e1f8f.png and /dev/null differ diff --git a/sprites/s_node_chromatic_abarration/layers/1e7df46e-3d34-44b1-9d4e-4df7e645e62f/8f34a12c-f458-4bd5-8ed1-6deb98989bb0.png b/sprites/s_node_chromatic_abarration/layers/1e7df46e-3d34-44b1-9d4e-4df7e645e62f/8f34a12c-f458-4bd5-8ed1-6deb98989bb0.png new file mode 100644 index 000000000..b47659e72 Binary files /dev/null and b/sprites/s_node_chromatic_abarration/layers/1e7df46e-3d34-44b1-9d4e-4df7e645e62f/8f34a12c-f458-4bd5-8ed1-6deb98989bb0.png differ diff --git a/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy b/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy index 46c8f232a..1335ef3f0 100644 --- a/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy +++ b/sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 29, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 6, + "bbox_right": 59, + "bbox_top": 6, + "bbox_bottom": 57, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0544c990-a138-4a61-a742-3c249ab9977b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1e7df46e-3d34-44b1-9d4e-4df7e645e62f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3389ecfe-6bb1-40cd-9b00-b87fe1a36ffc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0544c990-a138-4a61-a742-3c249ab9977b","path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"80fc3a78-beb3-4f46-bd45-6076acd8b94a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1e7df46e-3d34-44b1-9d4e-4df7e645e62f","path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e204a4ed-3887-44fe-ae83-703ea92e1f8f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8f34a12c-f458-4bd5-8ed1-6deb98989bb0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color/09c5661d-8141-489c-80a5-84b49dc0210f.png b/sprites/s_node_color/09c5661d-8141-489c-80a5-84b49dc0210f.png new file mode 100644 index 000000000..7c296044c Binary files /dev/null and b/sprites/s_node_color/09c5661d-8141-489c-80a5-84b49dc0210f.png differ diff --git a/sprites/s_node_color/d518fc60-c3c3-40f6-a764-ff515aa32c37.png b/sprites/s_node_color/d518fc60-c3c3-40f6-a764-ff515aa32c37.png deleted file mode 100644 index de52fb333..000000000 Binary files a/sprites/s_node_color/d518fc60-c3c3-40f6-a764-ff515aa32c37.png and /dev/null differ diff --git a/sprites/s_node_color/layers/09c5661d-8141-489c-80a5-84b49dc0210f/fa18ed19-acb9-439e-9000-3b7d48ca4fe0.png b/sprites/s_node_color/layers/09c5661d-8141-489c-80a5-84b49dc0210f/fa18ed19-acb9-439e-9000-3b7d48ca4fe0.png new file mode 100644 index 000000000..7c296044c Binary files /dev/null and b/sprites/s_node_color/layers/09c5661d-8141-489c-80a5-84b49dc0210f/fa18ed19-acb9-439e-9000-3b7d48ca4fe0.png differ diff --git a/sprites/s_node_color/layers/d518fc60-c3c3-40f6-a764-ff515aa32c37/9c6ebc18-9c2c-4a28-bae5-e8939ef94084.png b/sprites/s_node_color/layers/d518fc60-c3c3-40f6-a764-ff515aa32c37/9c6ebc18-9c2c-4a28-bae5-e8939ef94084.png deleted file mode 100644 index c25234cec..000000000 Binary files a/sprites/s_node_color/layers/d518fc60-c3c3-40f6-a764-ff515aa32c37/9c6ebc18-9c2c-4a28-bae5-e8939ef94084.png and /dev/null differ diff --git a/sprites/s_node_color/s_node_color.yy b/sprites/s_node_color/s_node_color.yy index fb94c3111..1b8d50e38 100644 --- a/sprites/s_node_color/s_node_color.yy +++ b/sprites/s_node_color/s_node_color.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 23, + "bbox_right": 63, + "bbox_top": 18, + "bbox_bottom": 47, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d518fc60-c3c3-40f6-a764-ff515aa32c37",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09c5661d-8141-489c-80a5-84b49dc0210f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"29c2e129-7965-40a3-a3e4-f110cb331bbe","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d518fc60-c3c3-40f6-a764-ff515aa32c37","path":"sprites/s_node_color/s_node_color.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4da7fb01-7a2e-4fc5-bf6c-661abff2713a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"09c5661d-8141-489c-80a5-84b49dc0210f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9c6ebc18-9c2c-4a28-bae5-e8939ef94084","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fa18ed19-acb9-439e-9000-3b7d48ca4fe0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_adjust/129d4de5-2590-4255-99ae-84daf34c6361.png b/sprites/s_node_color_adjust/129d4de5-2590-4255-99ae-84daf34c6361.png new file mode 100644 index 000000000..f3392d50f Binary files /dev/null and b/sprites/s_node_color_adjust/129d4de5-2590-4255-99ae-84daf34c6361.png differ diff --git a/sprites/s_node_color_adjust/16c7b1e7-d423-4dee-946b-ef46c5727b37.png b/sprites/s_node_color_adjust/16c7b1e7-d423-4dee-946b-ef46c5727b37.png deleted file mode 100644 index 06137744e..000000000 Binary files a/sprites/s_node_color_adjust/16c7b1e7-d423-4dee-946b-ef46c5727b37.png and /dev/null differ diff --git a/sprites/s_node_color_adjust/layers/129d4de5-2590-4255-99ae-84daf34c6361/3f4d8934-1767-438e-a313-661fe30f7794.png b/sprites/s_node_color_adjust/layers/129d4de5-2590-4255-99ae-84daf34c6361/3f4d8934-1767-438e-a313-661fe30f7794.png new file mode 100644 index 000000000..f3392d50f Binary files /dev/null and b/sprites/s_node_color_adjust/layers/129d4de5-2590-4255-99ae-84daf34c6361/3f4d8934-1767-438e-a313-661fe30f7794.png differ diff --git a/sprites/s_node_color_adjust/layers/16c7b1e7-d423-4dee-946b-ef46c5727b37/ec0b328f-98ce-4875-935b-46d4ce363ebe.png b/sprites/s_node_color_adjust/layers/16c7b1e7-d423-4dee-946b-ef46c5727b37/ec0b328f-98ce-4875-935b-46d4ce363ebe.png deleted file mode 100644 index 62816d7b2..000000000 Binary files a/sprites/s_node_color_adjust/layers/16c7b1e7-d423-4dee-946b-ef46c5727b37/ec0b328f-98ce-4875-935b-46d4ce363ebe.png and /dev/null 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 3ec4a40f1..3d5be15d6 100644 --- a/sprites/s_node_color_adjust/s_node_color_adjust.yy +++ b/sprites/s_node_color_adjust/s_node_color_adjust.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"16c7b1e7-d423-4dee-946b-ef46c5727b37",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"129d4de5-2590-4255-99ae-84daf34c6361",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3732f117-e804-4800-8670-315da3b0acb1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"16c7b1e7-d423-4dee-946b-ef46c5727b37","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"520547d2-2e3f-4738-85a3-07cf93e45735","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"129d4de5-2590-4255-99ae-84daf34c6361","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ec0b328f-98ce-4875-935b-46d4ce363ebe","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3f4d8934-1767-438e-a313-661fe30f7794","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_data/2726b948-e8a1-46f9-b1c1-bcc721cc739a.png b/sprites/s_node_color_data/2726b948-e8a1-46f9-b1c1-bcc721cc739a.png deleted file mode 100644 index e79eddb91..000000000 Binary files a/sprites/s_node_color_data/2726b948-e8a1-46f9-b1c1-bcc721cc739a.png and /dev/null differ diff --git a/sprites/s_node_color_data/7efde473-a4d0-42c1-b6cc-0dd0132fdd5c.png b/sprites/s_node_color_data/7efde473-a4d0-42c1-b6cc-0dd0132fdd5c.png new file mode 100644 index 000000000..7962e867a Binary files /dev/null and b/sprites/s_node_color_data/7efde473-a4d0-42c1-b6cc-0dd0132fdd5c.png differ diff --git a/sprites/s_node_color_data/layers/2726b948-e8a1-46f9-b1c1-bcc721cc739a/28c390ae-4706-4462-8eeb-93e40b6a7463.png b/sprites/s_node_color_data/layers/2726b948-e8a1-46f9-b1c1-bcc721cc739a/28c390ae-4706-4462-8eeb-93e40b6a7463.png deleted file mode 100644 index ea9b6f669..000000000 Binary files a/sprites/s_node_color_data/layers/2726b948-e8a1-46f9-b1c1-bcc721cc739a/28c390ae-4706-4462-8eeb-93e40b6a7463.png and /dev/null differ diff --git a/sprites/s_node_color_data/layers/7efde473-a4d0-42c1-b6cc-0dd0132fdd5c/71fe648f-342f-4c98-92b2-91d8fcd8017a.png b/sprites/s_node_color_data/layers/7efde473-a4d0-42c1-b6cc-0dd0132fdd5c/71fe648f-342f-4c98-92b2-91d8fcd8017a.png new file mode 100644 index 000000000..7962e867a Binary files /dev/null and b/sprites/s_node_color_data/layers/7efde473-a4d0-42c1-b6cc-0dd0132fdd5c/71fe648f-342f-4c98-92b2-91d8fcd8017a.png 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 72bd5f3fb..405ce151d 100644 --- a/sprites/s_node_color_data/s_node_color_data.yy +++ b/sprites/s_node_color_data/s_node_color_data.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2726b948-e8a1-46f9-b1c1-bcc721cc739a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7efde473-a4d0-42c1-b6cc-0dd0132fdd5c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"465077ce-5626-4dd7-8511-f095afb2b376","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2726b948-e8a1-46f9-b1c1-bcc721cc739a","path":"sprites/s_node_color_data/s_node_color_data.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3ce2a3cd-dc5a-45c1-b6fa-673163aa5a73","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7efde473-a4d0-42c1-b6cc-0dd0132fdd5c","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"28c390ae-4706-4462-8eeb-93e40b6a7463","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"71fe648f-342f-4c98-92b2-91d8fcd8017a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_from_hsv/0187ba9d-1262-4c6b-bc78-1ea6478d2d04.png b/sprites/s_node_color_from_hsv/0187ba9d-1262-4c6b-bc78-1ea6478d2d04.png deleted file mode 100644 index af20d573f..000000000 Binary files a/sprites/s_node_color_from_hsv/0187ba9d-1262-4c6b-bc78-1ea6478d2d04.png and /dev/null differ diff --git a/sprites/s_node_color_from_hsv/e59b611d-b040-4d3c-843b-f1f63f5ad6ac.png b/sprites/s_node_color_from_hsv/e59b611d-b040-4d3c-843b-f1f63f5ad6ac.png new file mode 100644 index 000000000..9e3c20122 Binary files /dev/null and b/sprites/s_node_color_from_hsv/e59b611d-b040-4d3c-843b-f1f63f5ad6ac.png differ diff --git a/sprites/s_node_color_from_hsv/layers/0187ba9d-1262-4c6b-bc78-1ea6478d2d04/59cd233a-a55a-423e-bb89-a57f45f63f61.png b/sprites/s_node_color_from_hsv/layers/0187ba9d-1262-4c6b-bc78-1ea6478d2d04/59cd233a-a55a-423e-bb89-a57f45f63f61.png deleted file mode 100644 index 8ea83add5..000000000 Binary files a/sprites/s_node_color_from_hsv/layers/0187ba9d-1262-4c6b-bc78-1ea6478d2d04/59cd233a-a55a-423e-bb89-a57f45f63f61.png and /dev/null differ diff --git a/sprites/s_node_color_from_hsv/layers/e59b611d-b040-4d3c-843b-f1f63f5ad6ac/104dc258-68b9-43d7-9a15-074a53a5f7d0.png b/sprites/s_node_color_from_hsv/layers/e59b611d-b040-4d3c-843b-f1f63f5ad6ac/104dc258-68b9-43d7-9a15-074a53a5f7d0.png new file mode 100644 index 000000000..9e3c20122 Binary files /dev/null and b/sprites/s_node_color_from_hsv/layers/e59b611d-b040-4d3c-843b-f1f63f5ad6ac/104dc258-68b9-43d7-9a15-074a53a5f7d0.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 b81ea7da7..4ffac2128 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 @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 21, + "bbox_left": 1, + "bbox_right": 62, + "bbox_top": 19, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0187ba9d-1262-4c6b-bc78-1ea6478d2d04",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e59b611d-b040-4d3c-843b-f1f63f5ad6ac",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"08394396-5f42-4e48-aa10-5e70775f12bf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0187ba9d-1262-4c6b-bc78-1ea6478d2d04","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"21b1ec67-c618-49b5-9c73-d27f003117f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e59b611d-b040-4d3c-843b-f1f63f5ad6ac","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"59cd233a-a55a-423e-bb89-a57f45f63f61","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"104dc258-68b9-43d7-9a15-074a53a5f7d0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_from_rgb/11d4de2a-d201-4bd7-ada1-4f25c54a8f48.png b/sprites/s_node_color_from_rgb/11d4de2a-d201-4bd7-ada1-4f25c54a8f48.png new file mode 100644 index 000000000..3bdfbf069 Binary files /dev/null and b/sprites/s_node_color_from_rgb/11d4de2a-d201-4bd7-ada1-4f25c54a8f48.png differ diff --git a/sprites/s_node_color_from_rgb/6ac6e284-446c-42b5-b241-f3bdba2384de.png b/sprites/s_node_color_from_rgb/6ac6e284-446c-42b5-b241-f3bdba2384de.png deleted file mode 100644 index 65209412d..000000000 Binary files a/sprites/s_node_color_from_rgb/6ac6e284-446c-42b5-b241-f3bdba2384de.png and /dev/null differ diff --git a/sprites/s_node_color_from_rgb/layers/11d4de2a-d201-4bd7-ada1-4f25c54a8f48/9cead07f-f721-4669-b035-990528d7a26a.png b/sprites/s_node_color_from_rgb/layers/11d4de2a-d201-4bd7-ada1-4f25c54a8f48/9cead07f-f721-4669-b035-990528d7a26a.png new file mode 100644 index 000000000..3bdfbf069 Binary files /dev/null and b/sprites/s_node_color_from_rgb/layers/11d4de2a-d201-4bd7-ada1-4f25c54a8f48/9cead07f-f721-4669-b035-990528d7a26a.png differ diff --git a/sprites/s_node_color_from_rgb/layers/6ac6e284-446c-42b5-b241-f3bdba2384de/02935282-f523-416a-84b5-78fe93d3b7e7.png b/sprites/s_node_color_from_rgb/layers/6ac6e284-446c-42b5-b241-f3bdba2384de/02935282-f523-416a-84b5-78fe93d3b7e7.png deleted file mode 100644 index d71d36256..000000000 Binary files a/sprites/s_node_color_from_rgb/layers/6ac6e284-446c-42b5-b241-f3bdba2384de/02935282-f523-416a-84b5-78fe93d3b7e7.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 c6e1603f0..6835442e5 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 @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 21, + "bbox_left": 1, + "bbox_right": 62, + "bbox_top": 18, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ac6e284-446c-42b5-b241-f3bdba2384de",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"11d4de2a-d201-4bd7-ada1-4f25c54a8f48",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f14bd2c9-5599-46cf-909a-0b014201d51f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6ac6e284-446c-42b5-b241-f3bdba2384de","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"88fe12bf-aa84-4bb6-ac91-3447f4d9b6ed","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"11d4de2a-d201-4bd7-ada1-4f25c54a8f48","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"02935282-f523-416a-84b5-78fe93d3b7e7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9cead07f-f721-4669-b035-990528d7a26a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_out/151ff45e-0994-479f-94a0-551d3257d61f.png b/sprites/s_node_color_out/151ff45e-0994-479f-94a0-551d3257d61f.png new file mode 100644 index 000000000..033898ce4 Binary files /dev/null and b/sprites/s_node_color_out/151ff45e-0994-479f-94a0-551d3257d61f.png differ diff --git a/sprites/s_node_color_out/6a7bcd06-4b7b-43ee-bed9-037efcebfa2e.png b/sprites/s_node_color_out/6a7bcd06-4b7b-43ee-bed9-037efcebfa2e.png deleted file mode 100644 index e6dcd651b..000000000 Binary files a/sprites/s_node_color_out/6a7bcd06-4b7b-43ee-bed9-037efcebfa2e.png and /dev/null differ diff --git a/sprites/s_node_color_out/layers/151ff45e-0994-479f-94a0-551d3257d61f/7b82e34f-e756-423c-a8c6-0d92ef4c0aae.png b/sprites/s_node_color_out/layers/151ff45e-0994-479f-94a0-551d3257d61f/7b82e34f-e756-423c-a8c6-0d92ef4c0aae.png new file mode 100644 index 000000000..033898ce4 Binary files /dev/null and b/sprites/s_node_color_out/layers/151ff45e-0994-479f-94a0-551d3257d61f/7b82e34f-e756-423c-a8c6-0d92ef4c0aae.png differ diff --git a/sprites/s_node_color_out/layers/6a7bcd06-4b7b-43ee-bed9-037efcebfa2e/5d2aac82-cac8-402f-ad4a-e92108cc84ef.png b/sprites/s_node_color_out/layers/6a7bcd06-4b7b-43ee-bed9-037efcebfa2e/5d2aac82-cac8-402f-ad4a-e92108cc84ef.png deleted file mode 100644 index a04820c2c..000000000 Binary files a/sprites/s_node_color_out/layers/6a7bcd06-4b7b-43ee-bed9-037efcebfa2e/5d2aac82-cac8-402f-ad4a-e92108cc84ef.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 2f389e62a..802b1fd56 100644 --- a/sprites/s_node_color_out/s_node_color_out.yy +++ b/sprites/s_node_color_out/s_node_color_out.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6a7bcd06-4b7b-43ee-bed9-037efcebfa2e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"151ff45e-0994-479f-94a0-551d3257d61f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"db4632aa-cc8c-4fa3-96aa-304d7161cbca","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6a7bcd06-4b7b-43ee-bed9-037efcebfa2e","path":"sprites/s_node_color_out/s_node_color_out.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"00dce838-7103-4189-acdd-6c76efce5acd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"151ff45e-0994-479f-94a0-551d3257d61f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5d2aac82-cac8-402f-ad4a-e92108cc84ef","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7b82e34f-e756-423c-a8c6-0d92ef4c0aae","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_remove/1d700b18-e654-4c68-aa89-ece082e992a2.png b/sprites/s_node_color_remove/1d700b18-e654-4c68-aa89-ece082e992a2.png new file mode 100644 index 000000000..fa10d8ff1 Binary files /dev/null and b/sprites/s_node_color_remove/1d700b18-e654-4c68-aa89-ece082e992a2.png differ diff --git a/sprites/s_node_color_remove/32a2c0d5-632b-44af-96d0-0f951167e344.png b/sprites/s_node_color_remove/32a2c0d5-632b-44af-96d0-0f951167e344.png deleted file mode 100644 index d465d69c1..000000000 Binary files a/sprites/s_node_color_remove/32a2c0d5-632b-44af-96d0-0f951167e344.png and /dev/null differ diff --git a/sprites/s_node_color_remove/layers/1d700b18-e654-4c68-aa89-ece082e992a2/3b832b72-3c57-4f81-bc9e-495a8e003142.png b/sprites/s_node_color_remove/layers/1d700b18-e654-4c68-aa89-ece082e992a2/3b832b72-3c57-4f81-bc9e-495a8e003142.png new file mode 100644 index 000000000..fa10d8ff1 Binary files /dev/null and b/sprites/s_node_color_remove/layers/1d700b18-e654-4c68-aa89-ece082e992a2/3b832b72-3c57-4f81-bc9e-495a8e003142.png differ diff --git a/sprites/s_node_color_remove/layers/32a2c0d5-632b-44af-96d0-0f951167e344/1be4be80-d71c-4fa4-a257-d33090f333de.png b/sprites/s_node_color_remove/layers/32a2c0d5-632b-44af-96d0-0f951167e344/1be4be80-d71c-4fa4-a257-d33090f333de.png deleted file mode 100644 index 2bab3a6b5..000000000 Binary files a/sprites/s_node_color_remove/layers/32a2c0d5-632b-44af-96d0-0f951167e344/1be4be80-d71c-4fa4-a257-d33090f333de.png and /dev/null 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 cbf96e75f..0764c6560 100644 --- a/sprites/s_node_color_remove/s_node_color_remove.yy +++ b/sprites/s_node_color_remove/s_node_color_remove.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"32a2c0d5-632b-44af-96d0-0f951167e344",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1d700b18-e654-4c68-aa89-ece082e992a2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"097577aa-6286-4eef-825b-46497773c9f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"32a2c0d5-632b-44af-96d0-0f951167e344","path":"sprites/s_node_color_remove/s_node_color_remove.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"58af48e8-63c9-4255-a798-cc7a67106f3d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1d700b18-e654-4c68-aa89-ece082e992a2","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1be4be80-d71c-4fa4-a257-d33090f333de","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3b832b72-3c57-4f81-bc9e-495a8e003142","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_color_replace/133a4363-92eb-4b4a-9e35-61a7a1422e78.png b/sprites/s_node_color_replace/133a4363-92eb-4b4a-9e35-61a7a1422e78.png new file mode 100644 index 000000000..d72682358 Binary files /dev/null and b/sprites/s_node_color_replace/133a4363-92eb-4b4a-9e35-61a7a1422e78.png differ diff --git a/sprites/s_node_color_replace/7ba0c8d1-f689-478b-9f26-414320c68c19.png b/sprites/s_node_color_replace/7ba0c8d1-f689-478b-9f26-414320c68c19.png deleted file mode 100644 index f819a108a..000000000 Binary files a/sprites/s_node_color_replace/7ba0c8d1-f689-478b-9f26-414320c68c19.png and /dev/null differ diff --git a/sprites/s_node_color_replace/layers/133a4363-92eb-4b4a-9e35-61a7a1422e78/6af05c97-ffcb-407d-a8d3-2ed5fd53441d.png b/sprites/s_node_color_replace/layers/133a4363-92eb-4b4a-9e35-61a7a1422e78/6af05c97-ffcb-407d-a8d3-2ed5fd53441d.png new file mode 100644 index 000000000..d72682358 Binary files /dev/null and b/sprites/s_node_color_replace/layers/133a4363-92eb-4b4a-9e35-61a7a1422e78/6af05c97-ffcb-407d-a8d3-2ed5fd53441d.png differ diff --git a/sprites/s_node_color_replace/layers/7ba0c8d1-f689-478b-9f26-414320c68c19/71e00633-e307-4903-9b0c-0dec46a42567.png b/sprites/s_node_color_replace/layers/7ba0c8d1-f689-478b-9f26-414320c68c19/71e00633-e307-4903-9b0c-0dec46a42567.png deleted file mode 100644 index 08a82dc44..000000000 Binary files a/sprites/s_node_color_replace/layers/7ba0c8d1-f689-478b-9f26-414320c68c19/71e00633-e307-4903-9b0c-0dec46a42567.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 177ddbcfb..d7ca7d513 100644 --- a/sprites/s_node_color_replace/s_node_color_replace.yy +++ b/sprites/s_node_color_replace/s_node_color_replace.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7ba0c8d1-f689-478b-9f26-414320c68c19",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"133a4363-92eb-4b4a-9e35-61a7a1422e78",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"67c28123-5751-45bf-bad3-4ee9fa458bc1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7ba0c8d1-f689-478b-9f26-414320c68c19","path":"sprites/s_node_color_replace/s_node_color_replace.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fd834153-e164-49bb-b215-df2f4865256a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"133a4363-92eb-4b4a-9e35-61a7a1422e78","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"71e00633-e307-4903-9b0c-0dec46a42567","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6af05c97-ffcb-407d-a8d3-2ed5fd53441d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_colorize/468ece28-e67a-4c51-911e-54b261287c5a.png b/sprites/s_node_colorize/468ece28-e67a-4c51-911e-54b261287c5a.png new file mode 100644 index 000000000..126f00a7b Binary files /dev/null and b/sprites/s_node_colorize/468ece28-e67a-4c51-911e-54b261287c5a.png differ diff --git a/sprites/s_node_colorize/de35392e-3019-4d5c-95dc-f8ca7717ef0d.png b/sprites/s_node_colorize/de35392e-3019-4d5c-95dc-f8ca7717ef0d.png deleted file mode 100644 index 0a798cd1f..000000000 Binary files a/sprites/s_node_colorize/de35392e-3019-4d5c-95dc-f8ca7717ef0d.png and /dev/null differ diff --git a/sprites/s_node_colorize/layers/468ece28-e67a-4c51-911e-54b261287c5a/843b99a6-7461-4a52-8930-fdf463767b04.png b/sprites/s_node_colorize/layers/468ece28-e67a-4c51-911e-54b261287c5a/843b99a6-7461-4a52-8930-fdf463767b04.png new file mode 100644 index 000000000..126f00a7b Binary files /dev/null and b/sprites/s_node_colorize/layers/468ece28-e67a-4c51-911e-54b261287c5a/843b99a6-7461-4a52-8930-fdf463767b04.png differ diff --git a/sprites/s_node_colorize/layers/de35392e-3019-4d5c-95dc-f8ca7717ef0d/3a11e6fe-37cd-48e1-a774-161c3fe2d2c4.png b/sprites/s_node_colorize/layers/de35392e-3019-4d5c-95dc-f8ca7717ef0d/3a11e6fe-37cd-48e1-a774-161c3fe2d2c4.png deleted file mode 100644 index 20ea670d9..000000000 Binary files a/sprites/s_node_colorize/layers/de35392e-3019-4d5c-95dc-f8ca7717ef0d/3a11e6fe-37cd-48e1-a774-161c3fe2d2c4.png and /dev/null differ diff --git a/sprites/s_node_colorize/s_node_colorize.yy b/sprites/s_node_colorize/s_node_colorize.yy index 9aec138c8..a4fe3a3be 100644 --- a/sprites/s_node_colorize/s_node_colorize.yy +++ b/sprites/s_node_colorize/s_node_colorize.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"de35392e-3019-4d5c-95dc-f8ca7717ef0d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"468ece28-e67a-4c51-911e-54b261287c5a",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ffa0a3e6-0ae7-42af-beae-1b97ee23bf4f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"de35392e-3019-4d5c-95dc-f8ca7717ef0d","path":"sprites/s_node_colorize/s_node_colorize.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"061ff3ca-9d3a-435e-932a-d4d78d462b1f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"468ece28-e67a-4c51-911e-54b261287c5a","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3a11e6fe-37cd-48e1-a774-161c3fe2d2c4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"843b99a6-7461-4a52-8930-fdf463767b04","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_compose/71b6c16c-7dbf-400d-90ac-fb68b5c0902b.png b/sprites/s_node_compose/71b6c16c-7dbf-400d-90ac-fb68b5c0902b.png deleted file mode 100644 index 915b27a77..000000000 Binary files a/sprites/s_node_compose/71b6c16c-7dbf-400d-90ac-fb68b5c0902b.png and /dev/null differ diff --git a/sprites/s_node_compose/c436006d-b8af-42d9-a8ec-8d49ab73c083.png b/sprites/s_node_compose/c436006d-b8af-42d9-a8ec-8d49ab73c083.png new file mode 100644 index 000000000..2816c4535 Binary files /dev/null and b/sprites/s_node_compose/c436006d-b8af-42d9-a8ec-8d49ab73c083.png differ diff --git a/sprites/s_node_compose/layers/71b6c16c-7dbf-400d-90ac-fb68b5c0902b/7af8e6f6-266b-441e-8c57-a280daa5165e.png b/sprites/s_node_compose/layers/71b6c16c-7dbf-400d-90ac-fb68b5c0902b/7af8e6f6-266b-441e-8c57-a280daa5165e.png deleted file mode 100644 index 508339707..000000000 Binary files a/sprites/s_node_compose/layers/71b6c16c-7dbf-400d-90ac-fb68b5c0902b/7af8e6f6-266b-441e-8c57-a280daa5165e.png and /dev/null differ diff --git a/sprites/s_node_compose/layers/c436006d-b8af-42d9-a8ec-8d49ab73c083/15513229-8a07-48c2-b9d5-d80c24aa0a59.png b/sprites/s_node_compose/layers/c436006d-b8af-42d9-a8ec-8d49ab73c083/15513229-8a07-48c2-b9d5-d80c24aa0a59.png new file mode 100644 index 000000000..2816c4535 Binary files /dev/null and b/sprites/s_node_compose/layers/c436006d-b8af-42d9-a8ec-8d49ab73c083/15513229-8a07-48c2-b9d5-d80c24aa0a59.png differ diff --git a/sprites/s_node_compose/s_node_compose.yy b/sprites/s_node_compose/s_node_compose.yy index 9027825b8..47f5502f1 100644 --- a/sprites/s_node_compose/s_node_compose.yy +++ b/sprites/s_node_compose/s_node_compose.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"71b6c16c-7dbf-400d-90ac-fb68b5c0902b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c436006d-b8af-42d9-a8ec-8d49ab73c083",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5a2a5ae5-07a2-44df-a1c3-81bd13dbbbd2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"71b6c16c-7dbf-400d-90ac-fb68b5c0902b","path":"sprites/s_node_compose/s_node_compose.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ba75fdb0-c2ef-478f-891f-7830ba751671","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c436006d-b8af-42d9-a8ec-8d49ab73c083","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,"modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7af8e6f6-266b-441e-8c57-a280daa5165e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"15513229-8a07-48c2-b9d5-d80c24aa0a59","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_condition/6282aae2-6225-47cb-bbff-9da90684de44.png b/sprites/s_node_condition/6282aae2-6225-47cb-bbff-9da90684de44.png new file mode 100644 index 000000000..570a12ec3 Binary files /dev/null and b/sprites/s_node_condition/6282aae2-6225-47cb-bbff-9da90684de44.png differ diff --git a/sprites/s_node_condition/ee1db80b-912c-44a2-8060-50ad192b5b08.png b/sprites/s_node_condition/ee1db80b-912c-44a2-8060-50ad192b5b08.png deleted file mode 100644 index 21b2562a3..000000000 Binary files a/sprites/s_node_condition/ee1db80b-912c-44a2-8060-50ad192b5b08.png and /dev/null differ diff --git a/sprites/s_node_condition/layers/6282aae2-6225-47cb-bbff-9da90684de44/11be5962-0967-4fc3-af35-50e6c07141ad.png b/sprites/s_node_condition/layers/6282aae2-6225-47cb-bbff-9da90684de44/11be5962-0967-4fc3-af35-50e6c07141ad.png new file mode 100644 index 000000000..570a12ec3 Binary files /dev/null and b/sprites/s_node_condition/layers/6282aae2-6225-47cb-bbff-9da90684de44/11be5962-0967-4fc3-af35-50e6c07141ad.png differ diff --git a/sprites/s_node_condition/layers/ee1db80b-912c-44a2-8060-50ad192b5b08/c4b544bb-4c3a-4495-af64-614199dbfdeb.png b/sprites/s_node_condition/layers/ee1db80b-912c-44a2-8060-50ad192b5b08/c4b544bb-4c3a-4495-af64-614199dbfdeb.png deleted file mode 100644 index 6240aca60..000000000 Binary files a/sprites/s_node_condition/layers/ee1db80b-912c-44a2-8060-50ad192b5b08/c4b544bb-4c3a-4495-af64-614199dbfdeb.png and /dev/null differ diff --git a/sprites/s_node_condition/s_node_condition.yy b/sprites/s_node_condition/s_node_condition.yy index b66bab98d..9b70c62fe 100644 --- a/sprites/s_node_condition/s_node_condition.yy +++ b/sprites/s_node_condition/s_node_condition.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 2, - "bbox_bottom": 29, + "bbox_right": 63, + "bbox_top": 5, + "bbox_bottom": 58, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ee1db80b-912c-44a2-8060-50ad192b5b08",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6282aae2-6225-47cb-bbff-9da90684de44",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fd81bb71-84a8-426b-b963-196bc41dada5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ee1db80b-912c-44a2-8060-50ad192b5b08","path":"sprites/s_node_condition/s_node_condition.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b9148adc-5ccd-4b83-9ad5-e3853be6d301","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6282aae2-6225-47cb-bbff-9da90684de44","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c4b544bb-4c3a-4495-af64-614199dbfdeb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"11be5962-0967-4fc3-af35-50e6c07141ad","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_corner/7944ce01-214e-4a08-8eb9-448486c4e812.png b/sprites/s_node_corner/7944ce01-214e-4a08-8eb9-448486c4e812.png new file mode 100644 index 000000000..88d048aec Binary files /dev/null and b/sprites/s_node_corner/7944ce01-214e-4a08-8eb9-448486c4e812.png differ diff --git a/sprites/s_node_corner/ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e.png b/sprites/s_node_corner/ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e.png deleted file mode 100644 index 00512817e..000000000 Binary files a/sprites/s_node_corner/ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e.png and /dev/null differ diff --git a/sprites/s_node_corner/layers/7944ce01-214e-4a08-8eb9-448486c4e812/96d88fd1-ca2b-43d4-99bf-ed75aac50d84.png b/sprites/s_node_corner/layers/7944ce01-214e-4a08-8eb9-448486c4e812/96d88fd1-ca2b-43d4-99bf-ed75aac50d84.png new file mode 100644 index 000000000..88d048aec Binary files /dev/null and b/sprites/s_node_corner/layers/7944ce01-214e-4a08-8eb9-448486c4e812/96d88fd1-ca2b-43d4-99bf-ed75aac50d84.png differ diff --git a/sprites/s_node_corner/layers/ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e/b1b9c854-72f8-4e13-b43b-407b85becfcb.png b/sprites/s_node_corner/layers/ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e/b1b9c854-72f8-4e13-b43b-407b85becfcb.png deleted file mode 100644 index f352acbc0..000000000 Binary files a/sprites/s_node_corner/layers/ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e/b1b9c854-72f8-4e13-b43b-407b85becfcb.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 f71d0d68e..ea17411c7 100644 --- a/sprites/s_node_corner/s_node_corner.yy +++ b/sprites/s_node_corner/s_node_corner.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7944ce01-214e-4a08-8eb9-448486c4e812",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3b2c23b2-6b2c-4372-beba-b582515a32aa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ffd20f20-6b6d-4fdc-8e6d-748c2b883d3e","path":"sprites/s_node_corner/s_node_corner.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7621813a-2889-42c0-bae7-159e6c0c054f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7944ce01-214e-4a08-8eb9-448486c4e812","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b1b9c854-72f8-4e13-b43b-407b85becfcb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"96d88fd1-ca2b-43d4-99bf-ed75aac50d84","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_counter/e4bd6691-ec13-421e-b59c-97b16f25c48d.png b/sprites/s_node_counter/e4bd6691-ec13-421e-b59c-97b16f25c48d.png deleted file mode 100644 index 5506b780c..000000000 Binary files a/sprites/s_node_counter/e4bd6691-ec13-421e-b59c-97b16f25c48d.png and /dev/null differ diff --git a/sprites/s_node_counter/f62960a2-eb56-4b8f-9bf9-10e552b9002f.png b/sprites/s_node_counter/f62960a2-eb56-4b8f-9bf9-10e552b9002f.png new file mode 100644 index 000000000..85ce95a09 Binary files /dev/null and b/sprites/s_node_counter/f62960a2-eb56-4b8f-9bf9-10e552b9002f.png differ diff --git a/sprites/s_node_counter/layers/e4bd6691-ec13-421e-b59c-97b16f25c48d/b5e496d9-8782-4e4c-84e1-2f0db8264dbb.png b/sprites/s_node_counter/layers/e4bd6691-ec13-421e-b59c-97b16f25c48d/b5e496d9-8782-4e4c-84e1-2f0db8264dbb.png deleted file mode 100644 index 4a02a01ec..000000000 Binary files a/sprites/s_node_counter/layers/e4bd6691-ec13-421e-b59c-97b16f25c48d/b5e496d9-8782-4e4c-84e1-2f0db8264dbb.png and /dev/null differ diff --git a/sprites/s_node_counter/layers/f62960a2-eb56-4b8f-9bf9-10e552b9002f/c77b9e52-2e03-42d2-9fc5-000544a4d722.png b/sprites/s_node_counter/layers/f62960a2-eb56-4b8f-9bf9-10e552b9002f/c77b9e52-2e03-42d2-9fc5-000544a4d722.png new file mode 100644 index 000000000..85ce95a09 Binary files /dev/null and b/sprites/s_node_counter/layers/f62960a2-eb56-4b8f-9bf9-10e552b9002f/c77b9e52-2e03-42d2-9fc5-000544a4d722.png differ diff --git a/sprites/s_node_counter/s_node_counter.yy b/sprites/s_node_counter/s_node_counter.yy index 752a74c19..c467bebd7 100644 --- a/sprites/s_node_counter/s_node_counter.yy +++ b/sprites/s_node_counter/s_node_counter.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 27, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 10, + "bbox_right": 54, + "bbox_top": 6, + "bbox_bottom": 56, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e4bd6691-ec13-421e-b59c-97b16f25c48d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f62960a2-eb56-4b8f-9bf9-10e552b9002f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"99d35361-523c-4b83-9773-1fbe6c3d57d1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e4bd6691-ec13-421e-b59c-97b16f25c48d","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7b2f366c-7981-4900-9d7d-8cc10d937e4b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f62960a2-eb56-4b8f-9bf9-10e552b9002f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b5e496d9-8782-4e4c-84e1-2f0db8264dbb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c77b9e52-2e03-42d2-9fc5-000544a4d722","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_crop/44ddc04c-2e44-411e-afa5-8996c0656e97.png b/sprites/s_node_crop/44ddc04c-2e44-411e-afa5-8996c0656e97.png deleted file mode 100644 index 71c7fa016..000000000 Binary files a/sprites/s_node_crop/44ddc04c-2e44-411e-afa5-8996c0656e97.png and /dev/null differ diff --git a/sprites/s_node_crop/daeacfa9-89fa-47b4-9312-25c04e567344.png b/sprites/s_node_crop/daeacfa9-89fa-47b4-9312-25c04e567344.png new file mode 100644 index 000000000..7d9492716 Binary files /dev/null and b/sprites/s_node_crop/daeacfa9-89fa-47b4-9312-25c04e567344.png differ diff --git a/sprites/s_node_crop/layers/44ddc04c-2e44-411e-afa5-8996c0656e97/de6a9baf-e926-4b9f-bed2-4a820952df91.png b/sprites/s_node_crop/layers/44ddc04c-2e44-411e-afa5-8996c0656e97/de6a9baf-e926-4b9f-bed2-4a820952df91.png deleted file mode 100644 index 00e3765dc..000000000 Binary files a/sprites/s_node_crop/layers/44ddc04c-2e44-411e-afa5-8996c0656e97/de6a9baf-e926-4b9f-bed2-4a820952df91.png and /dev/null differ diff --git a/sprites/s_node_crop/layers/daeacfa9-89fa-47b4-9312-25c04e567344/14804d5d-7f2f-4c05-96f6-cc941d8df3ce.png b/sprites/s_node_crop/layers/daeacfa9-89fa-47b4-9312-25c04e567344/14804d5d-7f2f-4c05-96f6-cc941d8df3ce.png new file mode 100644 index 000000000..7d9492716 Binary files /dev/null and b/sprites/s_node_crop/layers/daeacfa9-89fa-47b4-9312-25c04e567344/14804d5d-7f2f-4c05-96f6-cc941d8df3ce.png differ diff --git a/sprites/s_node_crop/s_node_crop.yy b/sprites/s_node_crop/s_node_crop.yy index 8c4676896..fa038456a 100644 --- a/sprites/s_node_crop/s_node_crop.yy +++ b/sprites/s_node_crop/s_node_crop.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"44ddc04c-2e44-411e-afa5-8996c0656e97",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"daeacfa9-89fa-47b4-9312-25c04e567344",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4b5a9f53-ae08-4795-a5cf-a269d39ca562","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"44ddc04c-2e44-411e-afa5-8996c0656e97","path":"sprites/s_node_crop/s_node_crop.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f9947144-c170-48f6-9e44-5ee30001c6d9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"daeacfa9-89fa-47b4-9312-25c04e567344","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"de6a9baf-e926-4b9f-bed2-4a820952df91","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"14804d5d-7f2f-4c05-96f6-cc941d8df3ce","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_curve/5403ef7e-f923-44c6-9529-b79e83d9ca54.png b/sprites/s_node_curve/5403ef7e-f923-44c6-9529-b79e83d9ca54.png deleted file mode 100644 index f3c3bf1ec..000000000 Binary files a/sprites/s_node_curve/5403ef7e-f923-44c6-9529-b79e83d9ca54.png and /dev/null differ diff --git a/sprites/s_node_curve/5c1b10dd-3e84-4914-9ec9-f01ea39b7156.png b/sprites/s_node_curve/5c1b10dd-3e84-4914-9ec9-f01ea39b7156.png new file mode 100644 index 000000000..c4d2ca5ea Binary files /dev/null and b/sprites/s_node_curve/5c1b10dd-3e84-4914-9ec9-f01ea39b7156.png differ diff --git a/sprites/s_node_curve/layers/5403ef7e-f923-44c6-9529-b79e83d9ca54/298e0e81-e5ac-4347-a054-6fbc295bc724.png b/sprites/s_node_curve/layers/5403ef7e-f923-44c6-9529-b79e83d9ca54/298e0e81-e5ac-4347-a054-6fbc295bc724.png deleted file mode 100644 index 5c77af789..000000000 Binary files a/sprites/s_node_curve/layers/5403ef7e-f923-44c6-9529-b79e83d9ca54/298e0e81-e5ac-4347-a054-6fbc295bc724.png and /dev/null differ diff --git a/sprites/s_node_curve/layers/5c1b10dd-3e84-4914-9ec9-f01ea39b7156/76faa9f2-5714-484e-a1b2-a4cda81fa426.png b/sprites/s_node_curve/layers/5c1b10dd-3e84-4914-9ec9-f01ea39b7156/76faa9f2-5714-484e-a1b2-a4cda81fa426.png new file mode 100644 index 000000000..c4d2ca5ea Binary files /dev/null and b/sprites/s_node_curve/layers/5c1b10dd-3e84-4914-9ec9-f01ea39b7156/76faa9f2-5714-484e-a1b2-a4cda81fa426.png differ diff --git a/sprites/s_node_curve/s_node_curve.yy b/sprites/s_node_curve/s_node_curve.yy index 4e5fa10e0..c51fb0c15 100644 --- a/sprites/s_node_curve/s_node_curve.yy +++ b/sprites/s_node_curve/s_node_curve.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 0, - "bbox_bottom": 31, + "bbox_left": 1, + "bbox_right": 62, + "bbox_top": 1, + "bbox_bottom": 62, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5403ef7e-f923-44c6-9529-b79e83d9ca54",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c1b10dd-3e84-4914-9ec9-f01ea39b7156",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5f315f77-218a-4f25-b273-5999d1fa0812","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5403ef7e-f923-44c6-9529-b79e83d9ca54","path":"sprites/s_node_curve/s_node_curve.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4c23982e-0a8a-4e64-9f79-1a564873c49c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5c1b10dd-3e84-4914-9ec9-f01ea39b7156","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"298e0e81-e5ac-4347-a054-6fbc295bc724","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"76faa9f2-5714-484e-a1b2-a4cda81fa426","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_decorner/1e765cc0-8f54-44c4-84dc-c1574f58e38f.png b/sprites/s_node_decorner/1e765cc0-8f54-44c4-84dc-c1574f58e38f.png deleted file mode 100644 index d424addf9..000000000 Binary files a/sprites/s_node_decorner/1e765cc0-8f54-44c4-84dc-c1574f58e38f.png and /dev/null differ diff --git a/sprites/s_node_decorner/87a193d5-0ce2-4b96-ae13-b6d1143ba420.png b/sprites/s_node_decorner/87a193d5-0ce2-4b96-ae13-b6d1143ba420.png new file mode 100644 index 000000000..fbd94cc36 Binary files /dev/null and b/sprites/s_node_decorner/87a193d5-0ce2-4b96-ae13-b6d1143ba420.png differ diff --git a/sprites/s_node_decorner/layers/1e765cc0-8f54-44c4-84dc-c1574f58e38f/511d56e8-71cb-4192-ad73-c2fa2ff48e80.png b/sprites/s_node_decorner/layers/1e765cc0-8f54-44c4-84dc-c1574f58e38f/511d56e8-71cb-4192-ad73-c2fa2ff48e80.png deleted file mode 100644 index d36aecc1e..000000000 Binary files a/sprites/s_node_decorner/layers/1e765cc0-8f54-44c4-84dc-c1574f58e38f/511d56e8-71cb-4192-ad73-c2fa2ff48e80.png and /dev/null differ diff --git a/sprites/s_node_decorner/layers/87a193d5-0ce2-4b96-ae13-b6d1143ba420/ac7b605b-99d3-4045-a6f9-1dc2f68e2a56.png b/sprites/s_node_decorner/layers/87a193d5-0ce2-4b96-ae13-b6d1143ba420/ac7b605b-99d3-4045-a6f9-1dc2f68e2a56.png new file mode 100644 index 000000000..fbd94cc36 Binary files /dev/null and b/sprites/s_node_decorner/layers/87a193d5-0ce2-4b96-ae13-b6d1143ba420/ac7b605b-99d3-4045-a6f9-1dc2f68e2a56.png differ diff --git a/sprites/s_node_decorner/s_node_decorner.yy b/sprites/s_node_decorner/s_node_decorner.yy index 8a72351f3..3a3789204 100644 --- a/sprites/s_node_decorner/s_node_decorner.yy +++ b/sprites/s_node_decorner/s_node_decorner.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1e765cc0-8f54-44c4-84dc-c1574f58e38f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87a193d5-0ce2-4b96-ae13-b6d1143ba420",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"71cd5b32-ee07-4b7f-923a-832bbf12a26b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1e765cc0-8f54-44c4-84dc-c1574f58e38f","path":"sprites/s_node_decorner/s_node_decorner.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6534026d-2b56-45d6-a595-89fdd915d217","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"87a193d5-0ce2-4b96-ae13-b6d1143ba420","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"511d56e8-71cb-4192-ad73-c2fa2ff48e80","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ac7b605b-99d3-4045-a6f9-1dc2f68e2a56","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_destray/f32cdb37-1715-471f-9bf7-df84a7a93579.png b/sprites/s_node_destray/f32cdb37-1715-471f-9bf7-df84a7a93579.png new file mode 100644 index 000000000..cc8f35c50 Binary files /dev/null and b/sprites/s_node_destray/f32cdb37-1715-471f-9bf7-df84a7a93579.png differ diff --git a/sprites/s_node_destray/fea90b2b-d855-4c29-b0f5-4773c2bf4064.png b/sprites/s_node_destray/fea90b2b-d855-4c29-b0f5-4773c2bf4064.png deleted file mode 100644 index 24609259e..000000000 Binary files a/sprites/s_node_destray/fea90b2b-d855-4c29-b0f5-4773c2bf4064.png and /dev/null differ diff --git a/sprites/s_node_destray/layers/f32cdb37-1715-471f-9bf7-df84a7a93579/75564110-5837-4b37-98e0-239bd7199c43.png b/sprites/s_node_destray/layers/f32cdb37-1715-471f-9bf7-df84a7a93579/75564110-5837-4b37-98e0-239bd7199c43.png new file mode 100644 index 000000000..cc8f35c50 Binary files /dev/null and b/sprites/s_node_destray/layers/f32cdb37-1715-471f-9bf7-df84a7a93579/75564110-5837-4b37-98e0-239bd7199c43.png differ diff --git a/sprites/s_node_destray/layers/fea90b2b-d855-4c29-b0f5-4773c2bf4064/964a4af7-2763-493f-ad39-f6b762ad0c43.png b/sprites/s_node_destray/layers/fea90b2b-d855-4c29-b0f5-4773c2bf4064/964a4af7-2763-493f-ad39-f6b762ad0c43.png deleted file mode 100644 index 728ae9873..000000000 Binary files a/sprites/s_node_destray/layers/fea90b2b-d855-4c29-b0f5-4773c2bf4064/964a4af7-2763-493f-ad39-f6b762ad0c43.png and /dev/null differ diff --git a/sprites/s_node_destray/s_node_destray.yy b/sprites/s_node_destray/s_node_destray.yy index 8f0358dc7..3ec7d8b1f 100644 --- a/sprites/s_node_destray/s_node_destray.yy +++ b/sprites/s_node_destray/s_node_destray.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fea90b2b-d855-4c29-b0f5-4773c2bf4064",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f32cdb37-1715-471f-9bf7-df84a7a93579",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fd5d022f-22c3-405e-b776-06015fa6355c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fea90b2b-d855-4c29-b0f5-4773c2bf4064","path":"sprites/s_node_destray/s_node_destray.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d8a32d65-9ab4-4cee-a28d-0b6148b1f4a2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f32cdb37-1715-471f-9bf7-df84a7a93579","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"964a4af7-2763-493f-ad39-f6b762ad0c43","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"75564110-5837-4b37-98e0-239bd7199c43","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_dilate/27ea9a51-487a-4135-bc39-b94d8a7db9a0.png b/sprites/s_node_dilate/27ea9a51-487a-4135-bc39-b94d8a7db9a0.png new file mode 100644 index 000000000..50fcfd4fc Binary files /dev/null and b/sprites/s_node_dilate/27ea9a51-487a-4135-bc39-b94d8a7db9a0.png differ diff --git a/sprites/s_node_dilate/f92ddf03-f372-42e0-a759-00d27a41313a.png b/sprites/s_node_dilate/f92ddf03-f372-42e0-a759-00d27a41313a.png deleted file mode 100644 index e4f0c250f..000000000 Binary files a/sprites/s_node_dilate/f92ddf03-f372-42e0-a759-00d27a41313a.png and /dev/null differ diff --git a/sprites/s_node_dilate/layers/27ea9a51-487a-4135-bc39-b94d8a7db9a0/3ff39818-4d21-432f-bf49-b50614661ab5.png b/sprites/s_node_dilate/layers/27ea9a51-487a-4135-bc39-b94d8a7db9a0/3ff39818-4d21-432f-bf49-b50614661ab5.png new file mode 100644 index 000000000..50fcfd4fc Binary files /dev/null and b/sprites/s_node_dilate/layers/27ea9a51-487a-4135-bc39-b94d8a7db9a0/3ff39818-4d21-432f-bf49-b50614661ab5.png differ diff --git a/sprites/s_node_dilate/layers/f92ddf03-f372-42e0-a759-00d27a41313a/e3988d78-db1a-412b-ad5b-a961bfb58bf7.png b/sprites/s_node_dilate/layers/f92ddf03-f372-42e0-a759-00d27a41313a/e3988d78-db1a-412b-ad5b-a961bfb58bf7.png deleted file mode 100644 index 4f772f1ca..000000000 Binary files a/sprites/s_node_dilate/layers/f92ddf03-f372-42e0-a759-00d27a41313a/e3988d78-db1a-412b-ad5b-a961bfb58bf7.png and /dev/null differ diff --git a/sprites/s_node_dilate/s_node_dilate.yy b/sprites/s_node_dilate/s_node_dilate.yy index 5bda69c9d..bc8e846d9 100644 --- a/sprites/s_node_dilate/s_node_dilate.yy +++ b/sprites/s_node_dilate/s_node_dilate.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f92ddf03-f372-42e0-a759-00d27a41313a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"27ea9a51-487a-4135-bc39-b94d8a7db9a0",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4dfc48f6-ba3b-4dae-8d95-b24188035765","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f92ddf03-f372-42e0-a759-00d27a41313a","path":"sprites/s_node_dilate/s_node_dilate.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c67c22fa-7c9e-495a-ae36-94b1053edaed","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"27ea9a51-487a-4135-bc39-b94d8a7db9a0","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e3988d78-db1a-412b-ad5b-a961bfb58bf7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3ff39818-4d21-432f-bf49-b50614661ab5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_displace/1ab08c3b-bbec-4791-8fa8-f30ca15407ba.png b/sprites/s_node_displace/1ab08c3b-bbec-4791-8fa8-f30ca15407ba.png new file mode 100644 index 000000000..4068a47e0 Binary files /dev/null and b/sprites/s_node_displace/1ab08c3b-bbec-4791-8fa8-f30ca15407ba.png differ diff --git a/sprites/s_node_displace/71a343aa-2d01-486e-bbc4-5c9ec77fabc2.png b/sprites/s_node_displace/71a343aa-2d01-486e-bbc4-5c9ec77fabc2.png deleted file mode 100644 index 8a8c2b88c..000000000 Binary files a/sprites/s_node_displace/71a343aa-2d01-486e-bbc4-5c9ec77fabc2.png and /dev/null differ diff --git a/sprites/s_node_displace/layers/1ab08c3b-bbec-4791-8fa8-f30ca15407ba/4682786d-d0db-4e87-ad9b-872881a34c38.png b/sprites/s_node_displace/layers/1ab08c3b-bbec-4791-8fa8-f30ca15407ba/4682786d-d0db-4e87-ad9b-872881a34c38.png new file mode 100644 index 000000000..4068a47e0 Binary files /dev/null and b/sprites/s_node_displace/layers/1ab08c3b-bbec-4791-8fa8-f30ca15407ba/4682786d-d0db-4e87-ad9b-872881a34c38.png differ diff --git a/sprites/s_node_displace/layers/71a343aa-2d01-486e-bbc4-5c9ec77fabc2/b46b2665-1a3f-4552-9ec7-0cbab43cb9b4.png b/sprites/s_node_displace/layers/71a343aa-2d01-486e-bbc4-5c9ec77fabc2/b46b2665-1a3f-4552-9ec7-0cbab43cb9b4.png deleted file mode 100644 index 6f428292b..000000000 Binary files a/sprites/s_node_displace/layers/71a343aa-2d01-486e-bbc4-5c9ec77fabc2/b46b2665-1a3f-4552-9ec7-0cbab43cb9b4.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 01fa61472..f7a0c19bf 100644 --- a/sprites/s_node_displace/s_node_displace.yy +++ b/sprites/s_node_displace/s_node_displace.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"71a343aa-2d01-486e-bbc4-5c9ec77fabc2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1ab08c3b-bbec-4791-8fa8-f30ca15407ba",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"56702985-7bad-447a-9609-a4f48817702b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"71a343aa-2d01-486e-bbc4-5c9ec77fabc2","path":"sprites/s_node_displace/s_node_displace.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4a0245c1-c658-47d0-85a6-a069484aaab9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1ab08c3b-bbec-4791-8fa8-f30ca15407ba","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b46b2665-1a3f-4552-9ec7-0cbab43cb9b4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4682786d-d0db-4e87-ad9b-872881a34c38","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_dithering/35fc4391-5794-420c-8003-6a986f0c30fd.png b/sprites/s_node_dithering/35fc4391-5794-420c-8003-6a986f0c30fd.png new file mode 100644 index 000000000..5ce21a8c8 Binary files /dev/null and b/sprites/s_node_dithering/35fc4391-5794-420c-8003-6a986f0c30fd.png differ diff --git a/sprites/s_node_dithering/78b3a928-ac0d-42f0-9c6c-2ac292997f5d.png b/sprites/s_node_dithering/78b3a928-ac0d-42f0-9c6c-2ac292997f5d.png deleted file mode 100644 index 022acd8c2..000000000 Binary files a/sprites/s_node_dithering/78b3a928-ac0d-42f0-9c6c-2ac292997f5d.png and /dev/null differ diff --git a/sprites/s_node_dithering/layers/35fc4391-5794-420c-8003-6a986f0c30fd/af07b577-64c7-49e2-8493-6e1bda0e732d.png b/sprites/s_node_dithering/layers/35fc4391-5794-420c-8003-6a986f0c30fd/af07b577-64c7-49e2-8493-6e1bda0e732d.png new file mode 100644 index 000000000..5ce21a8c8 Binary files /dev/null and b/sprites/s_node_dithering/layers/35fc4391-5794-420c-8003-6a986f0c30fd/af07b577-64c7-49e2-8493-6e1bda0e732d.png differ diff --git a/sprites/s_node_dithering/layers/78b3a928-ac0d-42f0-9c6c-2ac292997f5d/efede08d-9704-4339-9c76-06f584cd1faf.png b/sprites/s_node_dithering/layers/78b3a928-ac0d-42f0-9c6c-2ac292997f5d/efede08d-9704-4339-9c76-06f584cd1faf.png deleted file mode 100644 index 4cb8f4b0b..000000000 Binary files a/sprites/s_node_dithering/layers/78b3a928-ac0d-42f0-9c6c-2ac292997f5d/efede08d-9704-4339-9c76-06f584cd1faf.png and /dev/null differ diff --git a/sprites/s_node_dithering/s_node_dithering.yy b/sprites/s_node_dithering/s_node_dithering.yy index 5f44542cd..ede1d24a3 100644 --- a/sprites/s_node_dithering/s_node_dithering.yy +++ b/sprites/s_node_dithering/s_node_dithering.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"78b3a928-ac0d-42f0-9c6c-2ac292997f5d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"35fc4391-5794-420c-8003-6a986f0c30fd",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"52c4ae53-71ea-4cf8-9b61-102538a6560e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"78b3a928-ac0d-42f0-9c6c-2ac292997f5d","path":"sprites/s_node_dithering/s_node_dithering.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"82e6f8b4-e2ba-4c30-94d5-948d8312d79a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"35fc4391-5794-420c-8003-6a986f0c30fd","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"efede08d-9704-4339-9c76-06f584cd1faf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"af07b577-64c7-49e2-8493-6e1bda0e732d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_edge_detect/0f702a82-002f-475e-b977-8189ece26ed3.png b/sprites/s_node_edge_detect/0f702a82-002f-475e-b977-8189ece26ed3.png new file mode 100644 index 000000000..cbdb7ae91 Binary files /dev/null and b/sprites/s_node_edge_detect/0f702a82-002f-475e-b977-8189ece26ed3.png differ diff --git a/sprites/s_node_edge_detect/73c31b10-c743-452c-bbde-8561c3d7c7e5.png b/sprites/s_node_edge_detect/73c31b10-c743-452c-bbde-8561c3d7c7e5.png deleted file mode 100644 index 87d7e12f6..000000000 Binary files a/sprites/s_node_edge_detect/73c31b10-c743-452c-bbde-8561c3d7c7e5.png and /dev/null differ diff --git a/sprites/s_node_edge_detect/layers/0f702a82-002f-475e-b977-8189ece26ed3/77f2dfec-b9c1-4936-9f73-4080987687ca.png b/sprites/s_node_edge_detect/layers/0f702a82-002f-475e-b977-8189ece26ed3/77f2dfec-b9c1-4936-9f73-4080987687ca.png new file mode 100644 index 000000000..cbdb7ae91 Binary files /dev/null and b/sprites/s_node_edge_detect/layers/0f702a82-002f-475e-b977-8189ece26ed3/77f2dfec-b9c1-4936-9f73-4080987687ca.png differ diff --git a/sprites/s_node_edge_detect/layers/73c31b10-c743-452c-bbde-8561c3d7c7e5/83e03dba-03e5-4450-aae1-595c8fbfadb3.png b/sprites/s_node_edge_detect/layers/73c31b10-c743-452c-bbde-8561c3d7c7e5/83e03dba-03e5-4450-aae1-595c8fbfadb3.png deleted file mode 100644 index 87d7e12f6..000000000 Binary files a/sprites/s_node_edge_detect/layers/73c31b10-c743-452c-bbde-8561c3d7c7e5/83e03dba-03e5-4450-aae1-595c8fbfadb3.png and /dev/null differ diff --git a/sprites/s_node_edge_detect/s_node_edge_detect.yy b/sprites/s_node_edge_detect/s_node_edge_detect.yy index bed98afad..ae91f1a45 100644 --- a/sprites/s_node_edge_detect/s_node_edge_detect.yy +++ b/sprites/s_node_edge_detect/s_node_edge_detect.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 29, - "bbox_top": 3, - "bbox_bottom": 26, + "bbox_left": 6, + "bbox_right": 58, + "bbox_top": 6, + "bbox_bottom": 53, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"73c31b10-c743-452c-bbde-8561c3d7c7e5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f702a82-002f-475e-b977-8189ece26ed3",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e45a69fe-359d-4a7b-8750-d52f2a06bcc1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"73c31b10-c743-452c-bbde-8561c3d7c7e5","path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"02b60964-2c93-4ad3-94f6-80d127f9ad7b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f702a82-002f-475e-b977-8189ece26ed3","path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"83e03dba-03e5-4450-aae1-595c8fbfadb3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"77f2dfec-b9c1-4936-9f73-4080987687ca","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_erode/33f2d9ed-4988-4316-950d-27d88704e268.png b/sprites/s_node_erode/33f2d9ed-4988-4316-950d-27d88704e268.png new file mode 100644 index 000000000..49d3690cc Binary files /dev/null and b/sprites/s_node_erode/33f2d9ed-4988-4316-950d-27d88704e268.png differ diff --git a/sprites/s_node_erode/57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2.png b/sprites/s_node_erode/57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2.png deleted file mode 100644 index 46ec9a0c9..000000000 Binary files a/sprites/s_node_erode/57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2.png and /dev/null differ diff --git a/sprites/s_node_erode/layers/33f2d9ed-4988-4316-950d-27d88704e268/723478e7-365a-463c-bd6d-7397c8389dba.png b/sprites/s_node_erode/layers/33f2d9ed-4988-4316-950d-27d88704e268/723478e7-365a-463c-bd6d-7397c8389dba.png new file mode 100644 index 000000000..49d3690cc Binary files /dev/null and b/sprites/s_node_erode/layers/33f2d9ed-4988-4316-950d-27d88704e268/723478e7-365a-463c-bd6d-7397c8389dba.png differ diff --git a/sprites/s_node_erode/layers/57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2/d0355ce2-fefd-47b6-85d7-df1d99b017f3.png b/sprites/s_node_erode/layers/57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2/d0355ce2-fefd-47b6-85d7-df1d99b017f3.png deleted file mode 100644 index 26fa68c29..000000000 Binary files a/sprites/s_node_erode/layers/57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2/d0355ce2-fefd-47b6-85d7-df1d99b017f3.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 3fc23f4ef..ec20ab60e 100644 --- a/sprites/s_node_erode/s_node_erode.yy +++ b/sprites/s_node_erode/s_node_erode.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"33f2d9ed-4988-4316-950d-27d88704e268",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4b5184e8-3336-47b4-a2e6-a3627b6bd1b9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"57f3d9ce-e656-4e91-9ec0-782ff7c5cbc2","path":"sprites/s_node_erode/s_node_erode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0c0478cd-00f0-4901-872c-dcca6f2ffe5d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"33f2d9ed-4988-4316-950d-27d88704e268","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d0355ce2-fefd-47b6-85d7-df1d99b017f3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"723478e7-365a-463c-bd6d-7397c8389dba","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_export/71336bbc-0e98-492a-90f0-15be9ad5a286.png b/sprites/s_node_export/71336bbc-0e98-492a-90f0-15be9ad5a286.png new file mode 100644 index 000000000..a9f6e978f Binary files /dev/null and b/sprites/s_node_export/71336bbc-0e98-492a-90f0-15be9ad5a286.png differ diff --git a/sprites/s_node_export/fc5274dd-6a70-435f-ab27-23ac278d828b.png b/sprites/s_node_export/fc5274dd-6a70-435f-ab27-23ac278d828b.png deleted file mode 100644 index 2704b05a8..000000000 Binary files a/sprites/s_node_export/fc5274dd-6a70-435f-ab27-23ac278d828b.png and /dev/null differ diff --git a/sprites/s_node_export/layers/71336bbc-0e98-492a-90f0-15be9ad5a286/3659f6b2-e4c0-4935-ac4f-0fcf0b38b927.png b/sprites/s_node_export/layers/71336bbc-0e98-492a-90f0-15be9ad5a286/3659f6b2-e4c0-4935-ac4f-0fcf0b38b927.png new file mode 100644 index 000000000..a9f6e978f Binary files /dev/null and b/sprites/s_node_export/layers/71336bbc-0e98-492a-90f0-15be9ad5a286/3659f6b2-e4c0-4935-ac4f-0fcf0b38b927.png differ diff --git a/sprites/s_node_export/layers/fc5274dd-6a70-435f-ab27-23ac278d828b/06d7b84a-551f-41f9-83e4-2397725dcf1a.png b/sprites/s_node_export/layers/fc5274dd-6a70-435f-ab27-23ac278d828b/06d7b84a-551f-41f9-83e4-2397725dcf1a.png deleted file mode 100644 index f3be5a36c..000000000 Binary files a/sprites/s_node_export/layers/fc5274dd-6a70-435f-ab27-23ac278d828b/06d7b84a-551f-41f9-83e4-2397725dcf1a.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 ab0bc3da2..0e6bbaa35 100644 --- a/sprites/s_node_export/s_node_export.yy +++ b/sprites/s_node_export/s_node_export.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 1, - "bbox_bottom": 31, + "bbox_right": 63, + "bbox_top": 2, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fc5274dd-6a70-435f-ab27-23ac278d828b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"71336bbc-0e98-492a-90f0-15be9ad5a286",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"398e99bf-be51-42c6-8ee7-41e08c3ea8cb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fc5274dd-6a70-435f-ab27-23ac278d828b","path":"sprites/s_node_export/s_node_export.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fb9a1c66-c382-439f-9589-ae8f1fbd989b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"71336bbc-0e98-492a-90f0-15be9ad5a286","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"06d7b84a-551f-41f9-83e4-2397725dcf1a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3659f6b2-e4c0-4935-ac4f-0fcf0b38b927","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_frame/2a0d8439-912f-49e0-950b-6ad2dcd6ed1c.png b/sprites/s_node_frame/2a0d8439-912f-49e0-950b-6ad2dcd6ed1c.png deleted file mode 100644 index 419623aba..000000000 Binary files a/sprites/s_node_frame/2a0d8439-912f-49e0-950b-6ad2dcd6ed1c.png and /dev/null differ diff --git a/sprites/s_node_frame/c9b52ac2-100a-4dd4-8700-16fbea5d4120.png b/sprites/s_node_frame/c9b52ac2-100a-4dd4-8700-16fbea5d4120.png new file mode 100644 index 000000000..7d2cd77ff Binary files /dev/null and b/sprites/s_node_frame/c9b52ac2-100a-4dd4-8700-16fbea5d4120.png differ diff --git a/sprites/s_node_frame/layers/2a0d8439-912f-49e0-950b-6ad2dcd6ed1c/872e896a-cd5c-4e96-99ef-eca079b384c4.png b/sprites/s_node_frame/layers/2a0d8439-912f-49e0-950b-6ad2dcd6ed1c/872e896a-cd5c-4e96-99ef-eca079b384c4.png deleted file mode 100644 index ad257c1da..000000000 Binary files a/sprites/s_node_frame/layers/2a0d8439-912f-49e0-950b-6ad2dcd6ed1c/872e896a-cd5c-4e96-99ef-eca079b384c4.png and /dev/null differ diff --git a/sprites/s_node_frame/layers/c9b52ac2-100a-4dd4-8700-16fbea5d4120/9d787fe2-a03f-49fe-985b-9a70473945f5.png b/sprites/s_node_frame/layers/c9b52ac2-100a-4dd4-8700-16fbea5d4120/9d787fe2-a03f-49fe-985b-9a70473945f5.png new file mode 100644 index 000000000..7d2cd77ff Binary files /dev/null and b/sprites/s_node_frame/layers/c9b52ac2-100a-4dd4-8700-16fbea5d4120/9d787fe2-a03f-49fe-985b-9a70473945f5.png differ diff --git a/sprites/s_node_frame/s_node_frame.yy b/sprites/s_node_frame/s_node_frame.yy index 2d508decb..a364ac344 100644 --- a/sprites/s_node_frame/s_node_frame.yy +++ b/sprites/s_node_frame/s_node_frame.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2a0d8439-912f-49e0-950b-6ad2dcd6ed1c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c9b52ac2-100a-4dd4-8700-16fbea5d4120",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7df2a4d9-ee67-4aa0-89a2-9a3efad22170","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2a0d8439-912f-49e0-950b-6ad2dcd6ed1c","path":"sprites/s_node_frame/s_node_frame.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e43c2e9c-2073-4726-bab6-5103c7ea75ad","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c9b52ac2-100a-4dd4-8700-16fbea5d4120","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"872e896a-cd5c-4e96-99ef-eca079b384c4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9d787fe2-a03f-49fe-985b-9a70473945f5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_glow/4faa412f-da5f-4d6e-bf74-272fc54d3617.png b/sprites/s_node_glow/4faa412f-da5f-4d6e-bf74-272fc54d3617.png new file mode 100644 index 000000000..f4cd8f335 Binary files /dev/null and b/sprites/s_node_glow/4faa412f-da5f-4d6e-bf74-272fc54d3617.png differ diff --git a/sprites/s_node_glow/e479db87-4d4a-43fd-b1a5-2f5aa4842ed8.png b/sprites/s_node_glow/e479db87-4d4a-43fd-b1a5-2f5aa4842ed8.png deleted file mode 100644 index 8363e4691..000000000 Binary files a/sprites/s_node_glow/e479db87-4d4a-43fd-b1a5-2f5aa4842ed8.png and /dev/null differ diff --git a/sprites/s_node_glow/layers/4faa412f-da5f-4d6e-bf74-272fc54d3617/6f60a7af-43bb-4483-b8d1-44a265a6b7cb.png b/sprites/s_node_glow/layers/4faa412f-da5f-4d6e-bf74-272fc54d3617/6f60a7af-43bb-4483-b8d1-44a265a6b7cb.png new file mode 100644 index 000000000..f4cd8f335 Binary files /dev/null and b/sprites/s_node_glow/layers/4faa412f-da5f-4d6e-bf74-272fc54d3617/6f60a7af-43bb-4483-b8d1-44a265a6b7cb.png differ diff --git a/sprites/s_node_glow/layers/e479db87-4d4a-43fd-b1a5-2f5aa4842ed8/50106e97-6449-47f6-bce0-88a66307b1c5.png b/sprites/s_node_glow/layers/e479db87-4d4a-43fd-b1a5-2f5aa4842ed8/50106e97-6449-47f6-bce0-88a66307b1c5.png deleted file mode 100644 index 22b3dad4b..000000000 Binary files a/sprites/s_node_glow/layers/e479db87-4d4a-43fd-b1a5-2f5aa4842ed8/50106e97-6449-47f6-bce0-88a66307b1c5.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 9f485b068..31df8c52a 100644 --- a/sprites/s_node_glow/s_node_glow.yy +++ b/sprites/s_node_glow/s_node_glow.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e479db87-4d4a-43fd-b1a5-2f5aa4842ed8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4faa412f-da5f-4d6e-bf74-272fc54d3617",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f9a35b76-4026-4688-93b4-68c5e07b00e4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e479db87-4d4a-43fd-b1a5-2f5aa4842ed8","path":"sprites/s_node_glow/s_node_glow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1ab4ed95-2e17-48cb-a8e9-3f47bd6fa35d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4faa412f-da5f-4d6e-bf74-272fc54d3617","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"50106e97-6449-47f6-bce0-88a66307b1c5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6f60a7af-43bb-4483-b8d1-44a265a6b7cb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_gradient/38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd.png b/sprites/s_node_gradient/38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd.png new file mode 100644 index 000000000..2316dc528 Binary files /dev/null and b/sprites/s_node_gradient/38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd.png differ diff --git a/sprites/s_node_gradient/480982ca-c225-4cb4-bf32-0280440d019d.png b/sprites/s_node_gradient/480982ca-c225-4cb4-bf32-0280440d019d.png deleted file mode 100644 index 7e0febe96..000000000 Binary files a/sprites/s_node_gradient/480982ca-c225-4cb4-bf32-0280440d019d.png and /dev/null differ diff --git a/sprites/s_node_gradient/layers/38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd/2a39af54-2039-41c3-9803-364bb769346e.png b/sprites/s_node_gradient/layers/38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd/2a39af54-2039-41c3-9803-364bb769346e.png new file mode 100644 index 000000000..2316dc528 Binary files /dev/null and b/sprites/s_node_gradient/layers/38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd/2a39af54-2039-41c3-9803-364bb769346e.png differ diff --git a/sprites/s_node_gradient/layers/480982ca-c225-4cb4-bf32-0280440d019d/8fb2dfbe-ee1e-4124-8ca4-943d339dee87.png b/sprites/s_node_gradient/layers/480982ca-c225-4cb4-bf32-0280440d019d/8fb2dfbe-ee1e-4124-8ca4-943d339dee87.png deleted file mode 100644 index c8758a802..000000000 Binary files a/sprites/s_node_gradient/layers/480982ca-c225-4cb4-bf32-0280440d019d/8fb2dfbe-ee1e-4124-8ca4-943d339dee87.png and /dev/null differ diff --git a/sprites/s_node_gradient/s_node_gradient.yy b/sprites/s_node_gradient/s_node_gradient.yy index 1b98d8695..2e2d99148 100644 --- a/sprites/s_node_gradient/s_node_gradient.yy +++ b/sprites/s_node_gradient/s_node_gradient.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"480982ca-c225-4cb4-bf32-0280440d019d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7611258b-2493-4190-ae2e-d6add5fe0c1a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"480982ca-c225-4cb4-bf32-0280440d019d","path":"sprites/s_node_gradient/s_node_gradient.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c353a94e-59d9-42ee-b4af-82fb1914587e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"38e9a982-c6d3-47c9-ba9d-77cd4d9e7ddd","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8fb2dfbe-ee1e-4124-8ca4-943d339dee87","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2a39af54-2039-41c3-9803-364bb769346e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_gradient_out/668eb443-5011-442e-943a-decef6b1b97f.png b/sprites/s_node_gradient_out/668eb443-5011-442e-943a-decef6b1b97f.png new file mode 100644 index 000000000..56121d703 Binary files /dev/null and b/sprites/s_node_gradient_out/668eb443-5011-442e-943a-decef6b1b97f.png differ diff --git a/sprites/s_node_gradient_out/c5aecce0-638d-4286-81d5-950fbff6677e.png b/sprites/s_node_gradient_out/c5aecce0-638d-4286-81d5-950fbff6677e.png deleted file mode 100644 index fc1eae63b..000000000 Binary files a/sprites/s_node_gradient_out/c5aecce0-638d-4286-81d5-950fbff6677e.png and /dev/null differ diff --git a/sprites/s_node_gradient_out/layers/668eb443-5011-442e-943a-decef6b1b97f/4f047c47-a15d-4035-8930-c248d8ade6f7.png b/sprites/s_node_gradient_out/layers/668eb443-5011-442e-943a-decef6b1b97f/4f047c47-a15d-4035-8930-c248d8ade6f7.png new file mode 100644 index 000000000..56121d703 Binary files /dev/null and b/sprites/s_node_gradient_out/layers/668eb443-5011-442e-943a-decef6b1b97f/4f047c47-a15d-4035-8930-c248d8ade6f7.png differ diff --git a/sprites/s_node_gradient_out/layers/c5aecce0-638d-4286-81d5-950fbff6677e/18228d43-1b4b-4349-8588-a12c104aafe7.png b/sprites/s_node_gradient_out/layers/c5aecce0-638d-4286-81d5-950fbff6677e/18228d43-1b4b-4349-8588-a12c104aafe7.png deleted file mode 100644 index f8ea79808..000000000 Binary files a/sprites/s_node_gradient_out/layers/c5aecce0-638d-4286-81d5-950fbff6677e/18228d43-1b4b-4349-8588-a12c104aafe7.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 1956dd834..783f8b91a 100644 --- a/sprites/s_node_gradient_out/s_node_gradient_out.yy +++ b/sprites/s_node_gradient_out/s_node_gradient_out.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 22, + "bbox_right": 63, + "bbox_top": 18, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5aecce0-638d-4286-81d5-950fbff6677e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"668eb443-5011-442e-943a-decef6b1b97f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3c64e067-3f32-4bc0-8a1e-50a993091257","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c5aecce0-638d-4286-81d5-950fbff6677e","path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"bc73a905-b2b2-498c-909b-8acf9f310c96","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"668eb443-5011-442e-943a-decef6b1b97f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"18228d43-1b4b-4349-8588-a12c104aafe7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4f047c47-a15d-4035-8930-c248d8ade6f7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_grey_alpha/8778a860-5ec5-492f-8122-337889d15d67.png b/sprites/s_node_grey_alpha/8778a860-5ec5-492f-8122-337889d15d67.png deleted file mode 100644 index 7a8b43a66..000000000 Binary files a/sprites/s_node_grey_alpha/8778a860-5ec5-492f-8122-337889d15d67.png and /dev/null differ diff --git a/sprites/s_node_grey_alpha/abfdfa8c-f85b-4932-b39c-0ee617b99f63.png b/sprites/s_node_grey_alpha/abfdfa8c-f85b-4932-b39c-0ee617b99f63.png new file mode 100644 index 000000000..a9907c23b Binary files /dev/null and b/sprites/s_node_grey_alpha/abfdfa8c-f85b-4932-b39c-0ee617b99f63.png differ diff --git a/sprites/s_node_grey_alpha/layers/8778a860-5ec5-492f-8122-337889d15d67/b546b954-29db-4a16-97cd-145a27ae7df0.png b/sprites/s_node_grey_alpha/layers/8778a860-5ec5-492f-8122-337889d15d67/b546b954-29db-4a16-97cd-145a27ae7df0.png deleted file mode 100644 index 9a52e9d52..000000000 Binary files a/sprites/s_node_grey_alpha/layers/8778a860-5ec5-492f-8122-337889d15d67/b546b954-29db-4a16-97cd-145a27ae7df0.png and /dev/null differ diff --git a/sprites/s_node_grey_alpha/layers/abfdfa8c-f85b-4932-b39c-0ee617b99f63/e2fdfad0-1158-4de7-8789-3691ac2a73a3.png b/sprites/s_node_grey_alpha/layers/abfdfa8c-f85b-4932-b39c-0ee617b99f63/e2fdfad0-1158-4de7-8789-3691ac2a73a3.png new file mode 100644 index 000000000..a9907c23b Binary files /dev/null and b/sprites/s_node_grey_alpha/layers/abfdfa8c-f85b-4932-b39c-0ee617b99f63/e2fdfad0-1158-4de7-8789-3691ac2a73a3.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 5b2ec6a9f..02e526cc6 100644 --- a/sprites/s_node_grey_alpha/s_node_grey_alpha.yy +++ b/sprites/s_node_grey_alpha/s_node_grey_alpha.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8778a860-5ec5-492f-8122-337889d15d67",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"abfdfa8c-f85b-4932-b39c-0ee617b99f63",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"32a75cdc-7021-48b1-b180-540df45af056","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8778a860-5ec5-492f-8122-337889d15d67","path":"sprites/s_node_grey_alpha/s_node_grey_alpha.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"71c959d9-e463-4525-a93b-fecc19361cb8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"abfdfa8c-f85b-4932-b39c-0ee617b99f63","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b546b954-29db-4a16-97cd-145a27ae7df0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e2fdfad0-1158-4de7-8789-3691ac2a73a3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_greyscale/f57632c8-d948-49ce-9b9b-e9254724afcb.png b/sprites/s_node_greyscale/f57632c8-d948-49ce-9b9b-e9254724afcb.png deleted file mode 100644 index 987215945..000000000 Binary files a/sprites/s_node_greyscale/f57632c8-d948-49ce-9b9b-e9254724afcb.png and /dev/null differ diff --git a/sprites/s_node_greyscale/f5d88627-54be-4182-80dd-25ac7ca40667.png b/sprites/s_node_greyscale/f5d88627-54be-4182-80dd-25ac7ca40667.png new file mode 100644 index 000000000..af50d698f Binary files /dev/null and b/sprites/s_node_greyscale/f5d88627-54be-4182-80dd-25ac7ca40667.png differ diff --git a/sprites/s_node_greyscale/layers/f57632c8-d948-49ce-9b9b-e9254724afcb/b2991ce8-b629-4446-a5fd-859ac7c74709.png b/sprites/s_node_greyscale/layers/f57632c8-d948-49ce-9b9b-e9254724afcb/b2991ce8-b629-4446-a5fd-859ac7c74709.png deleted file mode 100644 index 038943245..000000000 Binary files a/sprites/s_node_greyscale/layers/f57632c8-d948-49ce-9b9b-e9254724afcb/b2991ce8-b629-4446-a5fd-859ac7c74709.png and /dev/null differ diff --git a/sprites/s_node_greyscale/layers/f5d88627-54be-4182-80dd-25ac7ca40667/e57514f1-908a-448f-b0fc-566d67383178.png b/sprites/s_node_greyscale/layers/f5d88627-54be-4182-80dd-25ac7ca40667/e57514f1-908a-448f-b0fc-566d67383178.png new file mode 100644 index 000000000..af50d698f Binary files /dev/null and b/sprites/s_node_greyscale/layers/f5d88627-54be-4182-80dd-25ac7ca40667/e57514f1-908a-448f-b0fc-566d67383178.png differ diff --git a/sprites/s_node_greyscale/s_node_greyscale.yy b/sprites/s_node_greyscale/s_node_greyscale.yy index 93c583621..4f90d996e 100644 --- a/sprites/s_node_greyscale/s_node_greyscale.yy +++ b/sprites/s_node_greyscale/s_node_greyscale.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 32, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 33, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f57632c8-d948-49ce-9b9b-e9254724afcb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f5d88627-54be-4182-80dd-25ac7ca40667",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e99ed22a-6095-46c0-bb4e-5922790f3f5e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f57632c8-d948-49ce-9b9b-e9254724afcb","path":"sprites/s_node_greyscale/s_node_greyscale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"adfe5753-2dce-495a-9c1b-a9469b7af8a7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f5d88627-54be-4182-80dd-25ac7ca40667","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b2991ce8-b629-4446-a5fd-859ac7c74709","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e57514f1-908a-448f-b0fc-566d67383178","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_grid/49f5c7e4-1156-4061-aa23-b557d98d6e67.png b/sprites/s_node_grid/49f5c7e4-1156-4061-aa23-b557d98d6e67.png new file mode 100644 index 000000000..4670792d0 Binary files /dev/null and b/sprites/s_node_grid/49f5c7e4-1156-4061-aa23-b557d98d6e67.png differ diff --git a/sprites/s_node_grid/7fc1cce4-d434-4c32-8116-727401b4c474.png b/sprites/s_node_grid/7fc1cce4-d434-4c32-8116-727401b4c474.png deleted file mode 100644 index bb42d8a74..000000000 Binary files a/sprites/s_node_grid/7fc1cce4-d434-4c32-8116-727401b4c474.png and /dev/null differ diff --git a/sprites/s_node_grid/layers/49f5c7e4-1156-4061-aa23-b557d98d6e67/fd8dfa77-f51c-4a07-939b-6037fd88d1bd.png b/sprites/s_node_grid/layers/49f5c7e4-1156-4061-aa23-b557d98d6e67/fd8dfa77-f51c-4a07-939b-6037fd88d1bd.png new file mode 100644 index 000000000..4670792d0 Binary files /dev/null and b/sprites/s_node_grid/layers/49f5c7e4-1156-4061-aa23-b557d98d6e67/fd8dfa77-f51c-4a07-939b-6037fd88d1bd.png differ diff --git a/sprites/s_node_grid/layers/7fc1cce4-d434-4c32-8116-727401b4c474/1108cfa1-e1ee-4061-a676-02de065dc2d1.png b/sprites/s_node_grid/layers/7fc1cce4-d434-4c32-8116-727401b4c474/1108cfa1-e1ee-4061-a676-02de065dc2d1.png deleted file mode 100644 index 6b790c38e..000000000 Binary files a/sprites/s_node_grid/layers/7fc1cce4-d434-4c32-8116-727401b4c474/1108cfa1-e1ee-4061-a676-02de065dc2d1.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 a8fc04df2..a7f9498c6 100644 --- a/sprites/s_node_grid/s_node_grid.yy +++ b/sprites/s_node_grid/s_node_grid.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7fc1cce4-d434-4c32-8116-727401b4c474",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49f5c7e4-1156-4061-aa23-b557d98d6e67",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ed81fe3d-dca2-4c9d-93d7-0909ddb24fbc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7fc1cce4-d434-4c32-8116-727401b4c474","path":"sprites/s_node_grid/s_node_grid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8714f537-ba6e-494d-b3d2-3426182edcf1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"49f5c7e4-1156-4061-aa23-b557d98d6e67","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1108cfa1-e1ee-4061-a676-02de065dc2d1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fd8dfa77-f51c-4a07-939b-6037fd88d1bd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_grid_noise/6127362e-2393-4bf1-a276-eb0b09262e07.png b/sprites/s_node_grid_noise/6127362e-2393-4bf1-a276-eb0b09262e07.png deleted file mode 100644 index b2bc67d44..000000000 Binary files a/sprites/s_node_grid_noise/6127362e-2393-4bf1-a276-eb0b09262e07.png and /dev/null differ diff --git a/sprites/s_node_grid_noise/c8995f04-9db1-482a-893c-a59ce7e426e2.png b/sprites/s_node_grid_noise/c8995f04-9db1-482a-893c-a59ce7e426e2.png new file mode 100644 index 000000000..7f63af307 Binary files /dev/null and b/sprites/s_node_grid_noise/c8995f04-9db1-482a-893c-a59ce7e426e2.png differ diff --git a/sprites/s_node_grid_noise/layers/6127362e-2393-4bf1-a276-eb0b09262e07/ef93c168-5d1f-4d13-8d81-6d9fc7d86d97.png b/sprites/s_node_grid_noise/layers/6127362e-2393-4bf1-a276-eb0b09262e07/ef93c168-5d1f-4d13-8d81-6d9fc7d86d97.png deleted file mode 100644 index 4f0a418e7..000000000 Binary files a/sprites/s_node_grid_noise/layers/6127362e-2393-4bf1-a276-eb0b09262e07/ef93c168-5d1f-4d13-8d81-6d9fc7d86d97.png and /dev/null differ diff --git a/sprites/s_node_grid_noise/layers/c8995f04-9db1-482a-893c-a59ce7e426e2/ea80fc9d-0896-4036-baac-511c22e6118d.png b/sprites/s_node_grid_noise/layers/c8995f04-9db1-482a-893c-a59ce7e426e2/ea80fc9d-0896-4036-baac-511c22e6118d.png new file mode 100644 index 000000000..7f63af307 Binary files /dev/null and b/sprites/s_node_grid_noise/layers/c8995f04-9db1-482a-893c-a59ce7e426e2/ea80fc9d-0896-4036-baac-511c22e6118d.png 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 885ae0c3c..678e0c988 100644 --- a/sprites/s_node_grid_noise/s_node_grid_noise.yy +++ b/sprites/s_node_grid_noise/s_node_grid_noise.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6127362e-2393-4bf1-a276-eb0b09262e07",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c8995f04-9db1-482a-893c-a59ce7e426e2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4c49d21c-da02-4293-b587-4c2b5daf3bd6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6127362e-2393-4bf1-a276-eb0b09262e07","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"dfdfa85e-b8c6-44b1-8057-3f306bc7d333","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c8995f04-9db1-482a-893c-a59ce7e426e2","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ef93c168-5d1f-4d13-8d81-6d9fc7d86d97","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ea80fc9d-0896-4036-baac-511c22e6118d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_group/3abce66a-8e22-4146-94d6-07b9273b37f4.png b/sprites/s_node_group/3abce66a-8e22-4146-94d6-07b9273b37f4.png deleted file mode 100644 index 7472ce40b..000000000 Binary files a/sprites/s_node_group/3abce66a-8e22-4146-94d6-07b9273b37f4.png and /dev/null differ diff --git a/sprites/s_node_group/7ca55142-cc74-4e24-be7e-9346f403cc5c.png b/sprites/s_node_group/7ca55142-cc74-4e24-be7e-9346f403cc5c.png new file mode 100644 index 000000000..923d1cd25 Binary files /dev/null and b/sprites/s_node_group/7ca55142-cc74-4e24-be7e-9346f403cc5c.png differ diff --git a/sprites/s_node_group/layers/3abce66a-8e22-4146-94d6-07b9273b37f4/29809c12-6302-4391-bf73-0878185bc4bf.png b/sprites/s_node_group/layers/3abce66a-8e22-4146-94d6-07b9273b37f4/29809c12-6302-4391-bf73-0878185bc4bf.png deleted file mode 100644 index 613b0bfb1..000000000 Binary files a/sprites/s_node_group/layers/3abce66a-8e22-4146-94d6-07b9273b37f4/29809c12-6302-4391-bf73-0878185bc4bf.png and /dev/null differ diff --git a/sprites/s_node_group/layers/7ca55142-cc74-4e24-be7e-9346f403cc5c/fcb9eadf-f6b0-4082-a318-e8df1ca14edf.png b/sprites/s_node_group/layers/7ca55142-cc74-4e24-be7e-9346f403cc5c/fcb9eadf-f6b0-4082-a318-e8df1ca14edf.png new file mode 100644 index 000000000..923d1cd25 Binary files /dev/null and b/sprites/s_node_group/layers/7ca55142-cc74-4e24-be7e-9346f403cc5c/fcb9eadf-f6b0-4082-a318-e8df1ca14edf.png differ diff --git a/sprites/s_node_group/s_node_group.yy b/sprites/s_node_group/s_node_group.yy index 52af965f5..e37efeb68 100644 --- a/sprites/s_node_group/s_node_group.yy +++ b/sprites/s_node_group/s_node_group.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3abce66a-8e22-4146-94d6-07b9273b37f4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7ca55142-cc74-4e24-be7e-9346f403cc5c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"49e5ed65-05c3-4633-aff7-998683309eb2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3abce66a-8e22-4146-94d6-07b9273b37f4","path":"sprites/s_node_group/s_node_group.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"87a7f87a-8cb7-4633-a8d2-d0b93ecc6f50","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7ca55142-cc74-4e24-be7e-9346f403cc5c","path":"sprites/s_node_group/s_node_group.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"29809c12-6302-4391-bf73-0878185bc4bf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fcb9eadf-f6b0-4082-a318-e8df1ca14edf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image/638349a6-1970-4264-afe7-a75fdf7c6fd2.png b/sprites/s_node_image/638349a6-1970-4264-afe7-a75fdf7c6fd2.png new file mode 100644 index 000000000..bc3ea2e2d Binary files /dev/null and b/sprites/s_node_image/638349a6-1970-4264-afe7-a75fdf7c6fd2.png differ diff --git a/sprites/s_node_image/87b6349a-0328-4f05-aa7a-d6366ac038d5.png b/sprites/s_node_image/87b6349a-0328-4f05-aa7a-d6366ac038d5.png deleted file mode 100644 index de722558a..000000000 Binary files a/sprites/s_node_image/87b6349a-0328-4f05-aa7a-d6366ac038d5.png and /dev/null differ diff --git a/sprites/s_node_image/layers/638349a6-1970-4264-afe7-a75fdf7c6fd2/ec6b2b7e-9266-4911-a7c3-04b7ea6073fa.png b/sprites/s_node_image/layers/638349a6-1970-4264-afe7-a75fdf7c6fd2/ec6b2b7e-9266-4911-a7c3-04b7ea6073fa.png new file mode 100644 index 000000000..bc3ea2e2d Binary files /dev/null and b/sprites/s_node_image/layers/638349a6-1970-4264-afe7-a75fdf7c6fd2/ec6b2b7e-9266-4911-a7c3-04b7ea6073fa.png differ diff --git a/sprites/s_node_image/layers/87b6349a-0328-4f05-aa7a-d6366ac038d5/93f127e9-eb18-462e-89cf-d5eebb70d8a9.png b/sprites/s_node_image/layers/87b6349a-0328-4f05-aa7a-d6366ac038d5/93f127e9-eb18-462e-89cf-d5eebb70d8a9.png deleted file mode 100644 index f93381960..000000000 Binary files a/sprites/s_node_image/layers/87b6349a-0328-4f05-aa7a-d6366ac038d5/93f127e9-eb18-462e-89cf-d5eebb70d8a9.png and /dev/null differ diff --git a/sprites/s_node_image/s_node_image.yy b/sprites/s_node_image/s_node_image.yy index 11ff7d2c0..3158ec494 100644 --- a/sprites/s_node_image/s_node_image.yy +++ b/sprites/s_node_image/s_node_image.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87b6349a-0328-4f05-aa7a-d6366ac038d5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"638349a6-1970-4264-afe7-a75fdf7c6fd2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5a127024-8191-43cf-a1b6-b6c4faee59b5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"87b6349a-0328-4f05-aa7a-d6366ac038d5","path":"sprites/s_node_image/s_node_image.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e549be26-23dc-4508-9f24-4f33acc386c7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"638349a6-1970-4264-afe7-a75fdf7c6fd2","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"93f127e9-eb18-462e-89cf-d5eebb70d8a9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ec6b2b7e-9266-4911-a7c3-04b7ea6073fa","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_animation/c3b6f469-c696-4de3-9d02-3d4ca6e4fb04.png b/sprites/s_node_image_animation/c3b6f469-c696-4de3-9d02-3d4ca6e4fb04.png deleted file mode 100644 index c0539af8b..000000000 Binary files a/sprites/s_node_image_animation/c3b6f469-c696-4de3-9d02-3d4ca6e4fb04.png and /dev/null differ diff --git a/sprites/s_node_image_animation/f9d466c6-71fe-41c4-ab65-565b2296855b.png b/sprites/s_node_image_animation/f9d466c6-71fe-41c4-ab65-565b2296855b.png new file mode 100644 index 000000000..7ca4b9a5b Binary files /dev/null and b/sprites/s_node_image_animation/f9d466c6-71fe-41c4-ab65-565b2296855b.png differ diff --git a/sprites/s_node_image_animation/layers/c3b6f469-c696-4de3-9d02-3d4ca6e4fb04/0f944a1d-77ea-499c-97a2-eef3246f006b.png b/sprites/s_node_image_animation/layers/c3b6f469-c696-4de3-9d02-3d4ca6e4fb04/0f944a1d-77ea-499c-97a2-eef3246f006b.png deleted file mode 100644 index d0e18c013..000000000 Binary files a/sprites/s_node_image_animation/layers/c3b6f469-c696-4de3-9d02-3d4ca6e4fb04/0f944a1d-77ea-499c-97a2-eef3246f006b.png and /dev/null differ diff --git a/sprites/s_node_image_animation/layers/f9d466c6-71fe-41c4-ab65-565b2296855b/35951ccb-9eeb-47bd-9615-3f9bda7a0a43.png b/sprites/s_node_image_animation/layers/f9d466c6-71fe-41c4-ab65-565b2296855b/35951ccb-9eeb-47bd-9615-3f9bda7a0a43.png new file mode 100644 index 000000000..7ca4b9a5b Binary files /dev/null and b/sprites/s_node_image_animation/layers/f9d466c6-71fe-41c4-ab65-565b2296855b/35951ccb-9eeb-47bd-9615-3f9bda7a0a43.png 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 b8d7dd7b7..9308a4a15 100644 --- a/sprites/s_node_image_animation/s_node_image_animation.yy +++ b/sprites/s_node_image_animation/s_node_image_animation.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 7, - "bbox_bottom": 24, + "bbox_right": 63, + "bbox_top": 14, + "bbox_bottom": 49, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c3b6f469-c696-4de3-9d02-3d4ca6e4fb04",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f9d466c6-71fe-41c4-ab65-565b2296855b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c7f67ad5-dda5-4100-a4da-9f817acd231e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c3b6f469-c696-4de3-9d02-3d4ca6e4fb04","path":"sprites/s_node_image_animation/s_node_image_animation.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a4a431d9-2d90-4de5-b413-a9897dbdeeaa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f9d466c6-71fe-41c4-ab65-565b2296855b","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0f944a1d-77ea-499c-97a2-eef3246f006b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"35951ccb-9eeb-47bd-9615-3f9bda7a0a43","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_copy/56283000-3ff8-4be2-9ead-9317ebb4f41f.png b/sprites/s_node_image_copy/56283000-3ff8-4be2-9ead-9317ebb4f41f.png deleted file mode 100644 index 2a26890b9..000000000 Binary files a/sprites/s_node_image_copy/56283000-3ff8-4be2-9ead-9317ebb4f41f.png and /dev/null differ diff --git a/sprites/s_node_image_copy/f4cf0848-00d7-4d06-84e7-ac7eb0d01876.png b/sprites/s_node_image_copy/f4cf0848-00d7-4d06-84e7-ac7eb0d01876.png new file mode 100644 index 000000000..fed3f3643 Binary files /dev/null and b/sprites/s_node_image_copy/f4cf0848-00d7-4d06-84e7-ac7eb0d01876.png differ diff --git a/sprites/s_node_image_copy/layers/56283000-3ff8-4be2-9ead-9317ebb4f41f/67d39175-9e66-4f09-bb9d-025767fe9411.png b/sprites/s_node_image_copy/layers/56283000-3ff8-4be2-9ead-9317ebb4f41f/67d39175-9e66-4f09-bb9d-025767fe9411.png deleted file mode 100644 index fd3d59644..000000000 Binary files a/sprites/s_node_image_copy/layers/56283000-3ff8-4be2-9ead-9317ebb4f41f/67d39175-9e66-4f09-bb9d-025767fe9411.png and /dev/null differ diff --git a/sprites/s_node_image_copy/layers/f4cf0848-00d7-4d06-84e7-ac7eb0d01876/cb875abb-4382-4f6e-a22d-5bb3b84bd215.png b/sprites/s_node_image_copy/layers/f4cf0848-00d7-4d06-84e7-ac7eb0d01876/cb875abb-4382-4f6e-a22d-5bb3b84bd215.png new file mode 100644 index 000000000..fed3f3643 Binary files /dev/null and b/sprites/s_node_image_copy/layers/f4cf0848-00d7-4d06-84e7-ac7eb0d01876/cb875abb-4382-4f6e-a22d-5bb3b84bd215.png differ diff --git a/sprites/s_node_image_copy/s_node_image_copy.yy b/sprites/s_node_image_copy/s_node_image_copy.yy index fa3a213db..22fc49624 100644 --- a/sprites/s_node_image_copy/s_node_image_copy.yy +++ b/sprites/s_node_image_copy/s_node_image_copy.yy @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"56283000-3ff8-4be2-9ead-9317ebb4f41f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f4cf0848-00d7-4d06-84e7-ac7eb0d01876",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7e6180d0-12c6-477c-8192-14b9ed0c1cff","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"56283000-3ff8-4be2-9ead-9317ebb4f41f","path":"sprites/s_node_image_copy/s_node_image_copy.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"86d4fdaa-9b04-46b9-98b3-65e43b15f391","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f4cf0848-00d7-4d06-84e7-ac7eb0d01876","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -64,7 +64,7 @@ "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"67d39175-9e66-4f09-bb9d-025767fe9411","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb875abb-4382-4f6e-a22d-5bb3b84bd215","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_gif/03137388-2075-452c-a38c-32792f23342d.png b/sprites/s_node_image_gif/03137388-2075-452c-a38c-32792f23342d.png new file mode 100644 index 000000000..07630df2d Binary files /dev/null and b/sprites/s_node_image_gif/03137388-2075-452c-a38c-32792f23342d.png differ diff --git a/sprites/s_node_image_gif/ba08a2c6-72ef-47b7-a802-816e0c445472.png b/sprites/s_node_image_gif/ba08a2c6-72ef-47b7-a802-816e0c445472.png deleted file mode 100644 index 2a26890b9..000000000 Binary files a/sprites/s_node_image_gif/ba08a2c6-72ef-47b7-a802-816e0c445472.png and /dev/null differ diff --git a/sprites/s_node_image_gif/layers/03137388-2075-452c-a38c-32792f23342d/7ce87a49-a547-443f-bc29-e7199fd46f0f.png b/sprites/s_node_image_gif/layers/03137388-2075-452c-a38c-32792f23342d/7ce87a49-a547-443f-bc29-e7199fd46f0f.png new file mode 100644 index 000000000..07630df2d Binary files /dev/null and b/sprites/s_node_image_gif/layers/03137388-2075-452c-a38c-32792f23342d/7ce87a49-a547-443f-bc29-e7199fd46f0f.png differ diff --git a/sprites/s_node_image_gif/layers/ba08a2c6-72ef-47b7-a802-816e0c445472/69be5eba-4a3d-4677-acff-7f0910cb1d54.png b/sprites/s_node_image_gif/layers/ba08a2c6-72ef-47b7-a802-816e0c445472/69be5eba-4a3d-4677-acff-7f0910cb1d54.png deleted file mode 100644 index fd3d59644..000000000 Binary files a/sprites/s_node_image_gif/layers/ba08a2c6-72ef-47b7-a802-816e0c445472/69be5eba-4a3d-4677-acff-7f0910cb1d54.png and /dev/null 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 88551f944..8d4baafcf 100644 --- a/sprites/s_node_image_gif/s_node_image_gif.yy +++ b/sprites/s_node_image_gif/s_node_image_gif.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ba08a2c6-72ef-47b7-a802-816e0c445472",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"03137388-2075-452c-a38c-32792f23342d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ef7763a2-675c-4f53-82ce-3d4ad2544111","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ba08a2c6-72ef-47b7-a802-816e0c445472","path":"sprites/s_node_image_gif/s_node_image_gif.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"af9c9157-5fd9-43f0-b46b-41b73af16ea6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"03137388-2075-452c-a38c-32792f23342d","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"69be5eba-4a3d-4677-acff-7f0910cb1d54","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7ce87a49-a547-443f-bc29-e7199fd46f0f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_sequence/5980e066-5801-45ef-83c7-3aed5c0971c0.png b/sprites/s_node_image_sequence/5980e066-5801-45ef-83c7-3aed5c0971c0.png deleted file mode 100644 index c1773a340..000000000 Binary files a/sprites/s_node_image_sequence/5980e066-5801-45ef-83c7-3aed5c0971c0.png and /dev/null differ diff --git a/sprites/s_node_image_sequence/93ac7530-be3c-4405-8c97-cea644ea37a9.png b/sprites/s_node_image_sequence/93ac7530-be3c-4405-8c97-cea644ea37a9.png new file mode 100644 index 000000000..05d3770a7 Binary files /dev/null and b/sprites/s_node_image_sequence/93ac7530-be3c-4405-8c97-cea644ea37a9.png differ diff --git a/sprites/s_node_image_sequence/layers/5980e066-5801-45ef-83c7-3aed5c0971c0/855daf1a-af92-461d-9364-8f3bb9fdb87f.png b/sprites/s_node_image_sequence/layers/5980e066-5801-45ef-83c7-3aed5c0971c0/855daf1a-af92-461d-9364-8f3bb9fdb87f.png deleted file mode 100644 index eac5c7be6..000000000 Binary files a/sprites/s_node_image_sequence/layers/5980e066-5801-45ef-83c7-3aed5c0971c0/855daf1a-af92-461d-9364-8f3bb9fdb87f.png and /dev/null differ diff --git a/sprites/s_node_image_sequence/layers/93ac7530-be3c-4405-8c97-cea644ea37a9/d09cf9af-38ca-4c4b-bc4f-b802050f8dd1.png b/sprites/s_node_image_sequence/layers/93ac7530-be3c-4405-8c97-cea644ea37a9/d09cf9af-38ca-4c4b-bc4f-b802050f8dd1.png new file mode 100644 index 000000000..05d3770a7 Binary files /dev/null and b/sprites/s_node_image_sequence/layers/93ac7530-be3c-4405-8c97-cea644ea37a9/d09cf9af-38ca-4c4b-bc4f-b802050f8dd1.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 cfa161f31..ee2fdb861 100644 --- a/sprites/s_node_image_sequence/s_node_image_sequence.yy +++ b/sprites/s_node_image_sequence/s_node_image_sequence.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5980e066-5801-45ef-83c7-3aed5c0971c0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"93ac7530-be3c-4405-8c97-cea644ea37a9",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"92d08ee8-0b98-4bf8-b734-29646849e2f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5980e066-5801-45ef-83c7-3aed5c0971c0","path":"sprites/s_node_image_sequence/s_node_image_sequence.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4a9c9d70-d874-45ed-acd0-51732f1b73c9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"93ac7530-be3c-4405-8c97-cea644ea37a9","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"855daf1a-af92-461d-9364-8f3bb9fdb87f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d09cf9af-38ca-4c4b-bc4f-b802050f8dd1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_sequence_to_anim/d0c58182-a641-4610-abde-a909cc441915.png b/sprites/s_node_image_sequence_to_anim/d0c58182-a641-4610-abde-a909cc441915.png new file mode 100644 index 000000000..6c5490608 Binary files /dev/null and b/sprites/s_node_image_sequence_to_anim/d0c58182-a641-4610-abde-a909cc441915.png differ diff --git a/sprites/s_node_image_sequence_to_anim/dc8e2ef7-8c69-4736-99be-49e478b9dcfe.png b/sprites/s_node_image_sequence_to_anim/dc8e2ef7-8c69-4736-99be-49e478b9dcfe.png deleted file mode 100644 index 9334574eb..000000000 Binary files a/sprites/s_node_image_sequence_to_anim/dc8e2ef7-8c69-4736-99be-49e478b9dcfe.png and /dev/null differ diff --git a/sprites/s_node_image_sequence_to_anim/layers/d0c58182-a641-4610-abde-a909cc441915/1d5dd807-f36a-4672-a5a9-9537dc919675.png b/sprites/s_node_image_sequence_to_anim/layers/d0c58182-a641-4610-abde-a909cc441915/1d5dd807-f36a-4672-a5a9-9537dc919675.png new file mode 100644 index 000000000..6c5490608 Binary files /dev/null and b/sprites/s_node_image_sequence_to_anim/layers/d0c58182-a641-4610-abde-a909cc441915/1d5dd807-f36a-4672-a5a9-9537dc919675.png differ diff --git a/sprites/s_node_image_sequence_to_anim/layers/dc8e2ef7-8c69-4736-99be-49e478b9dcfe/a02902d8-cdac-4494-9fb4-ec508e7706a5.png b/sprites/s_node_image_sequence_to_anim/layers/dc8e2ef7-8c69-4736-99be-49e478b9dcfe/a02902d8-cdac-4494-9fb4-ec508e7706a5.png deleted file mode 100644 index 3f9d73c0d..000000000 Binary files a/sprites/s_node_image_sequence_to_anim/layers/dc8e2ef7-8c69-4736-99be-49e478b9dcfe/a02902d8-cdac-4494-9fb4-ec508e7706a5.png and /dev/null 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 337ea9e15..41ca36b10 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 @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 6, - "bbox_bottom": 21, + "bbox_right": 63, + "bbox_top": 12, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dc8e2ef7-8c69-4736-99be-49e478b9dcfe",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d0c58182-a641-4610-abde-a909cc441915",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a4d272c2-8d87-4a80-85ae-db4f28410e56","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dc8e2ef7-8c69-4736-99be-49e478b9dcfe","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":"16a3ae26-c57b-44b8-b620-157dc01987fc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d0c58182-a641-4610-abde-a909cc441915","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a02902d8-cdac-4494-9fb4-ec508e7706a5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1d5dd807-f36a-4672-a5a9-9537dc919675","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_image_sheet/2a00f19b-8cbd-4756-af9d-5a79854106e9.png b/sprites/s_node_image_sheet/2a00f19b-8cbd-4756-af9d-5a79854106e9.png deleted file mode 100644 index b97eecd67..000000000 Binary files a/sprites/s_node_image_sheet/2a00f19b-8cbd-4756-af9d-5a79854106e9.png and /dev/null differ diff --git a/sprites/s_node_image_sheet/ccbcddb6-63f1-43eb-b25f-d38d177f593b.png b/sprites/s_node_image_sheet/ccbcddb6-63f1-43eb-b25f-d38d177f593b.png new file mode 100644 index 000000000..1b70764e0 Binary files /dev/null and b/sprites/s_node_image_sheet/ccbcddb6-63f1-43eb-b25f-d38d177f593b.png differ diff --git a/sprites/s_node_image_sheet/layers/2a00f19b-8cbd-4756-af9d-5a79854106e9/214cad9b-6a85-4832-b8f6-f41c3a616bbd.png b/sprites/s_node_image_sheet/layers/2a00f19b-8cbd-4756-af9d-5a79854106e9/214cad9b-6a85-4832-b8f6-f41c3a616bbd.png deleted file mode 100644 index 22e600ed9..000000000 Binary files a/sprites/s_node_image_sheet/layers/2a00f19b-8cbd-4756-af9d-5a79854106e9/214cad9b-6a85-4832-b8f6-f41c3a616bbd.png and /dev/null differ diff --git a/sprites/s_node_image_sheet/layers/ccbcddb6-63f1-43eb-b25f-d38d177f593b/4b513950-4b4d-4bb1-82f3-af1959b5bc2b.png b/sprites/s_node_image_sheet/layers/ccbcddb6-63f1-43eb-b25f-d38d177f593b/4b513950-4b4d-4bb1-82f3-af1959b5bc2b.png new file mode 100644 index 000000000..1b70764e0 Binary files /dev/null and b/sprites/s_node_image_sheet/layers/ccbcddb6-63f1-43eb-b25f-d38d177f593b/4b513950-4b4d-4bb1-82f3-af1959b5bc2b.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 648bfc128..aa099c83b 100644 --- a/sprites/s_node_image_sheet/s_node_image_sheet.yy +++ b/sprites/s_node_image_sheet/s_node_image_sheet.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2a00f19b-8cbd-4756-af9d-5a79854106e9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ccbcddb6-63f1-43eb-b25f-d38d177f593b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1d0a02b7-13c0-4c8a-8e1c-8d20b3112d3b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2a00f19b-8cbd-4756-af9d-5a79854106e9","path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"de8f7f9c-20bd-4698-ad02-7ef73848b1e7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ccbcddb6-63f1-43eb-b25f-d38d177f593b","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"214cad9b-6a85-4832-b8f6-f41c3a616bbd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4b513950-4b4d-4bb1-82f3-af1959b5bc2b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_input/49c7d93a-48ad-412b-8a01-3e979d075ed7.png b/sprites/s_node_input/49c7d93a-48ad-412b-8a01-3e979d075ed7.png new file mode 100644 index 000000000..5251db5bf Binary files /dev/null and b/sprites/s_node_input/49c7d93a-48ad-412b-8a01-3e979d075ed7.png differ diff --git a/sprites/s_node_input/9191d522-9184-49de-9646-a0d90ded9093.png b/sprites/s_node_input/9191d522-9184-49de-9646-a0d90ded9093.png deleted file mode 100644 index 9711c6389..000000000 Binary files a/sprites/s_node_input/9191d522-9184-49de-9646-a0d90ded9093.png and /dev/null differ diff --git a/sprites/s_node_input/layers/49c7d93a-48ad-412b-8a01-3e979d075ed7/2047f731-2b31-46e4-93d2-783d38f6b17f.png b/sprites/s_node_input/layers/49c7d93a-48ad-412b-8a01-3e979d075ed7/2047f731-2b31-46e4-93d2-783d38f6b17f.png new file mode 100644 index 000000000..5251db5bf Binary files /dev/null and b/sprites/s_node_input/layers/49c7d93a-48ad-412b-8a01-3e979d075ed7/2047f731-2b31-46e4-93d2-783d38f6b17f.png differ diff --git a/sprites/s_node_input/layers/9191d522-9184-49de-9646-a0d90ded9093/44613363-397f-4a42-b62d-8ed6ff46dc77.png b/sprites/s_node_input/layers/9191d522-9184-49de-9646-a0d90ded9093/44613363-397f-4a42-b62d-8ed6ff46dc77.png deleted file mode 100644 index c668df15e..000000000 Binary files a/sprites/s_node_input/layers/9191d522-9184-49de-9646-a0d90ded9093/44613363-397f-4a42-b62d-8ed6ff46dc77.png and /dev/null differ diff --git a/sprites/s_node_input/s_node_input.yy b/sprites/s_node_input/s_node_input.yy index ef87fb885..cdf63e342 100644 --- a/sprites/s_node_input/s_node_input.yy +++ b/sprites/s_node_input/s_node_input.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9191d522-9184-49de-9646-a0d90ded9093",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49c7d93a-48ad-412b-8a01-3e979d075ed7",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"751dedc1-06ac-4e27-9957-8e85be0d3bc2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9191d522-9184-49de-9646-a0d90ded9093","path":"sprites/s_node_input/s_node_input.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"cc6d34bc-e3b7-4ac7-b75c-37b92e4f6b86","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"49c7d93a-48ad-412b-8a01-3e979d075ed7","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"44613363-397f-4a42-b62d-8ed6ff46dc77","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2047f731-2b31-46e4-93d2-783d38f6b17f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_invert/3df7a805-1cd5-4a1b-9645-6c919927d88d.png b/sprites/s_node_invert/3df7a805-1cd5-4a1b-9645-6c919927d88d.png new file mode 100644 index 000000000..b868d954a Binary files /dev/null and b/sprites/s_node_invert/3df7a805-1cd5-4a1b-9645-6c919927d88d.png differ diff --git a/sprites/s_node_invert/c81883a8-56ae-45ea-805e-09092192d918.png b/sprites/s_node_invert/c81883a8-56ae-45ea-805e-09092192d918.png deleted file mode 100644 index 5a229d004..000000000 Binary files a/sprites/s_node_invert/c81883a8-56ae-45ea-805e-09092192d918.png and /dev/null differ diff --git a/sprites/s_node_invert/layers/3df7a805-1cd5-4a1b-9645-6c919927d88d/0859b135-d584-4657-86ae-55f7736627fd.png b/sprites/s_node_invert/layers/3df7a805-1cd5-4a1b-9645-6c919927d88d/0859b135-d584-4657-86ae-55f7736627fd.png new file mode 100644 index 000000000..b868d954a Binary files /dev/null and b/sprites/s_node_invert/layers/3df7a805-1cd5-4a1b-9645-6c919927d88d/0859b135-d584-4657-86ae-55f7736627fd.png differ diff --git a/sprites/s_node_invert/layers/c81883a8-56ae-45ea-805e-09092192d918/ea9d928d-4bcd-43a5-8281-59efe812d7e5.png b/sprites/s_node_invert/layers/c81883a8-56ae-45ea-805e-09092192d918/ea9d928d-4bcd-43a5-8281-59efe812d7e5.png deleted file mode 100644 index 9dca3ade3..000000000 Binary files a/sprites/s_node_invert/layers/c81883a8-56ae-45ea-805e-09092192d918/ea9d928d-4bcd-43a5-8281-59efe812d7e5.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 4ac77b61c..4c0554a63 100644 --- a/sprites/s_node_invert/s_node_invert.yy +++ b/sprites/s_node_invert/s_node_invert.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c81883a8-56ae-45ea-805e-09092192d918",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3df7a805-1cd5-4a1b-9645-6c919927d88d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6195e43b-acaf-43eb-8227-10da6c832548","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c81883a8-56ae-45ea-805e-09092192d918","path":"sprites/s_node_invert/s_node_invert.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f12fa22d-c480-4595-8f08-894deeee7794","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3df7a805-1cd5-4a1b-9645-6c919927d88d","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ea9d928d-4bcd-43a5-8281-59efe812d7e5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0859b135-d584-4657-86ae-55f7736627fd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_iterator_index/8f00da3e-1175-429b-a1cb-d21caa827a6c.png b/sprites/s_node_iterator_index/8f00da3e-1175-429b-a1cb-d21caa827a6c.png new file mode 100644 index 000000000..77e5e3341 Binary files /dev/null and b/sprites/s_node_iterator_index/8f00da3e-1175-429b-a1cb-d21caa827a6c.png differ diff --git a/sprites/s_node_iterator_index/e1bda8d8-69ed-4c4c-9580-557962b0d2b8.png b/sprites/s_node_iterator_index/e1bda8d8-69ed-4c4c-9580-557962b0d2b8.png deleted file mode 100644 index 6770622ca..000000000 Binary files a/sprites/s_node_iterator_index/e1bda8d8-69ed-4c4c-9580-557962b0d2b8.png and /dev/null differ diff --git a/sprites/s_node_iterator_index/layers/8f00da3e-1175-429b-a1cb-d21caa827a6c/55a8aa0f-1caa-4380-8565-c348e408a7ef.png b/sprites/s_node_iterator_index/layers/8f00da3e-1175-429b-a1cb-d21caa827a6c/55a8aa0f-1caa-4380-8565-c348e408a7ef.png new file mode 100644 index 000000000..77e5e3341 Binary files /dev/null and b/sprites/s_node_iterator_index/layers/8f00da3e-1175-429b-a1cb-d21caa827a6c/55a8aa0f-1caa-4380-8565-c348e408a7ef.png differ diff --git a/sprites/s_node_iterator_index/layers/e1bda8d8-69ed-4c4c-9580-557962b0d2b8/747f2928-6be8-4571-91a5-cf88cf4f7ecf.png b/sprites/s_node_iterator_index/layers/e1bda8d8-69ed-4c4c-9580-557962b0d2b8/747f2928-6be8-4571-91a5-cf88cf4f7ecf.png deleted file mode 100644 index fd81bdf2e..000000000 Binary files a/sprites/s_node_iterator_index/layers/e1bda8d8-69ed-4c4c-9580-557962b0d2b8/747f2928-6be8-4571-91a5-cf88cf4f7ecf.png and /dev/null differ diff --git a/sprites/s_node_iterator_index/s_node_iterator_index.yy b/sprites/s_node_iterator_index/s_node_iterator_index.yy index 67d4fc0e7..be88c9aa0 100644 --- a/sprites/s_node_iterator_index/s_node_iterator_index.yy +++ b/sprites/s_node_iterator_index/s_node_iterator_index.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 31, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 3, + "bbox_right": 63, + "bbox_top": 3, + "bbox_bottom": 60, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e1bda8d8-69ed-4c4c-9580-557962b0d2b8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8f00da3e-1175-429b-a1cb-d21caa827a6c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3a9d26e5-d2ff-4518-a4a2-ada3be171321","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e1bda8d8-69ed-4c4c-9580-557962b0d2b8","path":"sprites/s_node_iterator_index/s_node_iterator_index.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a4ac91db-eff0-414d-a33d-3b684c6bb138","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8f00da3e-1175-429b-a1cb-d21caa827a6c","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"747f2928-6be8-4571-91a5-cf88cf4f7ecf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"55a8aa0f-1caa-4380-8565-c348e408a7ef","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_level/abe4cdd9-82bd-4d93-93d9-81191d9a9535.png b/sprites/s_node_level/abe4cdd9-82bd-4d93-93d9-81191d9a9535.png new file mode 100644 index 000000000..b2991054a Binary files /dev/null and b/sprites/s_node_level/abe4cdd9-82bd-4d93-93d9-81191d9a9535.png differ diff --git a/sprites/s_node_level/f1c42f30-d52b-401e-a558-2e25e4658fae.png b/sprites/s_node_level/f1c42f30-d52b-401e-a558-2e25e4658fae.png deleted file mode 100644 index cfe814794..000000000 Binary files a/sprites/s_node_level/f1c42f30-d52b-401e-a558-2e25e4658fae.png and /dev/null differ diff --git a/sprites/s_node_level/layers/abe4cdd9-82bd-4d93-93d9-81191d9a9535/b0c09d4e-998a-441b-a041-9cee0e2c1935.png b/sprites/s_node_level/layers/abe4cdd9-82bd-4d93-93d9-81191d9a9535/b0c09d4e-998a-441b-a041-9cee0e2c1935.png new file mode 100644 index 000000000..b2991054a Binary files /dev/null and b/sprites/s_node_level/layers/abe4cdd9-82bd-4d93-93d9-81191d9a9535/b0c09d4e-998a-441b-a041-9cee0e2c1935.png differ diff --git a/sprites/s_node_level/layers/f1c42f30-d52b-401e-a558-2e25e4658fae/29e9bfc7-c1dd-4f0c-a606-f9de8f8093c4.png b/sprites/s_node_level/layers/f1c42f30-d52b-401e-a558-2e25e4658fae/29e9bfc7-c1dd-4f0c-a606-f9de8f8093c4.png deleted file mode 100644 index 7f38ae2c7..000000000 Binary files a/sprites/s_node_level/layers/f1c42f30-d52b-401e-a558-2e25e4658fae/29e9bfc7-c1dd-4f0c-a606-f9de8f8093c4.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 7264e585a..aa81117d9 100644 --- a/sprites/s_node_level/s_node_level.yy +++ b/sprites/s_node_level/s_node_level.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 2, + "bbox_right": 61, + "bbox_top": 4, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f1c42f30-d52b-401e-a558-2e25e4658fae",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"abe4cdd9-82bd-4d93-93d9-81191d9a9535",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"407e0f43-8ea7-4bbf-b048-57b305641b31","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f1c42f30-d52b-401e-a558-2e25e4658fae","path":"sprites/s_node_level/s_node_level.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"17441c01-cd2a-4a3b-acfd-e7c133a1ef3c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"abe4cdd9-82bd-4d93-93d9-81191d9a9535","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"29e9bfc7-c1dd-4f0c-a606-f9de8f8093c4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b0c09d4e-998a-441b-a041-9cee0e2c1935","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_level_selector/5161965a-3d81-4154-baf2-23a8b465e197.png b/sprites/s_node_level_selector/5161965a-3d81-4154-baf2-23a8b465e197.png deleted file mode 100644 index ad264d1cd..000000000 Binary files a/sprites/s_node_level_selector/5161965a-3d81-4154-baf2-23a8b465e197.png and /dev/null differ diff --git a/sprites/s_node_level_selector/db92b617-fdbc-4725-bb41-baf42c28c99f.png b/sprites/s_node_level_selector/db92b617-fdbc-4725-bb41-baf42c28c99f.png new file mode 100644 index 000000000..5683a1198 Binary files /dev/null and b/sprites/s_node_level_selector/db92b617-fdbc-4725-bb41-baf42c28c99f.png differ diff --git a/sprites/s_node_level_selector/layers/5161965a-3d81-4154-baf2-23a8b465e197/2e4cfdb7-dab2-49b8-9fe6-06a1f5e8a4bc.png b/sprites/s_node_level_selector/layers/5161965a-3d81-4154-baf2-23a8b465e197/2e4cfdb7-dab2-49b8-9fe6-06a1f5e8a4bc.png deleted file mode 100644 index 256268e4c..000000000 Binary files a/sprites/s_node_level_selector/layers/5161965a-3d81-4154-baf2-23a8b465e197/2e4cfdb7-dab2-49b8-9fe6-06a1f5e8a4bc.png and /dev/null differ diff --git a/sprites/s_node_level_selector/layers/db92b617-fdbc-4725-bb41-baf42c28c99f/afe7aa1f-d1d4-489e-86c9-33f5806e3665.png b/sprites/s_node_level_selector/layers/db92b617-fdbc-4725-bb41-baf42c28c99f/afe7aa1f-d1d4-489e-86c9-33f5806e3665.png new file mode 100644 index 000000000..5683a1198 Binary files /dev/null and b/sprites/s_node_level_selector/layers/db92b617-fdbc-4725-bb41-baf42c28c99f/afe7aa1f-d1d4-489e-86c9-33f5806e3665.png 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 77a850096..b326059e7 100644 --- a/sprites/s_node_level_selector/s_node_level_selector.yy +++ b/sprites/s_node_level_selector/s_node_level_selector.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 10, - "bbox_bottom": 30, + "bbox_left": 4, + "bbox_right": 60, + "bbox_top": 20, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5161965a-3d81-4154-baf2-23a8b465e197",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"db92b617-fdbc-4725-bb41-baf42c28c99f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fc875f19-b254-4669-8f67-b710619e82d8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5161965a-3d81-4154-baf2-23a8b465e197","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a866b5f3-ec2d-4f90-8ad3-10d5f4895451","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"db92b617-fdbc-4725-bb41-baf42c28c99f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2e4cfdb7-dab2-49b8-9fe6-06a1f5e8a4bc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"afe7aa1f-d1d4-489e-86c9-33f5806e3665","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_line/a7e43bcb-5412-4e54-ab55-7aa475596f0c.png b/sprites/s_node_line/a7e43bcb-5412-4e54-ab55-7aa475596f0c.png new file mode 100644 index 000000000..672b7e0a9 Binary files /dev/null and b/sprites/s_node_line/a7e43bcb-5412-4e54-ab55-7aa475596f0c.png differ diff --git a/sprites/s_node_line/ffd65511-6418-45fa-88c5-3cc57ce21ef3.png b/sprites/s_node_line/ffd65511-6418-45fa-88c5-3cc57ce21ef3.png deleted file mode 100644 index 1506fb45e..000000000 Binary files a/sprites/s_node_line/ffd65511-6418-45fa-88c5-3cc57ce21ef3.png and /dev/null differ diff --git a/sprites/s_node_line/layers/a7e43bcb-5412-4e54-ab55-7aa475596f0c/36791639-d43e-4bfb-8362-9be005850153.png b/sprites/s_node_line/layers/a7e43bcb-5412-4e54-ab55-7aa475596f0c/36791639-d43e-4bfb-8362-9be005850153.png new file mode 100644 index 000000000..672b7e0a9 Binary files /dev/null and b/sprites/s_node_line/layers/a7e43bcb-5412-4e54-ab55-7aa475596f0c/36791639-d43e-4bfb-8362-9be005850153.png differ diff --git a/sprites/s_node_line/layers/ffd65511-6418-45fa-88c5-3cc57ce21ef3/050465a7-fc55-411c-a17b-9431d7d58551.png b/sprites/s_node_line/layers/ffd65511-6418-45fa-88c5-3cc57ce21ef3/050465a7-fc55-411c-a17b-9431d7d58551.png deleted file mode 100644 index 4dffee7a4..000000000 Binary files a/sprites/s_node_line/layers/ffd65511-6418-45fa-88c5-3cc57ce21ef3/050465a7-fc55-411c-a17b-9431d7d58551.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 cd3d35a0d..9aa3c7c42 100644 --- a/sprites/s_node_line/s_node_line.yy +++ b/sprites/s_node_line/s_node_line.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 5, + "bbox_right": 58, + "bbox_top": 5, + "bbox_bottom": 58, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ffd65511-6418-45fa-88c5-3cc57ce21ef3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a7e43bcb-5412-4e54-ab55-7aa475596f0c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f6bd92d7-c1f2-4438-8f51-ac20329e5633","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ffd65511-6418-45fa-88c5-3cc57ce21ef3","path":"sprites/s_node_line/s_node_line.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0cee51e8-1efc-4830-97a1-c08ecb1d8e48","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a7e43bcb-5412-4e54-ab55-7aa475596f0c","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"050465a7-fc55-411c-a17b-9431d7d58551","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"36791639-d43e-4bfb-8362-9be005850153","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_loop/1ac6820a-11e3-46a6-be15-03bab6868d56.png b/sprites/s_node_loop/1ac6820a-11e3-46a6-be15-03bab6868d56.png deleted file mode 100644 index 7dd8b88d6..000000000 Binary files a/sprites/s_node_loop/1ac6820a-11e3-46a6-be15-03bab6868d56.png and /dev/null differ diff --git a/sprites/s_node_loop/4cc33a9e-bd51-4eca-bba9-4811cbb5254e.png b/sprites/s_node_loop/4cc33a9e-bd51-4eca-bba9-4811cbb5254e.png new file mode 100644 index 000000000..5c9151e71 Binary files /dev/null and b/sprites/s_node_loop/4cc33a9e-bd51-4eca-bba9-4811cbb5254e.png differ diff --git a/sprites/s_node_loop/layers/1ac6820a-11e3-46a6-be15-03bab6868d56/28a778f1-a610-49f1-8bca-4be6215c6504.png b/sprites/s_node_loop/layers/1ac6820a-11e3-46a6-be15-03bab6868d56/28a778f1-a610-49f1-8bca-4be6215c6504.png deleted file mode 100644 index 50455c923..000000000 Binary files a/sprites/s_node_loop/layers/1ac6820a-11e3-46a6-be15-03bab6868d56/28a778f1-a610-49f1-8bca-4be6215c6504.png and /dev/null differ diff --git a/sprites/s_node_loop/layers/4cc33a9e-bd51-4eca-bba9-4811cbb5254e/b926f743-f315-4e71-819b-91de7d622b44.png b/sprites/s_node_loop/layers/4cc33a9e-bd51-4eca-bba9-4811cbb5254e/b926f743-f315-4e71-819b-91de7d622b44.png new file mode 100644 index 000000000..5c9151e71 Binary files /dev/null and b/sprites/s_node_loop/layers/4cc33a9e-bd51-4eca-bba9-4811cbb5254e/b926f743-f315-4e71-819b-91de7d622b44.png differ diff --git a/sprites/s_node_loop/s_node_loop.yy b/sprites/s_node_loop/s_node_loop.yy index 02306f2fe..abddee2d2 100644 --- a/sprites/s_node_loop/s_node_loop.yy +++ b/sprites/s_node_loop/s_node_loop.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1ac6820a-11e3-46a6-be15-03bab6868d56",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4cc33a9e-bd51-4eca-bba9-4811cbb5254e",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5a35088e-5c73-469a-a1ef-eccef5aaecce","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1ac6820a-11e3-46a6-be15-03bab6868d56","path":"sprites/s_node_loop/s_node_loop.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"80632e75-f891-4065-af9d-421b866b6a69","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4cc33a9e-bd51-4eca-bba9-4811cbb5254e","path":"sprites/s_node_loop/s_node_loop.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"28a778f1-a610-49f1-8bca-4be6215c6504","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b926f743-f315-4e71-819b-91de7d622b44","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_math/51beeed4-5de9-4a1c-905b-2c893a590536.png b/sprites/s_node_math/51beeed4-5de9-4a1c-905b-2c893a590536.png deleted file mode 100644 index b88f1631e..000000000 Binary files a/sprites/s_node_math/51beeed4-5de9-4a1c-905b-2c893a590536.png and /dev/null differ diff --git a/sprites/s_node_math/54d5f186-ae24-4f27-8466-aca932d49244.png b/sprites/s_node_math/54d5f186-ae24-4f27-8466-aca932d49244.png new file mode 100644 index 000000000..a0f08206f Binary files /dev/null and b/sprites/s_node_math/54d5f186-ae24-4f27-8466-aca932d49244.png differ diff --git a/sprites/s_node_math/layers/51beeed4-5de9-4a1c-905b-2c893a590536/3d49faa0-a654-4c99-942c-d18c17b64e36.png b/sprites/s_node_math/layers/51beeed4-5de9-4a1c-905b-2c893a590536/3d49faa0-a654-4c99-942c-d18c17b64e36.png deleted file mode 100644 index f56d0cab2..000000000 Binary files a/sprites/s_node_math/layers/51beeed4-5de9-4a1c-905b-2c893a590536/3d49faa0-a654-4c99-942c-d18c17b64e36.png and /dev/null differ diff --git a/sprites/s_node_math/layers/54d5f186-ae24-4f27-8466-aca932d49244/f0690ccc-ea4d-4a71-9dea-40ef0ce5d6db.png b/sprites/s_node_math/layers/54d5f186-ae24-4f27-8466-aca932d49244/f0690ccc-ea4d-4a71-9dea-40ef0ce5d6db.png new file mode 100644 index 000000000..a0f08206f Binary files /dev/null and b/sprites/s_node_math/layers/54d5f186-ae24-4f27-8466-aca932d49244/f0690ccc-ea4d-4a71-9dea-40ef0ce5d6db.png differ diff --git a/sprites/s_node_math/s_node_math.yy b/sprites/s_node_math/s_node_math.yy index 2c51266c4..e2fb98d54 100644 --- a/sprites/s_node_math/s_node_math.yy +++ b/sprites/s_node_math/s_node_math.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 1, - "bbox_bottom": 29, + "bbox_left": 4, + "bbox_right": 59, + "bbox_top": 3, + "bbox_bottom": 59, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"51beeed4-5de9-4a1c-905b-2c893a590536",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"54d5f186-ae24-4f27-8466-aca932d49244",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ff379e2a-5a96-4449-9c71-6b64fc146304","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"51beeed4-5de9-4a1c-905b-2c893a590536","path":"sprites/s_node_math/s_node_math.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"037a78ed-c252-41fc-932c-3f83c7fab758","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"54d5f186-ae24-4f27-8466-aca932d49244","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3d49faa0-a654-4c99-942c-d18c17b64e36","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f0690ccc-ea4d-4a71-9dea-40ef0ce5d6db","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_mirror/5e66354d-b33e-4411-aae5-a12392d1b28c.png b/sprites/s_node_mirror/5e66354d-b33e-4411-aae5-a12392d1b28c.png new file mode 100644 index 000000000..6f1608192 Binary files /dev/null and b/sprites/s_node_mirror/5e66354d-b33e-4411-aae5-a12392d1b28c.png differ diff --git a/sprites/s_node_mirror/b00497f5-2c46-4878-89a2-4b444a56cb3a.png b/sprites/s_node_mirror/b00497f5-2c46-4878-89a2-4b444a56cb3a.png deleted file mode 100644 index 6bfa31daf..000000000 Binary files a/sprites/s_node_mirror/b00497f5-2c46-4878-89a2-4b444a56cb3a.png and /dev/null differ diff --git a/sprites/s_node_mirror/layers/5e66354d-b33e-4411-aae5-a12392d1b28c/6af4fc89-18f3-43aa-bb38-40fa64ccf609.png b/sprites/s_node_mirror/layers/5e66354d-b33e-4411-aae5-a12392d1b28c/6af4fc89-18f3-43aa-bb38-40fa64ccf609.png new file mode 100644 index 000000000..6f1608192 Binary files /dev/null and b/sprites/s_node_mirror/layers/5e66354d-b33e-4411-aae5-a12392d1b28c/6af4fc89-18f3-43aa-bb38-40fa64ccf609.png differ diff --git a/sprites/s_node_mirror/layers/b00497f5-2c46-4878-89a2-4b444a56cb3a/d2ae16ed-ad63-4d32-95f7-6cc83b8fb64b.png b/sprites/s_node_mirror/layers/b00497f5-2c46-4878-89a2-4b444a56cb3a/d2ae16ed-ad63-4d32-95f7-6cc83b8fb64b.png deleted file mode 100644 index e9b596e3d..000000000 Binary files a/sprites/s_node_mirror/layers/b00497f5-2c46-4878-89a2-4b444a56cb3a/d2ae16ed-ad63-4d32-95f7-6cc83b8fb64b.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 848684043..3d451334a 100644 --- a/sprites/s_node_mirror/s_node_mirror.yy +++ b/sprites/s_node_mirror/s_node_mirror.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 5, + "bbox_right": 58, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b00497f5-2c46-4878-89a2-4b444a56cb3a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5e66354d-b33e-4411-aae5-a12392d1b28c",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7f3c7472-de5e-4dd0-82f5-c3a58b5695e6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b00497f5-2c46-4878-89a2-4b444a56cb3a","path":"sprites/s_node_mirror/s_node_mirror.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d33ee729-7c87-437e-bbb9-37ba2f8e36e9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5e66354d-b33e-4411-aae5-a12392d1b28c","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d2ae16ed-ad63-4d32-95f7-6cc83b8fb64b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6af4fc89-18f3-43aa-bb38-40fa64ccf609","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_noise_aniso/3f131fb6-4400-4e2c-b957-cef40d30aac4.png b/sprites/s_node_noise_aniso/3f131fb6-4400-4e2c-b957-cef40d30aac4.png new file mode 100644 index 000000000..72a3d0828 Binary files /dev/null and b/sprites/s_node_noise_aniso/3f131fb6-4400-4e2c-b957-cef40d30aac4.png differ diff --git a/sprites/s_node_noise_aniso/9f9f91c8-7964-470e-b751-5abe808ea07d.png b/sprites/s_node_noise_aniso/9f9f91c8-7964-470e-b751-5abe808ea07d.png deleted file mode 100644 index 7e0ab48ff..000000000 Binary files a/sprites/s_node_noise_aniso/9f9f91c8-7964-470e-b751-5abe808ea07d.png and /dev/null differ diff --git a/sprites/s_node_noise_aniso/layers/3f131fb6-4400-4e2c-b957-cef40d30aac4/963ba668-adaa-45d6-9103-342a24cf6868.png b/sprites/s_node_noise_aniso/layers/3f131fb6-4400-4e2c-b957-cef40d30aac4/963ba668-adaa-45d6-9103-342a24cf6868.png new file mode 100644 index 000000000..72a3d0828 Binary files /dev/null and b/sprites/s_node_noise_aniso/layers/3f131fb6-4400-4e2c-b957-cef40d30aac4/963ba668-adaa-45d6-9103-342a24cf6868.png differ diff --git a/sprites/s_node_noise_aniso/layers/9f9f91c8-7964-470e-b751-5abe808ea07d/bd536631-2b92-47be-85b5-aba67e7b1dc0.png b/sprites/s_node_noise_aniso/layers/9f9f91c8-7964-470e-b751-5abe808ea07d/bd536631-2b92-47be-85b5-aba67e7b1dc0.png deleted file mode 100644 index 3bc8ec3ca..000000000 Binary files a/sprites/s_node_noise_aniso/layers/9f9f91c8-7964-470e-b751-5abe808ea07d/bd536631-2b92-47be-85b5-aba67e7b1dc0.png and /dev/null 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 7e3ea0ea6..380063c01 100644 --- a/sprites/s_node_noise_aniso/s_node_noise_aniso.yy +++ b/sprites/s_node_noise_aniso/s_node_noise_aniso.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f9f91c8-7964-470e-b751-5abe808ea07d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3f131fb6-4400-4e2c-b957-cef40d30aac4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4587e494-7e17-44c1-accf-5a720e2bd739","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9f9f91c8-7964-470e-b751-5abe808ea07d","path":"sprites/s_node_noise_aniso/s_node_noise_aniso.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5a2c62dd-0d02-41af-8c44-b246e23ba1cf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3f131fb6-4400-4e2c-b957-cef40d30aac4","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bd536631-2b92-47be-85b5-aba67e7b1dc0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"963ba668-adaa-45d6-9103-342a24cf6868","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_noise_cell/5c52dad2-2750-4275-812f-80ff03f3c9f1.png b/sprites/s_node_noise_cell/5c52dad2-2750-4275-812f-80ff03f3c9f1.png new file mode 100644 index 000000000..1e1b07367 Binary files /dev/null and b/sprites/s_node_noise_cell/5c52dad2-2750-4275-812f-80ff03f3c9f1.png differ diff --git a/sprites/s_node_noise_cell/b62a6bbc-12ee-47eb-862d-ad6eb92cc348.png b/sprites/s_node_noise_cell/b62a6bbc-12ee-47eb-862d-ad6eb92cc348.png deleted file mode 100644 index dc378f061..000000000 Binary files a/sprites/s_node_noise_cell/b62a6bbc-12ee-47eb-862d-ad6eb92cc348.png and /dev/null differ diff --git a/sprites/s_node_noise_cell/layers/5c52dad2-2750-4275-812f-80ff03f3c9f1/319d7785-3893-49cf-976b-e7940b308b8a.png b/sprites/s_node_noise_cell/layers/5c52dad2-2750-4275-812f-80ff03f3c9f1/319d7785-3893-49cf-976b-e7940b308b8a.png new file mode 100644 index 000000000..1e1b07367 Binary files /dev/null and b/sprites/s_node_noise_cell/layers/5c52dad2-2750-4275-812f-80ff03f3c9f1/319d7785-3893-49cf-976b-e7940b308b8a.png differ diff --git a/sprites/s_node_noise_cell/layers/b62a6bbc-12ee-47eb-862d-ad6eb92cc348/d557417b-32b6-430d-9f80-f9ee418b7879.png b/sprites/s_node_noise_cell/layers/b62a6bbc-12ee-47eb-862d-ad6eb92cc348/d557417b-32b6-430d-9f80-f9ee418b7879.png deleted file mode 100644 index eb9af8ceb..000000000 Binary files a/sprites/s_node_noise_cell/layers/b62a6bbc-12ee-47eb-862d-ad6eb92cc348/d557417b-32b6-430d-9f80-f9ee418b7879.png and /dev/null 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 685d1be71..a028de55c 100644 --- a/sprites/s_node_noise_cell/s_node_noise_cell.yy +++ b/sprites/s_node_noise_cell/s_node_noise_cell.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b62a6bbc-12ee-47eb-862d-ad6eb92cc348",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c52dad2-2750-4275-812f-80ff03f3c9f1",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8adf53e1-7de6-4f71-9d41-41dea12c4007","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b62a6bbc-12ee-47eb-862d-ad6eb92cc348","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2d7f6225-284c-4b92-bdd4-361e3a87f76f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5c52dad2-2750-4275-812f-80ff03f3c9f1","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d557417b-32b6-430d-9f80-f9ee418b7879","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"319d7785-3893-49cf-976b-e7940b308b8a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_noise_perlin/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9.png b/sprites/s_node_noise_perlin/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9.png new file mode 100644 index 000000000..e21c233d0 Binary files /dev/null and b/sprites/s_node_noise_perlin/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9.png differ diff --git a/sprites/s_node_noise_perlin/fd893f1e-7f0a-468b-a988-77ac07a9cd79.png b/sprites/s_node_noise_perlin/fd893f1e-7f0a-468b-a988-77ac07a9cd79.png deleted file mode 100644 index 4fd32ab22..000000000 Binary files a/sprites/s_node_noise_perlin/fd893f1e-7f0a-468b-a988-77ac07a9cd79.png and /dev/null differ diff --git a/sprites/s_node_noise_perlin/layers/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9/1e673824-1dd2-491d-9822-3b5a58956e5a.png b/sprites/s_node_noise_perlin/layers/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9/1e673824-1dd2-491d-9822-3b5a58956e5a.png new file mode 100644 index 000000000..e21c233d0 Binary files /dev/null and b/sprites/s_node_noise_perlin/layers/b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9/1e673824-1dd2-491d-9822-3b5a58956e5a.png differ diff --git a/sprites/s_node_noise_perlin/layers/fd893f1e-7f0a-468b-a988-77ac07a9cd79/d635714e-2fbc-4f80-9b24-bf81897d35c7.png b/sprites/s_node_noise_perlin/layers/fd893f1e-7f0a-468b-a988-77ac07a9cd79/d635714e-2fbc-4f80-9b24-bf81897d35c7.png deleted file mode 100644 index f0a9d60da..000000000 Binary files a/sprites/s_node_noise_perlin/layers/fd893f1e-7f0a-468b-a988-77ac07a9cd79/d635714e-2fbc-4f80-9b24-bf81897d35c7.png and /dev/null differ diff --git a/sprites/s_node_noise_perlin/s_node_noise_perlin.yy b/sprites/s_node_noise_perlin/s_node_noise_perlin.yy index ca5ecdba4..b3f940ddb 100644 --- a/sprites/s_node_noise_perlin/s_node_noise_perlin.yy +++ b/sprites/s_node_noise_perlin/s_node_noise_perlin.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fd893f1e-7f0a-468b-a988-77ac07a9cd79",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"deb29d8c-aeaa-4112-830c-f8fc16a11021","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd893f1e-7f0a-468b-a988-77ac07a9cd79","path":"sprites/s_node_noise_perlin/s_node_noise_perlin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"177721c5-d5a0-40e1-9638-766534ff633e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b67f0b73-3a58-4fdb-a7a5-66fecbbae2c9","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d635714e-2fbc-4f80-9b24-bf81897d35c7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1e673824-1dd2-491d-9822-3b5a58956e5a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_normal/637bb57c-916a-4f5f-8c0f-87200e203fc7.png b/sprites/s_node_normal/637bb57c-916a-4f5f-8c0f-87200e203fc7.png deleted file mode 100644 index 96ba5a185..000000000 Binary files a/sprites/s_node_normal/637bb57c-916a-4f5f-8c0f-87200e203fc7.png and /dev/null differ diff --git a/sprites/s_node_normal/a5325688-74ff-4655-83de-be1194ae9706.png b/sprites/s_node_normal/a5325688-74ff-4655-83de-be1194ae9706.png new file mode 100644 index 000000000..59936a5f8 Binary files /dev/null and b/sprites/s_node_normal/a5325688-74ff-4655-83de-be1194ae9706.png differ diff --git a/sprites/s_node_normal/layers/637bb57c-916a-4f5f-8c0f-87200e203fc7/3f0fe1b7-9329-474d-9a20-595b58ca4dd4.png b/sprites/s_node_normal/layers/637bb57c-916a-4f5f-8c0f-87200e203fc7/3f0fe1b7-9329-474d-9a20-595b58ca4dd4.png deleted file mode 100644 index 9acee1088..000000000 Binary files a/sprites/s_node_normal/layers/637bb57c-916a-4f5f-8c0f-87200e203fc7/3f0fe1b7-9329-474d-9a20-595b58ca4dd4.png and /dev/null differ diff --git a/sprites/s_node_normal/layers/a5325688-74ff-4655-83de-be1194ae9706/0847b602-955c-4e25-9321-431e71cde299.png b/sprites/s_node_normal/layers/a5325688-74ff-4655-83de-be1194ae9706/0847b602-955c-4e25-9321-431e71cde299.png new file mode 100644 index 000000000..59936a5f8 Binary files /dev/null and b/sprites/s_node_normal/layers/a5325688-74ff-4655-83de-be1194ae9706/0847b602-955c-4e25-9321-431e71cde299.png differ diff --git a/sprites/s_node_normal/s_node_normal.yy b/sprites/s_node_normal/s_node_normal.yy index ad4df2e24..6108b3e51 100644 --- a/sprites/s_node_normal/s_node_normal.yy +++ b/sprites/s_node_normal/s_node_normal.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 32, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"637bb57c-916a-4f5f-8c0f-87200e203fc7",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a5325688-74ff-4655-83de-be1194ae9706",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5b71d042-5c52-4768-9d5a-449a17e52cdc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"637bb57c-916a-4f5f-8c0f-87200e203fc7","path":"sprites/s_node_normal/s_node_normal.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d4d562e6-169c-42fc-8aea-9c831acbaa4a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a5325688-74ff-4655-83de-be1194ae9706","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3f0fe1b7-9329-474d-9a20-595b58ca4dd4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0847b602-955c-4e25-9321-431e71cde299","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_normal_light/6fbb28f3-533e-4e37-8d6a-a62c61421f82.png b/sprites/s_node_normal_light/6fbb28f3-533e-4e37-8d6a-a62c61421f82.png deleted file mode 100644 index e531ea781..000000000 Binary files a/sprites/s_node_normal_light/6fbb28f3-533e-4e37-8d6a-a62c61421f82.png and /dev/null differ diff --git a/sprites/s_node_normal_light/9f13df7e-3cd6-4780-bb47-ebb69a60c5d2.png b/sprites/s_node_normal_light/9f13df7e-3cd6-4780-bb47-ebb69a60c5d2.png new file mode 100644 index 000000000..074b0719e Binary files /dev/null and b/sprites/s_node_normal_light/9f13df7e-3cd6-4780-bb47-ebb69a60c5d2.png differ diff --git a/sprites/s_node_normal_light/layers/6fbb28f3-533e-4e37-8d6a-a62c61421f82/15c974d2-223e-4c13-9c25-b65165b105dd.png b/sprites/s_node_normal_light/layers/6fbb28f3-533e-4e37-8d6a-a62c61421f82/15c974d2-223e-4c13-9c25-b65165b105dd.png deleted file mode 100644 index 3286a41aa..000000000 Binary files a/sprites/s_node_normal_light/layers/6fbb28f3-533e-4e37-8d6a-a62c61421f82/15c974d2-223e-4c13-9c25-b65165b105dd.png and /dev/null differ diff --git a/sprites/s_node_normal_light/layers/9f13df7e-3cd6-4780-bb47-ebb69a60c5d2/26670460-f434-441a-8057-418627572968.png b/sprites/s_node_normal_light/layers/9f13df7e-3cd6-4780-bb47-ebb69a60c5d2/26670460-f434-441a-8057-418627572968.png new file mode 100644 index 000000000..074b0719e Binary files /dev/null and b/sprites/s_node_normal_light/layers/9f13df7e-3cd6-4780-bb47-ebb69a60c5d2/26670460-f434-441a-8057-418627572968.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 595c68c06..2f9bb05fa 100644 --- a/sprites/s_node_normal_light/s_node_normal_light.yy +++ b/sprites/s_node_normal_light/s_node_normal_light.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 32, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6fbb28f3-533e-4e37-8d6a-a62c61421f82",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f13df7e-3cd6-4780-bb47-ebb69a60c5d2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"708ecca7-a2be-45b3-8b8a-a904cac07d73","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6fbb28f3-533e-4e37-8d6a-a62c61421f82","path":"sprites/s_node_normal_light/s_node_normal_light.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"97e21ca6-f5d5-4e4c-a669-e233cd78a6eb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9f13df7e-3cd6-4780-bb47-ebb69a60c5d2","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"15c974d2-223e-4c13-9c25-b65165b105dd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"26670460-f434-441a-8057-418627572968","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_number/014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e.png b/sprites/s_node_number/014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e.png deleted file mode 100644 index f15bd27c6..000000000 Binary files a/sprites/s_node_number/014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e.png and /dev/null differ diff --git a/sprites/s_node_number/de37b433-f23b-4c81-8b19-901c80af24d6.png b/sprites/s_node_number/de37b433-f23b-4c81-8b19-901c80af24d6.png new file mode 100644 index 000000000..1346145c3 Binary files /dev/null and b/sprites/s_node_number/de37b433-f23b-4c81-8b19-901c80af24d6.png differ diff --git a/sprites/s_node_number/layers/014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e/fcb57119-588d-42ab-aa8d-35dcd8f1d5af.png b/sprites/s_node_number/layers/014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e/fcb57119-588d-42ab-aa8d-35dcd8f1d5af.png deleted file mode 100644 index b3cf943d6..000000000 Binary files a/sprites/s_node_number/layers/014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e/fcb57119-588d-42ab-aa8d-35dcd8f1d5af.png and /dev/null differ diff --git a/sprites/s_node_number/layers/de37b433-f23b-4c81-8b19-901c80af24d6/0447c7d7-1e1b-4482-a942-49bd39c8c1b4.png b/sprites/s_node_number/layers/de37b433-f23b-4c81-8b19-901c80af24d6/0447c7d7-1e1b-4482-a942-49bd39c8c1b4.png new file mode 100644 index 000000000..1346145c3 Binary files /dev/null and b/sprites/s_node_number/layers/de37b433-f23b-4c81-8b19-901c80af24d6/0447c7d7-1e1b-4482-a942-49bd39c8c1b4.png differ diff --git a/sprites/s_node_number/s_node_number.yy b/sprites/s_node_number/s_node_number.yy index 92e37ef30..7c864275b 100644 --- a/sprites/s_node_number/s_node_number.yy +++ b/sprites/s_node_number/s_node_number.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 6, - "bbox_right": 26, - "bbox_top": 11, - "bbox_bottom": 20, + "bbox_left": 12, + "bbox_right": 52, + "bbox_top": 23, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"de37b433-f23b-4c81-8b19-901c80af24d6",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9a0e34b1-ee4f-4953-bcbb-bd9caa29e839","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"014b59a0-8850-4f9c-b2b2-1aa01a4d8e9e","path":"sprites/s_node_number/s_node_number.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2cf259a1-0b91-4721-8ced-afe4c5215848","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"de37b433-f23b-4c81-8b19-901c80af24d6","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fcb57119-588d-42ab-aa8d-35dcd8f1d5af","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0447c7d7-1e1b-4482-a942-49bd39c8c1b4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_output/31e0c780-7ef4-434d-8246-6a4ed0377235.png b/sprites/s_node_output/31e0c780-7ef4-434d-8246-6a4ed0377235.png new file mode 100644 index 000000000..823d52d2f Binary files /dev/null and b/sprites/s_node_output/31e0c780-7ef4-434d-8246-6a4ed0377235.png differ diff --git a/sprites/s_node_output/af5ac379-b0f7-40ab-a960-edd2edc42c5a.png b/sprites/s_node_output/af5ac379-b0f7-40ab-a960-edd2edc42c5a.png deleted file mode 100644 index 1a6e20fd8..000000000 Binary files a/sprites/s_node_output/af5ac379-b0f7-40ab-a960-edd2edc42c5a.png and /dev/null differ diff --git a/sprites/s_node_output/layers/31e0c780-7ef4-434d-8246-6a4ed0377235/1d64949f-88d0-4f42-bf2a-beb1b8eaf059.png b/sprites/s_node_output/layers/31e0c780-7ef4-434d-8246-6a4ed0377235/1d64949f-88d0-4f42-bf2a-beb1b8eaf059.png new file mode 100644 index 000000000..823d52d2f Binary files /dev/null and b/sprites/s_node_output/layers/31e0c780-7ef4-434d-8246-6a4ed0377235/1d64949f-88d0-4f42-bf2a-beb1b8eaf059.png differ diff --git a/sprites/s_node_output/layers/af5ac379-b0f7-40ab-a960-edd2edc42c5a/18e8c363-644f-4b2a-997b-87c79b4f5fbe.png b/sprites/s_node_output/layers/af5ac379-b0f7-40ab-a960-edd2edc42c5a/18e8c363-644f-4b2a-997b-87c79b4f5fbe.png deleted file mode 100644 index 01d15ef86..000000000 Binary files a/sprites/s_node_output/layers/af5ac379-b0f7-40ab-a960-edd2edc42c5a/18e8c363-644f-4b2a-997b-87c79b4f5fbe.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 ed7b7620a..8b58fe723 100644 --- a/sprites/s_node_output/s_node_output.yy +++ b/sprites/s_node_output/s_node_output.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"af5ac379-b0f7-40ab-a960-edd2edc42c5a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"31e0c780-7ef4-434d-8246-6a4ed0377235",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"35728c0d-2292-4033-a2be-1fff00b7a606","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"af5ac379-b0f7-40ab-a960-edd2edc42c5a","path":"sprites/s_node_output/s_node_output.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d3d02349-c81b-48a0-8ad0-a70ad5abf75f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"31e0c780-7ef4-434d-8246-6a4ed0377235","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"18e8c363-644f-4b2a-997b-87c79b4f5fbe","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1d64949f-88d0-4f42-bf2a-beb1b8eaf059","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_padding/4b883e9b-ae7e-4121-9e10-28b5df299d3e.png b/sprites/s_node_padding/4b883e9b-ae7e-4121-9e10-28b5df299d3e.png new file mode 100644 index 000000000..8c172738f Binary files /dev/null and b/sprites/s_node_padding/4b883e9b-ae7e-4121-9e10-28b5df299d3e.png differ diff --git a/sprites/s_node_padding/ea0189a4-c1df-447f-a42f-a0c89f4e009b.png b/sprites/s_node_padding/ea0189a4-c1df-447f-a42f-a0c89f4e009b.png deleted file mode 100644 index 18f7ffc53..000000000 Binary files a/sprites/s_node_padding/ea0189a4-c1df-447f-a42f-a0c89f4e009b.png and /dev/null differ diff --git a/sprites/s_node_padding/layers/4b883e9b-ae7e-4121-9e10-28b5df299d3e/cd720ef4-9fdf-444c-8148-cfa96e1d6a72.png b/sprites/s_node_padding/layers/4b883e9b-ae7e-4121-9e10-28b5df299d3e/cd720ef4-9fdf-444c-8148-cfa96e1d6a72.png new file mode 100644 index 000000000..8c172738f Binary files /dev/null and b/sprites/s_node_padding/layers/4b883e9b-ae7e-4121-9e10-28b5df299d3e/cd720ef4-9fdf-444c-8148-cfa96e1d6a72.png differ diff --git a/sprites/s_node_padding/layers/ea0189a4-c1df-447f-a42f-a0c89f4e009b/c4bc3960-1c03-4d87-9cf1-40f64f7282e5.png b/sprites/s_node_padding/layers/ea0189a4-c1df-447f-a42f-a0c89f4e009b/c4bc3960-1c03-4d87-9cf1-40f64f7282e5.png deleted file mode 100644 index 8940b7e0b..000000000 Binary files a/sprites/s_node_padding/layers/ea0189a4-c1df-447f-a42f-a0c89f4e009b/c4bc3960-1c03-4d87-9cf1-40f64f7282e5.png and /dev/null differ diff --git a/sprites/s_node_padding/s_node_padding.yy b/sprites/s_node_padding/s_node_padding.yy index 6431f2939..aa8aeecf9 100644 --- a/sprites/s_node_padding/s_node_padding.yy +++ b/sprites/s_node_padding/s_node_padding.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ea0189a4-c1df-447f-a42f-a0c89f4e009b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4b883e9b-ae7e-4121-9e10-28b5df299d3e",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c3ae1e28-76ab-4218-93ba-9ac291ea7a18","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ea0189a4-c1df-447f-a42f-a0c89f4e009b","path":"sprites/s_node_padding/s_node_padding.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"33afdc84-e123-49c0-abef-e578d5988066","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4b883e9b-ae7e-4121-9e10-28b5df299d3e","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c4bc3960-1c03-4d87-9cf1-40f64f7282e5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cd720ef4-9fdf-444c-8148-cfa96e1d6a72","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_palette/418c7f22-b115-4983-879b-137d4b1626a4.png b/sprites/s_node_palette/418c7f22-b115-4983-879b-137d4b1626a4.png new file mode 100644 index 000000000..1f6903758 Binary files /dev/null and b/sprites/s_node_palette/418c7f22-b115-4983-879b-137d4b1626a4.png differ diff --git a/sprites/s_node_palette/9dd4cd73-c707-4723-8cd3-25665416de43.png b/sprites/s_node_palette/9dd4cd73-c707-4723-8cd3-25665416de43.png deleted file mode 100644 index 82e625a87..000000000 Binary files a/sprites/s_node_palette/9dd4cd73-c707-4723-8cd3-25665416de43.png and /dev/null differ diff --git a/sprites/s_node_palette/layers/418c7f22-b115-4983-879b-137d4b1626a4/8c57bce1-6e91-4128-973f-507264b41714.png b/sprites/s_node_palette/layers/418c7f22-b115-4983-879b-137d4b1626a4/8c57bce1-6e91-4128-973f-507264b41714.png new file mode 100644 index 000000000..1f6903758 Binary files /dev/null and b/sprites/s_node_palette/layers/418c7f22-b115-4983-879b-137d4b1626a4/8c57bce1-6e91-4128-973f-507264b41714.png differ diff --git a/sprites/s_node_palette/layers/9dd4cd73-c707-4723-8cd3-25665416de43/17a93481-e890-4431-87bf-81725114ac20.png b/sprites/s_node_palette/layers/9dd4cd73-c707-4723-8cd3-25665416de43/17a93481-e890-4431-87bf-81725114ac20.png deleted file mode 100644 index 54d47e4c4..000000000 Binary files a/sprites/s_node_palette/layers/9dd4cd73-c707-4723-8cd3-25665416de43/17a93481-e890-4431-87bf-81725114ac20.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 c53c3bc47..3ac54a36c 100644 --- a/sprites/s_node_palette/s_node_palette.yy +++ b/sprites/s_node_palette/s_node_palette.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 23, + "bbox_right": 63, + "bbox_top": 18, + "bbox_bottom": 47, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9dd4cd73-c707-4723-8cd3-25665416de43",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"418c7f22-b115-4983-879b-137d4b1626a4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"219b9ae9-e86e-4191-809f-17ba5437e7f5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9dd4cd73-c707-4723-8cd3-25665416de43","path":"sprites/s_node_palette/s_node_palette.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ad2a5116-93cd-48e1-83c6-5557830d9490","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"418c7f22-b115-4983-879b-137d4b1626a4","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"17a93481-e890-4431-87bf-81725114ac20","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8c57bce1-6e91-4128-973f-507264b41714","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_particle/868e494d-3797-4411-91aa-d2c1c61bce07.png b/sprites/s_node_particle/868e494d-3797-4411-91aa-d2c1c61bce07.png deleted file mode 100644 index 76583463e..000000000 Binary files a/sprites/s_node_particle/868e494d-3797-4411-91aa-d2c1c61bce07.png and /dev/null differ diff --git a/sprites/s_node_particle/aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52.png b/sprites/s_node_particle/aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52.png new file mode 100644 index 000000000..bf36ee8ee Binary files /dev/null and b/sprites/s_node_particle/aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52.png differ diff --git a/sprites/s_node_particle/layers/868e494d-3797-4411-91aa-d2c1c61bce07/f8fb52d3-f9c0-4d12-a65f-12f25ff342e8.png b/sprites/s_node_particle/layers/868e494d-3797-4411-91aa-d2c1c61bce07/f8fb52d3-f9c0-4d12-a65f-12f25ff342e8.png deleted file mode 100644 index d05f8381f..000000000 Binary files a/sprites/s_node_particle/layers/868e494d-3797-4411-91aa-d2c1c61bce07/f8fb52d3-f9c0-4d12-a65f-12f25ff342e8.png and /dev/null differ diff --git a/sprites/s_node_particle/layers/aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52/fa34de21-091e-4443-88ec-39424f2b5acb.png b/sprites/s_node_particle/layers/aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52/fa34de21-091e-4443-88ec-39424f2b5acb.png new file mode 100644 index 000000000..bf36ee8ee Binary files /dev/null and b/sprites/s_node_particle/layers/aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52/fa34de21-091e-4443-88ec-39424f2b5acb.png differ diff --git a/sprites/s_node_particle/s_node_particle.yy b/sprites/s_node_particle/s_node_particle.yy index a345544c5..5dd2c2f89 100644 --- a/sprites/s_node_particle/s_node_particle.yy +++ b/sprites/s_node_particle/s_node_particle.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 30, - "bbox_top": 2, - "bbox_bottom": 28, + "bbox_left": 4, + "bbox_right": 59, + "bbox_top": 4, + "bbox_bottom": 57, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"868e494d-3797-4411-91aa-d2c1c61bce07",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c1b16c4c-48da-4e06-b748-3bf01ed0030b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"868e494d-3797-4411-91aa-d2c1c61bce07","path":"sprites/s_node_particle/s_node_particle.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ac29927b-5c5b-4a16-969e-bfa3d09d482f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aa6a579d-a8b9-4bf4-a1f8-22a7a6daed52","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f8fb52d3-f9c0-4d12-a65f-12f25ff342e8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fa34de21-091e-4443-88ec-39424f2b5acb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_particle_effector/4befe9f0-6284-45a5-8a9e-6f685c5e7a04.png b/sprites/s_node_particle_effector/4befe9f0-6284-45a5-8a9e-6f685c5e7a04.png new file mode 100644 index 000000000..f911c385b Binary files /dev/null and b/sprites/s_node_particle_effector/4befe9f0-6284-45a5-8a9e-6f685c5e7a04.png differ diff --git a/sprites/s_node_particle_effector/57588984-dae6-45da-b265-537b917dd2c9.png b/sprites/s_node_particle_effector/57588984-dae6-45da-b265-537b917dd2c9.png deleted file mode 100644 index e9983e7a4..000000000 Binary files a/sprites/s_node_particle_effector/57588984-dae6-45da-b265-537b917dd2c9.png and /dev/null differ diff --git a/sprites/s_node_particle_effector/layers/4befe9f0-6284-45a5-8a9e-6f685c5e7a04/9259f39e-5f79-41e1-9928-83190c7dedc4.png b/sprites/s_node_particle_effector/layers/4befe9f0-6284-45a5-8a9e-6f685c5e7a04/9259f39e-5f79-41e1-9928-83190c7dedc4.png new file mode 100644 index 000000000..f911c385b Binary files /dev/null and b/sprites/s_node_particle_effector/layers/4befe9f0-6284-45a5-8a9e-6f685c5e7a04/9259f39e-5f79-41e1-9928-83190c7dedc4.png differ diff --git a/sprites/s_node_particle_effector/layers/57588984-dae6-45da-b265-537b917dd2c9/5e396c3e-5ea1-4154-b4b8-c9c3e59957cc.png b/sprites/s_node_particle_effector/layers/57588984-dae6-45da-b265-537b917dd2c9/5e396c3e-5ea1-4154-b4b8-c9c3e59957cc.png deleted file mode 100644 index f0e08cfa1..000000000 Binary files a/sprites/s_node_particle_effector/layers/57588984-dae6-45da-b265-537b917dd2c9/5e396c3e-5ea1-4154-b4b8-c9c3e59957cc.png and /dev/null 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 e7861ddbd..4d1bdd01d 100644 --- a/sprites/s_node_particle_effector/s_node_particle_effector.yy +++ b/sprites/s_node_particle_effector/s_node_particle_effector.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 29, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 4, + "bbox_right": 58, + "bbox_top": 6, + "bbox_bottom": 57, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"57588984-dae6-45da-b265-537b917dd2c9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4befe9f0-6284-45a5-8a9e-6f685c5e7a04",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7e21668a-d43e-46d0-af39-0d9315cc0dce","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"57588984-dae6-45da-b265-537b917dd2c9","path":"sprites/s_node_particle_effector/s_node_particle_effector.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c242b5f8-d995-4b7c-9d52-a60feb38112d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4befe9f0-6284-45a5-8a9e-6f685c5e7a04","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5e396c3e-5ea1-4154-b4b8-c9c3e59957cc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9259f39e-5f79-41e1-9928-83190c7dedc4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_path/a8bbd190-aa44-4571-82dc-94fdb843e7ac.png b/sprites/s_node_path/a8bbd190-aa44-4571-82dc-94fdb843e7ac.png new file mode 100644 index 000000000..b13a88e32 Binary files /dev/null and b/sprites/s_node_path/a8bbd190-aa44-4571-82dc-94fdb843e7ac.png differ diff --git a/sprites/s_node_path/b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2.png b/sprites/s_node_path/b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2.png deleted file mode 100644 index b636446de..000000000 Binary files a/sprites/s_node_path/b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2.png and /dev/null differ diff --git a/sprites/s_node_path/layers/a8bbd190-aa44-4571-82dc-94fdb843e7ac/4763d3a1-567f-4f87-810b-8b3463afccf8.png b/sprites/s_node_path/layers/a8bbd190-aa44-4571-82dc-94fdb843e7ac/4763d3a1-567f-4f87-810b-8b3463afccf8.png new file mode 100644 index 000000000..b13a88e32 Binary files /dev/null and b/sprites/s_node_path/layers/a8bbd190-aa44-4571-82dc-94fdb843e7ac/4763d3a1-567f-4f87-810b-8b3463afccf8.png differ diff --git a/sprites/s_node_path/layers/b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2/39e21b0c-066f-4b41-8860-56bbc9930236.png b/sprites/s_node_path/layers/b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2/39e21b0c-066f-4b41-8860-56bbc9930236.png deleted file mode 100644 index b81adf0bc..000000000 Binary files a/sprites/s_node_path/layers/b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2/39e21b0c-066f-4b41-8860-56bbc9930236.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 b010ddd30..6c1b0522a 100644 --- a/sprites/s_node_path/s_node_path.yy +++ b/sprites/s_node_path/s_node_path.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 2, + "bbox_right": 60, + "bbox_top": 2, + "bbox_bottom": 60, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a8bbd190-aa44-4571-82dc-94fdb843e7ac",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7010974f-a98e-4595-a9e7-48b1ce241edb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b31dd0f5-443d-4c8b-b5e9-7766e0d73ea2","path":"sprites/s_node_path/s_node_path.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"30725a0b-503d-4805-bd6a-06ba4b74f9b4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a8bbd190-aa44-4571-82dc-94fdb843e7ac","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"39e21b0c-066f-4b41-8860-56bbc9930236","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4763d3a1-567f-4f87-810b-8b3463afccf8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_pin/2365b7b9-43c9-4df2-83e6-d01751cc39c0.png b/sprites/s_node_pin/2365b7b9-43c9-4df2-83e6-d01751cc39c0.png deleted file mode 100644 index 1ca1d2354..000000000 Binary files a/sprites/s_node_pin/2365b7b9-43c9-4df2-83e6-d01751cc39c0.png and /dev/null differ diff --git a/sprites/s_node_pin/771bd973-2973-46fe-b9e3-37203f9c3b5d.png b/sprites/s_node_pin/771bd973-2973-46fe-b9e3-37203f9c3b5d.png new file mode 100644 index 000000000..caf3f18d3 Binary files /dev/null and b/sprites/s_node_pin/771bd973-2973-46fe-b9e3-37203f9c3b5d.png differ diff --git a/sprites/s_node_pin/layers/2365b7b9-43c9-4df2-83e6-d01751cc39c0/b65361b9-99a1-422c-8aa7-786c5b41cc59.png b/sprites/s_node_pin/layers/2365b7b9-43c9-4df2-83e6-d01751cc39c0/b65361b9-99a1-422c-8aa7-786c5b41cc59.png deleted file mode 100644 index 1d3f61a76..000000000 Binary files a/sprites/s_node_pin/layers/2365b7b9-43c9-4df2-83e6-d01751cc39c0/b65361b9-99a1-422c-8aa7-786c5b41cc59.png and /dev/null differ diff --git a/sprites/s_node_pin/layers/771bd973-2973-46fe-b9e3-37203f9c3b5d/76b60b44-5104-4214-8601-186581afc685.png b/sprites/s_node_pin/layers/771bd973-2973-46fe-b9e3-37203f9c3b5d/76b60b44-5104-4214-8601-186581afc685.png new file mode 100644 index 000000000..caf3f18d3 Binary files /dev/null and b/sprites/s_node_pin/layers/771bd973-2973-46fe-b9e3-37203f9c3b5d/76b60b44-5104-4214-8601-186581afc685.png differ diff --git a/sprites/s_node_pin/s_node_pin.yy b/sprites/s_node_pin/s_node_pin.yy index e978a3068..dc972cbe2 100644 --- a/sprites/s_node_pin/s_node_pin.yy +++ b/sprites/s_node_pin/s_node_pin.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 9, - "bbox_bottom": 22, + "bbox_right": 63, + "bbox_top": 18, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2365b7b9-43c9-4df2-83e6-d01751cc39c0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"771bd973-2973-46fe-b9e3-37203f9c3b5d",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3616baf9-d106-48d3-801a-d40e470422b1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2365b7b9-43c9-4df2-83e6-d01751cc39c0","path":"sprites/s_node_pin/s_node_pin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"43042f3e-df7a-4f47-b425-97d0379468c3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"771bd973-2973-46fe-b9e3-37203f9c3b5d","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b65361b9-99a1-422c-8aa7-786c5b41cc59","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"76b60b44-5104-4214-8601-186581afc685","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_pixel_cloud/0e6021e9-a0d1-4935-9bbb-12776fbf3b5f.png b/sprites/s_node_pixel_cloud/0e6021e9-a0d1-4935-9bbb-12776fbf3b5f.png deleted file mode 100644 index 5041a769e..000000000 Binary files a/sprites/s_node_pixel_cloud/0e6021e9-a0d1-4935-9bbb-12776fbf3b5f.png and /dev/null differ diff --git a/sprites/s_node_pixel_cloud/b21ab333-89b3-4f39-b7f5-674ce86984c6.png b/sprites/s_node_pixel_cloud/b21ab333-89b3-4f39-b7f5-674ce86984c6.png new file mode 100644 index 000000000..5eccaff6c Binary files /dev/null and b/sprites/s_node_pixel_cloud/b21ab333-89b3-4f39-b7f5-674ce86984c6.png differ diff --git a/sprites/s_node_pixel_cloud/layers/0e6021e9-a0d1-4935-9bbb-12776fbf3b5f/301d57bc-8e2e-4343-b698-daa996e145a3.png b/sprites/s_node_pixel_cloud/layers/0e6021e9-a0d1-4935-9bbb-12776fbf3b5f/301d57bc-8e2e-4343-b698-daa996e145a3.png deleted file mode 100644 index 5601c44ab..000000000 Binary files a/sprites/s_node_pixel_cloud/layers/0e6021e9-a0d1-4935-9bbb-12776fbf3b5f/301d57bc-8e2e-4343-b698-daa996e145a3.png and /dev/null differ diff --git a/sprites/s_node_pixel_cloud/layers/b21ab333-89b3-4f39-b7f5-674ce86984c6/571f0cc6-f67a-4808-85c1-e7b8375dd4de.png b/sprites/s_node_pixel_cloud/layers/b21ab333-89b3-4f39-b7f5-674ce86984c6/571f0cc6-f67a-4808-85c1-e7b8375dd4de.png new file mode 100644 index 000000000..5eccaff6c Binary files /dev/null and b/sprites/s_node_pixel_cloud/layers/b21ab333-89b3-4f39-b7f5-674ce86984c6/571f0cc6-f67a-4808-85c1-e7b8375dd4de.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 a991d19c1..61db7fb2d 100644 --- a/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy +++ b/sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0e6021e9-a0d1-4935-9bbb-12776fbf3b5f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b21ab333-89b3-4f39-b7f5-674ce86984c6",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9c23dcca-a738-4ca0-a3a9-2a4e70270320","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e6021e9-a0d1-4935-9bbb-12776fbf3b5f","path":"sprites/s_node_pixel_cloud/s_node_pixel_cloud.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c4584c70-2011-46bb-8ea7-fe77d6fb1f47","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b21ab333-89b3-4f39-b7f5-674ce86984c6","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"301d57bc-8e2e-4343-b698-daa996e145a3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"571f0cc6-f67a-4808-85c1-e7b8375dd4de","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_polar/f51e2b51-48fd-4834-a30b-6a44cfd4d97e.png b/sprites/s_node_polar/f51e2b51-48fd-4834-a30b-6a44cfd4d97e.png new file mode 100644 index 000000000..2db3e65f9 Binary files /dev/null and b/sprites/s_node_polar/f51e2b51-48fd-4834-a30b-6a44cfd4d97e.png differ diff --git a/sprites/s_node_polar/f5c2eabc-e60c-4927-b07c-ea905da9a8e4.png b/sprites/s_node_polar/f5c2eabc-e60c-4927-b07c-ea905da9a8e4.png deleted file mode 100644 index a7e4e1b15..000000000 Binary files a/sprites/s_node_polar/f5c2eabc-e60c-4927-b07c-ea905da9a8e4.png and /dev/null differ diff --git a/sprites/s_node_polar/layers/f51e2b51-48fd-4834-a30b-6a44cfd4d97e/9e01e8fd-e080-4d1b-b086-77060ad2a1f8.png b/sprites/s_node_polar/layers/f51e2b51-48fd-4834-a30b-6a44cfd4d97e/9e01e8fd-e080-4d1b-b086-77060ad2a1f8.png new file mode 100644 index 000000000..2db3e65f9 Binary files /dev/null and b/sprites/s_node_polar/layers/f51e2b51-48fd-4834-a30b-6a44cfd4d97e/9e01e8fd-e080-4d1b-b086-77060ad2a1f8.png differ diff --git a/sprites/s_node_polar/layers/f5c2eabc-e60c-4927-b07c-ea905da9a8e4/6ae9166a-335e-4ce9-ac04-02cf6c9a80d8.png b/sprites/s_node_polar/layers/f5c2eabc-e60c-4927-b07c-ea905da9a8e4/6ae9166a-335e-4ce9-ac04-02cf6c9a80d8.png deleted file mode 100644 index 8733cfb7e..000000000 Binary files a/sprites/s_node_polar/layers/f5c2eabc-e60c-4927-b07c-ea905da9a8e4/6ae9166a-335e-4ce9-ac04-02cf6c9a80d8.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 50cfd78ce..a6234adee 100644 --- a/sprites/s_node_polar/s_node_polar.yy +++ b/sprites/s_node_polar/s_node_polar.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f5c2eabc-e60c-4927-b07c-ea905da9a8e4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f51e2b51-48fd-4834-a30b-6a44cfd4d97e",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"cda4cb3c-9c41-43e3-b2a4-c546537b2cbb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f5c2eabc-e60c-4927-b07c-ea905da9a8e4","path":"sprites/s_node_polar/s_node_polar.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e4a47fa5-f0c9-4a36-83c5-d8a53e83bdaf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f51e2b51-48fd-4834-a30b-6a44cfd4d97e","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6ae9166a-335e-4ce9-ac04-02cf6c9a80d8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9e01e8fd-e080-4d1b-b086-77060ad2a1f8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_posterize/433518e5-ba2e-4dcc-adcc-59f32bd7f051.png b/sprites/s_node_posterize/433518e5-ba2e-4dcc-adcc-59f32bd7f051.png new file mode 100644 index 000000000..22f7dd80a Binary files /dev/null and b/sprites/s_node_posterize/433518e5-ba2e-4dcc-adcc-59f32bd7f051.png differ diff --git a/sprites/s_node_posterize/f658ba15-0270-47b4-ab02-5befbf23af4e.png b/sprites/s_node_posterize/f658ba15-0270-47b4-ab02-5befbf23af4e.png deleted file mode 100644 index 2ea9ec499..000000000 Binary files a/sprites/s_node_posterize/f658ba15-0270-47b4-ab02-5befbf23af4e.png and /dev/null differ diff --git a/sprites/s_node_posterize/layers/433518e5-ba2e-4dcc-adcc-59f32bd7f051/24c2914d-7013-48d0-bc56-b0e02fc17e71.png b/sprites/s_node_posterize/layers/433518e5-ba2e-4dcc-adcc-59f32bd7f051/24c2914d-7013-48d0-bc56-b0e02fc17e71.png new file mode 100644 index 000000000..22f7dd80a Binary files /dev/null and b/sprites/s_node_posterize/layers/433518e5-ba2e-4dcc-adcc-59f32bd7f051/24c2914d-7013-48d0-bc56-b0e02fc17e71.png differ diff --git a/sprites/s_node_posterize/layers/f658ba15-0270-47b4-ab02-5befbf23af4e/3fde6593-3b6d-4855-8a01-adcd236a3e1e.png b/sprites/s_node_posterize/layers/f658ba15-0270-47b4-ab02-5befbf23af4e/3fde6593-3b6d-4855-8a01-adcd236a3e1e.png deleted file mode 100644 index 3bba8cf36..000000000 Binary files a/sprites/s_node_posterize/layers/f658ba15-0270-47b4-ab02-5befbf23af4e/3fde6593-3b6d-4855-8a01-adcd236a3e1e.png and /dev/null differ diff --git a/sprites/s_node_posterize/s_node_posterize.yy b/sprites/s_node_posterize/s_node_posterize.yy index b59bc44d0..30700bfa1 100644 --- a/sprites/s_node_posterize/s_node_posterize.yy +++ b/sprites/s_node_posterize/s_node_posterize.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f658ba15-0270-47b4-ab02-5befbf23af4e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"433518e5-ba2e-4dcc-adcc-59f32bd7f051",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3d690ff8-d222-4064-bad7-e4f59e2ac976","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f658ba15-0270-47b4-ab02-5befbf23af4e","path":"sprites/s_node_posterize/s_node_posterize.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"415889ef-81fa-4faf-8d6f-1b8c090c43d7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"433518e5-ba2e-4dcc-adcc-59f32bd7f051","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3fde6593-3b6d-4855-8a01-adcd236a3e1e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"24c2914d-7013-48d0-bc56-b0e02fc17e71","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_processor/51e1097e-cc5c-4ffa-984b-c6d41b174aaa.png b/sprites/s_node_processor/51e1097e-cc5c-4ffa-984b-c6d41b174aaa.png new file mode 100644 index 000000000..11d4f83b7 Binary files /dev/null and b/sprites/s_node_processor/51e1097e-cc5c-4ffa-984b-c6d41b174aaa.png differ diff --git a/sprites/s_node_processor/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png b/sprites/s_node_processor/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png deleted file mode 100644 index 65ed1102a..000000000 Binary files a/sprites/s_node_processor/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png and /dev/null differ diff --git a/sprites/s_node_processor/layers/51e1097e-cc5c-4ffa-984b-c6d41b174aaa/f26bcd22-00f2-497f-99a6-b65b4d1ea357.png b/sprites/s_node_processor/layers/51e1097e-cc5c-4ffa-984b-c6d41b174aaa/f26bcd22-00f2-497f-99a6-b65b4d1ea357.png new file mode 100644 index 000000000..11d4f83b7 Binary files /dev/null and b/sprites/s_node_processor/layers/51e1097e-cc5c-4ffa-984b-c6d41b174aaa/f26bcd22-00f2-497f-99a6-b65b4d1ea357.png differ diff --git a/sprites/s_node_processor/layers/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d/90ac81d7-28a5-4c36-af7a-628cb9a827f7.png b/sprites/s_node_processor/layers/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d/90ac81d7-28a5-4c36-af7a-628cb9a827f7.png deleted file mode 100644 index 1f2bb200a..000000000 Binary files a/sprites/s_node_processor/layers/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d/90ac81d7-28a5-4c36-af7a-628cb9a827f7.png and /dev/null differ diff --git a/sprites/s_node_processor/s_node_processor.yy b/sprites/s_node_processor/s_node_processor.yy index 5821a4232..ae3a42e3a 100644 --- a/sprites/s_node_processor/s_node_processor.yy +++ b/sprites/s_node_processor/s_node_processor.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 14, - "bbox_top": 1, - "bbox_bottom": 14, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 2, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"51e1097e-cc5c-4ffa-984b-c6d41b174aaa",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7ee36483-cd31-4bb8-a6f7-01d8a2205a51","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ec4fa9ce-f07a-45eb-8315-9771ad793345","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"51e1097e-cc5c-4ffa-984b-c6d41b174aaa","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"90ac81d7-28a5-4c36-af7a-628cb9a827f7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f26bcd22-00f2-497f-99a6-b65b4d1ea357","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_sampler/381b34a6-761a-48e8-9540-02ac6c2611c2.png b/sprites/s_node_sampler/381b34a6-761a-48e8-9540-02ac6c2611c2.png new file mode 100644 index 000000000..78919670c Binary files /dev/null and b/sprites/s_node_sampler/381b34a6-761a-48e8-9540-02ac6c2611c2.png differ diff --git a/sprites/s_node_sampler/93cadb32-611a-42a7-833b-1429fd6420ab.png b/sprites/s_node_sampler/93cadb32-611a-42a7-833b-1429fd6420ab.png deleted file mode 100644 index ed22337be..000000000 Binary files a/sprites/s_node_sampler/93cadb32-611a-42a7-833b-1429fd6420ab.png and /dev/null differ diff --git a/sprites/s_node_sampler/layers/381b34a6-761a-48e8-9540-02ac6c2611c2/6e91c670-4dea-4e04-b8e2-33b37d7ab3b3.png b/sprites/s_node_sampler/layers/381b34a6-761a-48e8-9540-02ac6c2611c2/6e91c670-4dea-4e04-b8e2-33b37d7ab3b3.png new file mode 100644 index 000000000..78919670c Binary files /dev/null and b/sprites/s_node_sampler/layers/381b34a6-761a-48e8-9540-02ac6c2611c2/6e91c670-4dea-4e04-b8e2-33b37d7ab3b3.png differ diff --git a/sprites/s_node_sampler/layers/93cadb32-611a-42a7-833b-1429fd6420ab/001b51f0-e2cc-4189-86f8-b981027f23aa.png b/sprites/s_node_sampler/layers/93cadb32-611a-42a7-833b-1429fd6420ab/001b51f0-e2cc-4189-86f8-b981027f23aa.png deleted file mode 100644 index b83adbb0a..000000000 Binary files a/sprites/s_node_sampler/layers/93cadb32-611a-42a7-833b-1429fd6420ab/001b51f0-e2cc-4189-86f8-b981027f23aa.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 6809b4479..7fa20d6a2 100644 --- a/sprites/s_node_sampler/s_node_sampler.yy +++ b/sprites/s_node_sampler/s_node_sampler.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 3, - "bbox_bottom": 28, + "bbox_left": 7, + "bbox_right": 56, + "bbox_top": 7, + "bbox_bottom": 56, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"93cadb32-611a-42a7-833b-1429fd6420ab",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"381b34a6-761a-48e8-9540-02ac6c2611c2",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a3720d6d-1647-4397-9253-1f9e24a5eced","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"93cadb32-611a-42a7-833b-1429fd6420ab","path":"sprites/s_node_sampler/s_node_sampler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8b40ba3d-4a75-4588-a395-16c0352d2969","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"381b34a6-761a-48e8-9540-02ac6c2611c2","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"001b51f0-e2cc-4189-86f8-b981027f23aa","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6e91c670-4dea-4e04-b8e2-33b37d7ab3b3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_scale/1c1f486a-7ac6-452f-87da-4f6019c5c355.png b/sprites/s_node_scale/1c1f486a-7ac6-452f-87da-4f6019c5c355.png new file mode 100644 index 000000000..912160a11 Binary files /dev/null and b/sprites/s_node_scale/1c1f486a-7ac6-452f-87da-4f6019c5c355.png differ diff --git a/sprites/s_node_scale/2c090575-1bdc-4761-83de-451aca2de93a.png b/sprites/s_node_scale/2c090575-1bdc-4761-83de-451aca2de93a.png deleted file mode 100644 index 724c51cbb..000000000 Binary files a/sprites/s_node_scale/2c090575-1bdc-4761-83de-451aca2de93a.png and /dev/null differ diff --git a/sprites/s_node_scale/layers/1c1f486a-7ac6-452f-87da-4f6019c5c355/07becfed-db6c-4830-b8f2-0e4b89d7aa98.png b/sprites/s_node_scale/layers/1c1f486a-7ac6-452f-87da-4f6019c5c355/07becfed-db6c-4830-b8f2-0e4b89d7aa98.png new file mode 100644 index 000000000..912160a11 Binary files /dev/null and b/sprites/s_node_scale/layers/1c1f486a-7ac6-452f-87da-4f6019c5c355/07becfed-db6c-4830-b8f2-0e4b89d7aa98.png differ diff --git a/sprites/s_node_scale/layers/2c090575-1bdc-4761-83de-451aca2de93a/6d1363df-92fe-4cee-b7ae-6eb8e2fcb3e6.png b/sprites/s_node_scale/layers/2c090575-1bdc-4761-83de-451aca2de93a/6d1363df-92fe-4cee-b7ae-6eb8e2fcb3e6.png deleted file mode 100644 index 03db1890b..000000000 Binary files a/sprites/s_node_scale/layers/2c090575-1bdc-4761-83de-451aca2de93a/6d1363df-92fe-4cee-b7ae-6eb8e2fcb3e6.png and /dev/null differ diff --git a/sprites/s_node_scale/s_node_scale.yy b/sprites/s_node_scale/s_node_scale.yy index 8d0298b86..1a94daf67 100644 --- a/sprites/s_node_scale/s_node_scale.yy +++ b/sprites/s_node_scale/s_node_scale.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2c090575-1bdc-4761-83de-451aca2de93a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1c1f486a-7ac6-452f-87da-4f6019c5c355",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d97e46f2-de9d-4ee8-a51f-37bd8bbc47e8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2c090575-1bdc-4761-83de-451aca2de93a","path":"sprites/s_node_scale/s_node_scale.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c2a88694-60b5-4c0e-b1da-8e4d9ef142da","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1c1f486a-7ac6-452f-87da-4f6019c5c355","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6d1363df-92fe-4cee-b7ae-6eb8e2fcb3e6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"07becfed-db6c-4830-b8f2-0e4b89d7aa98","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_scale_algo/031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6.png b/sprites/s_node_scale_algo/031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6.png deleted file mode 100644 index 56ab5ca96..000000000 Binary files a/sprites/s_node_scale_algo/031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6.png and /dev/null differ diff --git a/sprites/s_node_scale_algo/c68b7787-8a2c-45c6-bfde-6a30005b0c9f.png b/sprites/s_node_scale_algo/c68b7787-8a2c-45c6-bfde-6a30005b0c9f.png new file mode 100644 index 000000000..81991b6ed Binary files /dev/null and b/sprites/s_node_scale_algo/c68b7787-8a2c-45c6-bfde-6a30005b0c9f.png differ diff --git a/sprites/s_node_scale_algo/layers/031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6/a943eada-11c2-4f0b-bd61-e7fbb0c82f3a.png b/sprites/s_node_scale_algo/layers/031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6/a943eada-11c2-4f0b-bd61-e7fbb0c82f3a.png deleted file mode 100644 index d163f08ac..000000000 Binary files a/sprites/s_node_scale_algo/layers/031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6/a943eada-11c2-4f0b-bd61-e7fbb0c82f3a.png and /dev/null differ diff --git a/sprites/s_node_scale_algo/layers/c68b7787-8a2c-45c6-bfde-6a30005b0c9f/2bf8c6db-4e7a-444d-b0cc-7f5a89165e43.png b/sprites/s_node_scale_algo/layers/c68b7787-8a2c-45c6-bfde-6a30005b0c9f/2bf8c6db-4e7a-444d-b0cc-7f5a89165e43.png new file mode 100644 index 000000000..81991b6ed Binary files /dev/null and b/sprites/s_node_scale_algo/layers/c68b7787-8a2c-45c6-bfde-6a30005b0c9f/2bf8c6db-4e7a-444d-b0cc-7f5a89165e43.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 565c2e5c2..9a6139a15 100644 --- a/sprites/s_node_scale_algo/s_node_scale_algo.yy +++ b/sprites/s_node_scale_algo/s_node_scale_algo.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c68b7787-8a2c-45c6-bfde-6a30005b0c9f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4adf4044-8781-4139-82a0-2757f2ad4b33","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"031fa6c8-6c48-4015-a2f3-e6d9ad6cc1d6","path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d2ec637b-7a41-4168-b20c-a868b8f2e450","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c68b7787-8a2c-45c6-bfde-6a30005b0c9f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a943eada-11c2-4f0b-bd61-e7fbb0c82f3a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2bf8c6db-4e7a-444d-b0cc-7f5a89165e43","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_scatter/2ebe5459-b8a6-4110-a8c8-94e6068d7f26.png b/sprites/s_node_scatter/2ebe5459-b8a6-4110-a8c8-94e6068d7f26.png new file mode 100644 index 000000000..d88d302cf Binary files /dev/null and b/sprites/s_node_scatter/2ebe5459-b8a6-4110-a8c8-94e6068d7f26.png differ diff --git a/sprites/s_node_scatter/d2078b35-52b3-4376-a082-496c008ac922.png b/sprites/s_node_scatter/d2078b35-52b3-4376-a082-496c008ac922.png deleted file mode 100644 index 974c08ce7..000000000 Binary files a/sprites/s_node_scatter/d2078b35-52b3-4376-a082-496c008ac922.png and /dev/null differ diff --git a/sprites/s_node_scatter/layers/2ebe5459-b8a6-4110-a8c8-94e6068d7f26/be8055d9-356e-478b-b094-eb1bd30130db.png b/sprites/s_node_scatter/layers/2ebe5459-b8a6-4110-a8c8-94e6068d7f26/be8055d9-356e-478b-b094-eb1bd30130db.png new file mode 100644 index 000000000..d88d302cf Binary files /dev/null and b/sprites/s_node_scatter/layers/2ebe5459-b8a6-4110-a8c8-94e6068d7f26/be8055d9-356e-478b-b094-eb1bd30130db.png differ diff --git a/sprites/s_node_scatter/layers/d2078b35-52b3-4376-a082-496c008ac922/b3146ca8-48e5-490a-af6f-643d478a1bfc.png b/sprites/s_node_scatter/layers/d2078b35-52b3-4376-a082-496c008ac922/b3146ca8-48e5-490a-af6f-643d478a1bfc.png deleted file mode 100644 index 2a0abe5ce..000000000 Binary files a/sprites/s_node_scatter/layers/d2078b35-52b3-4376-a082-496c008ac922/b3146ca8-48e5-490a-af6f-643d478a1bfc.png and /dev/null differ diff --git a/sprites/s_node_scatter/s_node_scatter.yy b/sprites/s_node_scatter/s_node_scatter.yy index c7ef57450..2559a4092 100644 --- a/sprites/s_node_scatter/s_node_scatter.yy +++ b/sprites/s_node_scatter/s_node_scatter.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_left": 6, + "bbox_right": 57, + "bbox_top": 4, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2078b35-52b3-4376-a082-496c008ac922",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2ebe5459-b8a6-4110-a8c8-94e6068d7f26",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5d86c2b3-d516-4550-9e07-8e470417a2d7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d2078b35-52b3-4376-a082-496c008ac922","path":"sprites/s_node_scatter/s_node_scatter.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"52cc4c19-2301-4df9-ac8c-be6a308d1469","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2ebe5459-b8a6-4110-a8c8-94e6068d7f26","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b3146ca8-48e5-490a-af6f-643d478a1bfc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"be8055d9-356e-478b-b094-eb1bd30130db","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_sepearte_shape/1d959b63-0220-4601-95d6-d057dcded291.png b/sprites/s_node_sepearte_shape/1d959b63-0220-4601-95d6-d057dcded291.png new file mode 100644 index 000000000..659ea120c Binary files /dev/null and b/sprites/s_node_sepearte_shape/1d959b63-0220-4601-95d6-d057dcded291.png differ diff --git a/sprites/s_node_sepearte_shape/ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35.png b/sprites/s_node_sepearte_shape/ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35.png deleted file mode 100644 index b1faa576d..000000000 Binary files a/sprites/s_node_sepearte_shape/ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35.png and /dev/null differ diff --git a/sprites/s_node_sepearte_shape/layers/1d959b63-0220-4601-95d6-d057dcded291/3d830f1d-8c05-4d6c-8fac-d9a4408e37c2.png b/sprites/s_node_sepearte_shape/layers/1d959b63-0220-4601-95d6-d057dcded291/3d830f1d-8c05-4d6c-8fac-d9a4408e37c2.png new file mode 100644 index 000000000..659ea120c Binary files /dev/null and b/sprites/s_node_sepearte_shape/layers/1d959b63-0220-4601-95d6-d057dcded291/3d830f1d-8c05-4d6c-8fac-d9a4408e37c2.png differ diff --git a/sprites/s_node_sepearte_shape/layers/ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35/205e7f14-400f-4bc2-b6d7-fa3908eaaee6.png b/sprites/s_node_sepearte_shape/layers/ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35/205e7f14-400f-4bc2-b6d7-fa3908eaaee6.png deleted file mode 100644 index aaa33c4a2..000000000 Binary files a/sprites/s_node_sepearte_shape/layers/ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35/205e7f14-400f-4bc2-b6d7-fa3908eaaee6.png and /dev/null 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 f6fc64728..f2ff99403 100644 --- a/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy +++ b/sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 31, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 2, + "bbox_right": 61, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1d959b63-0220-4601-95d6-d057dcded291",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ff887d79-7ee4-43b4-af54-b101f543ffdf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ab6bc4f3-e22b-4ee5-bd8c-fd4acc641e35","path":"sprites/s_node_sepearte_shape/s_node_sepearte_shape.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1a3149aa-ce27-4227-ae2f-d4fa0e7f15a1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1d959b63-0220-4601-95d6-d057dcded291","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"205e7f14-400f-4bc2-b6d7-fa3908eaaee6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3d830f1d-8c05-4d6c-8fac-d9a4408e37c2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_shadow/5a75fff3-df30-446a-9cc6-48ac91b0616f.png b/sprites/s_node_shadow/5a75fff3-df30-446a-9cc6-48ac91b0616f.png new file mode 100644 index 000000000..7482c700a Binary files /dev/null and b/sprites/s_node_shadow/5a75fff3-df30-446a-9cc6-48ac91b0616f.png differ diff --git a/sprites/s_node_shadow/8c8dcb55-4988-4a2d-912e-c4e266ac23ab.png b/sprites/s_node_shadow/8c8dcb55-4988-4a2d-912e-c4e266ac23ab.png deleted file mode 100644 index 6d2ad2092..000000000 Binary files a/sprites/s_node_shadow/8c8dcb55-4988-4a2d-912e-c4e266ac23ab.png and /dev/null differ diff --git a/sprites/s_node_shadow/layers/5a75fff3-df30-446a-9cc6-48ac91b0616f/079a36ed-18de-4d92-be29-9db5c7aba502.png b/sprites/s_node_shadow/layers/5a75fff3-df30-446a-9cc6-48ac91b0616f/079a36ed-18de-4d92-be29-9db5c7aba502.png new file mode 100644 index 000000000..7482c700a Binary files /dev/null and b/sprites/s_node_shadow/layers/5a75fff3-df30-446a-9cc6-48ac91b0616f/079a36ed-18de-4d92-be29-9db5c7aba502.png differ diff --git a/sprites/s_node_shadow/layers/8c8dcb55-4988-4a2d-912e-c4e266ac23ab/608a69c7-8a0e-426f-8723-053a99d89f46.png b/sprites/s_node_shadow/layers/8c8dcb55-4988-4a2d-912e-c4e266ac23ab/608a69c7-8a0e-426f-8723-053a99d89f46.png deleted file mode 100644 index 3999024f2..000000000 Binary files a/sprites/s_node_shadow/layers/8c8dcb55-4988-4a2d-912e-c4e266ac23ab/608a69c7-8a0e-426f-8723-053a99d89f46.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 c76a607f5..a8dcf9bd7 100644 --- a/sprites/s_node_shadow/s_node_shadow.yy +++ b/sprites/s_node_shadow/s_node_shadow.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 2, - "bbox_bottom": 31, + "bbox_right": 63, + "bbox_top": 3, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8c8dcb55-4988-4a2d-912e-c4e266ac23ab",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5a75fff3-df30-446a-9cc6-48ac91b0616f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f54c955d-fa64-400d-9bea-708bf5a872c8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8c8dcb55-4988-4a2d-912e-c4e266ac23ab","path":"sprites/s_node_shadow/s_node_shadow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"68cbdcf2-61c1-4b69-9c2d-d43034f53d42","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5a75fff3-df30-446a-9cc6-48ac91b0616f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"608a69c7-8a0e-426f-8723-053a99d89f46","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"079a36ed-18de-4d92-be29-9db5c7aba502","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_shape/1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e.png b/sprites/s_node_shape/1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e.png deleted file mode 100644 index 7e4d52153..000000000 Binary files a/sprites/s_node_shape/1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e.png and /dev/null differ diff --git a/sprites/s_node_shape/bc7f828c-c657-4859-bd0c-6eade2e905ae.png b/sprites/s_node_shape/bc7f828c-c657-4859-bd0c-6eade2e905ae.png new file mode 100644 index 000000000..4b63f69e7 Binary files /dev/null and b/sprites/s_node_shape/bc7f828c-c657-4859-bd0c-6eade2e905ae.png differ diff --git a/sprites/s_node_shape/layers/1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e/00dfc453-6a8f-46ad-8bd4-73c0434db5a3.png b/sprites/s_node_shape/layers/1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e/00dfc453-6a8f-46ad-8bd4-73c0434db5a3.png deleted file mode 100644 index 41d20f2e1..000000000 Binary files a/sprites/s_node_shape/layers/1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e/00dfc453-6a8f-46ad-8bd4-73c0434db5a3.png and /dev/null differ diff --git a/sprites/s_node_shape/layers/bc7f828c-c657-4859-bd0c-6eade2e905ae/40267519-1cd6-4b3b-a842-1089c7cfe825.png b/sprites/s_node_shape/layers/bc7f828c-c657-4859-bd0c-6eade2e905ae/40267519-1cd6-4b3b-a842-1089c7cfe825.png new file mode 100644 index 000000000..4b63f69e7 Binary files /dev/null and b/sprites/s_node_shape/layers/bc7f828c-c657-4859-bd0c-6eade2e905ae/40267519-1cd6-4b3b-a842-1089c7cfe825.png differ diff --git a/sprites/s_node_shape/s_node_shape.yy b/sprites/s_node_shape/s_node_shape.yy index 22ce10700..bd887fccb 100644 --- a/sprites/s_node_shape/s_node_shape.yy +++ b/sprites/s_node_shape/s_node_shape.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 30, - "bbox_top": 0, - "bbox_bottom": 30, + "bbox_left": 1, + "bbox_right": 61, + "bbox_top": 1, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bc7f828c-c657-4859-bd0c-6eade2e905ae",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d27ecddf-066e-43e9-9c26-57ec1e936289","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1ec8ab99-b9e9-4b28-8dd0-9494d6b1f07e","path":"sprites/s_node_shape/s_node_shape.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"39df5d82-f9f6-41ca-bc62-78aff76d79fe","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bc7f828c-c657-4859-bd0c-6eade2e905ae","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,"modifiers":[],}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"00dfc453-6a8f-46ad-8bd4-73c0434db5a3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"40267519-1cd6-4b3b-a842-1089c7cfe825","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_solid/7ae5b067-4dc1-4a90-a768-1435a92e9f61.png b/sprites/s_node_solid/7ae5b067-4dc1-4a90-a768-1435a92e9f61.png new file mode 100644 index 000000000..1e673b214 Binary files /dev/null and b/sprites/s_node_solid/7ae5b067-4dc1-4a90-a768-1435a92e9f61.png differ diff --git a/sprites/s_node_solid/7c077c9a-83b6-4846-a68c-3964fdaafea8.png b/sprites/s_node_solid/7c077c9a-83b6-4846-a68c-3964fdaafea8.png deleted file mode 100644 index 450025ca4..000000000 Binary files a/sprites/s_node_solid/7c077c9a-83b6-4846-a68c-3964fdaafea8.png and /dev/null differ diff --git a/sprites/s_node_solid/layers/7ae5b067-4dc1-4a90-a768-1435a92e9f61/173900e2-faa2-45a1-abf3-514b79909996.png b/sprites/s_node_solid/layers/7ae5b067-4dc1-4a90-a768-1435a92e9f61/173900e2-faa2-45a1-abf3-514b79909996.png new file mode 100644 index 000000000..1e673b214 Binary files /dev/null and b/sprites/s_node_solid/layers/7ae5b067-4dc1-4a90-a768-1435a92e9f61/173900e2-faa2-45a1-abf3-514b79909996.png differ diff --git a/sprites/s_node_solid/layers/7c077c9a-83b6-4846-a68c-3964fdaafea8/f525f915-74af-41f4-851c-e62cc1667e69.png b/sprites/s_node_solid/layers/7c077c9a-83b6-4846-a68c-3964fdaafea8/f525f915-74af-41f4-851c-e62cc1667e69.png deleted file mode 100644 index ed6c60867..000000000 Binary files a/sprites/s_node_solid/layers/7c077c9a-83b6-4846-a68c-3964fdaafea8/f525f915-74af-41f4-851c-e62cc1667e69.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 f91440ff6..da23f8702 100644 --- a/sprites/s_node_solid/s_node_solid.yy +++ b/sprites/s_node_solid/s_node_solid.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7c077c9a-83b6-4846-a68c-3964fdaafea8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7ae5b067-4dc1-4a90-a768-1435a92e9f61",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"47ae439d-ae85-47bf-b921-ee30682cd603","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7c077c9a-83b6-4846-a68c-3964fdaafea8","path":"sprites/s_node_solid/s_node_solid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"82527a08-6152-473b-aec2-c4a58c13c93f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7ae5b067-4dc1-4a90-a768-1435a92e9f61","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f525f915-74af-41f4-851c-e62cc1667e69","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"173900e2-faa2-45a1-abf3-514b79909996","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_sprite_sheet/0739df5d-127a-4966-898f-cf91c4fcd90a.png b/sprites/s_node_sprite_sheet/0739df5d-127a-4966-898f-cf91c4fcd90a.png deleted file mode 100644 index f807d1a01..000000000 Binary files a/sprites/s_node_sprite_sheet/0739df5d-127a-4966-898f-cf91c4fcd90a.png and /dev/null differ diff --git a/sprites/s_node_sprite_sheet/d91c28b0-7458-4df4-80f1-1f284fbc37af.png b/sprites/s_node_sprite_sheet/d91c28b0-7458-4df4-80f1-1f284fbc37af.png new file mode 100644 index 000000000..d3f6b9c82 Binary files /dev/null and b/sprites/s_node_sprite_sheet/d91c28b0-7458-4df4-80f1-1f284fbc37af.png differ diff --git a/sprites/s_node_sprite_sheet/layers/0739df5d-127a-4966-898f-cf91c4fcd90a/5989734b-a242-4347-ba6a-aa8cef085f6b.png b/sprites/s_node_sprite_sheet/layers/0739df5d-127a-4966-898f-cf91c4fcd90a/5989734b-a242-4347-ba6a-aa8cef085f6b.png deleted file mode 100644 index 506ac7ec4..000000000 Binary files a/sprites/s_node_sprite_sheet/layers/0739df5d-127a-4966-898f-cf91c4fcd90a/5989734b-a242-4347-ba6a-aa8cef085f6b.png and /dev/null differ diff --git a/sprites/s_node_sprite_sheet/layers/d91c28b0-7458-4df4-80f1-1f284fbc37af/56f062df-5dd3-4f4e-8037-52e6ba90f8d7.png b/sprites/s_node_sprite_sheet/layers/d91c28b0-7458-4df4-80f1-1f284fbc37af/56f062df-5dd3-4f4e-8037-52e6ba90f8d7.png new file mode 100644 index 000000000..d3f6b9c82 Binary files /dev/null and b/sprites/s_node_sprite_sheet/layers/d91c28b0-7458-4df4-80f1-1f284fbc37af/56f062df-5dd3-4f4e-8037-52e6ba90f8d7.png 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 948305a56..7e8135b8a 100644 --- a/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy +++ b/sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0739df5d-127a-4966-898f-cf91c4fcd90a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d91c28b0-7458-4df4-80f1-1f284fbc37af",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b38cd98f-7c02-46b0-b4db-2611183fe799","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0739df5d-127a-4966-898f-cf91c4fcd90a","path":"sprites/s_node_sprite_sheet/s_node_sprite_sheet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"153d3cc4-4769-4751-b26c-fd8cf359d268","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d91c28b0-7458-4df4-80f1-1f284fbc37af","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5989734b-a242-4347-ba6a-aa8cef085f6b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"56f062df-5dd3-4f4e-8037-52e6ba90f8d7","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_stack/42b63e05-d1c1-45c3-929a-d046abd1a791.png b/sprites/s_node_stack/42b63e05-d1c1-45c3-929a-d046abd1a791.png new file mode 100644 index 000000000..b79ef656e Binary files /dev/null and b/sprites/s_node_stack/42b63e05-d1c1-45c3-929a-d046abd1a791.png differ diff --git a/sprites/s_node_stack/a1dd195f-1b35-47b8-ad0f-39b9745d2a48.png b/sprites/s_node_stack/a1dd195f-1b35-47b8-ad0f-39b9745d2a48.png deleted file mode 100644 index fcc55ea49..000000000 Binary files a/sprites/s_node_stack/a1dd195f-1b35-47b8-ad0f-39b9745d2a48.png and /dev/null differ diff --git a/sprites/s_node_stack/layers/42b63e05-d1c1-45c3-929a-d046abd1a791/a606144a-7767-4e48-bab9-891a2e72430d.png b/sprites/s_node_stack/layers/42b63e05-d1c1-45c3-929a-d046abd1a791/a606144a-7767-4e48-bab9-891a2e72430d.png new file mode 100644 index 000000000..b79ef656e Binary files /dev/null and b/sprites/s_node_stack/layers/42b63e05-d1c1-45c3-929a-d046abd1a791/a606144a-7767-4e48-bab9-891a2e72430d.png differ diff --git a/sprites/s_node_stack/layers/a1dd195f-1b35-47b8-ad0f-39b9745d2a48/b346c04f-5d64-4ec6-b7bb-a4f6166ad4c8.png b/sprites/s_node_stack/layers/a1dd195f-1b35-47b8-ad0f-39b9745d2a48/b346c04f-5d64-4ec6-b7bb-a4f6166ad4c8.png deleted file mode 100644 index 11a8d4bd9..000000000 Binary files a/sprites/s_node_stack/layers/a1dd195f-1b35-47b8-ad0f-39b9745d2a48/b346c04f-5d64-4ec6-b7bb-a4f6166ad4c8.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 9d631ba62..c0cd51a9f 100644 --- a/sprites/s_node_stack/s_node_stack.yy +++ b/sprites/s_node_stack/s_node_stack.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 8, - "bbox_right": 23, + "bbox_left": 16, + "bbox_right": 47, "bbox_top": 1, - "bbox_bottom": 31, + "bbox_bottom": 62, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 33, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a1dd195f-1b35-47b8-ad0f-39b9745d2a48",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"42b63e05-d1c1-45c3-929a-d046abd1a791",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"979477a6-514a-4dba-969f-f8763c03348d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a1dd195f-1b35-47b8-ad0f-39b9745d2a48","path":"sprites/s_node_stack/s_node_stack.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b6ae2ec6-dfdc-4846-84bc-180e42f24f0e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"42b63e05-d1c1-45c3-929a-d046abd1a791","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b346c04f-5d64-4ec6-b7bb-a4f6166ad4c8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a606144a-7767-4e48-bab9-891a2e72430d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_statistic/419fe86d-dec4-4a4c-9e22-5a30877d4901.png b/sprites/s_node_statistic/419fe86d-dec4-4a4c-9e22-5a30877d4901.png deleted file mode 100644 index 9d6ab03d2..000000000 Binary files a/sprites/s_node_statistic/419fe86d-dec4-4a4c-9e22-5a30877d4901.png and /dev/null differ diff --git a/sprites/s_node_statistic/4bec15a1-3f88-4de1-83a2-f4ae6ab769f3.png b/sprites/s_node_statistic/4bec15a1-3f88-4de1-83a2-f4ae6ab769f3.png new file mode 100644 index 000000000..5f54f28be Binary files /dev/null and b/sprites/s_node_statistic/4bec15a1-3f88-4de1-83a2-f4ae6ab769f3.png differ diff --git a/sprites/s_node_statistic/layers/419fe86d-dec4-4a4c-9e22-5a30877d4901/d15005af-1cac-4443-8a8c-c2e55e3a9569.png b/sprites/s_node_statistic/layers/419fe86d-dec4-4a4c-9e22-5a30877d4901/d15005af-1cac-4443-8a8c-c2e55e3a9569.png deleted file mode 100644 index 376ab32ee..000000000 Binary files a/sprites/s_node_statistic/layers/419fe86d-dec4-4a4c-9e22-5a30877d4901/d15005af-1cac-4443-8a8c-c2e55e3a9569.png and /dev/null differ diff --git a/sprites/s_node_statistic/layers/4bec15a1-3f88-4de1-83a2-f4ae6ab769f3/7beb25b2-5211-4af9-9b44-fb47366572db.png b/sprites/s_node_statistic/layers/4bec15a1-3f88-4de1-83a2-f4ae6ab769f3/7beb25b2-5211-4af9-9b44-fb47366572db.png new file mode 100644 index 000000000..5f54f28be Binary files /dev/null and b/sprites/s_node_statistic/layers/4bec15a1-3f88-4de1-83a2-f4ae6ab769f3/7beb25b2-5211-4af9-9b44-fb47366572db.png differ diff --git a/sprites/s_node_statistic/s_node_statistic.yy b/sprites/s_node_statistic/s_node_statistic.yy index 999fe0edf..a19f7b569 100644 --- a/sprites/s_node_statistic/s_node_statistic.yy +++ b/sprites/s_node_statistic/s_node_statistic.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 2, + "bbox_right": 61, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"419fe86d-dec4-4a4c-9e22-5a30877d4901",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4bec15a1-3f88-4de1-83a2-f4ae6ab769f3",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1c14fa29-6bf4-4e3f-b9d3-7313153e5651","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"419fe86d-dec4-4a4c-9e22-5a30877d4901","path":"sprites/s_node_statistic/s_node_statistic.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a23d4c3a-d660-432f-a051-a6389d84e868","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4bec15a1-3f88-4de1-83a2-f4ae6ab769f3","path":"sprites/s_node_statistic/s_node_statistic.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d15005af-1cac-4443-8a8c-c2e55e3a9569","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7beb25b2-5211-4af9-9b44-fb47366572db","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_stripe/290a592a-a08c-4e95-b74c-e3892a85806a.png b/sprites/s_node_stripe/290a592a-a08c-4e95-b74c-e3892a85806a.png deleted file mode 100644 index 00e20d7e6..000000000 Binary files a/sprites/s_node_stripe/290a592a-a08c-4e95-b74c-e3892a85806a.png and /dev/null differ diff --git a/sprites/s_node_stripe/38ac0b94-d267-4676-ac5f-18a1443860f1.png b/sprites/s_node_stripe/38ac0b94-d267-4676-ac5f-18a1443860f1.png new file mode 100644 index 000000000..cdb5005c5 Binary files /dev/null and b/sprites/s_node_stripe/38ac0b94-d267-4676-ac5f-18a1443860f1.png differ diff --git a/sprites/s_node_stripe/layers/290a592a-a08c-4e95-b74c-e3892a85806a/f9db7b68-2a0a-41a9-9903-d1f05db942e9.png b/sprites/s_node_stripe/layers/290a592a-a08c-4e95-b74c-e3892a85806a/f9db7b68-2a0a-41a9-9903-d1f05db942e9.png deleted file mode 100644 index 596bb3522..000000000 Binary files a/sprites/s_node_stripe/layers/290a592a-a08c-4e95-b74c-e3892a85806a/f9db7b68-2a0a-41a9-9903-d1f05db942e9.png and /dev/null differ diff --git a/sprites/s_node_stripe/layers/38ac0b94-d267-4676-ac5f-18a1443860f1/390f459e-83b8-4d5a-8f56-d5d551ae8b07.png b/sprites/s_node_stripe/layers/38ac0b94-d267-4676-ac5f-18a1443860f1/390f459e-83b8-4d5a-8f56-d5d551ae8b07.png new file mode 100644 index 000000000..cdb5005c5 Binary files /dev/null and b/sprites/s_node_stripe/layers/38ac0b94-d267-4676-ac5f-18a1443860f1/390f459e-83b8-4d5a-8f56-d5d551ae8b07.png differ diff --git a/sprites/s_node_stripe/s_node_stripe.yy b/sprites/s_node_stripe/s_node_stripe.yy index e8d6c8e7e..023145181 100644 --- a/sprites/s_node_stripe/s_node_stripe.yy +++ b/sprites/s_node_stripe/s_node_stripe.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"290a592a-a08c-4e95-b74c-e3892a85806a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"38ac0b94-d267-4676-ac5f-18a1443860f1",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8b833826-775c-41e7-8bfc-7029f46c9e79","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"290a592a-a08c-4e95-b74c-e3892a85806a","path":"sprites/s_node_stripe/s_node_stripe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9c69477b-28fe-4794-b727-211345c0a1ae","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"38ac0b94-d267-4676-ac5f-18a1443860f1","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f9db7b68-2a0a-41a9-9903-d1f05db942e9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"390f459e-83b8-4d5a-8f56-d5d551ae8b07","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_text/05ec59f9-08e5-4c6d-8a91-ac7092335b3c.png b/sprites/s_node_text/05ec59f9-08e5-4c6d-8a91-ac7092335b3c.png deleted file mode 100644 index 412139f0e..000000000 Binary files a/sprites/s_node_text/05ec59f9-08e5-4c6d-8a91-ac7092335b3c.png and /dev/null differ diff --git a/sprites/s_node_text/c8392b51-d8c5-4a99-aca0-fcf2556c9f4f.png b/sprites/s_node_text/c8392b51-d8c5-4a99-aca0-fcf2556c9f4f.png new file mode 100644 index 000000000..8eb205da9 Binary files /dev/null and b/sprites/s_node_text/c8392b51-d8c5-4a99-aca0-fcf2556c9f4f.png differ diff --git a/sprites/s_node_text/layers/05ec59f9-08e5-4c6d-8a91-ac7092335b3c/bd2845ed-1917-472a-816d-6cc1f42e7992.png b/sprites/s_node_text/layers/05ec59f9-08e5-4c6d-8a91-ac7092335b3c/bd2845ed-1917-472a-816d-6cc1f42e7992.png deleted file mode 100644 index 487616499..000000000 Binary files a/sprites/s_node_text/layers/05ec59f9-08e5-4c6d-8a91-ac7092335b3c/bd2845ed-1917-472a-816d-6cc1f42e7992.png and /dev/null differ diff --git a/sprites/s_node_text/layers/c8392b51-d8c5-4a99-aca0-fcf2556c9f4f/5559da90-c45d-4c92-85a2-0557248f609b.png b/sprites/s_node_text/layers/c8392b51-d8c5-4a99-aca0-fcf2556c9f4f/5559da90-c45d-4c92-85a2-0557248f609b.png new file mode 100644 index 000000000..8eb205da9 Binary files /dev/null and b/sprites/s_node_text/layers/c8392b51-d8c5-4a99-aca0-fcf2556c9f4f/5559da90-c45d-4c92-85a2-0557248f609b.png differ diff --git a/sprites/s_node_text/s_node_text.yy b/sprites/s_node_text/s_node_text.yy index 23b211005..e841254a7 100644 --- a/sprites/s_node_text/s_node_text.yy +++ b/sprites/s_node_text/s_node_text.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 28, - "bbox_top": 9, - "bbox_bottom": 22, + "bbox_left": 5, + "bbox_right": 57, + "bbox_top": 18, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"05ec59f9-08e5-4c6d-8a91-ac7092335b3c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c8392b51-d8c5-4a99-aca0-fcf2556c9f4f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8f2011e8-3f6f-482d-a539-26109158a18b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"05ec59f9-08e5-4c6d-8a91-ac7092335b3c","path":"sprites/s_node_text/s_node_text.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c4994f5d-977b-4064-b4cb-9f7ffd473689","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c8392b51-d8c5-4a99-aca0-fcf2556c9f4f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bd2845ed-1917-472a-816d-6cc1f42e7992","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5559da90-c45d-4c92-85a2-0557248f609b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_texture_map/8076e57b-7880-43df-8ca1-1604158b2e03.png b/sprites/s_node_texture_map/8076e57b-7880-43df-8ca1-1604158b2e03.png deleted file mode 100644 index a0782ba22..000000000 Binary files a/sprites/s_node_texture_map/8076e57b-7880-43df-8ca1-1604158b2e03.png and /dev/null differ diff --git a/sprites/s_node_texture_map/ac482ea8-30cb-4736-9cc7-22d89001dfaf.png b/sprites/s_node_texture_map/ac482ea8-30cb-4736-9cc7-22d89001dfaf.png new file mode 100644 index 000000000..f9cf5c075 Binary files /dev/null and b/sprites/s_node_texture_map/ac482ea8-30cb-4736-9cc7-22d89001dfaf.png differ diff --git a/sprites/s_node_texture_map/layers/8076e57b-7880-43df-8ca1-1604158b2e03/2509f3a4-feb9-4f3c-a379-6d9c22638d80.png b/sprites/s_node_texture_map/layers/8076e57b-7880-43df-8ca1-1604158b2e03/2509f3a4-feb9-4f3c-a379-6d9c22638d80.png deleted file mode 100644 index 6056908a8..000000000 Binary files a/sprites/s_node_texture_map/layers/8076e57b-7880-43df-8ca1-1604158b2e03/2509f3a4-feb9-4f3c-a379-6d9c22638d80.png and /dev/null differ diff --git a/sprites/s_node_texture_map/layers/ac482ea8-30cb-4736-9cc7-22d89001dfaf/b7807180-019a-4072-b5f0-ed294c1748df.png b/sprites/s_node_texture_map/layers/ac482ea8-30cb-4736-9cc7-22d89001dfaf/b7807180-019a-4072-b5f0-ed294c1748df.png new file mode 100644 index 000000000..f9cf5c075 Binary files /dev/null and b/sprites/s_node_texture_map/layers/ac482ea8-30cb-4736-9cc7-22d89001dfaf/b7807180-019a-4072-b5f0-ed294c1748df.png 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 da64ef3f3..07d3fae15 100644 --- a/sprites/s_node_texture_map/s_node_texture_map.yy +++ b/sprites/s_node_texture_map/s_node_texture_map.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8076e57b-7880-43df-8ca1-1604158b2e03",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ac482ea8-30cb-4736-9cc7-22d89001dfaf",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0b285194-4aa2-4c4d-a22e-e564c7db4ae4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8076e57b-7880-43df-8ca1-1604158b2e03","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"cf82b646-9bbf-4dc0-9b03-0994808dff23","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ac482ea8-30cb-4736-9cc7-22d89001dfaf","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2509f3a4-feb9-4f3c-a379-6d9c22638d80","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b7807180-019a-4072-b5f0-ed294c1748df","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_time_map/086cb077-ae24-4ea7-9b49-eb731ec28823.png b/sprites/s_node_time_map/086cb077-ae24-4ea7-9b49-eb731ec28823.png deleted file mode 100644 index d54fff274..000000000 Binary files a/sprites/s_node_time_map/086cb077-ae24-4ea7-9b49-eb731ec28823.png and /dev/null differ diff --git a/sprites/s_node_time_map/47d95360-63e8-428e-baed-7d638d3997c8.png b/sprites/s_node_time_map/47d95360-63e8-428e-baed-7d638d3997c8.png new file mode 100644 index 000000000..f3843b6d4 Binary files /dev/null and b/sprites/s_node_time_map/47d95360-63e8-428e-baed-7d638d3997c8.png differ diff --git a/sprites/s_node_time_map/layers/086cb077-ae24-4ea7-9b49-eb731ec28823/7374d68c-c2de-4c98-bdaa-da3b4fd9ebbd.png b/sprites/s_node_time_map/layers/086cb077-ae24-4ea7-9b49-eb731ec28823/7374d68c-c2de-4c98-bdaa-da3b4fd9ebbd.png deleted file mode 100644 index a9bcaef91..000000000 Binary files a/sprites/s_node_time_map/layers/086cb077-ae24-4ea7-9b49-eb731ec28823/7374d68c-c2de-4c98-bdaa-da3b4fd9ebbd.png and /dev/null differ diff --git a/sprites/s_node_time_map/layers/47d95360-63e8-428e-baed-7d638d3997c8/134cd9e4-2c6d-4c68-bccd-3aff7c06a631.png b/sprites/s_node_time_map/layers/47d95360-63e8-428e-baed-7d638d3997c8/134cd9e4-2c6d-4c68-bccd-3aff7c06a631.png new file mode 100644 index 000000000..f3843b6d4 Binary files /dev/null and b/sprites/s_node_time_map/layers/47d95360-63e8-428e-baed-7d638d3997c8/134cd9e4-2c6d-4c68-bccd-3aff7c06a631.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 9fcc18a48..6eed8617b 100644 --- a/sprites/s_node_time_map/s_node_time_map.yy +++ b/sprites/s_node_time_map/s_node_time_map.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 4, - "bbox_right": 27, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 8, + "bbox_right": 55, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"086cb077-ae24-4ea7-9b49-eb731ec28823",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"47d95360-63e8-428e-baed-7d638d3997c8",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b90c5d81-11ab-4b7d-bde5-e7302c8a4eb9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"086cb077-ae24-4ea7-9b49-eb731ec28823","path":"sprites/s_node_time_map/s_node_time_map.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"651d215c-51ce-47d7-bfaf-3a97f4393b63","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"47d95360-63e8-428e-baed-7d638d3997c8","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7374d68c-c2de-4c98-bdaa-da3b4fd9ebbd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"134cd9e4-2c6d-4c68-bccd-3aff7c06a631","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_timeline_preview/b6754260-0d26-4555-90ab-1d26075c28ac.png b/sprites/s_node_timeline_preview/b6754260-0d26-4555-90ab-1d26075c28ac.png new file mode 100644 index 000000000..2106ca638 Binary files /dev/null and b/sprites/s_node_timeline_preview/b6754260-0d26-4555-90ab-1d26075c28ac.png differ diff --git a/sprites/s_node_timeline_preview/c7abaef1-9a90-4faa-9935-52a45ccba95b.png b/sprites/s_node_timeline_preview/c7abaef1-9a90-4faa-9935-52a45ccba95b.png deleted file mode 100644 index a94da3e38..000000000 Binary files a/sprites/s_node_timeline_preview/c7abaef1-9a90-4faa-9935-52a45ccba95b.png and /dev/null differ diff --git a/sprites/s_node_timeline_preview/layers/b6754260-0d26-4555-90ab-1d26075c28ac/cb94cc82-2775-4d0b-86b0-106e61e6911c.png b/sprites/s_node_timeline_preview/layers/b6754260-0d26-4555-90ab-1d26075c28ac/cb94cc82-2775-4d0b-86b0-106e61e6911c.png new file mode 100644 index 000000000..2106ca638 Binary files /dev/null and b/sprites/s_node_timeline_preview/layers/b6754260-0d26-4555-90ab-1d26075c28ac/cb94cc82-2775-4d0b-86b0-106e61e6911c.png differ diff --git a/sprites/s_node_timeline_preview/layers/c7abaef1-9a90-4faa-9935-52a45ccba95b/0d178d2a-1106-4fe4-81b5-280252c38b63.png b/sprites/s_node_timeline_preview/layers/c7abaef1-9a90-4faa-9935-52a45ccba95b/0d178d2a-1106-4fe4-81b5-280252c38b63.png deleted file mode 100644 index 34c556fa5..000000000 Binary files a/sprites/s_node_timeline_preview/layers/c7abaef1-9a90-4faa-9935-52a45ccba95b/0d178d2a-1106-4fe4-81b5-280252c38b63.png and /dev/null 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 4f5f90618..f2672f06c 100644 --- a/sprites/s_node_timeline_preview/s_node_timeline_preview.yy +++ b/sprites/s_node_timeline_preview/s_node_timeline_preview.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 5, - "bbox_bottom": 26, + "bbox_right": 63, + "bbox_top": 10, + "bbox_bottom": 53, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c7abaef1-9a90-4faa-9935-52a45ccba95b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6754260-0d26-4555-90ab-1d26075c28ac",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"44f8215a-6035-446c-bdb7-6607dffd8f61","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c7abaef1-9a90-4faa-9935-52a45ccba95b","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3a447045-07e0-45a1-a6e4-f37c2488b0f1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b6754260-0d26-4555-90ab-1d26075c28ac","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0d178d2a-1106-4fe4-81b5-280252c38b63","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb94cc82-2775-4d0b-86b0-106e61e6911c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_trail/6606780d-742e-48e4-835e-f10fca00f98b.png b/sprites/s_node_trail/6606780d-742e-48e4-835e-f10fca00f98b.png new file mode 100644 index 000000000..8db33dbe7 Binary files /dev/null and b/sprites/s_node_trail/6606780d-742e-48e4-835e-f10fca00f98b.png differ diff --git a/sprites/s_node_trail/f844b8e4-77fc-412d-a941-f1ea7b5139f2.png b/sprites/s_node_trail/f844b8e4-77fc-412d-a941-f1ea7b5139f2.png deleted file mode 100644 index 51d2574ad..000000000 Binary files a/sprites/s_node_trail/f844b8e4-77fc-412d-a941-f1ea7b5139f2.png and /dev/null differ diff --git a/sprites/s_node_trail/layers/6606780d-742e-48e4-835e-f10fca00f98b/7ae048cf-a60d-4675-8bc5-81cf5ca76c86.png b/sprites/s_node_trail/layers/6606780d-742e-48e4-835e-f10fca00f98b/7ae048cf-a60d-4675-8bc5-81cf5ca76c86.png new file mode 100644 index 000000000..8db33dbe7 Binary files /dev/null and b/sprites/s_node_trail/layers/6606780d-742e-48e4-835e-f10fca00f98b/7ae048cf-a60d-4675-8bc5-81cf5ca76c86.png differ diff --git a/sprites/s_node_trail/layers/f844b8e4-77fc-412d-a941-f1ea7b5139f2/a851998c-e1d8-408c-a0fd-8978566a8038.png b/sprites/s_node_trail/layers/f844b8e4-77fc-412d-a941-f1ea7b5139f2/a851998c-e1d8-408c-a0fd-8978566a8038.png deleted file mode 100644 index 2dab93e2f..000000000 Binary files a/sprites/s_node_trail/layers/f844b8e4-77fc-412d-a941-f1ea7b5139f2/a851998c-e1d8-408c-a0fd-8978566a8038.png and /dev/null differ diff --git a/sprites/s_node_trail/s_node_trail.yy b/sprites/s_node_trail/s_node_trail.yy index 6c50edbde..3d7697a23 100644 --- a/sprites/s_node_trail/s_node_trail.yy +++ b/sprites/s_node_trail/s_node_trail.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f844b8e4-77fc-412d-a941-f1ea7b5139f2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6606780d-742e-48e4-835e-f10fca00f98b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2498be56-2917-4ba2-9189-4bb9613d0af1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f844b8e4-77fc-412d-a941-f1ea7b5139f2","path":"sprites/s_node_trail/s_node_trail.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"01f93b24-e2c8-4581-bcd7-483d3a9517be","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6606780d-742e-48e4-835e-f10fca00f98b","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a851998c-e1d8-408c-a0fd-8978566a8038","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7ae048cf-a60d-4675-8bc5-81cf5ca76c86","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_transform/30f8e18a-71db-4741-8b7c-06263ca1f8d9.png b/sprites/s_node_transform/30f8e18a-71db-4741-8b7c-06263ca1f8d9.png deleted file mode 100644 index a329c4ab2..000000000 Binary files a/sprites/s_node_transform/30f8e18a-71db-4741-8b7c-06263ca1f8d9.png and /dev/null differ diff --git a/sprites/s_node_transform/3b7bac78-f181-449d-a74b-f5c690430c90.png b/sprites/s_node_transform/3b7bac78-f181-449d-a74b-f5c690430c90.png new file mode 100644 index 000000000..acb75795a Binary files /dev/null and b/sprites/s_node_transform/3b7bac78-f181-449d-a74b-f5c690430c90.png differ diff --git a/sprites/s_node_transform/layers/30f8e18a-71db-4741-8b7c-06263ca1f8d9/fc45f0b9-b737-48a6-a7f1-f397ab82081e.png b/sprites/s_node_transform/layers/30f8e18a-71db-4741-8b7c-06263ca1f8d9/fc45f0b9-b737-48a6-a7f1-f397ab82081e.png deleted file mode 100644 index bb213a9e4..000000000 Binary files a/sprites/s_node_transform/layers/30f8e18a-71db-4741-8b7c-06263ca1f8d9/fc45f0b9-b737-48a6-a7f1-f397ab82081e.png and /dev/null differ diff --git a/sprites/s_node_transform/layers/3b7bac78-f181-449d-a74b-f5c690430c90/9e24ab6e-0324-42c7-9dcd-36f7a377fd2f.png b/sprites/s_node_transform/layers/3b7bac78-f181-449d-a74b-f5c690430c90/9e24ab6e-0324-42c7-9dcd-36f7a377fd2f.png new file mode 100644 index 000000000..acb75795a Binary files /dev/null and b/sprites/s_node_transform/layers/3b7bac78-f181-449d-a74b-f5c690430c90/9e24ab6e-0324-42c7-9dcd-36f7a377fd2f.png differ diff --git a/sprites/s_node_transform/s_node_transform.yy b/sprites/s_node_transform/s_node_transform.yy index 23d31bbac..274b649b0 100644 --- a/sprites/s_node_transform/s_node_transform.yy +++ b/sprites/s_node_transform/s_node_transform.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 30, - "bbox_top": 1, - "bbox_bottom": 30, + "bbox_left": 2, + "bbox_right": 61, + "bbox_top": 2, + "bbox_bottom": 61, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"30f8e18a-71db-4741-8b7c-06263ca1f8d9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3b7bac78-f181-449d-a74b-f5c690430c90",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"38c4cacf-b427-4ab9-8afd-444afae08056","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"30f8e18a-71db-4741-8b7c-06263ca1f8d9","path":"sprites/s_node_transform/s_node_transform.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"73a0e12b-b8ee-499a-b150-ca38ac31263c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3b7bac78-f181-449d-a74b-f5c690430c90","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fc45f0b9-b737-48a6-a7f1-f397ab82081e","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9e24ab6e-0324-42c7-9dcd-36f7a377fd2f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_twirl/4a5fbeb7-f507-4597-b44e-cc2038e88980.png b/sprites/s_node_twirl/4a5fbeb7-f507-4597-b44e-cc2038e88980.png deleted file mode 100644 index 36141bae9..000000000 Binary files a/sprites/s_node_twirl/4a5fbeb7-f507-4597-b44e-cc2038e88980.png and /dev/null differ diff --git a/sprites/s_node_twirl/db7550f1-6011-49ea-8610-b8ee46f15c99.png b/sprites/s_node_twirl/db7550f1-6011-49ea-8610-b8ee46f15c99.png new file mode 100644 index 000000000..7a52b86ae Binary files /dev/null and b/sprites/s_node_twirl/db7550f1-6011-49ea-8610-b8ee46f15c99.png differ diff --git a/sprites/s_node_twirl/layers/4a5fbeb7-f507-4597-b44e-cc2038e88980/844e669d-f341-4081-99b4-974900e67cd4.png b/sprites/s_node_twirl/layers/4a5fbeb7-f507-4597-b44e-cc2038e88980/844e669d-f341-4081-99b4-974900e67cd4.png deleted file mode 100644 index 1988a9f4a..000000000 Binary files a/sprites/s_node_twirl/layers/4a5fbeb7-f507-4597-b44e-cc2038e88980/844e669d-f341-4081-99b4-974900e67cd4.png and /dev/null differ diff --git a/sprites/s_node_twirl/layers/db7550f1-6011-49ea-8610-b8ee46f15c99/d10b2105-1d4a-4c19-8974-aabac910a58f.png b/sprites/s_node_twirl/layers/db7550f1-6011-49ea-8610-b8ee46f15c99/d10b2105-1d4a-4c19-8974-aabac910a58f.png new file mode 100644 index 000000000..7a52b86ae Binary files /dev/null and b/sprites/s_node_twirl/layers/db7550f1-6011-49ea-8610-b8ee46f15c99/d10b2105-1d4a-4c19-8974-aabac910a58f.png differ diff --git a/sprites/s_node_twirl/s_node_twirl.yy b/sprites/s_node_twirl/s_node_twirl.yy index 7dbcd0275..12e079923 100644 --- a/sprites/s_node_twirl/s_node_twirl.yy +++ b/sprites/s_node_twirl/s_node_twirl.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4a5fbeb7-f507-4597-b44e-cc2038e88980",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"db7550f1-6011-49ea-8610-b8ee46f15c99",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a7f3470b-db82-48ba-8542-0d8423fc6329","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4a5fbeb7-f507-4597-b44e-cc2038e88980","path":"sprites/s_node_twirl/s_node_twirl.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c96a9b06-e07a-4c36-ab3a-3123def26f43","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"db7550f1-6011-49ea-8610-b8ee46f15c99","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"844e669d-f341-4081-99b4-974900e67cd4","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d10b2105-1d4a-4c19-8974-aabac910a58f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_unicode/60e5a5a7-6465-4158-a438-ffc341e7905f.png b/sprites/s_node_unicode/60e5a5a7-6465-4158-a438-ffc341e7905f.png new file mode 100644 index 000000000..96ff666df Binary files /dev/null and b/sprites/s_node_unicode/60e5a5a7-6465-4158-a438-ffc341e7905f.png differ diff --git a/sprites/s_node_unicode/c4ca5e55-ae84-4d62-80d6-e229fbacaf51.png b/sprites/s_node_unicode/c4ca5e55-ae84-4d62-80d6-e229fbacaf51.png deleted file mode 100644 index 32eb87a90..000000000 Binary files a/sprites/s_node_unicode/c4ca5e55-ae84-4d62-80d6-e229fbacaf51.png and /dev/null differ diff --git a/sprites/s_node_unicode/layers/60e5a5a7-6465-4158-a438-ffc341e7905f/e48f7830-cd3e-4aa1-9083-08ccda0b5d10.png b/sprites/s_node_unicode/layers/60e5a5a7-6465-4158-a438-ffc341e7905f/e48f7830-cd3e-4aa1-9083-08ccda0b5d10.png new file mode 100644 index 000000000..96ff666df Binary files /dev/null and b/sprites/s_node_unicode/layers/60e5a5a7-6465-4158-a438-ffc341e7905f/e48f7830-cd3e-4aa1-9083-08ccda0b5d10.png differ diff --git a/sprites/s_node_unicode/layers/c4ca5e55-ae84-4d62-80d6-e229fbacaf51/3d6e02d4-084b-4f5b-a5dd-c70b83e276b5.png b/sprites/s_node_unicode/layers/c4ca5e55-ae84-4d62-80d6-e229fbacaf51/3d6e02d4-084b-4f5b-a5dd-c70b83e276b5.png deleted file mode 100644 index ff864edbd..000000000 Binary files a/sprites/s_node_unicode/layers/c4ca5e55-ae84-4d62-80d6-e229fbacaf51/3d6e02d4-084b-4f5b-a5dd-c70b83e276b5.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 551592b24..7b8689ee7 100644 --- a/sprites/s_node_unicode/s_node_unicode.yy +++ b/sprites/s_node_unicode/s_node_unicode.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 28, - "bbox_top": 9, - "bbox_bottom": 22, + "bbox_left": 7, + "bbox_right": 57, + "bbox_top": 19, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c4ca5e55-ae84-4d62-80d6-e229fbacaf51",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"60e5a5a7-6465-4158-a438-ffc341e7905f",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"af8c5d03-d0ad-4bdb-8a97-daf5f2075081","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c4ca5e55-ae84-4d62-80d6-e229fbacaf51","path":"sprites/s_node_unicode/s_node_unicode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5bd37184-6127-4665-8a76-17f42c367a6d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"60e5a5a7-6465-4158-a438-ffc341e7905f","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3d6e02d4-084b-4f5b-a5dd-c70b83e276b5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e48f7830-cd3e-4aa1-9083-08ccda0b5d10","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec2/44a2558b-c2ab-41fe-b364-9d7845b51e83.png b/sprites/s_node_vec2/44a2558b-c2ab-41fe-b364-9d7845b51e83.png new file mode 100644 index 000000000..5d79b6ffe Binary files /dev/null and b/sprites/s_node_vec2/44a2558b-c2ab-41fe-b364-9d7845b51e83.png differ diff --git a/sprites/s_node_vec2/bf39b953-e91b-4188-9f9c-e574545e32ff.png b/sprites/s_node_vec2/bf39b953-e91b-4188-9f9c-e574545e32ff.png deleted file mode 100644 index 27f610115..000000000 Binary files a/sprites/s_node_vec2/bf39b953-e91b-4188-9f9c-e574545e32ff.png and /dev/null differ diff --git a/sprites/s_node_vec2/layers/44a2558b-c2ab-41fe-b364-9d7845b51e83/cb0ad90c-528a-4f90-a1b4-e710cae67421.png b/sprites/s_node_vec2/layers/44a2558b-c2ab-41fe-b364-9d7845b51e83/cb0ad90c-528a-4f90-a1b4-e710cae67421.png new file mode 100644 index 000000000..5d79b6ffe Binary files /dev/null and b/sprites/s_node_vec2/layers/44a2558b-c2ab-41fe-b364-9d7845b51e83/cb0ad90c-528a-4f90-a1b4-e710cae67421.png differ diff --git a/sprites/s_node_vec2/layers/bf39b953-e91b-4188-9f9c-e574545e32ff/493fd5cd-b1e0-4af6-b05a-75abc0e9d8d3.png b/sprites/s_node_vec2/layers/bf39b953-e91b-4188-9f9c-e574545e32ff/493fd5cd-b1e0-4af6-b05a-75abc0e9d8d3.png deleted file mode 100644 index d200b1e37..000000000 Binary files a/sprites/s_node_vec2/layers/bf39b953-e91b-4188-9f9c-e574545e32ff/493fd5cd-b1e0-4af6-b05a-75abc0e9d8d3.png and /dev/null differ diff --git a/sprites/s_node_vec2/s_node_vec2.yy b/sprites/s_node_vec2/s_node_vec2.yy index 3d402cde2..9260caa1a 100644 --- a/sprites/s_node_vec2/s_node_vec2.yy +++ b/sprites/s_node_vec2/s_node_vec2.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 29, - "bbox_top": 11, - "bbox_bottom": 20, + "bbox_left": 3, + "bbox_right": 58, + "bbox_top": 23, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bf39b953-e91b-4188-9f9c-e574545e32ff",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"44a2558b-c2ab-41fe-b364-9d7845b51e83",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8c465147-8858-456a-b4b7-6d583014783c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bf39b953-e91b-4188-9f9c-e574545e32ff","path":"sprites/s_node_vec2/s_node_vec2.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"08288cc2-a80f-4e32-a41f-b99292a98c7c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"44a2558b-c2ab-41fe-b364-9d7845b51e83","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"493fd5cd-b1e0-4af6-b05a-75abc0e9d8d3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb0ad90c-528a-4f90-a1b4-e710cae67421","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec3/0821e6a9-08b2-4f3a-975e-2405fdfda116.png b/sprites/s_node_vec3/0821e6a9-08b2-4f3a-975e-2405fdfda116.png deleted file mode 100644 index fe13cfd62..000000000 Binary files a/sprites/s_node_vec3/0821e6a9-08b2-4f3a-975e-2405fdfda116.png and /dev/null differ diff --git a/sprites/s_node_vec3/fd8c15dc-ef9c-4a82-b1a4-48498043befc.png b/sprites/s_node_vec3/fd8c15dc-ef9c-4a82-b1a4-48498043befc.png new file mode 100644 index 000000000..1b7d7fb0b Binary files /dev/null and b/sprites/s_node_vec3/fd8c15dc-ef9c-4a82-b1a4-48498043befc.png differ diff --git a/sprites/s_node_vec3/layers/0821e6a9-08b2-4f3a-975e-2405fdfda116/8842a4de-ce40-4c41-80e6-2f7f5a28114a.png b/sprites/s_node_vec3/layers/0821e6a9-08b2-4f3a-975e-2405fdfda116/8842a4de-ce40-4c41-80e6-2f7f5a28114a.png deleted file mode 100644 index 2e8818015..000000000 Binary files a/sprites/s_node_vec3/layers/0821e6a9-08b2-4f3a-975e-2405fdfda116/8842a4de-ce40-4c41-80e6-2f7f5a28114a.png and /dev/null differ diff --git a/sprites/s_node_vec3/layers/fd8c15dc-ef9c-4a82-b1a4-48498043befc/7a3a8ec3-f1f0-4b99-882c-8eb0a073b0d9.png b/sprites/s_node_vec3/layers/fd8c15dc-ef9c-4a82-b1a4-48498043befc/7a3a8ec3-f1f0-4b99-882c-8eb0a073b0d9.png new file mode 100644 index 000000000..1b7d7fb0b Binary files /dev/null and b/sprites/s_node_vec3/layers/fd8c15dc-ef9c-4a82-b1a4-48498043befc/7a3a8ec3-f1f0-4b99-882c-8eb0a073b0d9.png differ diff --git a/sprites/s_node_vec3/s_node_vec3.yy b/sprites/s_node_vec3/s_node_vec3.yy index 6caa0cfb2..a4caae88b 100644 --- a/sprites/s_node_vec3/s_node_vec3.yy +++ b/sprites/s_node_vec3/s_node_vec3.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 29, - "bbox_top": 11, - "bbox_bottom": 20, + "bbox_left": 3, + "bbox_right": 58, + "bbox_top": 23, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0821e6a9-08b2-4f3a-975e-2405fdfda116",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fd8c15dc-ef9c-4a82-b1a4-48498043befc",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"352f100c-ff8f-4f18-a16e-5497d5ed1d38","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0821e6a9-08b2-4f3a-975e-2405fdfda116","path":"sprites/s_node_vec3/s_node_vec3.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"36df64ce-bdba-465a-91e1-ce2f4fa38413","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd8c15dc-ef9c-4a82-b1a4-48498043befc","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8842a4de-ce40-4c41-80e6-2f7f5a28114a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7a3a8ec3-f1f0-4b99-882c-8eb0a073b0d9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec4/22d1a71e-2f34-479f-b970-3a844cc3b311.png b/sprites/s_node_vec4/22d1a71e-2f34-479f-b970-3a844cc3b311.png deleted file mode 100644 index 429f0cc8d..000000000 Binary files a/sprites/s_node_vec4/22d1a71e-2f34-479f-b970-3a844cc3b311.png and /dev/null differ diff --git a/sprites/s_node_vec4/37371e96-7c25-45b7-86b2-b3823b8f3359.png b/sprites/s_node_vec4/37371e96-7c25-45b7-86b2-b3823b8f3359.png new file mode 100644 index 000000000..7ade735f6 Binary files /dev/null and b/sprites/s_node_vec4/37371e96-7c25-45b7-86b2-b3823b8f3359.png differ diff --git a/sprites/s_node_vec4/layers/22d1a71e-2f34-479f-b970-3a844cc3b311/fd82f6fa-4733-410c-a8d5-7ce3c6f7a026.png b/sprites/s_node_vec4/layers/22d1a71e-2f34-479f-b970-3a844cc3b311/fd82f6fa-4733-410c-a8d5-7ce3c6f7a026.png deleted file mode 100644 index 6d995a32b..000000000 Binary files a/sprites/s_node_vec4/layers/22d1a71e-2f34-479f-b970-3a844cc3b311/fd82f6fa-4733-410c-a8d5-7ce3c6f7a026.png and /dev/null differ diff --git a/sprites/s_node_vec4/layers/37371e96-7c25-45b7-86b2-b3823b8f3359/71ee5615-177b-426d-af25-ac8ef4b9b1fc.png b/sprites/s_node_vec4/layers/37371e96-7c25-45b7-86b2-b3823b8f3359/71ee5615-177b-426d-af25-ac8ef4b9b1fc.png new file mode 100644 index 000000000..7ade735f6 Binary files /dev/null and b/sprites/s_node_vec4/layers/37371e96-7c25-45b7-86b2-b3823b8f3359/71ee5615-177b-426d-af25-ac8ef4b9b1fc.png differ diff --git a/sprites/s_node_vec4/s_node_vec4.yy b/sprites/s_node_vec4/s_node_vec4.yy index 83e98c408..65ccc5cd7 100644 --- a/sprites/s_node_vec4/s_node_vec4.yy +++ b/sprites/s_node_vec4/s_node_vec4.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 29, - "bbox_top": 11, - "bbox_bottom": 20, + "bbox_left": 3, + "bbox_right": 59, + "bbox_top": 23, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"22d1a71e-2f34-479f-b970-3a844cc3b311",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"37371e96-7c25-45b7-86b2-b3823b8f3359",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8ece9925-5667-441b-94a2-6b9661b1d38e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"22d1a71e-2f34-479f-b970-3a844cc3b311","path":"sprites/s_node_vec4/s_node_vec4.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e3b47817-42c4-44fa-94ea-4c5aa463b506","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"37371e96-7c25-45b7-86b2-b3823b8f3359","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fd82f6fa-4733-410c-a8d5-7ce3c6f7a026","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"71ee5615-177b-426d-af25-ac8ef4b9b1fc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_vec_split/45ce5bd7-9908-48c5-8489-90c67e67597b.png b/sprites/s_node_vec_split/45ce5bd7-9908-48c5-8489-90c67e67597b.png new file mode 100644 index 000000000..8f4ab1c91 Binary files /dev/null and b/sprites/s_node_vec_split/45ce5bd7-9908-48c5-8489-90c67e67597b.png differ diff --git a/sprites/s_node_vec_split/f63478fc-1991-49dd-9a05-5b90dbfbd254.png b/sprites/s_node_vec_split/f63478fc-1991-49dd-9a05-5b90dbfbd254.png deleted file mode 100644 index 06aac8267..000000000 Binary files a/sprites/s_node_vec_split/f63478fc-1991-49dd-9a05-5b90dbfbd254.png and /dev/null differ diff --git a/sprites/s_node_vec_split/layers/45ce5bd7-9908-48c5-8489-90c67e67597b/4482ea3a-4232-44b0-bdfc-9ca3b158c347.png b/sprites/s_node_vec_split/layers/45ce5bd7-9908-48c5-8489-90c67e67597b/4482ea3a-4232-44b0-bdfc-9ca3b158c347.png new file mode 100644 index 000000000..8f4ab1c91 Binary files /dev/null and b/sprites/s_node_vec_split/layers/45ce5bd7-9908-48c5-8489-90c67e67597b/4482ea3a-4232-44b0-bdfc-9ca3b158c347.png differ diff --git a/sprites/s_node_vec_split/layers/f63478fc-1991-49dd-9a05-5b90dbfbd254/35016188-e7a0-471b-ae2c-e8e080f9e039.png b/sprites/s_node_vec_split/layers/f63478fc-1991-49dd-9a05-5b90dbfbd254/35016188-e7a0-471b-ae2c-e8e080f9e039.png deleted file mode 100644 index 4adac241d..000000000 Binary files a/sprites/s_node_vec_split/layers/f63478fc-1991-49dd-9a05-5b90dbfbd254/35016188-e7a0-471b-ae2c-e8e080f9e039.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 151aab815..286737da4 100644 --- a/sprites/s_node_vec_split/s_node_vec_split.yy +++ b/sprites/s_node_vec_split/s_node_vec_split.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f63478fc-1991-49dd-9a05-5b90dbfbd254",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"45ce5bd7-9908-48c5-8489-90c67e67597b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"899062cc-f1da-41c5-8969-61f72b3e2781","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f63478fc-1991-49dd-9a05-5b90dbfbd254","path":"sprites/s_node_vec_split/s_node_vec_split.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d589f7de-39f0-4be9-bced-8713ca84ac31","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"45ce5bd7-9908-48c5-8489-90c67e67597b","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"35016188-e7a0-471b-ae2c-e8e080f9e039","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4482ea3a-4232-44b0-bdfc-9ca3b158c347","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_warp/1441d53c-072b-42d4-9670-073e6592780b.png b/sprites/s_node_warp/1441d53c-072b-42d4-9670-073e6592780b.png new file mode 100644 index 000000000..0878b978e Binary files /dev/null and b/sprites/s_node_warp/1441d53c-072b-42d4-9670-073e6592780b.png differ diff --git a/sprites/s_node_warp/6c5612cb-c6d9-4e1c-bee8-76f9ad734224.png b/sprites/s_node_warp/6c5612cb-c6d9-4e1c-bee8-76f9ad734224.png deleted file mode 100644 index dcb9e81cb..000000000 Binary files a/sprites/s_node_warp/6c5612cb-c6d9-4e1c-bee8-76f9ad734224.png and /dev/null differ diff --git a/sprites/s_node_warp/layers/1441d53c-072b-42d4-9670-073e6592780b/2f2aa1dc-8410-46d4-aa3f-be0e70278d19.png b/sprites/s_node_warp/layers/1441d53c-072b-42d4-9670-073e6592780b/2f2aa1dc-8410-46d4-aa3f-be0e70278d19.png new file mode 100644 index 000000000..0878b978e Binary files /dev/null and b/sprites/s_node_warp/layers/1441d53c-072b-42d4-9670-073e6592780b/2f2aa1dc-8410-46d4-aa3f-be0e70278d19.png differ diff --git a/sprites/s_node_warp/layers/6c5612cb-c6d9-4e1c-bee8-76f9ad734224/c0897b44-b7c0-4493-b288-2be84021cc0c.png b/sprites/s_node_warp/layers/6c5612cb-c6d9-4e1c-bee8-76f9ad734224/c0897b44-b7c0-4493-b288-2be84021cc0c.png deleted file mode 100644 index 3f68f760f..000000000 Binary files a/sprites/s_node_warp/layers/6c5612cb-c6d9-4e1c-bee8-76f9ad734224/c0897b44-b7c0-4493-b288-2be84021cc0c.png and /dev/null differ diff --git a/sprites/s_node_warp/s_node_warp.yy b/sprites/s_node_warp/s_node_warp.yy index bbbd4db29..c2328313a 100644 --- a/sprites/s_node_warp/s_node_warp.yy +++ b/sprites/s_node_warp/s_node_warp.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6c5612cb-c6d9-4e1c-bee8-76f9ad734224",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1441d53c-072b-42d4-9670-073e6592780b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1353fa63-9eb1-4388-96e8-1ba82e9abae4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6c5612cb-c6d9-4e1c-bee8-76f9ad734224","path":"sprites/s_node_warp/s_node_warp.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5e0113c9-f15a-4932-8919-6d9f080e1c3d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1441d53c-072b-42d4-9670-073e6592780b","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c0897b44-b7c0-4493-b288-2be84021cc0c","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2f2aa1dc-8410-46d4-aa3f-be0e70278d19","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_warp_mesh/65a2bea1-1c8c-49cd-b536-64caed42e9c5.png b/sprites/s_node_warp_mesh/65a2bea1-1c8c-49cd-b536-64caed42e9c5.png new file mode 100644 index 000000000..b6c681cd5 Binary files /dev/null and b/sprites/s_node_warp_mesh/65a2bea1-1c8c-49cd-b536-64caed42e9c5.png differ diff --git a/sprites/s_node_warp_mesh/e9d3f385-ffa5-402b-9214-9528f323cb13.png b/sprites/s_node_warp_mesh/e9d3f385-ffa5-402b-9214-9528f323cb13.png deleted file mode 100644 index 03511d21a..000000000 Binary files a/sprites/s_node_warp_mesh/e9d3f385-ffa5-402b-9214-9528f323cb13.png and /dev/null differ diff --git a/sprites/s_node_warp_mesh/layers/65a2bea1-1c8c-49cd-b536-64caed42e9c5/fabdb8d0-bfbc-48bf-8392-6dfcfcdc77bf.png b/sprites/s_node_warp_mesh/layers/65a2bea1-1c8c-49cd-b536-64caed42e9c5/fabdb8d0-bfbc-48bf-8392-6dfcfcdc77bf.png new file mode 100644 index 000000000..b6c681cd5 Binary files /dev/null and b/sprites/s_node_warp_mesh/layers/65a2bea1-1c8c-49cd-b536-64caed42e9c5/fabdb8d0-bfbc-48bf-8392-6dfcfcdc77bf.png differ diff --git a/sprites/s_node_warp_mesh/layers/e9d3f385-ffa5-402b-9214-9528f323cb13/7426171a-c0da-4a4e-9d6c-2d592cb1f0af.png b/sprites/s_node_warp_mesh/layers/e9d3f385-ffa5-402b-9214-9528f323cb13/7426171a-c0da-4a4e-9d6c-2d592cb1f0af.png deleted file mode 100644 index db181bf8f..000000000 Binary files a/sprites/s_node_warp_mesh/layers/e9d3f385-ffa5-402b-9214-9528f323cb13/7426171a-c0da-4a4e-9d6c-2d592cb1f0af.png and /dev/null 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 6e9e49e84..09ea0f91a 100644 --- a/sprites/s_node_warp_mesh/s_node_warp_mesh.yy +++ b/sprites/s_node_warp_mesh/s_node_warp_mesh.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e9d3f385-ffa5-402b-9214-9528f323cb13",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"65a2bea1-1c8c-49cd-b536-64caed42e9c5",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2cea00b2-82b5-4e36-8ddf-6e1e0f2bd535","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e9d3f385-ffa5-402b-9214-9528f323cb13","path":"sprites/s_node_warp_mesh/s_node_warp_mesh.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"89865563-c0bc-4338-9e0f-0fb7378e4673","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"65a2bea1-1c8c-49cd-b536-64caed42e9c5","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7426171a-c0da-4a4e-9d6c-2d592cb1f0af","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fabdb8d0-bfbc-48bf-8392-6dfcfcdc77bf","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_wiggler/7e8c22ae-b343-412c-b6d8-5052c75cc3fe.png b/sprites/s_node_wiggler/7e8c22ae-b343-412c-b6d8-5052c75cc3fe.png new file mode 100644 index 000000000..d2312c949 Binary files /dev/null and b/sprites/s_node_wiggler/7e8c22ae-b343-412c-b6d8-5052c75cc3fe.png differ diff --git a/sprites/s_node_wiggler/c48bb093-52fa-4749-b3e9-50d71b7f7c15.png b/sprites/s_node_wiggler/c48bb093-52fa-4749-b3e9-50d71b7f7c15.png deleted file mode 100644 index 07558d932..000000000 Binary files a/sprites/s_node_wiggler/c48bb093-52fa-4749-b3e9-50d71b7f7c15.png and /dev/null differ diff --git a/sprites/s_node_wiggler/layers/7e8c22ae-b343-412c-b6d8-5052c75cc3fe/4707f513-c44f-49a8-9007-58f929f75602.png b/sprites/s_node_wiggler/layers/7e8c22ae-b343-412c-b6d8-5052c75cc3fe/4707f513-c44f-49a8-9007-58f929f75602.png new file mode 100644 index 000000000..d2312c949 Binary files /dev/null and b/sprites/s_node_wiggler/layers/7e8c22ae-b343-412c-b6d8-5052c75cc3fe/4707f513-c44f-49a8-9007-58f929f75602.png differ diff --git a/sprites/s_node_wiggler/layers/c48bb093-52fa-4749-b3e9-50d71b7f7c15/4ec031d7-d2f2-406f-88b3-37fe11d4ce88.png b/sprites/s_node_wiggler/layers/c48bb093-52fa-4749-b3e9-50d71b7f7c15/4ec031d7-d2f2-406f-88b3-37fe11d4ce88.png deleted file mode 100644 index ee3f43a6c..000000000 Binary files a/sprites/s_node_wiggler/layers/c48bb093-52fa-4749-b3e9-50d71b7f7c15/4ec031d7-d2f2-406f-88b3-37fe11d4ce88.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 666d4d9c1..aecfded3e 100644 --- a/sprites/s_node_wiggler/s_node_wiggler.yy +++ b/sprites/s_node_wiggler/s_node_wiggler.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 2, - "bbox_bottom": 30, + "bbox_right": 63, + "bbox_top": 3, + "bbox_bottom": 60, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c48bb093-52fa-4749-b3e9-50d71b7f7c15",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7e8c22ae-b343-412c-b6d8-5052c75cc3fe",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"dbade4e0-5020-47f4-bc39-2d42215092f2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c48bb093-52fa-4749-b3e9-50d71b7f7c15","path":"sprites/s_node_wiggler/s_node_wiggler.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d0c9d110-4447-4301-aada-37d8621e688b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7e8c22ae-b343-412c-b6d8-5052c75cc3fe","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4ec031d7-d2f2-406f-88b3-37fe11d4ce88","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4707f513-c44f-49a8-9007-58f929f75602","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_zigzag/e0268189-c6b1-4b00-a235-38215f394dd0.png b/sprites/s_node_zigzag/e0268189-c6b1-4b00-a235-38215f394dd0.png new file mode 100644 index 000000000..73b234d2c Binary files /dev/null and b/sprites/s_node_zigzag/e0268189-c6b1-4b00-a235-38215f394dd0.png differ diff --git a/sprites/s_node_zigzag/e2f38c35-b163-4b40-b4db-5806d82bc954.png b/sprites/s_node_zigzag/e2f38c35-b163-4b40-b4db-5806d82bc954.png deleted file mode 100644 index 7bdd58536..000000000 Binary files a/sprites/s_node_zigzag/e2f38c35-b163-4b40-b4db-5806d82bc954.png and /dev/null differ diff --git a/sprites/s_node_zigzag/layers/e0268189-c6b1-4b00-a235-38215f394dd0/ae8e5e22-5097-486c-acd7-7b52468f7930.png b/sprites/s_node_zigzag/layers/e0268189-c6b1-4b00-a235-38215f394dd0/ae8e5e22-5097-486c-acd7-7b52468f7930.png new file mode 100644 index 000000000..73b234d2c Binary files /dev/null and b/sprites/s_node_zigzag/layers/e0268189-c6b1-4b00-a235-38215f394dd0/ae8e5e22-5097-486c-acd7-7b52468f7930.png differ diff --git a/sprites/s_node_zigzag/layers/e2f38c35-b163-4b40-b4db-5806d82bc954/76e5cc02-d97b-4c29-a908-eebf7720efb2.png b/sprites/s_node_zigzag/layers/e2f38c35-b163-4b40-b4db-5806d82bc954/76e5cc02-d97b-4c29-a908-eebf7720efb2.png deleted file mode 100644 index 4410c50fd..000000000 Binary files a/sprites/s_node_zigzag/layers/e2f38c35-b163-4b40-b4db-5806d82bc954/76e5cc02-d97b-4c29-a908-eebf7720efb2.png and /dev/null differ diff --git a/sprites/s_node_zigzag/s_node_zigzag.yy b/sprites/s_node_zigzag/s_node_zigzag.yy index 525742dd8..ab19a803b 100644 --- a/sprites/s_node_zigzag/s_node_zigzag.yy +++ b/sprites/s_node_zigzag/s_node_zigzag.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 63, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 32, - "height": 32, + "width": 64, + "height": 64, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e2f38c35-b163-4b40-b4db-5806d82bc954",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e0268189-c6b1-4b00-a235-38215f394dd0",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"81bbdbb1-6338-4f49-95c1-8a4b92d4cb83","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e2f38c35-b163-4b40-b4db-5806d82bc954","path":"sprites/s_node_zigzag/s_node_zigzag.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"222fd72e-0a28-484e-a263-dcfd16302500","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e0268189-c6b1-4b00-a235-38215f394dd0","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,"modifiers":[],}, ], "visibleRange": {"x":0.0,"y":0.0,}, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 32, + "yorigin": 32, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"76e5cc02-d97b-4c29-a908-eebf7720efb2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ae8e5e22-5097-486c-acd7-7b52468f7930","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_noti_icon_complete/3500cd24-9188-4571-bc11-080a16d0cf53.png b/sprites/s_noti_icon_complete/3500cd24-9188-4571-bc11-080a16d0cf53.png new file mode 100644 index 000000000..044acd1f0 Binary files /dev/null and b/sprites/s_noti_icon_complete/3500cd24-9188-4571-bc11-080a16d0cf53.png differ diff --git a/sprites/s_noti_icon_complete/85d22b31-c40e-45ff-8f8b-c83218c851e5.png b/sprites/s_noti_icon_complete/85d22b31-c40e-45ff-8f8b-c83218c851e5.png deleted file mode 100644 index 1dce11bb8..000000000 Binary files a/sprites/s_noti_icon_complete/85d22b31-c40e-45ff-8f8b-c83218c851e5.png and /dev/null differ diff --git a/sprites/s_noti_icon_complete/layers/3500cd24-9188-4571-bc11-080a16d0cf53/8f2ae81a-c333-4db4-b3c5-fd89d45c5f54.png b/sprites/s_noti_icon_complete/layers/3500cd24-9188-4571-bc11-080a16d0cf53/8f2ae81a-c333-4db4-b3c5-fd89d45c5f54.png new file mode 100644 index 000000000..044acd1f0 Binary files /dev/null and b/sprites/s_noti_icon_complete/layers/3500cd24-9188-4571-bc11-080a16d0cf53/8f2ae81a-c333-4db4-b3c5-fd89d45c5f54.png differ diff --git a/sprites/s_noti_icon_complete/layers/85d22b31-c40e-45ff-8f8b-c83218c851e5/4b215c18-23bf-4b03-832c-97f7f522391a.png b/sprites/s_noti_icon_complete/layers/85d22b31-c40e-45ff-8f8b-c83218c851e5/4b215c18-23bf-4b03-832c-97f7f522391a.png deleted file mode 100644 index 3b0e5ccdb..000000000 Binary files a/sprites/s_noti_icon_complete/layers/85d22b31-c40e-45ff-8f8b-c83218c851e5/4b215c18-23bf-4b03-832c-97f7f522391a.png and /dev/null differ diff --git a/sprites/s_noti_icon_complete/s_noti_icon_complete.yy b/sprites/s_noti_icon_complete/s_noti_icon_complete.yy index e2ee68624..235b0a2fb 100644 --- a/sprites/s_noti_icon_complete/s_noti_icon_complete.yy +++ b/sprites/s_noti_icon_complete/s_noti_icon_complete.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 17, - "bbox_top": 4, - "bbox_bottom": 16, + "bbox_left": 3, + "bbox_right": 36, + "bbox_top": 7, + "bbox_bottom": 32, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"85d22b31-c40e-45ff-8f8b-c83218c851e5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3500cd24-9188-4571-bc11-080a16d0cf53",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f93dbb18-0a33-410f-89e9-5726d39758d5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"85d22b31-c40e-45ff-8f8b-c83218c851e5","path":"sprites/s_noti_icon_complete/s_noti_icon_complete.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d45687c1-4c2e-4465-ada3-e8709acd8a76","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3500cd24-9188-4571-bc11-080a16d0cf53","path":"sprites/s_noti_icon_complete/s_noti_icon_complete.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4b215c18-23bf-4b03-832c-97f7f522391a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8f2ae81a-c333-4db4-b3c5-fd89d45c5f54","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_noti_icon_error/46ffc702-8bab-4f22-b705-7819e379ca85.png b/sprites/s_noti_icon_error/46ffc702-8bab-4f22-b705-7819e379ca85.png new file mode 100644 index 000000000..5e3f75d2d Binary files /dev/null and b/sprites/s_noti_icon_error/46ffc702-8bab-4f22-b705-7819e379ca85.png differ diff --git a/sprites/s_noti_icon_error/7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b.png b/sprites/s_noti_icon_error/7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b.png new file mode 100644 index 000000000..93829078c Binary files /dev/null and b/sprites/s_noti_icon_error/7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b.png differ diff --git a/sprites/s_noti_icon_error/layers/46ffc702-8bab-4f22-b705-7819e379ca85/1b71045e-232a-49f4-9750-8baafdf02966.png b/sprites/s_noti_icon_error/layers/46ffc702-8bab-4f22-b705-7819e379ca85/1b71045e-232a-49f4-9750-8baafdf02966.png new file mode 100644 index 000000000..5e3f75d2d Binary files /dev/null and b/sprites/s_noti_icon_error/layers/46ffc702-8bab-4f22-b705-7819e379ca85/1b71045e-232a-49f4-9750-8baafdf02966.png differ diff --git a/sprites/s_noti_icon_error/layers/7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b/1b71045e-232a-49f4-9750-8baafdf02966.png b/sprites/s_noti_icon_error/layers/7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b/1b71045e-232a-49f4-9750-8baafdf02966.png new file mode 100644 index 000000000..93829078c Binary files /dev/null and b/sprites/s_noti_icon_error/layers/7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b/1b71045e-232a-49f4-9750-8baafdf02966.png differ diff --git a/sprites/s_noti_icon_error/s_noti_icon_error.yy b/sprites/s_noti_icon_error/s_noti_icon_error.yy new file mode 100644 index 000000000..dfa406b9d --- /dev/null +++ b/sprites/s_noti_icon_error/s_noti_icon_error.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "s_noti_icon_error", + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 2, + "bbox_right": 37, + "bbox_top": 2, + "bbox_bottom": 37, + "HTile": false, + "VTile": false, + "For3D": false, + "DynamicTexturePage": false, + "width": 40, + "height": 40, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"46ffc702-8bab-4f22-b705-7819e379ca85",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b",}, + ], + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "s_noti_icon_error", + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 2.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"f1aee99f-c9f6-407b-8f95-cd5356021338","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"46ffc702-8bab-4f22-b705-7819e379ca85","path":"sprites/s_noti_icon_error/s_noti_icon_error.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6740ce8d-2a75-4f85-ba70-bccf7003aadf","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7a7ab5df-bcc1-4a02-8d3d-ecd0f1f56e8b","path":"sprites/s_noti_icon_error/s_noti_icon_error.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 20, + "yorigin": 20, + "eventToFunction": {}, + "eventStubScript": null, + }, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1b71045e-232a-49f4-9750-8baafdf02966","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + ], + "nineSlice": null, + "parent": { + "name": "noti", + "path": "folders/sprites/panels/noti.yy", + }, +} \ No newline at end of file diff --git a/sprites/s_noti_icon_file_load/22ca1d06-e7da-4af2-8fd7-67c3a2b40024.png b/sprites/s_noti_icon_file_load/22ca1d06-e7da-4af2-8fd7-67c3a2b40024.png deleted file mode 100644 index 44aa8faff..000000000 Binary files a/sprites/s_noti_icon_file_load/22ca1d06-e7da-4af2-8fd7-67c3a2b40024.png and /dev/null differ diff --git a/sprites/s_noti_icon_file_load/3bf23322-7f20-4879-a71d-90cfb2fa9649.png b/sprites/s_noti_icon_file_load/3bf23322-7f20-4879-a71d-90cfb2fa9649.png new file mode 100644 index 000000000..187d06087 Binary files /dev/null and b/sprites/s_noti_icon_file_load/3bf23322-7f20-4879-a71d-90cfb2fa9649.png differ diff --git a/sprites/s_noti_icon_file_load/layers/22ca1d06-e7da-4af2-8fd7-67c3a2b40024/b09919d3-76f0-47d0-9f21-1330a8233bc5.png b/sprites/s_noti_icon_file_load/layers/22ca1d06-e7da-4af2-8fd7-67c3a2b40024/b09919d3-76f0-47d0-9f21-1330a8233bc5.png deleted file mode 100644 index 1d14be3a5..000000000 Binary files a/sprites/s_noti_icon_file_load/layers/22ca1d06-e7da-4af2-8fd7-67c3a2b40024/b09919d3-76f0-47d0-9f21-1330a8233bc5.png and /dev/null differ diff --git a/sprites/s_noti_icon_file_load/layers/3bf23322-7f20-4879-a71d-90cfb2fa9649/712be54c-36b1-4da0-a47c-d27715633c99.png b/sprites/s_noti_icon_file_load/layers/3bf23322-7f20-4879-a71d-90cfb2fa9649/712be54c-36b1-4da0-a47c-d27715633c99.png new file mode 100644 index 000000000..187d06087 Binary files /dev/null and b/sprites/s_noti_icon_file_load/layers/3bf23322-7f20-4879-a71d-90cfb2fa9649/712be54c-36b1-4da0-a47c-d27715633c99.png differ diff --git a/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy b/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy index b10290f9b..c7c5bdc66 100644 --- a/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy +++ b/sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 19, - "bbox_top": 1, - "bbox_bottom": 19, + "bbox_right": 38, + "bbox_top": 3, + "bbox_bottom": 39, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"22ca1d06-e7da-4af2-8fd7-67c3a2b40024",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3bf23322-7f20-4879-a71d-90cfb2fa9649",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"49dd490c-b474-4f73-9464-65e13ec106f9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"22ca1d06-e7da-4af2-8fd7-67c3a2b40024","path":"sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3dcbf60f-cf20-4a24-940d-2770f85cad9c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3bf23322-7f20-4879-a71d-90cfb2fa9649","path":"sprites/s_noti_icon_file_load/s_noti_icon_file_load.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b09919d3-76f0-47d0-9f21-1330a8233bc5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"712be54c-36b1-4da0-a47c-d27715633c99","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_noti_icon_file_save/182a3db1-50c3-4907-9d2d-76b542302019.png b/sprites/s_noti_icon_file_save/182a3db1-50c3-4907-9d2d-76b542302019.png new file mode 100644 index 000000000..62564ffa2 Binary files /dev/null and b/sprites/s_noti_icon_file_save/182a3db1-50c3-4907-9d2d-76b542302019.png differ diff --git a/sprites/s_noti_icon_file_save/83b4d62c-3fd9-4292-ab92-8e5458746328.png b/sprites/s_noti_icon_file_save/83b4d62c-3fd9-4292-ab92-8e5458746328.png deleted file mode 100644 index c3fc76f13..000000000 Binary files a/sprites/s_noti_icon_file_save/83b4d62c-3fd9-4292-ab92-8e5458746328.png and /dev/null differ diff --git a/sprites/s_noti_icon_file_save/layers/182a3db1-50c3-4907-9d2d-76b542302019/996b2f70-e4e0-4311-8012-f0291c77bc4a.png b/sprites/s_noti_icon_file_save/layers/182a3db1-50c3-4907-9d2d-76b542302019/996b2f70-e4e0-4311-8012-f0291c77bc4a.png new file mode 100644 index 000000000..62564ffa2 Binary files /dev/null and b/sprites/s_noti_icon_file_save/layers/182a3db1-50c3-4907-9d2d-76b542302019/996b2f70-e4e0-4311-8012-f0291c77bc4a.png differ diff --git a/sprites/s_noti_icon_file_save/layers/83b4d62c-3fd9-4292-ab92-8e5458746328/48cc33cc-baa4-46fe-9dda-5e191165b554.png b/sprites/s_noti_icon_file_save/layers/83b4d62c-3fd9-4292-ab92-8e5458746328/48cc33cc-baa4-46fe-9dda-5e191165b554.png deleted file mode 100644 index b7d1572a1..000000000 Binary files a/sprites/s_noti_icon_file_save/layers/83b4d62c-3fd9-4292-ab92-8e5458746328/48cc33cc-baa4-46fe-9dda-5e191165b554.png and /dev/null differ diff --git a/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy b/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy index 371b97577..c727be3a0 100644 --- a/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy +++ b/sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 19, - "bbox_top": 1, - "bbox_bottom": 19, + "bbox_right": 38, + "bbox_top": 3, + "bbox_bottom": 39, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"83b4d62c-3fd9-4292-ab92-8e5458746328",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"182a3db1-50c3-4907-9d2d-76b542302019",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fd78b19f-074b-4186-884e-4e33d281d7a1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"83b4d62c-3fd9-4292-ab92-8e5458746328","path":"sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2992166d-df3d-4bf9-987e-d5ed86657d30","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"182a3db1-50c3-4907-9d2d-76b542302019","path":"sprites/s_noti_icon_file_save/s_noti_icon_file_save.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"48cc33cc-baa4-46fe-9dda-5e191165b554","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"996b2f70-e4e0-4311-8012-f0291c77bc4a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_noti_icon_log/39d0addc-91f5-48d7-bb9a-c12c1bc4f01d.png b/sprites/s_noti_icon_log/39d0addc-91f5-48d7-bb9a-c12c1bc4f01d.png new file mode 100644 index 000000000..6cb511552 Binary files /dev/null and b/sprites/s_noti_icon_log/39d0addc-91f5-48d7-bb9a-c12c1bc4f01d.png differ diff --git a/sprites/s_noti_icon_log/e4475301-6b04-4220-b7f8-2d7e31d08f22.png b/sprites/s_noti_icon_log/e4475301-6b04-4220-b7f8-2d7e31d08f22.png new file mode 100644 index 000000000..dc73daa98 Binary files /dev/null and b/sprites/s_noti_icon_log/e4475301-6b04-4220-b7f8-2d7e31d08f22.png differ diff --git a/sprites/s_noti_icon_log/layers/39d0addc-91f5-48d7-bb9a-c12c1bc4f01d/05d048c4-20eb-4f16-9e0a-1f075199daae.png b/sprites/s_noti_icon_log/layers/39d0addc-91f5-48d7-bb9a-c12c1bc4f01d/05d048c4-20eb-4f16-9e0a-1f075199daae.png new file mode 100644 index 000000000..6cb511552 Binary files /dev/null and b/sprites/s_noti_icon_log/layers/39d0addc-91f5-48d7-bb9a-c12c1bc4f01d/05d048c4-20eb-4f16-9e0a-1f075199daae.png differ diff --git a/sprites/s_noti_icon_log/layers/e4475301-6b04-4220-b7f8-2d7e31d08f22/05d048c4-20eb-4f16-9e0a-1f075199daae.png b/sprites/s_noti_icon_log/layers/e4475301-6b04-4220-b7f8-2d7e31d08f22/05d048c4-20eb-4f16-9e0a-1f075199daae.png new file mode 100644 index 000000000..dc73daa98 Binary files /dev/null and b/sprites/s_noti_icon_log/layers/e4475301-6b04-4220-b7f8-2d7e31d08f22/05d048c4-20eb-4f16-9e0a-1f075199daae.png differ diff --git a/sprites/s_noti_icon_log/s_noti_icon_log.yy b/sprites/s_noti_icon_log/s_noti_icon_log.yy new file mode 100644 index 000000000..fa82a9c8a --- /dev/null +++ b/sprites/s_noti_icon_log/s_noti_icon_log.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "s_noti_icon_log", + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 2, + "bbox_right": 37, + "bbox_top": 4, + "bbox_bottom": 37, + "HTile": false, + "VTile": false, + "For3D": false, + "DynamicTexturePage": false, + "width": 40, + "height": 40, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e4475301-6b04-4220-b7f8-2d7e31d08f22",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"39d0addc-91f5-48d7-bb9a-c12c1bc4f01d",}, + ], + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "s_noti_icon_log", + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 2.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"7c7f88a1-7aee-450a-8b1b-3fe4b952f0c8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e4475301-6b04-4220-b7f8-2d7e31d08f22","path":"sprites/s_noti_icon_log/s_noti_icon_log.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"04455ebb-f0aa-463c-8850-9cd7b7d8ffa9","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"39d0addc-91f5-48d7-bb9a-c12c1bc4f01d","path":"sprites/s_noti_icon_log/s_noti_icon_log.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 20, + "yorigin": 20, + "eventToFunction": {}, + "eventStubScript": null, + }, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"05d048c4-20eb-4f16-9e0a-1f075199daae","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + ], + "nineSlice": null, + "parent": { + "name": "noti", + "path": "folders/sprites/panels/noti.yy", + }, +} \ No newline at end of file diff --git a/sprites/s_noti_icon_warning/09a3a37b-bd7b-40a7-b818-50b041fd07c8.png b/sprites/s_noti_icon_warning/09a3a37b-bd7b-40a7-b818-50b041fd07c8.png deleted file mode 100644 index 4f78118ca..000000000 Binary files a/sprites/s_noti_icon_warning/09a3a37b-bd7b-40a7-b818-50b041fd07c8.png and /dev/null differ diff --git a/sprites/s_noti_icon_warning/168b7123-efe7-4bc1-a77d-4dc616daf236.png b/sprites/s_noti_icon_warning/168b7123-efe7-4bc1-a77d-4dc616daf236.png new file mode 100644 index 000000000..2ac464ceb Binary files /dev/null and b/sprites/s_noti_icon_warning/168b7123-efe7-4bc1-a77d-4dc616daf236.png differ diff --git a/sprites/s_noti_icon_warning/c1983d8e-766a-4e7b-8441-bc58c5ffc263.png b/sprites/s_noti_icon_warning/c1983d8e-766a-4e7b-8441-bc58c5ffc263.png new file mode 100644 index 000000000..eb2586a46 Binary files /dev/null and b/sprites/s_noti_icon_warning/c1983d8e-766a-4e7b-8441-bc58c5ffc263.png differ diff --git a/sprites/s_noti_icon_warning/layers/09a3a37b-bd7b-40a7-b818-50b041fd07c8/a257c51e-12a7-47b6-9f05-e3ab251a6973.png b/sprites/s_noti_icon_warning/layers/09a3a37b-bd7b-40a7-b818-50b041fd07c8/a257c51e-12a7-47b6-9f05-e3ab251a6973.png deleted file mode 100644 index f330e28d5..000000000 Binary files a/sprites/s_noti_icon_warning/layers/09a3a37b-bd7b-40a7-b818-50b041fd07c8/a257c51e-12a7-47b6-9f05-e3ab251a6973.png and /dev/null differ diff --git a/sprites/s_noti_icon_warning/layers/168b7123-efe7-4bc1-a77d-4dc616daf236/0574835b-e3ef-4fa4-83b5-4d6c2d7df12a.png b/sprites/s_noti_icon_warning/layers/168b7123-efe7-4bc1-a77d-4dc616daf236/0574835b-e3ef-4fa4-83b5-4d6c2d7df12a.png new file mode 100644 index 000000000..2ac464ceb Binary files /dev/null and b/sprites/s_noti_icon_warning/layers/168b7123-efe7-4bc1-a77d-4dc616daf236/0574835b-e3ef-4fa4-83b5-4d6c2d7df12a.png differ diff --git a/sprites/s_noti_icon_warning/layers/c1983d8e-766a-4e7b-8441-bc58c5ffc263/0574835b-e3ef-4fa4-83b5-4d6c2d7df12a.png b/sprites/s_noti_icon_warning/layers/c1983d8e-766a-4e7b-8441-bc58c5ffc263/0574835b-e3ef-4fa4-83b5-4d6c2d7df12a.png new file mode 100644 index 000000000..eb2586a46 Binary files /dev/null and b/sprites/s_noti_icon_warning/layers/c1983d8e-766a-4e7b-8441-bc58c5ffc263/0574835b-e3ef-4fa4-83b5-4d6c2d7df12a.png differ diff --git a/sprites/s_noti_icon_warning/s_noti_icon_warning.yy b/sprites/s_noti_icon_warning/s_noti_icon_warning.yy index ebec64421..38f49bb07 100644 --- a/sprites/s_noti_icon_warning/s_noti_icon_warning.yy +++ b/sprites/s_noti_icon_warning/s_noti_icon_warning.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 7, - "bbox_right": 12, - "bbox_top": 1, - "bbox_bottom": 18, + "bbox_left": 2, + "bbox_right": 37, + "bbox_top": 2, + "bbox_bottom": 37, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09a3a37b-bd7b-40a7-b818-50b041fd07c8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c1983d8e-766a-4e7b-8441-bc58c5ffc263",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"168b7123-efe7-4bc1-a77d-4dc616daf236",}, ], "sequence": { "resourceType": "GMSequence", @@ -40,12 +41,13 @@ "playbackSpeedType": 0, "autoRecord": true, "volume": 1.0, - "length": 1.0, + "length": 2.0, "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"dce711fb-d36c-4df5-a173-21788cc907d5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"09a3a37b-bd7b-40a7-b818-50b041fd07c8","path":"sprites/s_noti_icon_warning/s_noti_icon_warning.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4fc4aa06-41df-46aa-8024-539f81f11db2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c1983d8e-766a-4e7b-8441-bc58c5ffc263","path":"sprites/s_noti_icon_warning/s_noti_icon_warning.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e9ddf91b-732f-47a0-8e06-664bb060bfb7","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"168b7123-efe7-4bc1-a77d-4dc616daf236","path":"sprites/s_noti_icon_warning/s_noti_icon_warning.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a257c51e-12a7-47b6-9f05-e3ab251a6973","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0574835b-e3ef-4fa4-83b5-4d6c2d7df12a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_padding_link/25ab78b2-7c32-4fbc-909f-76519c3f924a.png b/sprites/s_padding_link/25ab78b2-7c32-4fbc-909f-76519c3f924a.png deleted file mode 100644 index 7a8c8a1a4..000000000 Binary files a/sprites/s_padding_link/25ab78b2-7c32-4fbc-909f-76519c3f924a.png and /dev/null differ diff --git a/sprites/s_padding_link/26ebb2bd-54af-411b-98d9-d0bcc008bce6.png b/sprites/s_padding_link/26ebb2bd-54af-411b-98d9-d0bcc008bce6.png new file mode 100644 index 000000000..eeb61dfb2 Binary files /dev/null and b/sprites/s_padding_link/26ebb2bd-54af-411b-98d9-d0bcc008bce6.png differ diff --git a/sprites/s_padding_link/5147baa3-7ab9-47b1-8553-1475479e6191.png b/sprites/s_padding_link/5147baa3-7ab9-47b1-8553-1475479e6191.png deleted file mode 100644 index f0d21f72a..000000000 Binary files a/sprites/s_padding_link/5147baa3-7ab9-47b1-8553-1475479e6191.png and /dev/null differ diff --git a/sprites/s_padding_link/8941dd01-bab6-4213-b273-32c264775c8f.png b/sprites/s_padding_link/8941dd01-bab6-4213-b273-32c264775c8f.png new file mode 100644 index 000000000..ece46cc92 Binary files /dev/null and b/sprites/s_padding_link/8941dd01-bab6-4213-b273-32c264775c8f.png differ diff --git a/sprites/s_padding_link/layers/25ab78b2-7c32-4fbc-909f-76519c3f924a/c29f61b1-f125-4f4d-b3fa-b8251585a43f.png b/sprites/s_padding_link/layers/25ab78b2-7c32-4fbc-909f-76519c3f924a/c29f61b1-f125-4f4d-b3fa-b8251585a43f.png deleted file mode 100644 index 64ec3c987..000000000 Binary files a/sprites/s_padding_link/layers/25ab78b2-7c32-4fbc-909f-76519c3f924a/c29f61b1-f125-4f4d-b3fa-b8251585a43f.png and /dev/null differ diff --git a/sprites/s_padding_link/layers/26ebb2bd-54af-411b-98d9-d0bcc008bce6/49152877-d643-45b9-a0ac-41ceecefe54f.png b/sprites/s_padding_link/layers/26ebb2bd-54af-411b-98d9-d0bcc008bce6/49152877-d643-45b9-a0ac-41ceecefe54f.png new file mode 100644 index 000000000..eeb61dfb2 Binary files /dev/null and b/sprites/s_padding_link/layers/26ebb2bd-54af-411b-98d9-d0bcc008bce6/49152877-d643-45b9-a0ac-41ceecefe54f.png differ diff --git a/sprites/s_padding_link/layers/5147baa3-7ab9-47b1-8553-1475479e6191/c29f61b1-f125-4f4d-b3fa-b8251585a43f.png b/sprites/s_padding_link/layers/5147baa3-7ab9-47b1-8553-1475479e6191/c29f61b1-f125-4f4d-b3fa-b8251585a43f.png deleted file mode 100644 index 84cbdeffd..000000000 Binary files a/sprites/s_padding_link/layers/5147baa3-7ab9-47b1-8553-1475479e6191/c29f61b1-f125-4f4d-b3fa-b8251585a43f.png and /dev/null differ diff --git a/sprites/s_padding_link/layers/8941dd01-bab6-4213-b273-32c264775c8f/49152877-d643-45b9-a0ac-41ceecefe54f.png b/sprites/s_padding_link/layers/8941dd01-bab6-4213-b273-32c264775c8f/49152877-d643-45b9-a0ac-41ceecefe54f.png new file mode 100644 index 000000000..ece46cc92 Binary files /dev/null and b/sprites/s_padding_link/layers/8941dd01-bab6-4213-b273-32c264775c8f/49152877-d643-45b9-a0ac-41ceecefe54f.png differ diff --git a/sprites/s_padding_link/s_padding_link.yy b/sprites/s_padding_link/s_padding_link.yy index 4b141beb2..0dc5ed2bc 100644 --- a/sprites/s_padding_link/s_padding_link.yy +++ b/sprites/s_padding_link/s_padding_link.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 3, + "bbox_right": 44, + "bbox_top": 3, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5147baa3-7ab9-47b1-8553-1475479e6191",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"25ab78b2-7c32-4fbc-909f-76519c3f924a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8941dd01-bab6-4213-b273-32c264775c8f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26ebb2bd-54af-411b-98d9-d0bcc008bce6",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"adf195d6-d248-4b56-9d71-0cb36ad2f43e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5147baa3-7ab9-47b1-8553-1475479e6191","path":"sprites/s_padding_link/s_padding_link.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"ab8bcc2f-0f39-4696-b0b6-b6475a015694","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"25ab78b2-7c32-4fbc-909f-76519c3f924a","path":"sprites/s_padding_link/s_padding_link.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9d6176d0-c91a-43b3-8945-232008274477","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8941dd01-bab6-4213-b273-32c264775c8f","path":"sprites/s_padding_link/s_padding_link.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b9b240df-9dd5-479d-87c3-c9f126899f68","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"26ebb2bd-54af-411b-98d9-d0bcc008bce6","path":"sprites/s_padding_link/s_padding_link.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c29f61b1-f125-4f4d-b3fa-b8251585a43f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"49152877-d643-45b9-a0ac-41ceecefe54f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_panel_active_split/7642bca8-ad08-4054-afe3-57f6f31ffbd3.png b/sprites/s_panel_active_split/7642bca8-ad08-4054-afe3-57f6f31ffbd3.png deleted file mode 100644 index 394c9cd21..000000000 Binary files a/sprites/s_panel_active_split/7642bca8-ad08-4054-afe3-57f6f31ffbd3.png and /dev/null differ diff --git a/sprites/s_panel_active_split/c5af1c0d-3bf9-4b16-873f-8600f0f317a3.png b/sprites/s_panel_active_split/c5af1c0d-3bf9-4b16-873f-8600f0f317a3.png new file mode 100644 index 000000000..78a4dc735 Binary files /dev/null and b/sprites/s_panel_active_split/c5af1c0d-3bf9-4b16-873f-8600f0f317a3.png differ diff --git a/sprites/s_panel_active_split/layers/7642bca8-ad08-4054-afe3-57f6f31ffbd3/c7806bd3-2a3d-4425-9830-87c7beac5e59.png b/sprites/s_panel_active_split/layers/7642bca8-ad08-4054-afe3-57f6f31ffbd3/c7806bd3-2a3d-4425-9830-87c7beac5e59.png deleted file mode 100644 index 394c9cd21..000000000 Binary files a/sprites/s_panel_active_split/layers/7642bca8-ad08-4054-afe3-57f6f31ffbd3/c7806bd3-2a3d-4425-9830-87c7beac5e59.png and /dev/null differ diff --git a/sprites/s_panel_active_split/layers/c5af1c0d-3bf9-4b16-873f-8600f0f317a3/a06b64a9-64ce-4f4d-998d-0c81d9fc2106.png b/sprites/s_panel_active_split/layers/c5af1c0d-3bf9-4b16-873f-8600f0f317a3/a06b64a9-64ce-4f4d-998d-0c81d9fc2106.png new file mode 100644 index 000000000..78a4dc735 Binary files /dev/null and b/sprites/s_panel_active_split/layers/c5af1c0d-3bf9-4b16-873f-8600f0f317a3/a06b64a9-64ce-4f4d-998d-0c81d9fc2106.png differ diff --git a/sprites/s_panel_active_split/s_panel_active_split.yy b/sprites/s_panel_active_split/s_panel_active_split.yy index 3a613ade6..ab8822f3e 100644 --- a/sprites/s_panel_active_split/s_panel_active_split.yy +++ b/sprites/s_panel_active_split/s_panel_active_split.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 11, + "bbox_right": 23, "bbox_top": 0, - "bbox_bottom": 11, + "bbox_bottom": 23, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 12, - "height": 12, + "width": 24, + "height": 24, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7642bca8-ad08-4054-afe3-57f6f31ffbd3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5af1c0d-3bf9-4b16-873f-8600f0f317a3",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"0269079e-6dff-438f-b137-987059ae3c1f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7642bca8-ad08-4054-afe3-57f6f31ffbd3","path":"sprites/s_panel_active_split/s_panel_active_split.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b4f1c43c-073b-4238-99eb-14fa9472ff17","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c5af1c0d-3bf9-4b16-873f-8600f0f317a3","path":"sprites/s_panel_active_split/s_panel_active_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,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,15 +58,39 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 6, - "yorigin": 6, + "xorigin": 12, + "yorigin": 12, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c7806bd3-2a3d-4425-9830-87c7beac5e59","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a06b64a9-64ce-4f4d-998d-0c81d9fc2106","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], - "nineSlice": null, + "nineSlice": { + "left": 0, + "top": 0, + "right": 0, + "bottom": 0, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "enabled": false, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "resourceVersion": "1.0", + "loadedVersion": null, + "resourceType": "GMNineSliceData", + }, "parent": { "name": "preview", "path": "folders/sprites/panels/preview.yy", diff --git a/sprites/s_path_tools_add/c2ef6bc6-06c8-47ee-b4ff-6f2974231875.png b/sprites/s_path_tools_add/c2ef6bc6-06c8-47ee-b4ff-6f2974231875.png new file mode 100644 index 000000000..79f9698c5 Binary files /dev/null and b/sprites/s_path_tools_add/c2ef6bc6-06c8-47ee-b4ff-6f2974231875.png differ diff --git a/sprites/s_path_tools_add/d34724b4-ee73-40d0-ae6c-ba5b16950845.png b/sprites/s_path_tools_add/d34724b4-ee73-40d0-ae6c-ba5b16950845.png deleted file mode 100644 index 7af41dbc1..000000000 Binary files a/sprites/s_path_tools_add/d34724b4-ee73-40d0-ae6c-ba5b16950845.png and /dev/null differ diff --git a/sprites/s_path_tools_add/layers/c2ef6bc6-06c8-47ee-b4ff-6f2974231875/b0d2ed0f-3395-4419-9641-c419e41c5111.png b/sprites/s_path_tools_add/layers/c2ef6bc6-06c8-47ee-b4ff-6f2974231875/b0d2ed0f-3395-4419-9641-c419e41c5111.png new file mode 100644 index 000000000..79f9698c5 Binary files /dev/null and b/sprites/s_path_tools_add/layers/c2ef6bc6-06c8-47ee-b4ff-6f2974231875/b0d2ed0f-3395-4419-9641-c419e41c5111.png differ diff --git a/sprites/s_path_tools_add/layers/d34724b4-ee73-40d0-ae6c-ba5b16950845/36e44ecc-6334-40d9-a56c-55fe3335b1fc.png b/sprites/s_path_tools_add/layers/d34724b4-ee73-40d0-ae6c-ba5b16950845/36e44ecc-6334-40d9-a56c-55fe3335b1fc.png deleted file mode 100644 index 1f03e0328..000000000 Binary files a/sprites/s_path_tools_add/layers/d34724b4-ee73-40d0-ae6c-ba5b16950845/36e44ecc-6334-40d9-a56c-55fe3335b1fc.png and /dev/null differ diff --git a/sprites/s_path_tools_add/s_path_tools_add.yy b/sprites/s_path_tools_add/s_path_tools_add.yy index 163714b6e..83edf5782 100644 --- a/sprites/s_path_tools_add/s_path_tools_add.yy +++ b/sprites/s_path_tools_add/s_path_tools_add.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 22, - "bbox_top": 3, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 45, + "bbox_top": 6, + "bbox_bottom": 43, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d34724b4-ee73-40d0-ae6c-ba5b16950845",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c2ef6bc6-06c8-47ee-b4ff-6f2974231875",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b5ed3e0e-960c-492c-82f1-7d1418c239f4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d34724b4-ee73-40d0-ae6c-ba5b16950845","path":"sprites/s_path_tools_add/s_path_tools_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ee9348f4-d5bf-444f-97a6-91a436069e72","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c2ef6bc6-06c8-47ee-b4ff-6f2974231875","path":"sprites/s_path_tools_add/s_path_tools_add.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"36e44ecc-6334-40d9-a56c-55fe3335b1fc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b0d2ed0f-3395-4419-9641-c419e41c5111","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_path_tools_anchor/021c0a88-43ad-4f7f-b8bd-c636bfb763cc.png b/sprites/s_path_tools_anchor/021c0a88-43ad-4f7f-b8bd-c636bfb763cc.png deleted file mode 100644 index 2e56223a9..000000000 Binary files a/sprites/s_path_tools_anchor/021c0a88-43ad-4f7f-b8bd-c636bfb763cc.png and /dev/null differ diff --git a/sprites/s_path_tools_anchor/96d7c18c-0e7a-4ed3-bfe1-baec04265252.png b/sprites/s_path_tools_anchor/96d7c18c-0e7a-4ed3-bfe1-baec04265252.png new file mode 100644 index 000000000..c3dc210ac Binary files /dev/null and b/sprites/s_path_tools_anchor/96d7c18c-0e7a-4ed3-bfe1-baec04265252.png differ diff --git a/sprites/s_path_tools_anchor/layers/021c0a88-43ad-4f7f-b8bd-c636bfb763cc/1fdb69da-bfce-43b0-a4e4-f133a49c4b5f.png b/sprites/s_path_tools_anchor/layers/021c0a88-43ad-4f7f-b8bd-c636bfb763cc/1fdb69da-bfce-43b0-a4e4-f133a49c4b5f.png deleted file mode 100644 index 03e59a6c6..000000000 Binary files a/sprites/s_path_tools_anchor/layers/021c0a88-43ad-4f7f-b8bd-c636bfb763cc/1fdb69da-bfce-43b0-a4e4-f133a49c4b5f.png and /dev/null differ diff --git a/sprites/s_path_tools_anchor/layers/96d7c18c-0e7a-4ed3-bfe1-baec04265252/655982b3-b373-4f76-8d7e-f51bcfe5cfbc.png b/sprites/s_path_tools_anchor/layers/96d7c18c-0e7a-4ed3-bfe1-baec04265252/655982b3-b373-4f76-8d7e-f51bcfe5cfbc.png new file mode 100644 index 000000000..c3dc210ac Binary files /dev/null and b/sprites/s_path_tools_anchor/layers/96d7c18c-0e7a-4ed3-bfe1-baec04265252/655982b3-b373-4f76-8d7e-f51bcfe5cfbc.png differ diff --git a/sprites/s_path_tools_anchor/s_path_tools_anchor.yy b/sprites/s_path_tools_anchor/s_path_tools_anchor.yy index f13af5371..cd4483562 100644 --- a/sprites/s_path_tools_anchor/s_path_tools_anchor.yy +++ b/sprites/s_path_tools_anchor/s_path_tools_anchor.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 2, - "bbox_bottom": 22, + "bbox_left": 2, + "bbox_right": 45, + "bbox_top": 4, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"021c0a88-43ad-4f7f-b8bd-c636bfb763cc",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"96d7c18c-0e7a-4ed3-bfe1-baec04265252",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e0d40b15-16aa-4199-a349-984177b11aed","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"021c0a88-43ad-4f7f-b8bd-c636bfb763cc","path":"sprites/s_path_tools_anchor/s_path_tools_anchor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d20e2989-2a0d-40b6-beeb-dde299f1e989","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"96d7c18c-0e7a-4ed3-bfe1-baec04265252","path":"sprites/s_path_tools_anchor/s_path_tools_anchor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1fdb69da-bfce-43b0-a4e4-f133a49c4b5f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"655982b3-b373-4f76-8d7e-f51bcfe5cfbc","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_preview_crosshair/01da77e2-56fa-4345-aff7-99cd1c7373f2.png b/sprites/s_preview_crosshair/01da77e2-56fa-4345-aff7-99cd1c7373f2.png deleted file mode 100644 index f794f3627..000000000 Binary files a/sprites/s_preview_crosshair/01da77e2-56fa-4345-aff7-99cd1c7373f2.png and /dev/null differ diff --git a/sprites/s_preview_crosshair/b33f6bb4-6acf-40b9-9090-4c1dad525ecd.png b/sprites/s_preview_crosshair/b33f6bb4-6acf-40b9-9090-4c1dad525ecd.png new file mode 100644 index 000000000..eda0d286f Binary files /dev/null and b/sprites/s_preview_crosshair/b33f6bb4-6acf-40b9-9090-4c1dad525ecd.png differ diff --git a/sprites/s_preview_crosshair/layers/01da77e2-56fa-4345-aff7-99cd1c7373f2/7907cd62-72ba-4dde-85cc-f8f4d1a81f46.png b/sprites/s_preview_crosshair/layers/01da77e2-56fa-4345-aff7-99cd1c7373f2/7907cd62-72ba-4dde-85cc-f8f4d1a81f46.png deleted file mode 100644 index f794f3627..000000000 Binary files a/sprites/s_preview_crosshair/layers/01da77e2-56fa-4345-aff7-99cd1c7373f2/7907cd62-72ba-4dde-85cc-f8f4d1a81f46.png and /dev/null differ diff --git a/sprites/s_preview_crosshair/layers/b33f6bb4-6acf-40b9-9090-4c1dad525ecd/b16d92fe-4a67-4cc3-9b45-82dcbbddcdc5.png b/sprites/s_preview_crosshair/layers/b33f6bb4-6acf-40b9-9090-4c1dad525ecd/b16d92fe-4a67-4cc3-9b45-82dcbbddcdc5.png new file mode 100644 index 000000000..eda0d286f Binary files /dev/null and b/sprites/s_preview_crosshair/layers/b33f6bb4-6acf-40b9-9090-4c1dad525ecd/b16d92fe-4a67-4cc3-9b45-82dcbbddcdc5.png differ diff --git a/sprites/s_preview_crosshair/s_preview_crosshair.yy b/sprites/s_preview_crosshair/s_preview_crosshair.yy index 491ddf364..d70a38591 100644 --- a/sprites/s_preview_crosshair/s_preview_crosshair.yy +++ b/sprites/s_preview_crosshair/s_preview_crosshair.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 12, - "bbox_top": 1, - "bbox_bottom": 12, + "bbox_left": 2, + "bbox_right": 25, + "bbox_top": 2, + "bbox_bottom": 25, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 14, - "height": 14, + "width": 28, + "height": 28, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"01da77e2-56fa-4345-aff7-99cd1c7373f2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b33f6bb4-6acf-40b9-9090-4c1dad525ecd",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8332c6a9-8259-49e1-9af9-e9ffcafc00f4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"01da77e2-56fa-4345-aff7-99cd1c7373f2","path":"sprites/s_preview_crosshair/s_preview_crosshair.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8b0a963e-c1ee-4b38-b384-91ad2a362a8f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b33f6bb4-6acf-40b9-9090-4c1dad525ecd","path":"sprites/s_preview_crosshair/s_preview_crosshair.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 7, - "yorigin": 7, + "xorigin": 14, + "yorigin": 14, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7907cd62-72ba-4dde-85cc-f8f4d1a81f46","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b16d92fe-4a67-4cc3-9b45-82dcbbddcdc5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_prop_gradient/13137766-a784-4cee-afa7-44894e418075.png b/sprites/s_prop_gradient/13137766-a784-4cee-afa7-44894e418075.png new file mode 100644 index 000000000..cca9239ee Binary files /dev/null and b/sprites/s_prop_gradient/13137766-a784-4cee-afa7-44894e418075.png differ diff --git a/sprites/s_prop_gradient/164d045c-8b8c-40fe-8a19-9b480eaca49e.png b/sprites/s_prop_gradient/164d045c-8b8c-40fe-8a19-9b480eaca49e.png deleted file mode 100644 index 723a61237..000000000 Binary files a/sprites/s_prop_gradient/164d045c-8b8c-40fe-8a19-9b480eaca49e.png and /dev/null differ diff --git a/sprites/s_prop_gradient/554b184c-df1b-4831-9dae-32b5f86e65be.png b/sprites/s_prop_gradient/554b184c-df1b-4831-9dae-32b5f86e65be.png deleted file mode 100644 index 0a13db387..000000000 Binary files a/sprites/s_prop_gradient/554b184c-df1b-4831-9dae-32b5f86e65be.png and /dev/null differ diff --git a/sprites/s_prop_gradient/ce97c34d-153f-4c91-a658-deed8cb4d878.png b/sprites/s_prop_gradient/ce97c34d-153f-4c91-a658-deed8cb4d878.png new file mode 100644 index 000000000..030861fde Binary files /dev/null and b/sprites/s_prop_gradient/ce97c34d-153f-4c91-a658-deed8cb4d878.png differ diff --git a/sprites/s_prop_gradient/layers/13137766-a784-4cee-afa7-44894e418075/3e0080ca-d344-4374-8767-b056a4798c2d.png b/sprites/s_prop_gradient/layers/13137766-a784-4cee-afa7-44894e418075/3e0080ca-d344-4374-8767-b056a4798c2d.png new file mode 100644 index 000000000..cca9239ee Binary files /dev/null and b/sprites/s_prop_gradient/layers/13137766-a784-4cee-afa7-44894e418075/3e0080ca-d344-4374-8767-b056a4798c2d.png differ diff --git a/sprites/s_prop_gradient/layers/164d045c-8b8c-40fe-8a19-9b480eaca49e/3020a753-3ba8-4c7c-b162-52af11174dbb.png b/sprites/s_prop_gradient/layers/164d045c-8b8c-40fe-8a19-9b480eaca49e/3020a753-3ba8-4c7c-b162-52af11174dbb.png deleted file mode 100644 index 372d62775..000000000 Binary files a/sprites/s_prop_gradient/layers/164d045c-8b8c-40fe-8a19-9b480eaca49e/3020a753-3ba8-4c7c-b162-52af11174dbb.png and /dev/null differ diff --git a/sprites/s_prop_gradient/layers/554b184c-df1b-4831-9dae-32b5f86e65be/3020a753-3ba8-4c7c-b162-52af11174dbb.png b/sprites/s_prop_gradient/layers/554b184c-df1b-4831-9dae-32b5f86e65be/3020a753-3ba8-4c7c-b162-52af11174dbb.png deleted file mode 100644 index 3e604bd55..000000000 Binary files a/sprites/s_prop_gradient/layers/554b184c-df1b-4831-9dae-32b5f86e65be/3020a753-3ba8-4c7c-b162-52af11174dbb.png and /dev/null differ diff --git a/sprites/s_prop_gradient/layers/ce97c34d-153f-4c91-a658-deed8cb4d878/3e0080ca-d344-4374-8767-b056a4798c2d.png b/sprites/s_prop_gradient/layers/ce97c34d-153f-4c91-a658-deed8cb4d878/3e0080ca-d344-4374-8767-b056a4798c2d.png new file mode 100644 index 000000000..030861fde Binary files /dev/null and b/sprites/s_prop_gradient/layers/ce97c34d-153f-4c91-a658-deed8cb4d878/3e0080ca-d344-4374-8767-b056a4798c2d.png differ diff --git a/sprites/s_prop_gradient/s_prop_gradient.yy b/sprites/s_prop_gradient/s_prop_gradient.yy index 100cb001b..3211c4bab 100644 --- a/sprites/s_prop_gradient/s_prop_gradient.yy +++ b/sprites/s_prop_gradient/s_prop_gradient.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 5, - "bbox_right": 14, + "bbox_left": 9, + "bbox_right": 29, "bbox_top": 0, - "bbox_bottom": 19, + "bbox_bottom": 39, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"554b184c-df1b-4831-9dae-32b5f86e65be",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"164d045c-8b8c-40fe-8a19-9b480eaca49e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"13137766-a784-4cee-afa7-44894e418075",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ce97c34d-153f-4c91-a658-deed8cb4d878",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"7c7da80c-89b1-4a83-8296-cbad21ba2399","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"554b184c-df1b-4831-9dae-32b5f86e65be","path":"sprites/s_prop_gradient/s_prop_gradient.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"4018fbe2-5cfb-41fa-86d9-a54857fb524b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"164d045c-8b8c-40fe-8a19-9b480eaca49e","path":"sprites/s_prop_gradient/s_prop_gradient.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"246e5d7b-d7e8-4190-8a1d-2294f7a22930","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"13137766-a784-4cee-afa7-44894e418075","path":"sprites/s_prop_gradient/s_prop_gradient.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"bcf2ddf6-2895-4da2-86aa-b367032a2365","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ce97c34d-153f-4c91-a658-deed8cb4d878","path":"sprites/s_prop_gradient/s_prop_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,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3020a753-3ba8-4c7c-b162-52af11174dbb","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3e0080ca-d344-4374-8767-b056a4798c2d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_prop_keyframe/278ddbab-9355-41d8-b41b-314d2d1bdfc4.png b/sprites/s_prop_keyframe/278ddbab-9355-41d8-b41b-314d2d1bdfc4.png new file mode 100644 index 000000000..b58b998f9 Binary files /dev/null and b/sprites/s_prop_keyframe/278ddbab-9355-41d8-b41b-314d2d1bdfc4.png differ diff --git a/sprites/s_prop_keyframe/5dc89ad2-0ad2-444b-81ca-11dabf2d18d6.png b/sprites/s_prop_keyframe/5dc89ad2-0ad2-444b-81ca-11dabf2d18d6.png deleted file mode 100644 index 1807834dd..000000000 Binary files a/sprites/s_prop_keyframe/5dc89ad2-0ad2-444b-81ca-11dabf2d18d6.png and /dev/null differ diff --git a/sprites/s_prop_keyframe/831ea41b-591c-4964-b54e-f295bb6c91ee.png b/sprites/s_prop_keyframe/831ea41b-591c-4964-b54e-f295bb6c91ee.png new file mode 100644 index 000000000..aa233215f Binary files /dev/null and b/sprites/s_prop_keyframe/831ea41b-591c-4964-b54e-f295bb6c91ee.png differ diff --git a/sprites/s_prop_keyframe/892a49b4-40c5-4258-8356-7e31983c8b80.png b/sprites/s_prop_keyframe/892a49b4-40c5-4258-8356-7e31983c8b80.png new file mode 100644 index 000000000..6e95f6f4b Binary files /dev/null and b/sprites/s_prop_keyframe/892a49b4-40c5-4258-8356-7e31983c8b80.png differ diff --git a/sprites/s_prop_keyframe/a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22.png b/sprites/s_prop_keyframe/a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22.png deleted file mode 100644 index 7d8fabd89..000000000 Binary files a/sprites/s_prop_keyframe/a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22.png and /dev/null differ diff --git a/sprites/s_prop_keyframe/bee41585-8ac8-4370-a323-4d42f2a031fd.png b/sprites/s_prop_keyframe/bee41585-8ac8-4370-a323-4d42f2a031fd.png deleted file mode 100644 index bb8a6b27f..000000000 Binary files a/sprites/s_prop_keyframe/bee41585-8ac8-4370-a323-4d42f2a031fd.png and /dev/null differ diff --git a/sprites/s_prop_keyframe/layers/278ddbab-9355-41d8-b41b-314d2d1bdfc4/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png b/sprites/s_prop_keyframe/layers/278ddbab-9355-41d8-b41b-314d2d1bdfc4/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png new file mode 100644 index 000000000..b58b998f9 Binary files /dev/null and b/sprites/s_prop_keyframe/layers/278ddbab-9355-41d8-b41b-314d2d1bdfc4/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png differ diff --git a/sprites/s_prop_keyframe/layers/5dc89ad2-0ad2-444b-81ca-11dabf2d18d6/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png b/sprites/s_prop_keyframe/layers/5dc89ad2-0ad2-444b-81ca-11dabf2d18d6/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png deleted file mode 100644 index 24a9df866..000000000 Binary files a/sprites/s_prop_keyframe/layers/5dc89ad2-0ad2-444b-81ca-11dabf2d18d6/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png and /dev/null differ diff --git a/sprites/s_prop_keyframe/layers/831ea41b-591c-4964-b54e-f295bb6c91ee/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png b/sprites/s_prop_keyframe/layers/831ea41b-591c-4964-b54e-f295bb6c91ee/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png new file mode 100644 index 000000000..aa233215f Binary files /dev/null and b/sprites/s_prop_keyframe/layers/831ea41b-591c-4964-b54e-f295bb6c91ee/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png differ diff --git a/sprites/s_prop_keyframe/layers/892a49b4-40c5-4258-8356-7e31983c8b80/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png b/sprites/s_prop_keyframe/layers/892a49b4-40c5-4258-8356-7e31983c8b80/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png new file mode 100644 index 000000000..6e95f6f4b Binary files /dev/null and b/sprites/s_prop_keyframe/layers/892a49b4-40c5-4258-8356-7e31983c8b80/954a9e0e-832f-47b6-a1b5-3e5034c48b45.png differ diff --git a/sprites/s_prop_keyframe/layers/a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png b/sprites/s_prop_keyframe/layers/a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png deleted file mode 100644 index 9e495782c..000000000 Binary files a/sprites/s_prop_keyframe/layers/a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png and /dev/null differ diff --git a/sprites/s_prop_keyframe/layers/bee41585-8ac8-4370-a323-4d42f2a031fd/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png b/sprites/s_prop_keyframe/layers/bee41585-8ac8-4370-a323-4d42f2a031fd/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png deleted file mode 100644 index eaacd3c9b..000000000 Binary files a/sprites/s_prop_keyframe/layers/bee41585-8ac8-4370-a323-4d42f2a031fd/bcbf5a63-cae2-40a4-afb9-7da5ff750fd9.png and /dev/null differ diff --git a/sprites/s_prop_keyframe/s_prop_keyframe.yy b/sprites/s_prop_keyframe/s_prop_keyframe.yy index 66c5a6547..b4b2da2ca 100644 --- a/sprites/s_prop_keyframe/s_prop_keyframe.yy +++ b/sprites/s_prop_keyframe/s_prop_keyframe.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 12, - "bbox_top": 2, - "bbox_bottom": 13, + "bbox_left": 7, + "bbox_right": 24, + "bbox_top": 4, + "bbox_bottom": 27, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bee41585-8ac8-4370-a323-4d42f2a031fd",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5dc89ad2-0ad2-444b-81ca-11dabf2d18d6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"892a49b4-40c5-4258-8356-7e31983c8b80",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"278ddbab-9355-41d8-b41b-314d2d1bdfc4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"831ea41b-591c-4964-b54e-f295bb6c91ee",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ff281257-a15c-4221-8cc2-69aee12b0be2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a6dbe5d4-0cdf-495c-adb1-0f9f58ca5c22","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"a4b2bb1b-6de2-4023-bfe9-43726ea81fe7","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bee41585-8ac8-4370-a323-4d42f2a031fd","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"85571597-d065-4ef5-9dc5-df4313e68759","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5dc89ad2-0ad2-444b-81ca-11dabf2d18d6","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"07f87fd0-79af-449e-971f-ab5f79769a71","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"892a49b4-40c5-4258-8356-7e31983c8b80","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a4d1af97-a206-4bd9-bf89-10266ab39315","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"278ddbab-9355-41d8-b41b-314d2d1bdfc4","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8cfeb9dc-d18a-40aa-a18c-0eb6ebef372d","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"831ea41b-591c-4964-b54e-f295bb6c91ee","path":"sprites/s_prop_keyframe/s_prop_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bcbf5a63-cae2-40a4-afb9-7da5ff750fd9","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"954a9e0e-832f-47b6-a1b5-3e5034c48b45","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_prop_on_end/3fbd4a59-5044-47ed-b2d4-07c8a058547e.png b/sprites/s_prop_on_end/3fbd4a59-5044-47ed-b2d4-07c8a058547e.png deleted file mode 100644 index 1b3aa962d..000000000 Binary files a/sprites/s_prop_on_end/3fbd4a59-5044-47ed-b2d4-07c8a058547e.png and /dev/null differ diff --git a/sprites/s_prop_on_end/70c72e67-69e8-44ae-9850-97a7c17833ec.png b/sprites/s_prop_on_end/70c72e67-69e8-44ae-9850-97a7c17833ec.png new file mode 100644 index 000000000..0ca25a358 Binary files /dev/null and b/sprites/s_prop_on_end/70c72e67-69e8-44ae-9850-97a7c17833ec.png differ diff --git a/sprites/s_prop_on_end/909b76ab-340f-4e61-b8bc-835ae242b685.png b/sprites/s_prop_on_end/909b76ab-340f-4e61-b8bc-835ae242b685.png new file mode 100644 index 000000000..58dcfb464 Binary files /dev/null and b/sprites/s_prop_on_end/909b76ab-340f-4e61-b8bc-835ae242b685.png differ diff --git a/sprites/s_prop_on_end/bd6a25b3-9453-4baf-82f6-82e80f56f2a1.png b/sprites/s_prop_on_end/bd6a25b3-9453-4baf-82f6-82e80f56f2a1.png new file mode 100644 index 000000000..a240826d5 Binary files /dev/null and b/sprites/s_prop_on_end/bd6a25b3-9453-4baf-82f6-82e80f56f2a1.png differ diff --git a/sprites/s_prop_on_end/ce82c155-89bb-4a20-8eab-f5f8b0188042.png b/sprites/s_prop_on_end/ce82c155-89bb-4a20-8eab-f5f8b0188042.png deleted file mode 100644 index 44d2d9d68..000000000 Binary files a/sprites/s_prop_on_end/ce82c155-89bb-4a20-8eab-f5f8b0188042.png and /dev/null differ diff --git a/sprites/s_prop_on_end/f95ed6a9-6378-413e-921d-a6360a43547f.png b/sprites/s_prop_on_end/f95ed6a9-6378-413e-921d-a6360a43547f.png deleted file mode 100644 index daca4374d..000000000 Binary files a/sprites/s_prop_on_end/f95ed6a9-6378-413e-921d-a6360a43547f.png and /dev/null differ diff --git a/sprites/s_prop_on_end/layers/3fbd4a59-5044-47ed-b2d4-07c8a058547e/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png b/sprites/s_prop_on_end/layers/3fbd4a59-5044-47ed-b2d4-07c8a058547e/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png deleted file mode 100644 index 20d4d0ba4..000000000 Binary files a/sprites/s_prop_on_end/layers/3fbd4a59-5044-47ed-b2d4-07c8a058547e/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png and /dev/null differ diff --git a/sprites/s_prop_on_end/layers/70c72e67-69e8-44ae-9850-97a7c17833ec/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png b/sprites/s_prop_on_end/layers/70c72e67-69e8-44ae-9850-97a7c17833ec/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png new file mode 100644 index 000000000..0ca25a358 Binary files /dev/null and b/sprites/s_prop_on_end/layers/70c72e67-69e8-44ae-9850-97a7c17833ec/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png differ diff --git a/sprites/s_prop_on_end/layers/909b76ab-340f-4e61-b8bc-835ae242b685/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png b/sprites/s_prop_on_end/layers/909b76ab-340f-4e61-b8bc-835ae242b685/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png new file mode 100644 index 000000000..58dcfb464 Binary files /dev/null and b/sprites/s_prop_on_end/layers/909b76ab-340f-4e61-b8bc-835ae242b685/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png differ diff --git a/sprites/s_prop_on_end/layers/bd6a25b3-9453-4baf-82f6-82e80f56f2a1/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png b/sprites/s_prop_on_end/layers/bd6a25b3-9453-4baf-82f6-82e80f56f2a1/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png new file mode 100644 index 000000000..a240826d5 Binary files /dev/null and b/sprites/s_prop_on_end/layers/bd6a25b3-9453-4baf-82f6-82e80f56f2a1/5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a.png differ diff --git a/sprites/s_prop_on_end/layers/ce82c155-89bb-4a20-8eab-f5f8b0188042/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png b/sprites/s_prop_on_end/layers/ce82c155-89bb-4a20-8eab-f5f8b0188042/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png deleted file mode 100644 index b8d631135..000000000 Binary files a/sprites/s_prop_on_end/layers/ce82c155-89bb-4a20-8eab-f5f8b0188042/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png and /dev/null differ diff --git a/sprites/s_prop_on_end/layers/f95ed6a9-6378-413e-921d-a6360a43547f/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png b/sprites/s_prop_on_end/layers/f95ed6a9-6378-413e-921d-a6360a43547f/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png deleted file mode 100644 index 151ee0d2d..000000000 Binary files a/sprites/s_prop_on_end/layers/f95ed6a9-6378-413e-921d-a6360a43547f/7f11489b-3b55-47cd-a58c-5ae3260ded2f.png and /dev/null differ diff --git a/sprites/s_prop_on_end/s_prop_on_end.yy b/sprites/s_prop_on_end/s_prop_on_end.yy index 0c1508a5d..14e25fc1d 100644 --- a/sprites/s_prop_on_end/s_prop_on_end.yy +++ b/sprites/s_prop_on_end/s_prop_on_end.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 14, - "bbox_top": 1, - "bbox_bottom": 14, + "bbox_left": 2, + "bbox_right": 29, + "bbox_top": 2, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3fbd4a59-5044-47ed-b2d4-07c8a058547e",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ce82c155-89bb-4a20-8eab-f5f8b0188042",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f95ed6a9-6378-413e-921d-a6360a43547f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bd6a25b3-9453-4baf-82f6-82e80f56f2a1",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"909b76ab-340f-4e61-b8bc-835ae242b685",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"70c72e67-69e8-44ae-9850-97a7c17833ec",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6fb531c6-0a52-4415-aef3-5a8c7fbd9fe3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3fbd4a59-5044-47ed-b2d4-07c8a058547e","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"1554b903-e5d1-4d27-ade1-c732fd31d242","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ce82c155-89bb-4a20-8eab-f5f8b0188042","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"6ec24920-22a6-4f5a-99be-639b6e61e742","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f95ed6a9-6378-413e-921d-a6360a43547f","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"af3df910-6c9b-47f8-9994-47b79328e74f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bd6a25b3-9453-4baf-82f6-82e80f56f2a1","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"a648f10f-1e6f-4d64-a4ac-18c74cf31f79","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"909b76ab-340f-4e61-b8bc-835ae242b685","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7a78d022-7b81-44a4-9d6c-0c80ca23fd33","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"70c72e67-69e8-44ae-9850-97a7c17833ec","path":"sprites/s_prop_on_end/s_prop_on_end.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7f11489b-3b55-47cd-a58c-5ae3260ded2f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5cc817b1-dc98-4201-b7c8-7f5ef9c93b1a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_refresh_16/bcbad3b2-b025-4f22-9116-5886ad921432.png b/sprites/s_refresh_16/bcbad3b2-b025-4f22-9116-5886ad921432.png deleted file mode 100644 index 7f64168d8..000000000 Binary files a/sprites/s_refresh_16/bcbad3b2-b025-4f22-9116-5886ad921432.png and /dev/null differ diff --git a/sprites/s_refresh_16/c5e03c90-ac83-4c98-8dc6-26711d9353b1.png b/sprites/s_refresh_16/c5e03c90-ac83-4c98-8dc6-26711d9353b1.png new file mode 100644 index 000000000..8b00206e1 Binary files /dev/null and b/sprites/s_refresh_16/c5e03c90-ac83-4c98-8dc6-26711d9353b1.png differ diff --git a/sprites/s_refresh_16/layers/bcbad3b2-b025-4f22-9116-5886ad921432/1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45.png b/sprites/s_refresh_16/layers/bcbad3b2-b025-4f22-9116-5886ad921432/1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45.png deleted file mode 100644 index c50b87e82..000000000 Binary files a/sprites/s_refresh_16/layers/bcbad3b2-b025-4f22-9116-5886ad921432/1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45.png and /dev/null differ diff --git a/sprites/s_refresh_16/layers/c5e03c90-ac83-4c98-8dc6-26711d9353b1/28f9c66e-c278-4581-b9b6-169775339772.png b/sprites/s_refresh_16/layers/c5e03c90-ac83-4c98-8dc6-26711d9353b1/28f9c66e-c278-4581-b9b6-169775339772.png new file mode 100644 index 000000000..8b00206e1 Binary files /dev/null and b/sprites/s_refresh_16/layers/c5e03c90-ac83-4c98-8dc6-26711d9353b1/28f9c66e-c278-4581-b9b6-169775339772.png differ diff --git a/sprites/s_refresh_16/s_refresh_16.yy b/sprites/s_refresh_16/s_refresh_16.yy index fa3ccccf9..29ea77774 100644 --- a/sprites/s_refresh_16/s_refresh_16.yy +++ b/sprites/s_refresh_16/s_refresh_16.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bbox_bottom": 15, + "bbox_right": 31, + "bbox_top": 1, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bcbad3b2-b025-4f22-9116-5886ad921432",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5e03c90-ac83-4c98-8dc6-26711d9353b1",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"474d1d19-d5bc-4a98-bd10-1ef870b257cb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bcbad3b2-b025-4f22-9116-5886ad921432","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"988ce24b-0dfe-4560-b112-09ac9d2a4838","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c5e03c90-ac83-4c98-8dc6-26711d9353b1","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"28f9c66e-c278-4581-b9b6-169775339772","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_refresh_24/2c5d4de2-581f-4058-9dd3-8ebbbae9287a.png b/sprites/s_refresh_24/2c5d4de2-581f-4058-9dd3-8ebbbae9287a.png new file mode 100644 index 000000000..cf77d7e86 Binary files /dev/null and b/sprites/s_refresh_24/2c5d4de2-581f-4058-9dd3-8ebbbae9287a.png differ diff --git a/sprites/s_refresh_24/c9de546c-873e-451a-bce8-38d85cec7488.png b/sprites/s_refresh_24/c9de546c-873e-451a-bce8-38d85cec7488.png deleted file mode 100644 index bc7fbb2ed..000000000 Binary files a/sprites/s_refresh_24/c9de546c-873e-451a-bce8-38d85cec7488.png and /dev/null differ diff --git a/sprites/s_refresh_24/layers/2c5d4de2-581f-4058-9dd3-8ebbbae9287a/e08606aa-e889-44b8-bf01-a37806e4a750.png b/sprites/s_refresh_24/layers/2c5d4de2-581f-4058-9dd3-8ebbbae9287a/e08606aa-e889-44b8-bf01-a37806e4a750.png new file mode 100644 index 000000000..cf77d7e86 Binary files /dev/null and b/sprites/s_refresh_24/layers/2c5d4de2-581f-4058-9dd3-8ebbbae9287a/e08606aa-e889-44b8-bf01-a37806e4a750.png differ diff --git a/sprites/s_refresh_24/layers/c9de546c-873e-451a-bce8-38d85cec7488/fa90d5a5-061b-4ced-9086-67fd45e21c27.png b/sprites/s_refresh_24/layers/c9de546c-873e-451a-bce8-38d85cec7488/fa90d5a5-061b-4ced-9086-67fd45e21c27.png deleted file mode 100644 index 4a999d0f6..000000000 Binary files a/sprites/s_refresh_24/layers/c9de546c-873e-451a-bce8-38d85cec7488/fa90d5a5-061b-4ced-9086-67fd45e21c27.png and /dev/null differ diff --git a/sprites/s_refresh_24/s_refresh_24.yy b/sprites/s_refresh_24/s_refresh_24.yy index a068f8190..540fa7a70 100644 --- a/sprites/s_refresh_24/s_refresh_24.yy +++ b/sprites/s_refresh_24/s_refresh_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 3, - "bbox_bottom": 21, + "bbox_left": 5, + "bbox_right": 43, + "bbox_top": 6, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c9de546c-873e-451a-bce8-38d85cec7488",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2c5d4de2-581f-4058-9dd3-8ebbbae9287a",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d72f71f5-b9ac-4982-860e-014652009243","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c9de546c-873e-451a-bce8-38d85cec7488","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"995041d7-054b-497c-b5cf-08fd652259e9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2c5d4de2-581f-4058-9dd3-8ebbbae9287a","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fa90d5a5-061b-4ced-9086-67fd45e21c27","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e08606aa-e889-44b8-bf01-a37806e4a750","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_rotator_bg/38b0f479-3ac7-4840-a735-593f73853667.png b/sprites/s_rotator_bg/38b0f479-3ac7-4840-a735-593f73853667.png new file mode 100644 index 000000000..09dea773d Binary files /dev/null and b/sprites/s_rotator_bg/38b0f479-3ac7-4840-a735-593f73853667.png differ diff --git a/sprites/s_rotator_bg/faac3c17-8964-49a8-9931-dd2c01785953.png b/sprites/s_rotator_bg/faac3c17-8964-49a8-9931-dd2c01785953.png deleted file mode 100644 index e870dc500..000000000 Binary files a/sprites/s_rotator_bg/faac3c17-8964-49a8-9931-dd2c01785953.png and /dev/null differ diff --git a/sprites/s_rotator_bg/layers/38b0f479-3ac7-4840-a735-593f73853667/b2c5196d-0c91-473c-806c-7984fa3b65e3.png b/sprites/s_rotator_bg/layers/38b0f479-3ac7-4840-a735-593f73853667/b2c5196d-0c91-473c-806c-7984fa3b65e3.png new file mode 100644 index 000000000..09dea773d Binary files /dev/null and b/sprites/s_rotator_bg/layers/38b0f479-3ac7-4840-a735-593f73853667/b2c5196d-0c91-473c-806c-7984fa3b65e3.png differ diff --git a/sprites/s_rotator_bg/layers/faac3c17-8964-49a8-9931-dd2c01785953/75d4717c-315c-4161-bbbb-28bcd252b322.png b/sprites/s_rotator_bg/layers/faac3c17-8964-49a8-9931-dd2c01785953/75d4717c-315c-4161-bbbb-28bcd252b322.png deleted file mode 100644 index cc5451b59..000000000 Binary files a/sprites/s_rotator_bg/layers/faac3c17-8964-49a8-9931-dd2c01785953/75d4717c-315c-4161-bbbb-28bcd252b322.png and /dev/null differ diff --git a/sprites/s_rotator_bg/s_rotator_bg.yy b/sprites/s_rotator_bg/s_rotator_bg.yy index 17942b386..bab83f934 100644 --- a/sprites/s_rotator_bg/s_rotator_bg.yy +++ b/sprites/s_rotator_bg/s_rotator_bg.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 79, + "bbox_right": 159, "bbox_top": 0, - "bbox_bottom": 79, + "bbox_bottom": 159, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 80, - "height": 80, + "width": 160, + "height": 160, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"faac3c17-8964-49a8-9931-dd2c01785953",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"38b0f479-3ac7-4840-a735-593f73853667",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"838c198b-95c8-469d-9936-805f3f0fcbd7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"faac3c17-8964-49a8-9931-dd2c01785953","path":"sprites/s_rotator_bg/s_rotator_bg.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5d5b65b5-ca32-4305-81e3-4743077a2408","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"38b0f479-3ac7-4840-a735-593f73853667","path":"sprites/s_rotator_bg/s_rotator_bg.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,17 +58,17 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 40, - "yorigin": 40, + "xorigin": 80, + "yorigin": 80, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"75d4717c-315c-4161-bbbb-28bcd252b322","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b2c5196d-0c91-473c-806c-7984fa3b65e3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { - "name": "widget", - "path": "folders/sprites/widget.yy", + "name": "inspector", + "path": "folders/sprites/inspector.yy", }, } \ No newline at end of file diff --git a/sprites/s_rotator_knob/3563837d-1841-4aaa-bd9f-c67d41c3959e.png b/sprites/s_rotator_knob/3563837d-1841-4aaa-bd9f-c67d41c3959e.png deleted file mode 100644 index c27c6c47c..000000000 Binary files a/sprites/s_rotator_knob/3563837d-1841-4aaa-bd9f-c67d41c3959e.png and /dev/null differ diff --git a/sprites/s_rotator_knob/52c5492d-6638-4917-9c7d-e5f314ebae84.png b/sprites/s_rotator_knob/52c5492d-6638-4917-9c7d-e5f314ebae84.png new file mode 100644 index 000000000..5c2033771 Binary files /dev/null and b/sprites/s_rotator_knob/52c5492d-6638-4917-9c7d-e5f314ebae84.png differ diff --git a/sprites/s_rotator_knob/93330ac3-8617-42bb-831e-021599ce9c0b.png b/sprites/s_rotator_knob/93330ac3-8617-42bb-831e-021599ce9c0b.png deleted file mode 100644 index 9368c5e99..000000000 Binary files a/sprites/s_rotator_knob/93330ac3-8617-42bb-831e-021599ce9c0b.png and /dev/null differ diff --git a/sprites/s_rotator_knob/e1661935-e04b-466e-825b-775728afabcd.png b/sprites/s_rotator_knob/e1661935-e04b-466e-825b-775728afabcd.png new file mode 100644 index 000000000..b38aae84b Binary files /dev/null and b/sprites/s_rotator_knob/e1661935-e04b-466e-825b-775728afabcd.png differ diff --git a/sprites/s_rotator_knob/layers/3563837d-1841-4aaa-bd9f-c67d41c3959e/c556ca4f-d2b9-4f9f-a067-df07d5c8faae.png b/sprites/s_rotator_knob/layers/3563837d-1841-4aaa-bd9f-c67d41c3959e/c556ca4f-d2b9-4f9f-a067-df07d5c8faae.png deleted file mode 100644 index cc683920f..000000000 Binary files a/sprites/s_rotator_knob/layers/3563837d-1841-4aaa-bd9f-c67d41c3959e/c556ca4f-d2b9-4f9f-a067-df07d5c8faae.png and /dev/null differ diff --git a/sprites/s_rotator_knob/layers/52c5492d-6638-4917-9c7d-e5f314ebae84/e38708d3-2944-4e32-9802-0b18b2fee2e6.png b/sprites/s_rotator_knob/layers/52c5492d-6638-4917-9c7d-e5f314ebae84/e38708d3-2944-4e32-9802-0b18b2fee2e6.png new file mode 100644 index 000000000..5c2033771 Binary files /dev/null and b/sprites/s_rotator_knob/layers/52c5492d-6638-4917-9c7d-e5f314ebae84/e38708d3-2944-4e32-9802-0b18b2fee2e6.png differ diff --git a/sprites/s_rotator_knob/layers/93330ac3-8617-42bb-831e-021599ce9c0b/c556ca4f-d2b9-4f9f-a067-df07d5c8faae.png b/sprites/s_rotator_knob/layers/93330ac3-8617-42bb-831e-021599ce9c0b/c556ca4f-d2b9-4f9f-a067-df07d5c8faae.png deleted file mode 100644 index eb08d2dc4..000000000 Binary files a/sprites/s_rotator_knob/layers/93330ac3-8617-42bb-831e-021599ce9c0b/c556ca4f-d2b9-4f9f-a067-df07d5c8faae.png and /dev/null differ diff --git a/sprites/s_rotator_knob/layers/e1661935-e04b-466e-825b-775728afabcd/e38708d3-2944-4e32-9802-0b18b2fee2e6.png b/sprites/s_rotator_knob/layers/e1661935-e04b-466e-825b-775728afabcd/e38708d3-2944-4e32-9802-0b18b2fee2e6.png new file mode 100644 index 000000000..b38aae84b Binary files /dev/null and b/sprites/s_rotator_knob/layers/e1661935-e04b-466e-825b-775728afabcd/e38708d3-2944-4e32-9802-0b18b2fee2e6.png differ diff --git a/sprites/s_rotator_knob/s_rotator_knob.yy b/sprites/s_rotator_knob/s_rotator_knob.yy index e01bea6d3..6880adb99 100644 --- a/sprites/s_rotator_knob/s_rotator_knob.yy +++ b/sprites/s_rotator_knob/s_rotator_knob.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 19, + "bbox_right": 39, "bbox_top": 0, - "bbox_bottom": 19, + "bbox_bottom": 39, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3563837d-1841-4aaa-bd9f-c67d41c3959e",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"93330ac3-8617-42bb-831e-021599ce9c0b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"52c5492d-6638-4917-9c7d-e5f314ebae84",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e1661935-e04b-466e-825b-775728afabcd",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"915ab637-9b9f-4c95-8f07-0a88593c22ed","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3563837d-1841-4aaa-bd9f-c67d41c3959e","path":"sprites/s_rotator_knob/s_rotator_knob.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"6ca52c51-c2e6-4a5f-bef1-fc53e7f20b9e","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"93330ac3-8617-42bb-831e-021599ce9c0b","path":"sprites/s_rotator_knob/s_rotator_knob.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"885511c9-19a3-45f1-9846-f9234fcae0e4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"52c5492d-6638-4917-9c7d-e5f314ebae84","path":"sprites/s_rotator_knob/s_rotator_knob.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"876715db-a965-4960-833d-7b2caebe79ad","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e1661935-e04b-466e-825b-775728afabcd","path":"sprites/s_rotator_knob/s_rotator_knob.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,17 +60,17 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c556ca4f-d2b9-4f9f-a067-df07d5c8faae","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e38708d3-2944-4e32-9802-0b18b2fee2e6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { - "name": "widget", - "path": "folders/sprites/widget.yy", + "name": "inspector", + "path": "folders/sprites/inspector.yy", }, } \ No newline at end of file diff --git a/sprites/s_scroll_box_arrow/6cf632fe-3b47-44c9-b35d-c4786e056eeb.png b/sprites/s_scroll_box_arrow/6cf632fe-3b47-44c9-b35d-c4786e056eeb.png deleted file mode 100644 index 3b7375327..000000000 Binary files a/sprites/s_scroll_box_arrow/6cf632fe-3b47-44c9-b35d-c4786e056eeb.png and /dev/null differ diff --git a/sprites/s_scroll_box_arrow/8c57bcc4-b2d7-47cc-b396-7d63a9dec632.png b/sprites/s_scroll_box_arrow/8c57bcc4-b2d7-47cc-b396-7d63a9dec632.png new file mode 100644 index 000000000..bace2e110 Binary files /dev/null and b/sprites/s_scroll_box_arrow/8c57bcc4-b2d7-47cc-b396-7d63a9dec632.png differ diff --git a/sprites/s_scroll_box_arrow/layers/6cf632fe-3b47-44c9-b35d-c4786e056eeb/1c99eea1-03b4-4040-81da-ee066397595d.png b/sprites/s_scroll_box_arrow/layers/6cf632fe-3b47-44c9-b35d-c4786e056eeb/1c99eea1-03b4-4040-81da-ee066397595d.png deleted file mode 100644 index ec2afd102..000000000 Binary files a/sprites/s_scroll_box_arrow/layers/6cf632fe-3b47-44c9-b35d-c4786e056eeb/1c99eea1-03b4-4040-81da-ee066397595d.png and /dev/null differ diff --git a/sprites/s_scroll_box_arrow/layers/8c57bcc4-b2d7-47cc-b396-7d63a9dec632/b71249ef-5979-4653-9c63-72867913c0bd.png b/sprites/s_scroll_box_arrow/layers/8c57bcc4-b2d7-47cc-b396-7d63a9dec632/b71249ef-5979-4653-9c63-72867913c0bd.png new file mode 100644 index 000000000..bace2e110 Binary files /dev/null and b/sprites/s_scroll_box_arrow/layers/8c57bcc4-b2d7-47cc-b396-7d63a9dec632/b71249ef-5979-4653-9c63-72867913c0bd.png differ diff --git a/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy b/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy index bf4310256..b540d3da7 100644 --- a/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy +++ b/sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 7, - "bbox_bottom": 16, + "bbox_left": 7, + "bbox_right": 40, + "bbox_top": 15, + "bbox_bottom": 34, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6cf632fe-3b47-44c9-b35d-c4786e056eeb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8c57bcc4-b2d7-47cc-b396-7d63a9dec632",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"89d45071-0ea4-41c3-886e-5096cfb12d83","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6cf632fe-3b47-44c9-b35d-c4786e056eeb","path":"sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6df89ef1-c808-477a-b7e9-6811a7060f50","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8c57bcc4-b2d7-47cc-b396-7d63a9dec632","path":"sprites/s_scroll_box_arrow/s_scroll_box_arrow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1c99eea1-03b4-4040-81da-ee066397595d","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b71249ef-5979-4653-9c63-72867913c0bd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_search_16/1a4d2d86-c02d-4acb-aa81-85d86d1fef36.png b/sprites/s_search_16/1a4d2d86-c02d-4acb-aa81-85d86d1fef36.png new file mode 100644 index 000000000..21e205b2c Binary files /dev/null and b/sprites/s_search_16/1a4d2d86-c02d-4acb-aa81-85d86d1fef36.png differ diff --git a/sprites/s_search_16/5e2328bf-0a60-4b4f-8289-5aa9d08124fa.png b/sprites/s_search_16/5e2328bf-0a60-4b4f-8289-5aa9d08124fa.png deleted file mode 100644 index 79a535c49..000000000 Binary files a/sprites/s_search_16/5e2328bf-0a60-4b4f-8289-5aa9d08124fa.png and /dev/null differ diff --git a/sprites/s_search_16/layers/1a4d2d86-c02d-4acb-aa81-85d86d1fef36/ca09fcd3-c8bd-4cd2-81c4-442dcb81f7ae.png b/sprites/s_search_16/layers/1a4d2d86-c02d-4acb-aa81-85d86d1fef36/ca09fcd3-c8bd-4cd2-81c4-442dcb81f7ae.png new file mode 100644 index 000000000..21e205b2c Binary files /dev/null and b/sprites/s_search_16/layers/1a4d2d86-c02d-4acb-aa81-85d86d1fef36/ca09fcd3-c8bd-4cd2-81c4-442dcb81f7ae.png differ diff --git a/sprites/s_search_16/layers/5e2328bf-0a60-4b4f-8289-5aa9d08124fa/8e8d4f0f-5729-4e35-90b7-35868c96a2c8.png b/sprites/s_search_16/layers/5e2328bf-0a60-4b4f-8289-5aa9d08124fa/8e8d4f0f-5729-4e35-90b7-35868c96a2c8.png deleted file mode 100644 index 7504c5d5a..000000000 Binary files a/sprites/s_search_16/layers/5e2328bf-0a60-4b4f-8289-5aa9d08124fa/8e8d4f0f-5729-4e35-90b7-35868c96a2c8.png and /dev/null differ diff --git a/sprites/s_search_16/s_search_16.yy b/sprites/s_search_16/s_search_16.yy index 2cc6a2636..d886c5e17 100644 --- a/sprites/s_search_16/s_search_16.yy +++ b/sprites/s_search_16/s_search_16.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 15, - "bbox_top": 0, - "bbox_bottom": 14, + "bbox_left": 2, + "bbox_right": 30, + "bbox_top": 1, + "bbox_bottom": 29, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5e2328bf-0a60-4b4f-8289-5aa9d08124fa",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1a4d2d86-c02d-4acb-aa81-85d86d1fef36",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"91d66b33-e986-44df-8c23-2cb57ba8dbd9","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5e2328bf-0a60-4b4f-8289-5aa9d08124fa","path":"sprites/s_search_16/s_search_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"ae25123c-7c14-472a-8085-30c08c1f08d2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1a4d2d86-c02d-4acb-aa81-85d86d1fef36","path":"sprites/s_search_16/s_search_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8e8d4f0f-5729-4e35-90b7-35868c96a2c8","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ca09fcd3-c8bd-4cd2-81c4-442dcb81f7ae","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_sequence_control/07b9fe28-727d-40c5-a6af-ead363b0150f.png b/sprites/s_sequence_control/07b9fe28-727d-40c5-a6af-ead363b0150f.png deleted file mode 100644 index 02f60cf7b..000000000 Binary files a/sprites/s_sequence_control/07b9fe28-727d-40c5-a6af-ead363b0150f.png and /dev/null differ diff --git a/sprites/s_sequence_control/0a378c06-22db-4073-a05f-7fec6b72006b.png b/sprites/s_sequence_control/0a378c06-22db-4073-a05f-7fec6b72006b.png deleted file mode 100644 index 001332acc..000000000 Binary files a/sprites/s_sequence_control/0a378c06-22db-4073-a05f-7fec6b72006b.png and /dev/null differ diff --git a/sprites/s_sequence_control/1f01eab1-88d0-4ca9-9ac9-e397e665556d.png b/sprites/s_sequence_control/1f01eab1-88d0-4ca9-9ac9-e397e665556d.png deleted file mode 100644 index 9fc9dbc14..000000000 Binary files a/sprites/s_sequence_control/1f01eab1-88d0-4ca9-9ac9-e397e665556d.png and /dev/null differ diff --git a/sprites/s_sequence_control/21f01f8a-2751-4384-9972-3f391442875a.png b/sprites/s_sequence_control/21f01f8a-2751-4384-9972-3f391442875a.png deleted file mode 100644 index 8f4d72ca5..000000000 Binary files a/sprites/s_sequence_control/21f01f8a-2751-4384-9972-3f391442875a.png and /dev/null differ diff --git a/sprites/s_sequence_control/29768d54-8b34-47d7-90df-1d0d615f75c9.png b/sprites/s_sequence_control/29768d54-8b34-47d7-90df-1d0d615f75c9.png new file mode 100644 index 000000000..5674c0322 Binary files /dev/null and b/sprites/s_sequence_control/29768d54-8b34-47d7-90df-1d0d615f75c9.png differ diff --git a/sprites/s_sequence_control/387784f0-c5cb-49eb-8246-e769b3b05d7c.png b/sprites/s_sequence_control/387784f0-c5cb-49eb-8246-e769b3b05d7c.png deleted file mode 100644 index 74e557c44..000000000 Binary files a/sprites/s_sequence_control/387784f0-c5cb-49eb-8246-e769b3b05d7c.png and /dev/null differ diff --git a/sprites/s_sequence_control/4eebbfde-3fbb-4d48-a360-f357fb8756c4.png b/sprites/s_sequence_control/4eebbfde-3fbb-4d48-a360-f357fb8756c4.png new file mode 100644 index 000000000..9b27d5b57 Binary files /dev/null and b/sprites/s_sequence_control/4eebbfde-3fbb-4d48-a360-f357fb8756c4.png differ diff --git a/sprites/s_sequence_control/58dbbd03-c5e0-4e33-8bce-9c0da169ecf0.png b/sprites/s_sequence_control/58dbbd03-c5e0-4e33-8bce-9c0da169ecf0.png deleted file mode 100644 index c739409f6..000000000 Binary files a/sprites/s_sequence_control/58dbbd03-c5e0-4e33-8bce-9c0da169ecf0.png and /dev/null differ diff --git a/sprites/s_sequence_control/6829925e-b5c1-4e6c-b6fc-74984fc3e0a0.png b/sprites/s_sequence_control/6829925e-b5c1-4e6c-b6fc-74984fc3e0a0.png new file mode 100644 index 000000000..c60c949be Binary files /dev/null and b/sprites/s_sequence_control/6829925e-b5c1-4e6c-b6fc-74984fc3e0a0.png differ diff --git a/sprites/s_sequence_control/b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae.png b/sprites/s_sequence_control/b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae.png new file mode 100644 index 000000000..84f2bfa89 Binary files /dev/null and b/sprites/s_sequence_control/b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae.png differ diff --git a/sprites/s_sequence_control/d2b09de6-81a3-40f2-80b6-903acc39e7de.png b/sprites/s_sequence_control/d2b09de6-81a3-40f2-80b6-903acc39e7de.png new file mode 100644 index 000000000..3ea12d2b3 Binary files /dev/null and b/sprites/s_sequence_control/d2b09de6-81a3-40f2-80b6-903acc39e7de.png differ diff --git a/sprites/s_sequence_control/e41fc033-ead5-42ca-9ee3-f571dcdec4c9.png b/sprites/s_sequence_control/e41fc033-ead5-42ca-9ee3-f571dcdec4c9.png new file mode 100644 index 000000000..edb3f1ee8 Binary files /dev/null and b/sprites/s_sequence_control/e41fc033-ead5-42ca-9ee3-f571dcdec4c9.png differ diff --git a/sprites/s_sequence_control/f22375ac-b0cb-4047-a80f-788748be6067.png b/sprites/s_sequence_control/f22375ac-b0cb-4047-a80f-788748be6067.png new file mode 100644 index 000000000..02ec22ce3 Binary files /dev/null and b/sprites/s_sequence_control/f22375ac-b0cb-4047-a80f-788748be6067.png differ diff --git a/sprites/s_sequence_control/fd31e0bc-2613-43d3-aef9-35f7657f45bb.png b/sprites/s_sequence_control/fd31e0bc-2613-43d3-aef9-35f7657f45bb.png deleted file mode 100644 index f2ac4ad78..000000000 Binary files a/sprites/s_sequence_control/fd31e0bc-2613-43d3-aef9-35f7657f45bb.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/07b9fe28-727d-40c5-a6af-ead363b0150f/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/07b9fe28-727d-40c5-a6af-ead363b0150f/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index 629fb03db..000000000 Binary files a/sprites/s_sequence_control/layers/07b9fe28-727d-40c5-a6af-ead363b0150f/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/0a378c06-22db-4073-a05f-7fec6b72006b/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/0a378c06-22db-4073-a05f-7fec6b72006b/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index ec8cfbf27..000000000 Binary files a/sprites/s_sequence_control/layers/0a378c06-22db-4073-a05f-7fec6b72006b/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/1f01eab1-88d0-4ca9-9ac9-e397e665556d/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/1f01eab1-88d0-4ca9-9ac9-e397e665556d/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index ab55f08bc..000000000 Binary files a/sprites/s_sequence_control/layers/1f01eab1-88d0-4ca9-9ac9-e397e665556d/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/21f01f8a-2751-4384-9972-3f391442875a/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/21f01f8a-2751-4384-9972-3f391442875a/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index 4b6c173ff..000000000 Binary files a/sprites/s_sequence_control/layers/21f01f8a-2751-4384-9972-3f391442875a/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/29768d54-8b34-47d7-90df-1d0d615f75c9/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/29768d54-8b34-47d7-90df-1d0d615f75c9/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..5674c0322 Binary files /dev/null and b/sprites/s_sequence_control/layers/29768d54-8b34-47d7-90df-1d0d615f75c9/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/387784f0-c5cb-49eb-8246-e769b3b05d7c/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/387784f0-c5cb-49eb-8246-e769b3b05d7c/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index 9a7734e0a..000000000 Binary files a/sprites/s_sequence_control/layers/387784f0-c5cb-49eb-8246-e769b3b05d7c/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/4eebbfde-3fbb-4d48-a360-f357fb8756c4/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/4eebbfde-3fbb-4d48-a360-f357fb8756c4/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..9b27d5b57 Binary files /dev/null and b/sprites/s_sequence_control/layers/4eebbfde-3fbb-4d48-a360-f357fb8756c4/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/58dbbd03-c5e0-4e33-8bce-9c0da169ecf0/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/58dbbd03-c5e0-4e33-8bce-9c0da169ecf0/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index 2b9ac8a70..000000000 Binary files a/sprites/s_sequence_control/layers/58dbbd03-c5e0-4e33-8bce-9c0da169ecf0/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/layers/6829925e-b5c1-4e6c-b6fc-74984fc3e0a0/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/6829925e-b5c1-4e6c-b6fc-74984fc3e0a0/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..c60c949be Binary files /dev/null and b/sprites/s_sequence_control/layers/6829925e-b5c1-4e6c-b6fc-74984fc3e0a0/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..84f2bfa89 Binary files /dev/null and b/sprites/s_sequence_control/layers/b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/d2b09de6-81a3-40f2-80b6-903acc39e7de/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/d2b09de6-81a3-40f2-80b6-903acc39e7de/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..3ea12d2b3 Binary files /dev/null and b/sprites/s_sequence_control/layers/d2b09de6-81a3-40f2-80b6-903acc39e7de/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/e41fc033-ead5-42ca-9ee3-f571dcdec4c9/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/e41fc033-ead5-42ca-9ee3-f571dcdec4c9/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..edb3f1ee8 Binary files /dev/null and b/sprites/s_sequence_control/layers/e41fc033-ead5-42ca-9ee3-f571dcdec4c9/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/f22375ac-b0cb-4047-a80f-788748be6067/9c943fa4-a037-4a22-920e-b8c79ed84787.png b/sprites/s_sequence_control/layers/f22375ac-b0cb-4047-a80f-788748be6067/9c943fa4-a037-4a22-920e-b8c79ed84787.png new file mode 100644 index 000000000..02ec22ce3 Binary files /dev/null and b/sprites/s_sequence_control/layers/f22375ac-b0cb-4047-a80f-788748be6067/9c943fa4-a037-4a22-920e-b8c79ed84787.png differ diff --git a/sprites/s_sequence_control/layers/fd31e0bc-2613-43d3-aef9-35f7657f45bb/4b138233-c43a-4757-8dab-ee36efbf531f.png b/sprites/s_sequence_control/layers/fd31e0bc-2613-43d3-aef9-35f7657f45bb/4b138233-c43a-4757-8dab-ee36efbf531f.png deleted file mode 100644 index 70901d0a0..000000000 Binary files a/sprites/s_sequence_control/layers/fd31e0bc-2613-43d3-aef9-35f7657f45bb/4b138233-c43a-4757-8dab-ee36efbf531f.png and /dev/null differ diff --git a/sprites/s_sequence_control/s_sequence_control.yy b/sprites/s_sequence_control/s_sequence_control.yy index 1a2888e03..4f788faab 100644 --- a/sprites/s_sequence_control/s_sequence_control.yy +++ b/sprites/s_sequence_control/s_sequence_control.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 3, + "bbox_right": 44, + "bbox_top": 6, + "bbox_bottom": 41, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,13 +28,13 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"21f01f8a-2751-4384-9972-3f391442875a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"58dbbd03-c5e0-4e33-8bce-9c0da169ecf0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"07b9fe28-727d-40c5-a6af-ead363b0150f",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"387784f0-c5cb-49eb-8246-e769b3b05d7c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1f01eab1-88d0-4ca9-9ac9-e397e665556d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0a378c06-22db-4073-a05f-7fec6b72006b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fd31e0bc-2613-43d3-aef9-35f7657f45bb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29768d54-8b34-47d7-90df-1d0d615f75c9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e41fc033-ead5-42ca-9ee3-f571dcdec4c9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6829925e-b5c1-4e6c-b6fc-74984fc3e0a0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2b09de6-81a3-40f2-80b6-903acc39e7de",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f22375ac-b0cb-4047-a80f-788748be6067",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4eebbfde-3fbb-4d48-a360-f357fb8756c4",}, ], "sequence": { "resourceType": "GMSequence", @@ -51,13 +51,13 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"193e7f19-ae25-41c5-a24c-08a6e2e56a5b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"21f01f8a-2751-4384-9972-3f391442875a","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"ec83f621-2bb5-430e-9bec-aee4e41ba508","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"58dbbd03-c5e0-4e33-8bce-9c0da169ecf0","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"ced82b82-797a-4900-9a91-f712ae9387d5","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"07b9fe28-727d-40c5-a6af-ead363b0150f","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"6d15285c-496d-43bd-b355-d552080a3618","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"387784f0-c5cb-49eb-8246-e769b3b05d7c","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"e7fcba2d-d6c5-4cbd-b0f4-4732cfee90cf","Key":4.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f01eab1-88d0-4ca9-9ac9-e397e665556d","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"d91436d1-eda2-4198-b574-1abdbfd70f70","Key":5.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0a378c06-22db-4073-a05f-7fec6b72006b","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"c688dfb7-27ac-4304-bf47-20f93a1d764a","Key":6.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd31e0bc-2613-43d3-aef9-35f7657f45bb","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"98276c42-8361-48cd-9756-57d8c9530b1d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"29768d54-8b34-47d7-90df-1d0d615f75c9","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1b66499d-cb90-411e-abeb-5b9062905cf9","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e41fc033-ead5-42ca-9ee3-f571dcdec4c9","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f3577077-3cee-4861-ad40-7f11676f25fb","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6829925e-b5c1-4e6c-b6fc-74984fc3e0a0","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"1f27511b-0a99-4cf2-8055-825a02b7cd1f","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b82a5abc-0dd6-4dbb-8a1b-97bc4fe447ae","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"881d30da-dc3d-4848-8a79-aae4d6d7f6bf","Key":4.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d2b09de6-81a3-40f2-80b6-903acc39e7de","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e2a8749a-e7b9-4840-9186-b4d2d2b0c4e0","Key":5.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f22375ac-b0cb-4047-a80f-788748be6067","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"b8947f19-440c-4c1f-bbcf-0d6769c8bc42","Key":6.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4eebbfde-3fbb-4d48-a360-f357fb8756c4","path":"sprites/s_sequence_control/s_sequence_control.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -70,13 +70,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4b138233-c43a-4757-8dab-ee36efbf531f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9c943fa4-a037-4a22-920e-b8c79ed84787","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_sort_24/2c708986-b16e-48f2-b452-a21d8f33b8c5.png b/sprites/s_sort_24/2c708986-b16e-48f2-b452-a21d8f33b8c5.png new file mode 100644 index 000000000..b3cf1ef5f Binary files /dev/null and b/sprites/s_sort_24/2c708986-b16e-48f2-b452-a21d8f33b8c5.png differ diff --git a/sprites/s_sort_24/ef243a7e-3826-4778-bf95-d325981ff029.png b/sprites/s_sort_24/ef243a7e-3826-4778-bf95-d325981ff029.png deleted file mode 100644 index 99f3d5482..000000000 Binary files a/sprites/s_sort_24/ef243a7e-3826-4778-bf95-d325981ff029.png and /dev/null differ diff --git a/sprites/s_sort_24/layers/2c708986-b16e-48f2-b452-a21d8f33b8c5/f1a7b68a-68bd-4aaf-88c1-c5d35bfc825a.png b/sprites/s_sort_24/layers/2c708986-b16e-48f2-b452-a21d8f33b8c5/f1a7b68a-68bd-4aaf-88c1-c5d35bfc825a.png new file mode 100644 index 000000000..b3cf1ef5f Binary files /dev/null and b/sprites/s_sort_24/layers/2c708986-b16e-48f2-b452-a21d8f33b8c5/f1a7b68a-68bd-4aaf-88c1-c5d35bfc825a.png differ diff --git a/sprites/s_sort_24/layers/ef243a7e-3826-4778-bf95-d325981ff029/0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea.png b/sprites/s_sort_24/layers/ef243a7e-3826-4778-bf95-d325981ff029/0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea.png deleted file mode 100644 index db209efb0..000000000 Binary files a/sprites/s_sort_24/layers/ef243a7e-3826-4778-bf95-d325981ff029/0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea.png and /dev/null differ diff --git a/sprites/s_sort_24/s_sort_24.yy b/sprites/s_sort_24/s_sort_24.yy index 54f4ed963..655c49255 100644 --- a/sprites/s_sort_24/s_sort_24.yy +++ b/sprites/s_sort_24/s_sort_24.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 21, + "bbox_left": 4, + "bbox_right": 44, + "bbox_top": 4, + "bbox_bottom": 42, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ef243a7e-3826-4778-bf95-d325981ff029",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2c708986-b16e-48f2-b452-a21d8f33b8c5",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b59dffa0-58cb-4c37-bdf1-5648ec3f5828","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ef243a7e-3826-4778-bf95-d325981ff029","path":"sprites/s_sort_24/s_sort_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e6b00077-4217-463b-adc2-4b5c3f4451b7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2c708986-b16e-48f2-b452-a21d8f33b8c5","path":"sprites/s_sort_24/s_sort_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f1a7b68a-68bd-4aaf-88c1-c5d35bfc825a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_splice_draw/09c793d9-2f32-4e48-8283-979b38cd8a41.png b/sprites/s_splice_draw/09c793d9-2f32-4e48-8283-979b38cd8a41.png new file mode 100644 index 000000000..a97bb33a8 Binary files /dev/null and b/sprites/s_splice_draw/09c793d9-2f32-4e48-8283-979b38cd8a41.png differ diff --git a/sprites/s_splice_draw/5c29470b-aaff-410b-a00a-11c22a64beb6.png b/sprites/s_splice_draw/5c29470b-aaff-410b-a00a-11c22a64beb6.png deleted file mode 100644 index 257dc9c62..000000000 Binary files a/sprites/s_splice_draw/5c29470b-aaff-410b-a00a-11c22a64beb6.png and /dev/null differ diff --git a/sprites/s_splice_draw/layers/09c793d9-2f32-4e48-8283-979b38cd8a41/5376595c-e746-4616-82d8-d65eeece33c0.png b/sprites/s_splice_draw/layers/09c793d9-2f32-4e48-8283-979b38cd8a41/5376595c-e746-4616-82d8-d65eeece33c0.png new file mode 100644 index 000000000..a97bb33a8 Binary files /dev/null and b/sprites/s_splice_draw/layers/09c793d9-2f32-4e48-8283-979b38cd8a41/5376595c-e746-4616-82d8-d65eeece33c0.png differ diff --git a/sprites/s_splice_draw/layers/5c29470b-aaff-410b-a00a-11c22a64beb6/c1fe5f41-7f34-4711-86a2-e7c839393158.png b/sprites/s_splice_draw/layers/5c29470b-aaff-410b-a00a-11c22a64beb6/c1fe5f41-7f34-4711-86a2-e7c839393158.png deleted file mode 100644 index 05546522d..000000000 Binary files a/sprites/s_splice_draw/layers/5c29470b-aaff-410b-a00a-11c22a64beb6/c1fe5f41-7f34-4711-86a2-e7c839393158.png and /dev/null differ diff --git a/sprites/s_splice_draw/s_splice_draw.yy b/sprites/s_splice_draw/s_splice_draw.yy index 8d31f0fb8..c79aea168 100644 --- a/sprites/s_splice_draw/s_splice_draw.yy +++ b/sprites/s_splice_draw/s_splice_draw.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 23, - "bbox_top": 2, - "bbox_bottom": 22, + "bbox_left": 4, + "bbox_right": 45, + "bbox_top": 4, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c29470b-aaff-410b-a00a-11c22a64beb6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09c793d9-2f32-4e48-8283-979b38cd8a41",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,10 +45,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c9c11a43-5112-45b7-a3dd-bc63ed583652","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5c29470b-aaff-410b-a00a-11c22a64beb6","path":"sprites/s_splice_draw/s_splice_draw.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e734499a-20ea-4816-8dae-42815edc0ffb","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"09c793d9-2f32-4e48-8283-979b38cd8a41","path":"sprites/s_splice_draw/s_splice_draw.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c1fe5f41-7f34-4711-86a2-e7c839393158","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5376595c-e746-4616-82d8-d65eeece33c0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_text_bullet/068620c7-022b-4f0a-a5b4-ed2ca6711dfa.png b/sprites/s_text_bullet/068620c7-022b-4f0a-a5b4-ed2ca6711dfa.png new file mode 100644 index 000000000..f0632a45e Binary files /dev/null and b/sprites/s_text_bullet/068620c7-022b-4f0a-a5b4-ed2ca6711dfa.png differ diff --git a/sprites/s_text_bullet/0a8c5f08-a734-4c1e-936d-c3e0d25fd00b.png b/sprites/s_text_bullet/0a8c5f08-a734-4c1e-936d-c3e0d25fd00b.png deleted file mode 100644 index d254ef8ec..000000000 Binary files a/sprites/s_text_bullet/0a8c5f08-a734-4c1e-936d-c3e0d25fd00b.png and /dev/null differ diff --git a/sprites/s_text_bullet/64e43aba-b9e4-45f6-ace8-a022d6d4bb60.png b/sprites/s_text_bullet/64e43aba-b9e4-45f6-ace8-a022d6d4bb60.png deleted file mode 100644 index 15af0851b..000000000 Binary files a/sprites/s_text_bullet/64e43aba-b9e4-45f6-ace8-a022d6d4bb60.png and /dev/null differ diff --git a/sprites/s_text_bullet/e8d655f9-45a6-48db-abd6-fd53fa1d15c9.png b/sprites/s_text_bullet/e8d655f9-45a6-48db-abd6-fd53fa1d15c9.png new file mode 100644 index 000000000..113905039 Binary files /dev/null and b/sprites/s_text_bullet/e8d655f9-45a6-48db-abd6-fd53fa1d15c9.png differ diff --git a/sprites/s_text_bullet/layers/068620c7-022b-4f0a-a5b4-ed2ca6711dfa/c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573.png b/sprites/s_text_bullet/layers/068620c7-022b-4f0a-a5b4-ed2ca6711dfa/c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573.png new file mode 100644 index 000000000..f0632a45e Binary files /dev/null and b/sprites/s_text_bullet/layers/068620c7-022b-4f0a-a5b4-ed2ca6711dfa/c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573.png differ diff --git a/sprites/s_text_bullet/layers/0a8c5f08-a734-4c1e-936d-c3e0d25fd00b/0258c837-c578-491e-864b-73a6ac0bb266.png b/sprites/s_text_bullet/layers/0a8c5f08-a734-4c1e-936d-c3e0d25fd00b/0258c837-c578-491e-864b-73a6ac0bb266.png deleted file mode 100644 index cd81ed2b3..000000000 Binary files a/sprites/s_text_bullet/layers/0a8c5f08-a734-4c1e-936d-c3e0d25fd00b/0258c837-c578-491e-864b-73a6ac0bb266.png and /dev/null differ diff --git a/sprites/s_text_bullet/layers/64e43aba-b9e4-45f6-ace8-a022d6d4bb60/0258c837-c578-491e-864b-73a6ac0bb266.png b/sprites/s_text_bullet/layers/64e43aba-b9e4-45f6-ace8-a022d6d4bb60/0258c837-c578-491e-864b-73a6ac0bb266.png deleted file mode 100644 index e906f0a88..000000000 Binary files a/sprites/s_text_bullet/layers/64e43aba-b9e4-45f6-ace8-a022d6d4bb60/0258c837-c578-491e-864b-73a6ac0bb266.png and /dev/null differ diff --git a/sprites/s_text_bullet/layers/e8d655f9-45a6-48db-abd6-fd53fa1d15c9/c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573.png b/sprites/s_text_bullet/layers/e8d655f9-45a6-48db-abd6-fd53fa1d15c9/c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573.png new file mode 100644 index 000000000..113905039 Binary files /dev/null and b/sprites/s_text_bullet/layers/e8d655f9-45a6-48db-abd6-fd53fa1d15c9/c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573.png differ diff --git a/sprites/s_text_bullet/s_text_bullet.yy b/sprites/s_text_bullet/s_text_bullet.yy index 5ac33a6d1..59f944c68 100644 --- a/sprites/s_text_bullet/s_text_bullet.yy +++ b/sprites/s_text_bullet/s_text_bullet.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 12, - "bbox_top": 3, - "bbox_bottom": 12, + "bbox_left": 6, + "bbox_right": 25, + "bbox_top": 6, + "bbox_bottom": 25, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0a8c5f08-a734-4c1e-936d-c3e0d25fd00b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"64e43aba-b9e4-45f6-ace8-a022d6d4bb60",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"068620c7-022b-4f0a-a5b4-ed2ca6711dfa",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e8d655f9-45a6-48db-abd6-fd53fa1d15c9",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4a9200d2-3ace-4416-b037-55ef90126883","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0a8c5f08-a734-4c1e-936d-c3e0d25fd00b","path":"sprites/s_text_bullet/s_text_bullet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"54324cc4-bfb4-4751-b207-acdcbce920bb","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"64e43aba-b9e4-45f6-ace8-a022d6d4bb60","path":"sprites/s_text_bullet/s_text_bullet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"51610aad-7e8b-487d-82e9-1fa25b98c8f7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"068620c7-022b-4f0a-a5b4-ed2ca6711dfa","path":"sprites/s_text_bullet/s_text_bullet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f7f02c67-f41b-4b34-892e-41835a04dc22","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e8d655f9-45a6-48db-abd6-fd53fa1d15c9","path":"sprites/s_text_bullet/s_text_bullet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0258c837-c578-491e-864b-73a6ac0bb266","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c2ea26c7-5f9b-4b5f-91d8-a8fa911f4573","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_text_slider/4d561729-9292-46da-a7bc-7070bf62b235.png b/sprites/s_text_slider/4d561729-9292-46da-a7bc-7070bf62b235.png deleted file mode 100644 index 88263efbd..000000000 Binary files a/sprites/s_text_slider/4d561729-9292-46da-a7bc-7070bf62b235.png and /dev/null differ diff --git a/sprites/s_text_slider/a6e91fd1-54e4-416c-821b-618926aa9297.png b/sprites/s_text_slider/a6e91fd1-54e4-416c-821b-618926aa9297.png new file mode 100644 index 000000000..1ce73e64c Binary files /dev/null and b/sprites/s_text_slider/a6e91fd1-54e4-416c-821b-618926aa9297.png differ diff --git a/sprites/s_text_slider/layers/4d561729-9292-46da-a7bc-7070bf62b235/e2fff93f-141e-45f1-9f85-2efa7c2370be.png b/sprites/s_text_slider/layers/4d561729-9292-46da-a7bc-7070bf62b235/e2fff93f-141e-45f1-9f85-2efa7c2370be.png deleted file mode 100644 index 1a9365c4d..000000000 Binary files a/sprites/s_text_slider/layers/4d561729-9292-46da-a7bc-7070bf62b235/e2fff93f-141e-45f1-9f85-2efa7c2370be.png and /dev/null differ diff --git a/sprites/s_text_slider/layers/a6e91fd1-54e4-416c-821b-618926aa9297/bdca2035-5bc9-452a-843b-93d3fa2d66ab.png b/sprites/s_text_slider/layers/a6e91fd1-54e4-416c-821b-618926aa9297/bdca2035-5bc9-452a-843b-93d3fa2d66ab.png new file mode 100644 index 000000000..1ce73e64c Binary files /dev/null and b/sprites/s_text_slider/layers/a6e91fd1-54e4-416c-821b-618926aa9297/bdca2035-5bc9-452a-843b-93d3fa2d66ab.png differ diff --git a/sprites/s_text_slider/s_text_slider.yy b/sprites/s_text_slider/s_text_slider.yy index 6a9194f11..c1e142d09 100644 --- a/sprites/s_text_slider/s_text_slider.yy +++ b/sprites/s_text_slider/s_text_slider.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 3, + "bbox_right": 44, + "bbox_top": 7, + "bbox_bottom": 40, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4d561729-9292-46da-a7bc-7070bf62b235",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a6e91fd1-54e4-416c-821b-618926aa9297",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"98ab1255-b976-4ad2-a466-6568f121becd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4d561729-9292-46da-a7bc-7070bf62b235","path":"sprites/s_text_slider/s_text_slider.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7a16602f-ed18-4af2-a0b6-6c5779728f8f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a6e91fd1-54e4-416c-821b-618926aa9297","path":"sprites/s_text_slider/s_text_slider.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e2fff93f-141e-45f1-9f85-2efa7c2370be","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bdca2035-5bc9-452a-843b-93d3fa2d66ab","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_timeline_clock/97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b.png b/sprites/s_timeline_clock/97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b.png new file mode 100644 index 000000000..6b3193572 Binary files /dev/null and b/sprites/s_timeline_clock/97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b.png differ diff --git a/sprites/s_timeline_clock/c3f60dc0-9067-4851-9a1e-043d752a6e85.png b/sprites/s_timeline_clock/c3f60dc0-9067-4851-9a1e-043d752a6e85.png deleted file mode 100644 index 9ff2a9157..000000000 Binary files a/sprites/s_timeline_clock/c3f60dc0-9067-4851-9a1e-043d752a6e85.png and /dev/null differ diff --git a/sprites/s_timeline_clock/layers/97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b/1775df6f-facf-4505-85d3-53eb92b4b9b1.png b/sprites/s_timeline_clock/layers/97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b/1775df6f-facf-4505-85d3-53eb92b4b9b1.png new file mode 100644 index 000000000..6b3193572 Binary files /dev/null and b/sprites/s_timeline_clock/layers/97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b/1775df6f-facf-4505-85d3-53eb92b4b9b1.png differ diff --git a/sprites/s_timeline_clock/layers/c3f60dc0-9067-4851-9a1e-043d752a6e85/56721904-8a63-46e8-b924-fd3009b46c47.png b/sprites/s_timeline_clock/layers/c3f60dc0-9067-4851-9a1e-043d752a6e85/56721904-8a63-46e8-b924-fd3009b46c47.png deleted file mode 100644 index 91ef7d3c5..000000000 Binary files a/sprites/s_timeline_clock/layers/c3f60dc0-9067-4851-9a1e-043d752a6e85/56721904-8a63-46e8-b924-fd3009b46c47.png and /dev/null differ diff --git a/sprites/s_timeline_clock/s_timeline_clock.yy b/sprites/s_timeline_clock/s_timeline_clock.yy index 5efb15df8..69a182bae 100644 --- a/sprites/s_timeline_clock/s_timeline_clock.yy +++ b/sprites/s_timeline_clock/s_timeline_clock.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 10, - "bbox_top": 1, - "bbox_bottom": 10, + "bbox_left": 1, + "bbox_right": 21, + "bbox_top": 2, + "bbox_bottom": 21, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 12, - "height": 12, + "width": 24, + "height": 24, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c3f60dc0-9067-4851-9a1e-043d752a6e85",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4ae15dfd-5403-40a7-915d-53051930f383","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c3f60dc0-9067-4851-9a1e-043d752a6e85","path":"sprites/s_timeline_clock/s_timeline_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"dcfcf2b9-4ba5-465d-af31-dbaa200a36bc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"97bfc02d-6621-44e7-a4a1-f66ad0e8eb8b","path":"sprites/s_timeline_clock/s_timeline_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,17 +58,17 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 6, - "yorigin": 6, + "xorigin": 12, + "yorigin": 12, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"56721904-8a63-46e8-b924-fd3009b46c47","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1775df6f-facf-4505-85d3-53eb92b4b9b1","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { - "name": "timeline", - "path": "folders/sprites/timeline.yy", + "name": "icon", + "path": "folders/sprites/icon.yy", }, } \ No newline at end of file diff --git a/sprites/s_timeline_ease/24290950-35fc-4ecc-ba0d-649f84bd31cc.png b/sprites/s_timeline_ease/24290950-35fc-4ecc-ba0d-649f84bd31cc.png deleted file mode 100644 index 56318a6d0..000000000 Binary files a/sprites/s_timeline_ease/24290950-35fc-4ecc-ba0d-649f84bd31cc.png and /dev/null differ diff --git a/sprites/s_timeline_ease/28ea8a9d-44bd-46ed-9942-6ba74ffd0726.png b/sprites/s_timeline_ease/28ea8a9d-44bd-46ed-9942-6ba74ffd0726.png deleted file mode 100644 index 7fc1736fe..000000000 Binary files a/sprites/s_timeline_ease/28ea8a9d-44bd-46ed-9942-6ba74ffd0726.png and /dev/null differ diff --git a/sprites/s_timeline_ease/66c132f9-ae6a-429c-8cf4-30a9d47ef7a3.png b/sprites/s_timeline_ease/66c132f9-ae6a-429c-8cf4-30a9d47ef7a3.png deleted file mode 100644 index 0bedf0613..000000000 Binary files a/sprites/s_timeline_ease/66c132f9-ae6a-429c-8cf4-30a9d47ef7a3.png and /dev/null differ diff --git a/sprites/s_timeline_ease/6c240b55-f44c-4c9a-9b93-13cf630af0c3.png b/sprites/s_timeline_ease/6c240b55-f44c-4c9a-9b93-13cf630af0c3.png new file mode 100644 index 000000000..155a3a30b Binary files /dev/null and b/sprites/s_timeline_ease/6c240b55-f44c-4c9a-9b93-13cf630af0c3.png differ diff --git a/sprites/s_timeline_ease/6ca25682-cb07-4b3f-b98f-993a2f6be2f2.png b/sprites/s_timeline_ease/6ca25682-cb07-4b3f-b98f-993a2f6be2f2.png deleted file mode 100644 index 214a01034..000000000 Binary files a/sprites/s_timeline_ease/6ca25682-cb07-4b3f-b98f-993a2f6be2f2.png and /dev/null differ diff --git a/sprites/s_timeline_ease/ac98fc8e-9c16-423d-b27d-9c4b51131812.png b/sprites/s_timeline_ease/ac98fc8e-9c16-423d-b27d-9c4b51131812.png new file mode 100644 index 000000000..d090655d7 Binary files /dev/null and b/sprites/s_timeline_ease/ac98fc8e-9c16-423d-b27d-9c4b51131812.png differ diff --git a/sprites/s_timeline_ease/da0f3346-d636-431f-b50f-5296404be176.png b/sprites/s_timeline_ease/da0f3346-d636-431f-b50f-5296404be176.png new file mode 100644 index 000000000..312ec1646 Binary files /dev/null and b/sprites/s_timeline_ease/da0f3346-d636-431f-b50f-5296404be176.png differ diff --git a/sprites/s_timeline_ease/f64e00e8-671c-4b95-8a9b-3fbe070b3075.png b/sprites/s_timeline_ease/f64e00e8-671c-4b95-8a9b-3fbe070b3075.png new file mode 100644 index 000000000..a96d234fd Binary files /dev/null and b/sprites/s_timeline_ease/f64e00e8-671c-4b95-8a9b-3fbe070b3075.png differ diff --git a/sprites/s_timeline_ease/layers/24290950-35fc-4ecc-ba0d-649f84bd31cc/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png b/sprites/s_timeline_ease/layers/24290950-35fc-4ecc-ba0d-649f84bd31cc/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png deleted file mode 100644 index 56318a6d0..000000000 Binary files a/sprites/s_timeline_ease/layers/24290950-35fc-4ecc-ba0d-649f84bd31cc/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png and /dev/null differ diff --git a/sprites/s_timeline_ease/layers/28ea8a9d-44bd-46ed-9942-6ba74ffd0726/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png b/sprites/s_timeline_ease/layers/28ea8a9d-44bd-46ed-9942-6ba74ffd0726/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png deleted file mode 100644 index 7fc1736fe..000000000 Binary files a/sprites/s_timeline_ease/layers/28ea8a9d-44bd-46ed-9942-6ba74ffd0726/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png and /dev/null differ diff --git a/sprites/s_timeline_ease/layers/66c132f9-ae6a-429c-8cf4-30a9d47ef7a3/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png b/sprites/s_timeline_ease/layers/66c132f9-ae6a-429c-8cf4-30a9d47ef7a3/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png deleted file mode 100644 index 0bedf0613..000000000 Binary files a/sprites/s_timeline_ease/layers/66c132f9-ae6a-429c-8cf4-30a9d47ef7a3/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png and /dev/null differ diff --git a/sprites/s_timeline_ease/layers/6c240b55-f44c-4c9a-9b93-13cf630af0c3/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png b/sprites/s_timeline_ease/layers/6c240b55-f44c-4c9a-9b93-13cf630af0c3/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png new file mode 100644 index 000000000..155a3a30b Binary files /dev/null and b/sprites/s_timeline_ease/layers/6c240b55-f44c-4c9a-9b93-13cf630af0c3/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png differ diff --git a/sprites/s_timeline_ease/layers/6ca25682-cb07-4b3f-b98f-993a2f6be2f2/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png b/sprites/s_timeline_ease/layers/6ca25682-cb07-4b3f-b98f-993a2f6be2f2/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png deleted file mode 100644 index 214a01034..000000000 Binary files a/sprites/s_timeline_ease/layers/6ca25682-cb07-4b3f-b98f-993a2f6be2f2/bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b.png and /dev/null differ diff --git a/sprites/s_timeline_ease/layers/ac98fc8e-9c16-423d-b27d-9c4b51131812/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png b/sprites/s_timeline_ease/layers/ac98fc8e-9c16-423d-b27d-9c4b51131812/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png new file mode 100644 index 000000000..d090655d7 Binary files /dev/null and b/sprites/s_timeline_ease/layers/ac98fc8e-9c16-423d-b27d-9c4b51131812/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png differ diff --git a/sprites/s_timeline_ease/layers/da0f3346-d636-431f-b50f-5296404be176/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png b/sprites/s_timeline_ease/layers/da0f3346-d636-431f-b50f-5296404be176/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png new file mode 100644 index 000000000..312ec1646 Binary files /dev/null and b/sprites/s_timeline_ease/layers/da0f3346-d636-431f-b50f-5296404be176/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png differ diff --git a/sprites/s_timeline_ease/layers/f64e00e8-671c-4b95-8a9b-3fbe070b3075/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png b/sprites/s_timeline_ease/layers/f64e00e8-671c-4b95-8a9b-3fbe070b3075/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png new file mode 100644 index 000000000..a96d234fd Binary files /dev/null and b/sprites/s_timeline_ease/layers/f64e00e8-671c-4b95-8a9b-3fbe070b3075/f2edec38-3e88-4bb7-ab7e-3e60237f5f31.png differ diff --git a/sprites/s_timeline_ease/s_timeline_ease.yy b/sprites/s_timeline_ease/s_timeline_ease.yy index dfa590911..3713de1e4 100644 --- a/sprites/s_timeline_ease/s_timeline_ease.yy +++ b/sprites/s_timeline_ease/s_timeline_ease.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 3, - "bbox_bottom": 22, + "bbox_left": 6, + "bbox_right": 41, + "bbox_top": 6, + "bbox_bottom": 45, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,10 +28,10 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"28ea8a9d-44bd-46ed-9942-6ba74ffd0726",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ca25682-cb07-4b3f-b98f-993a2f6be2f2",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"24290950-35fc-4ecc-ba0d-649f84bd31cc",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"66c132f9-ae6a-429c-8cf4-30a9d47ef7a3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f64e00e8-671c-4b95-8a9b-3fbe070b3075",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ac98fc8e-9c16-423d-b27d-9c4b51131812",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6c240b55-f44c-4c9a-9b93-13cf630af0c3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da0f3346-d636-431f-b50f-5296404be176",}, ], "sequence": { "resourceType": "GMSequence", @@ -48,10 +48,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ee0f9ed2-76e7-4da0-90a8-8f54d08ffa87","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"28ea8a9d-44bd-46ed-9942-6ba74ffd0726","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"00a4ab7c-dc24-46aa-92e1-cf5c34649d70","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6ca25682-cb07-4b3f-b98f-993a2f6be2f2","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"9e9a2d7f-167c-45ad-9f42-ac50d2b4adc4","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"24290950-35fc-4ecc-ba0d-649f84bd31cc","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"bd5eaa76-9373-45a7-9b15-268475d1a531","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"66c132f9-ae6a-429c-8cf4-30a9d47ef7a3","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"28bb6748-40a3-4787-a488-0bfdfef5e64a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f64e00e8-671c-4b95-8a9b-3fbe070b3075","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fc38925d-b279-4c99-97d7-e752521a2519","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ac98fc8e-9c16-423d-b27d-9c4b51131812","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3f1a9886-8111-40bc-ba49-68e4c9d2bc59","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6c240b55-f44c-4c9a-9b93-13cf630af0c3","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"cba3b674-7281-4c5c-bb4d-fe20daf23769","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"da0f3346-d636-431f-b50f-5296404be176","path":"sprites/s_timeline_ease/s_timeline_ease.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -64,13 +64,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bb50a3b3-cd69-4d09-b7d9-e02fa14ec76b","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f2edec38-3e88-4bb7-ab7e-3e60237f5f31","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_timeline_graph/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d.png b/sprites/s_timeline_graph/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d.png deleted file mode 100644 index 1ebe83b5e..000000000 Binary files a/sprites/s_timeline_graph/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d.png and /dev/null differ diff --git a/sprites/s_timeline_graph/75fc5c18-1190-4bdc-a93a-90840df417f4.png b/sprites/s_timeline_graph/75fc5c18-1190-4bdc-a93a-90840df417f4.png new file mode 100644 index 000000000..0342d325f Binary files /dev/null and b/sprites/s_timeline_graph/75fc5c18-1190-4bdc-a93a-90840df417f4.png differ diff --git a/sprites/s_timeline_graph/layers/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d/ebc1a659-127b-4d29-9174-e85ace797e98.png b/sprites/s_timeline_graph/layers/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d/ebc1a659-127b-4d29-9174-e85ace797e98.png deleted file mode 100644 index d251fc6a3..000000000 Binary files a/sprites/s_timeline_graph/layers/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d/ebc1a659-127b-4d29-9174-e85ace797e98.png and /dev/null differ diff --git a/sprites/s_timeline_graph/layers/75fc5c18-1190-4bdc-a93a-90840df417f4/0e641c29-cf6c-41af-8ce1-4631084d3b49.png b/sprites/s_timeline_graph/layers/75fc5c18-1190-4bdc-a93a-90840df417f4/0e641c29-cf6c-41af-8ce1-4631084d3b49.png new file mode 100644 index 000000000..0342d325f Binary files /dev/null and b/sprites/s_timeline_graph/layers/75fc5c18-1190-4bdc-a93a-90840df417f4/0e641c29-cf6c-41af-8ce1-4631084d3b49.png differ diff --git a/sprites/s_timeline_graph/s_timeline_graph.yy b/sprites/s_timeline_graph/s_timeline_graph.yy index bf88f7697..c6e9dc7d4 100644 --- a/sprites/s_timeline_graph/s_timeline_graph.yy +++ b/sprites/s_timeline_graph/s_timeline_graph.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 14, - "bbox_top": 1, - "bbox_bottom": 15, + "bbox_left": 1, + "bbox_right": 29, + "bbox_top": 2, + "bbox_bottom": 30, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"75fc5c18-1190-4bdc-a93a-90840df417f4",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"cc77a809-f590-4655-b5ac-cbad77df35e2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d","path":"sprites/s_timeline_graph/s_timeline_graph.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"bc6da1e8-56ba-4e9c-a2fc-d84584f2036a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"75fc5c18-1190-4bdc-a93a-90840df417f4","path":"sprites/s_timeline_graph/s_timeline_graph.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,17 +58,17 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ebc1a659-127b-4d29-9174-e85ace797e98","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0e641c29-cf6c-41af-8ce1-4631084d3b49","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { - "name": "timeline", - "path": "folders/sprites/timeline.yy", + "name": "icon", + "path": "folders/sprites/icon.yy", }, } \ No newline at end of file diff --git a/sprites/s_timeline_keyframe/0c43086f-b85e-4995-abb3-b2f8ddeb50e8.png b/sprites/s_timeline_keyframe/0c43086f-b85e-4995-abb3-b2f8ddeb50e8.png new file mode 100644 index 000000000..8f0fceff9 Binary files /dev/null and b/sprites/s_timeline_keyframe/0c43086f-b85e-4995-abb3-b2f8ddeb50e8.png differ diff --git a/sprites/s_timeline_keyframe/0d0e313c-fafe-42e5-b077-c93fc064bc25.png b/sprites/s_timeline_keyframe/0d0e313c-fafe-42e5-b077-c93fc064bc25.png deleted file mode 100644 index a71fa7eff..000000000 Binary files a/sprites/s_timeline_keyframe/0d0e313c-fafe-42e5-b077-c93fc064bc25.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/0f4b3970-02d5-436b-99bb-69fd71eb30aa.png b/sprites/s_timeline_keyframe/0f4b3970-02d5-436b-99bb-69fd71eb30aa.png new file mode 100644 index 000000000..8b611608c Binary files /dev/null and b/sprites/s_timeline_keyframe/0f4b3970-02d5-436b-99bb-69fd71eb30aa.png differ diff --git a/sprites/s_timeline_keyframe/391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a.png b/sprites/s_timeline_keyframe/391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a.png deleted file mode 100644 index ae08e15da..000000000 Binary files a/sprites/s_timeline_keyframe/391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/3d472492-94cf-4d0a-b0bb-43cad651aad9.png b/sprites/s_timeline_keyframe/3d472492-94cf-4d0a-b0bb-43cad651aad9.png deleted file mode 100644 index 978f9db4e..000000000 Binary files a/sprites/s_timeline_keyframe/3d472492-94cf-4d0a-b0bb-43cad651aad9.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/657e34ed-db4c-4964-9589-a8255ca3349c.png b/sprites/s_timeline_keyframe/657e34ed-db4c-4964-9589-a8255ca3349c.png new file mode 100644 index 000000000..fd40e52e0 Binary files /dev/null and b/sprites/s_timeline_keyframe/657e34ed-db4c-4964-9589-a8255ca3349c.png differ diff --git a/sprites/s_timeline_keyframe/7e409d3c-0555-4eb6-bb4e-bdcf0e885620.png b/sprites/s_timeline_keyframe/7e409d3c-0555-4eb6-bb4e-bdcf0e885620.png deleted file mode 100644 index 9c040bb70..000000000 Binary files a/sprites/s_timeline_keyframe/7e409d3c-0555-4eb6-bb4e-bdcf0e885620.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/c3113697-3b6c-405b-ad4c-aa89b0cbf1b0.png b/sprites/s_timeline_keyframe/c3113697-3b6c-405b-ad4c-aa89b0cbf1b0.png new file mode 100644 index 000000000..9b1aa781f Binary files /dev/null and b/sprites/s_timeline_keyframe/c3113697-3b6c-405b-ad4c-aa89b0cbf1b0.png differ diff --git a/sprites/s_timeline_keyframe/layers/0c43086f-b85e-4995-abb3-b2f8ddeb50e8/24637f6f-8447-4678-87c5-f086fd299f39.png b/sprites/s_timeline_keyframe/layers/0c43086f-b85e-4995-abb3-b2f8ddeb50e8/24637f6f-8447-4678-87c5-f086fd299f39.png new file mode 100644 index 000000000..8f0fceff9 Binary files /dev/null and b/sprites/s_timeline_keyframe/layers/0c43086f-b85e-4995-abb3-b2f8ddeb50e8/24637f6f-8447-4678-87c5-f086fd299f39.png differ diff --git a/sprites/s_timeline_keyframe/layers/0d0e313c-fafe-42e5-b077-c93fc064bc25/b1392cea-a152-4f40-ac82-ded33d6288af.png b/sprites/s_timeline_keyframe/layers/0d0e313c-fafe-42e5-b077-c93fc064bc25/b1392cea-a152-4f40-ac82-ded33d6288af.png deleted file mode 100644 index a71fa7eff..000000000 Binary files a/sprites/s_timeline_keyframe/layers/0d0e313c-fafe-42e5-b077-c93fc064bc25/b1392cea-a152-4f40-ac82-ded33d6288af.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/layers/0f4b3970-02d5-436b-99bb-69fd71eb30aa/24637f6f-8447-4678-87c5-f086fd299f39.png b/sprites/s_timeline_keyframe/layers/0f4b3970-02d5-436b-99bb-69fd71eb30aa/24637f6f-8447-4678-87c5-f086fd299f39.png new file mode 100644 index 000000000..8b611608c Binary files /dev/null and b/sprites/s_timeline_keyframe/layers/0f4b3970-02d5-436b-99bb-69fd71eb30aa/24637f6f-8447-4678-87c5-f086fd299f39.png differ diff --git a/sprites/s_timeline_keyframe/layers/391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a/b1392cea-a152-4f40-ac82-ded33d6288af.png b/sprites/s_timeline_keyframe/layers/391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a/b1392cea-a152-4f40-ac82-ded33d6288af.png deleted file mode 100644 index ae08e15da..000000000 Binary files a/sprites/s_timeline_keyframe/layers/391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a/b1392cea-a152-4f40-ac82-ded33d6288af.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/layers/3d472492-94cf-4d0a-b0bb-43cad651aad9/b1392cea-a152-4f40-ac82-ded33d6288af.png b/sprites/s_timeline_keyframe/layers/3d472492-94cf-4d0a-b0bb-43cad651aad9/b1392cea-a152-4f40-ac82-ded33d6288af.png deleted file mode 100644 index 978f9db4e..000000000 Binary files a/sprites/s_timeline_keyframe/layers/3d472492-94cf-4d0a-b0bb-43cad651aad9/b1392cea-a152-4f40-ac82-ded33d6288af.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/layers/657e34ed-db4c-4964-9589-a8255ca3349c/24637f6f-8447-4678-87c5-f086fd299f39.png b/sprites/s_timeline_keyframe/layers/657e34ed-db4c-4964-9589-a8255ca3349c/24637f6f-8447-4678-87c5-f086fd299f39.png new file mode 100644 index 000000000..fd40e52e0 Binary files /dev/null and b/sprites/s_timeline_keyframe/layers/657e34ed-db4c-4964-9589-a8255ca3349c/24637f6f-8447-4678-87c5-f086fd299f39.png differ diff --git a/sprites/s_timeline_keyframe/layers/7e409d3c-0555-4eb6-bb4e-bdcf0e885620/b1392cea-a152-4f40-ac82-ded33d6288af.png b/sprites/s_timeline_keyframe/layers/7e409d3c-0555-4eb6-bb4e-bdcf0e885620/b1392cea-a152-4f40-ac82-ded33d6288af.png deleted file mode 100644 index 9c040bb70..000000000 Binary files a/sprites/s_timeline_keyframe/layers/7e409d3c-0555-4eb6-bb4e-bdcf0e885620/b1392cea-a152-4f40-ac82-ded33d6288af.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe/layers/c3113697-3b6c-405b-ad4c-aa89b0cbf1b0/24637f6f-8447-4678-87c5-f086fd299f39.png b/sprites/s_timeline_keyframe/layers/c3113697-3b6c-405b-ad4c-aa89b0cbf1b0/24637f6f-8447-4678-87c5-f086fd299f39.png new file mode 100644 index 000000000..9b1aa781f Binary files /dev/null and b/sprites/s_timeline_keyframe/layers/c3113697-3b6c-405b-ad4c-aa89b0cbf1b0/24637f6f-8447-4678-87c5-f086fd299f39.png differ diff --git a/sprites/s_timeline_keyframe/s_timeline_keyframe.yy b/sprites/s_timeline_keyframe/s_timeline_keyframe.yy index 471a1e5e0..d761a18aa 100644 --- a/sprites/s_timeline_keyframe/s_timeline_keyframe.yy +++ b/sprites/s_timeline_keyframe/s_timeline_keyframe.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 13, - "bbox_top": 2, - "bbox_bottom": 13, + "bbox_left": 5, + "bbox_right": 26, + "bbox_top": 5, + "bbox_bottom": 26, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,10 +28,10 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3d472492-94cf-4d0a-b0bb-43cad651aad9",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7e409d3c-0555-4eb6-bb4e-bdcf0e885620",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0d0e313c-fafe-42e5-b077-c93fc064bc25",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c3113697-3b6c-405b-ad4c-aa89b0cbf1b0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"657e34ed-db4c-4964-9589-a8255ca3349c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0c43086f-b85e-4995-abb3-b2f8ddeb50e8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f4b3970-02d5-436b-99bb-69fd71eb30aa",}, ], "sequence": { "resourceType": "GMSequence", @@ -48,10 +48,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"81d08e3d-5eb5-408a-892d-81e62481d374","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"391ccbea-dc4a-4f1a-a4da-ed7fb77dd32a","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"85cbd1c8-f6cf-4853-a959-e6782f57a855","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3d472492-94cf-4d0a-b0bb-43cad651aad9","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"2a8845c6-a16c-40f1-a1d9-7340998a7f3e","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7e409d3c-0555-4eb6-bb4e-bdcf0e885620","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"5f94b9fa-6783-4bc2-889b-9a5769f8fcd7","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0d0e313c-fafe-42e5-b077-c93fc064bc25","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7d38f42d-731b-4907-aab1-c741ed5243e3","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c3113697-3b6c-405b-ad4c-aa89b0cbf1b0","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"197e88bc-47d3-48c0-a1a3-b6658a6a232c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"657e34ed-db4c-4964-9589-a8255ca3349c","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9197d6bc-7862-453e-8121-e36a00f6a11b","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0c43086f-b85e-4995-abb3-b2f8ddeb50e8","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"7c42b651-eb8f-4d35-8b88-33df485928c6","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f4b3970-02d5-436b-99bb-69fd71eb30aa","path":"sprites/s_timeline_keyframe/s_timeline_keyframe.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -64,13 +64,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b1392cea-a152-4f40-ac82-ded33d6288af","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"24637f6f-8447-4678-87c5-f086fd299f39","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_timeline_keyframe_selecting/06a2325a-4a03-4c0c-8948-e4ada978c209.png b/sprites/s_timeline_keyframe_selecting/06a2325a-4a03-4c0c-8948-e4ada978c209.png new file mode 100644 index 000000000..e06d2ac9c Binary files /dev/null and b/sprites/s_timeline_keyframe_selecting/06a2325a-4a03-4c0c-8948-e4ada978c209.png differ diff --git a/sprites/s_timeline_keyframe_selecting/741ad96f-dd2d-4bc7-9ccf-80027d373dc5.png b/sprites/s_timeline_keyframe_selecting/741ad96f-dd2d-4bc7-9ccf-80027d373dc5.png deleted file mode 100644 index 7d69d99de..000000000 Binary files a/sprites/s_timeline_keyframe_selecting/741ad96f-dd2d-4bc7-9ccf-80027d373dc5.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe_selecting/layers/06a2325a-4a03-4c0c-8948-e4ada978c209/6544230d-28c3-48ca-a912-47747bce06e6.png b/sprites/s_timeline_keyframe_selecting/layers/06a2325a-4a03-4c0c-8948-e4ada978c209/6544230d-28c3-48ca-a912-47747bce06e6.png new file mode 100644 index 000000000..e06d2ac9c Binary files /dev/null and b/sprites/s_timeline_keyframe_selecting/layers/06a2325a-4a03-4c0c-8948-e4ada978c209/6544230d-28c3-48ca-a912-47747bce06e6.png differ diff --git a/sprites/s_timeline_keyframe_selecting/layers/741ad96f-dd2d-4bc7-9ccf-80027d373dc5/8ed37eb2-3476-40db-aba9-295147fd14b5.png b/sprites/s_timeline_keyframe_selecting/layers/741ad96f-dd2d-4bc7-9ccf-80027d373dc5/8ed37eb2-3476-40db-aba9-295147fd14b5.png deleted file mode 100644 index 7d69d99de..000000000 Binary files a/sprites/s_timeline_keyframe_selecting/layers/741ad96f-dd2d-4bc7-9ccf-80027d373dc5/8ed37eb2-3476-40db-aba9-295147fd14b5.png and /dev/null differ diff --git a/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy b/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy index dfc04c532..49491cadc 100644 --- a/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy +++ b/sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 19, - "bbox_top": 0, - "bbox_bottom": 19, + "bbox_left": 1, + "bbox_right": 38, + "bbox_top": 1, + "bbox_bottom": 38, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 20, - "height": 20, + "width": 40, + "height": 40, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"741ad96f-dd2d-4bc7-9ccf-80027d373dc5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"06a2325a-4a03-4c0c-8948-e4ada978c209",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"78310ebe-afdf-4192-9ec6-f98596db075d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"741ad96f-dd2d-4bc7-9ccf-80027d373dc5","path":"sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f53df40d-a733-4578-a300-32b791b43c39","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"06a2325a-4a03-4c0c-8948-e4ada978c209","path":"sprites/s_timeline_keyframe_selecting/s_timeline_keyframe_selecting.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,13 +58,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 10, - "yorigin": 10, + "xorigin": 20, + "yorigin": 20, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8ed37eb2-3476-40db-aba9-295147fd14b5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6544230d-28c3-48ca-a912-47747bce06e6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_timeline_obj_halign/05642409-4457-4bd4-b39b-04909166c96e.png b/sprites/s_timeline_obj_halign/05642409-4457-4bd4-b39b-04909166c96e.png deleted file mode 100644 index 27ff84de9..000000000 Binary files a/sprites/s_timeline_obj_halign/05642409-4457-4bd4-b39b-04909166c96e.png and /dev/null differ diff --git a/sprites/s_timeline_obj_halign/75209bd0-8b4a-43f9-b61f-be5d332c4a5d.png b/sprites/s_timeline_obj_halign/75209bd0-8b4a-43f9-b61f-be5d332c4a5d.png new file mode 100644 index 000000000..85c18f4dd Binary files /dev/null and b/sprites/s_timeline_obj_halign/75209bd0-8b4a-43f9-b61f-be5d332c4a5d.png differ diff --git a/sprites/s_timeline_obj_halign/76ba7dd8-2350-4cf2-8e55-30a0ff94cd33.png b/sprites/s_timeline_obj_halign/76ba7dd8-2350-4cf2-8e55-30a0ff94cd33.png deleted file mode 100644 index 674b86ecb..000000000 Binary files a/sprites/s_timeline_obj_halign/76ba7dd8-2350-4cf2-8e55-30a0ff94cd33.png and /dev/null differ diff --git a/sprites/s_timeline_obj_halign/90786137-e0d1-43fc-9bdc-85dcfbea33e4.png b/sprites/s_timeline_obj_halign/90786137-e0d1-43fc-9bdc-85dcfbea33e4.png new file mode 100644 index 000000000..69c74538b Binary files /dev/null and b/sprites/s_timeline_obj_halign/90786137-e0d1-43fc-9bdc-85dcfbea33e4.png differ diff --git a/sprites/s_timeline_obj_halign/98c65aaa-7697-4845-8eb1-c1d4c4191cba.png b/sprites/s_timeline_obj_halign/98c65aaa-7697-4845-8eb1-c1d4c4191cba.png deleted file mode 100644 index 250c3a2df..000000000 Binary files a/sprites/s_timeline_obj_halign/98c65aaa-7697-4845-8eb1-c1d4c4191cba.png and /dev/null differ diff --git a/sprites/s_timeline_obj_halign/e3f874cc-f568-48d7-9c24-9b6019a5d14d.png b/sprites/s_timeline_obj_halign/e3f874cc-f568-48d7-9c24-9b6019a5d14d.png new file mode 100644 index 000000000..bbb76e54e Binary files /dev/null and b/sprites/s_timeline_obj_halign/e3f874cc-f568-48d7-9c24-9b6019a5d14d.png differ diff --git a/sprites/s_timeline_obj_halign/layers/05642409-4457-4bd4-b39b-04909166c96e/a4e7b7c2-58c3-44c3-9861-16a307950bab.png b/sprites/s_timeline_obj_halign/layers/05642409-4457-4bd4-b39b-04909166c96e/a4e7b7c2-58c3-44c3-9861-16a307950bab.png deleted file mode 100644 index 27ff84de9..000000000 Binary files a/sprites/s_timeline_obj_halign/layers/05642409-4457-4bd4-b39b-04909166c96e/a4e7b7c2-58c3-44c3-9861-16a307950bab.png and /dev/null differ diff --git a/sprites/s_timeline_obj_halign/layers/75209bd0-8b4a-43f9-b61f-be5d332c4a5d/57bfd983-0b3f-4b30-90bc-3be95173eb85.png b/sprites/s_timeline_obj_halign/layers/75209bd0-8b4a-43f9-b61f-be5d332c4a5d/57bfd983-0b3f-4b30-90bc-3be95173eb85.png new file mode 100644 index 000000000..85c18f4dd Binary files /dev/null and b/sprites/s_timeline_obj_halign/layers/75209bd0-8b4a-43f9-b61f-be5d332c4a5d/57bfd983-0b3f-4b30-90bc-3be95173eb85.png differ diff --git a/sprites/s_timeline_obj_halign/layers/76ba7dd8-2350-4cf2-8e55-30a0ff94cd33/a4e7b7c2-58c3-44c3-9861-16a307950bab.png b/sprites/s_timeline_obj_halign/layers/76ba7dd8-2350-4cf2-8e55-30a0ff94cd33/a4e7b7c2-58c3-44c3-9861-16a307950bab.png deleted file mode 100644 index 674b86ecb..000000000 Binary files a/sprites/s_timeline_obj_halign/layers/76ba7dd8-2350-4cf2-8e55-30a0ff94cd33/a4e7b7c2-58c3-44c3-9861-16a307950bab.png and /dev/null differ diff --git a/sprites/s_timeline_obj_halign/layers/90786137-e0d1-43fc-9bdc-85dcfbea33e4/57bfd983-0b3f-4b30-90bc-3be95173eb85.png b/sprites/s_timeline_obj_halign/layers/90786137-e0d1-43fc-9bdc-85dcfbea33e4/57bfd983-0b3f-4b30-90bc-3be95173eb85.png new file mode 100644 index 000000000..69c74538b Binary files /dev/null and b/sprites/s_timeline_obj_halign/layers/90786137-e0d1-43fc-9bdc-85dcfbea33e4/57bfd983-0b3f-4b30-90bc-3be95173eb85.png differ diff --git a/sprites/s_timeline_obj_halign/layers/98c65aaa-7697-4845-8eb1-c1d4c4191cba/a4e7b7c2-58c3-44c3-9861-16a307950bab.png b/sprites/s_timeline_obj_halign/layers/98c65aaa-7697-4845-8eb1-c1d4c4191cba/a4e7b7c2-58c3-44c3-9861-16a307950bab.png deleted file mode 100644 index 250c3a2df..000000000 Binary files a/sprites/s_timeline_obj_halign/layers/98c65aaa-7697-4845-8eb1-c1d4c4191cba/a4e7b7c2-58c3-44c3-9861-16a307950bab.png and /dev/null differ diff --git a/sprites/s_timeline_obj_halign/layers/e3f874cc-f568-48d7-9c24-9b6019a5d14d/57bfd983-0b3f-4b30-90bc-3be95173eb85.png b/sprites/s_timeline_obj_halign/layers/e3f874cc-f568-48d7-9c24-9b6019a5d14d/57bfd983-0b3f-4b30-90bc-3be95173eb85.png new file mode 100644 index 000000000..bbb76e54e Binary files /dev/null and b/sprites/s_timeline_obj_halign/layers/e3f874cc-f568-48d7-9c24-9b6019a5d14d/57bfd983-0b3f-4b30-90bc-3be95173eb85.png differ diff --git a/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy b/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy index 1987bca2c..dd6e8ba19 100644 --- a/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy +++ b/sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 21, - "bbox_top": 2, - "bbox_bottom": 22, + "bbox_left": 4, + "bbox_right": 43, + "bbox_top": 4, + "bbox_bottom": 44, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,9 +28,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"98c65aaa-7697-4845-8eb1-c1d4c4191cba",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"05642409-4457-4bd4-b39b-04909166c96e",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"76ba7dd8-2350-4cf2-8e55-30a0ff94cd33",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"90786137-e0d1-43fc-9bdc-85dcfbea33e4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e3f874cc-f568-48d7-9c24-9b6019a5d14d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"75209bd0-8b4a-43f9-b61f-be5d332c4a5d",}, ], "sequence": { "resourceType": "GMSequence", @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"1b8b15c9-75b5-4e28-bd3c-8b56c260049e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"98c65aaa-7697-4845-8eb1-c1d4c4191cba","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"a6393c16-0f13-46f0-8379-9a1a70b82bea","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"05642409-4457-4bd4-b39b-04909166c96e","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"59cf6d31-0727-45a3-ad63-414338dc8f9e","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"76ba7dd8-2350-4cf2-8e55-30a0ff94cd33","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d7ab7423-f036-44d2-bf7e-ac749cac927e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"90786137-e0d1-43fc-9bdc-85dcfbea33e4","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"66d8e6ba-d5a9-4a46-bceb-e9e160f41526","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e3f874cc-f568-48d7-9c24-9b6019a5d14d","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"fa564605-ead0-46fd-8b1e-2a2558a39e96","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"75209bd0-8b4a-43f9-b61f-be5d332c4a5d","path":"sprites/s_timeline_obj_halign/s_timeline_obj_halign.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -62,13 +62,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a4e7b7c2-58c3-44c3-9861-16a307950bab","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"57bfd983-0b3f-4b30-90bc-3be95173eb85","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_toolbar_shadow/s_toolbar_shadow.yy b/sprites/s_toolbar_shadow/s_toolbar_shadow.yy index 462c29f67..2ed8eced3 100644 --- a/sprites/s_toolbar_shadow/s_toolbar_shadow.yy +++ b/sprites/s_toolbar_shadow/s_toolbar_shadow.yy @@ -66,7 +66,31 @@ "layers": [ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3f73e0a2-39cf-4a1c-bcf9-9b8a04ac11f6","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], - "nineSlice": null, + "nineSlice": { + "left": 0, + "top": 0, + "right": 0, + "bottom": 0, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "enabled": false, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "resourceVersion": "1.0", + "loadedVersion": null, + "resourceType": "GMNineSliceData", + }, "parent": { "name": "panels", "path": "folders/sprites/panels.yy", diff --git a/sprites/s_view_mode/9190dc17-3cda-48e4-a556-1afc27d5a3fe.png b/sprites/s_view_mode/9190dc17-3cda-48e4-a556-1afc27d5a3fe.png deleted file mode 100644 index 78e1fe345..000000000 Binary files a/sprites/s_view_mode/9190dc17-3cda-48e4-a556-1afc27d5a3fe.png and /dev/null differ diff --git a/sprites/s_view_mode/9abbe2d0-fbf0-4ec6-9233-6280b121ddbf.png b/sprites/s_view_mode/9abbe2d0-fbf0-4ec6-9233-6280b121ddbf.png new file mode 100644 index 000000000..5ba3e96e5 Binary files /dev/null and b/sprites/s_view_mode/9abbe2d0-fbf0-4ec6-9233-6280b121ddbf.png differ diff --git a/sprites/s_view_mode/c9ec91e8-d101-4994-bbe5-9f691807b062.png b/sprites/s_view_mode/c9ec91e8-d101-4994-bbe5-9f691807b062.png deleted file mode 100644 index f05e335bc..000000000 Binary files a/sprites/s_view_mode/c9ec91e8-d101-4994-bbe5-9f691807b062.png and /dev/null differ diff --git a/sprites/s_view_mode/f186216b-37dc-48f4-ab80-690b6dbc0871.png b/sprites/s_view_mode/f186216b-37dc-48f4-ab80-690b6dbc0871.png new file mode 100644 index 000000000..499ac5af2 Binary files /dev/null and b/sprites/s_view_mode/f186216b-37dc-48f4-ab80-690b6dbc0871.png differ diff --git a/sprites/s_view_mode/layers/9190dc17-3cda-48e4-a556-1afc27d5a3fe/cc3f4fd9-3079-439c-9b59-2cf4fa8e9035.png b/sprites/s_view_mode/layers/9190dc17-3cda-48e4-a556-1afc27d5a3fe/cc3f4fd9-3079-439c-9b59-2cf4fa8e9035.png deleted file mode 100644 index 78e1fe345..000000000 Binary files a/sprites/s_view_mode/layers/9190dc17-3cda-48e4-a556-1afc27d5a3fe/cc3f4fd9-3079-439c-9b59-2cf4fa8e9035.png and /dev/null differ diff --git a/sprites/s_view_mode/layers/9abbe2d0-fbf0-4ec6-9233-6280b121ddbf/a0abe9b4-b356-42bc-9712-bf9d85621a9f.png b/sprites/s_view_mode/layers/9abbe2d0-fbf0-4ec6-9233-6280b121ddbf/a0abe9b4-b356-42bc-9712-bf9d85621a9f.png new file mode 100644 index 000000000..5ba3e96e5 Binary files /dev/null and b/sprites/s_view_mode/layers/9abbe2d0-fbf0-4ec6-9233-6280b121ddbf/a0abe9b4-b356-42bc-9712-bf9d85621a9f.png differ diff --git a/sprites/s_view_mode/layers/c9ec91e8-d101-4994-bbe5-9f691807b062/cc3f4fd9-3079-439c-9b59-2cf4fa8e9035.png b/sprites/s_view_mode/layers/c9ec91e8-d101-4994-bbe5-9f691807b062/cc3f4fd9-3079-439c-9b59-2cf4fa8e9035.png deleted file mode 100644 index f05e335bc..000000000 Binary files a/sprites/s_view_mode/layers/c9ec91e8-d101-4994-bbe5-9f691807b062/cc3f4fd9-3079-439c-9b59-2cf4fa8e9035.png and /dev/null differ diff --git a/sprites/s_view_mode/layers/f186216b-37dc-48f4-ab80-690b6dbc0871/a0abe9b4-b356-42bc-9712-bf9d85621a9f.png b/sprites/s_view_mode/layers/f186216b-37dc-48f4-ab80-690b6dbc0871/a0abe9b4-b356-42bc-9712-bf9d85621a9f.png new file mode 100644 index 000000000..499ac5af2 Binary files /dev/null and b/sprites/s_view_mode/layers/f186216b-37dc-48f4-ab80-690b6dbc0871/a0abe9b4-b356-42bc-9712-bf9d85621a9f.png differ diff --git a/sprites/s_view_mode/s_view_mode.yy b/sprites/s_view_mode/s_view_mode.yy index 39bee1b2e..c741261b0 100644 --- a/sprites/s_view_mode/s_view_mode.yy +++ b/sprites/s_view_mode/s_view_mode.yy @@ -10,16 +10,16 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 3, - "bbox_right": 20, - "bbox_top": 3, - "bbox_bottom": 20, + "bbox_left": 6, + "bbox_right": 42, + "bbox_top": 6, + "bbox_bottom": 41, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 24, - "height": 24, + "width": 48, + "height": 48, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,8 +28,8 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c9ec91e8-d101-4994-bbe5-9f691807b062",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9190dc17-3cda-48e4-a556-1afc27d5a3fe",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9abbe2d0-fbf0-4ec6-9233-6280b121ddbf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f186216b-37dc-48f4-ab80-690b6dbc0871",}, ], "sequence": { "resourceType": "GMSequence", @@ -46,8 +46,8 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"84e58499-95a2-400d-9e34-3afe57f33b91","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c9ec91e8-d101-4994-bbe5-9f691807b062","path":"sprites/s_view_mode/s_view_mode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"f4a0d110-4ada-4d3a-b1a9-d3cec848c321","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9190dc17-3cda-48e4-a556-1afc27d5a3fe","path":"sprites/s_view_mode/s_view_mode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6f9d633b-b7a9-4e06-a97a-60d43e7f3f81","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9abbe2d0-fbf0-4ec6-9233-6280b121ddbf","path":"sprites/s_view_mode/s_view_mode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"8011e179-1d3f-44a4-9c5c-2f26627ea49e","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f186216b-37dc-48f4-ab80-690b6dbc0871","path":"sprites/s_view_mode/s_view_mode.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -60,13 +60,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 12, - "yorigin": 12, + "xorigin": 24, + "yorigin": 24, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cc3f4fd9-3079-439c-9b59-2cf4fa8e9035","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a0abe9b4-b356-42bc-9712-bf9d85621a9f","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_workspace_0/1a3e21fb-d853-4888-87a4-20a1f179e5ba.png b/sprites/s_workspace_0/1a3e21fb-d853-4888-87a4-20a1f179e5ba.png new file mode 100644 index 000000000..02c00a051 Binary files /dev/null and b/sprites/s_workspace_0/1a3e21fb-d853-4888-87a4-20a1f179e5ba.png differ diff --git a/sprites/s_workspace_0/8fb54b61-fe3a-42b1-ad79-d4e4e4794416.png b/sprites/s_workspace_0/8fb54b61-fe3a-42b1-ad79-d4e4e4794416.png deleted file mode 100644 index 720bef40d..000000000 Binary files a/sprites/s_workspace_0/8fb54b61-fe3a-42b1-ad79-d4e4e4794416.png and /dev/null differ diff --git a/sprites/s_workspace_0/layers/1a3e21fb-d853-4888-87a4-20a1f179e5ba/4861ccfb-6cb9-4781-a1e8-ee101ed2ffb5.png b/sprites/s_workspace_0/layers/1a3e21fb-d853-4888-87a4-20a1f179e5ba/4861ccfb-6cb9-4781-a1e8-ee101ed2ffb5.png new file mode 100644 index 000000000..02c00a051 Binary files /dev/null and b/sprites/s_workspace_0/layers/1a3e21fb-d853-4888-87a4-20a1f179e5ba/4861ccfb-6cb9-4781-a1e8-ee101ed2ffb5.png differ diff --git a/sprites/s_workspace_0/layers/8fb54b61-fe3a-42b1-ad79-d4e4e4794416/e520e8ee-0810-49df-93d6-0d968408ab12.png b/sprites/s_workspace_0/layers/8fb54b61-fe3a-42b1-ad79-d4e4e4794416/e520e8ee-0810-49df-93d6-0d968408ab12.png deleted file mode 100644 index 147a284a0..000000000 Binary files a/sprites/s_workspace_0/layers/8fb54b61-fe3a-42b1-ad79-d4e4e4794416/e520e8ee-0810-49df-93d6-0d968408ab12.png and /dev/null differ diff --git a/sprites/s_workspace_0/s_workspace_0.yy b/sprites/s_workspace_0/s_workspace_0.yy index a0a5443ce..64bd4e7f3 100644 --- a/sprites/s_workspace_0/s_workspace_0.yy +++ b/sprites/s_workspace_0/s_workspace_0.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 15, + "bbox_right": 31, "bbox_top": 0, - "bbox_bottom": 15, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fb54b61-fe3a-42b1-ad79-d4e4e4794416",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1a3e21fb-d853-4888-87a4-20a1f179e5ba",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"e8ff19a9-4579-49ce-b3c7-3849e478b8aa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8fb54b61-fe3a-42b1-ad79-d4e4e4794416","path":"sprites/s_workspace_0/s_workspace_0.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"92345b65-bf01-41c0-8402-b04e99664595","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1a3e21fb-d853-4888-87a4-20a1f179e5ba","path":"sprites/s_workspace_0/s_workspace_0.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,17 +58,17 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e520e8ee-0810-49df-93d6-0d968408ab12","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4861ccfb-6cb9-4781-a1e8-ee101ed2ffb5","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { "name": "workspace", - "path": "folders/sprites/workspace.yy", + "path": "folders/sprites/icon/workspace.yy", }, } \ No newline at end of file diff --git a/sprites/s_workspace_1/bda0fd5e-08a0-4485-8af8-d54a922120bd.png b/sprites/s_workspace_1/bda0fd5e-08a0-4485-8af8-d54a922120bd.png new file mode 100644 index 000000000..d04fb85fd Binary files /dev/null and b/sprites/s_workspace_1/bda0fd5e-08a0-4485-8af8-d54a922120bd.png differ diff --git a/sprites/s_workspace_1/f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71.png b/sprites/s_workspace_1/f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71.png deleted file mode 100644 index a0d7a4002..000000000 Binary files a/sprites/s_workspace_1/f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71.png and /dev/null differ diff --git a/sprites/s_workspace_1/layers/bda0fd5e-08a0-4485-8af8-d54a922120bd/8882eed8-50e2-47a7-8691-7de788b1c874.png b/sprites/s_workspace_1/layers/bda0fd5e-08a0-4485-8af8-d54a922120bd/8882eed8-50e2-47a7-8691-7de788b1c874.png new file mode 100644 index 000000000..d04fb85fd Binary files /dev/null and b/sprites/s_workspace_1/layers/bda0fd5e-08a0-4485-8af8-d54a922120bd/8882eed8-50e2-47a7-8691-7de788b1c874.png differ diff --git a/sprites/s_workspace_1/layers/f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71/6ae190cc-85e8-4397-9732-87274c6923dd.png b/sprites/s_workspace_1/layers/f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71/6ae190cc-85e8-4397-9732-87274c6923dd.png deleted file mode 100644 index 68f3e4743..000000000 Binary files a/sprites/s_workspace_1/layers/f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71/6ae190cc-85e8-4397-9732-87274c6923dd.png and /dev/null differ diff --git a/sprites/s_workspace_1/s_workspace_1.yy b/sprites/s_workspace_1/s_workspace_1.yy index 0b91d2b44..5281a2430 100644 --- a/sprites/s_workspace_1/s_workspace_1.yy +++ b/sprites/s_workspace_1/s_workspace_1.yy @@ -11,15 +11,15 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 15, + "bbox_right": 31, "bbox_top": 0, - "bbox_bottom": 15, + "bbox_bottom": 31, "HTile": false, "VTile": false, "For3D": false, "DynamicTexturePage": false, - "width": 16, - "height": 16, + "width": 32, + "height": 32, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -28,7 +28,7 @@ "gridX": 0, "gridY": 0, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bda0fd5e-08a0-4485-8af8-d54a922120bd",}, ], "sequence": { "resourceType": "GMSequence", @@ -45,7 +45,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f862c773-7f0f-4f8e-9cd7-5d388607ccf4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f2b48abb-1763-4b6f-bdb3-0ccbb4cd5a71","path":"sprites/s_workspace_1/s_workspace_1.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d8cef8cc-6f8a-4114-8347-3ac9ef6a0954","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bda0fd5e-08a0-4485-8af8-d54a922120bd","path":"sprites/s_workspace_1/s_workspace_1.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, @@ -58,17 +58,17 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 8, - "yorigin": 8, + "xorigin": 16, + "yorigin": 16, "eventToFunction": {}, "eventStubScript": null, }, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6ae190cc-85e8-4397-9732-87274c6923dd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8882eed8-50e2-47a7-8691-7de788b1c874","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { "name": "workspace", - "path": "folders/sprites/workspace.yy", + "path": "folders/sprites/icon/workspace.yy", }, } \ No newline at end of file