From 0e3f9977081cbb1dc31bd8c6e78de21ff5af5dd2 Mon Sep 17 00:00:00 2001 From: MakhamDev Date: Wed, 26 Jan 2022 19:02:30 +0700 Subject: [PATCH] Icons, text area --- Pixels Composer.yyp | 7 +- datafiles/Sample Projects/0 introduction.pxc | 1 + datafiles/Sample Projects/1 image import.pxc | 1177 +++++++++++++++++ datafiles/Sample Projects/2 animation.pxc | 1 + .../3 Group and collection.pxc | 1 + datafiles/Sample Projects/Bevel.pxc | 1 - scripts/node_canvas/node_canvas.gml | 2 + scripts/node_export/node_export.gml | 4 +- scripts/node_registry/node_registry.gml | 2 +- scripts/node_scale_algo/node_scale_algo.gml | 8 +- scripts/node_value/node_value.gml | 2 +- scripts/panel_animation/panel_animation.gml | 2 +- scripts/panel_inspector/panel_inspector.gml | 6 +- scripts/textArea/textArea.gml | 412 ++++++ scripts/textArea/textArea.yy | 12 + scripts/textBox/textBox.gml | 44 +- .../39218c13-6d67-4f8d-b48c-cb90a2c07653.png | Bin 316 -> 0 bytes .../6834d5b7-d54e-4c98-99b2-739ea2611aac.png | Bin 0 -> 332 bytes .../238fe7b8-d41a-4828-8c7d-ab218160beb0.png | Bin 317 -> 0 bytes .../238fe7b8-d41a-4828-8c7d-ab218160beb0.png | Bin 0 -> 331 bytes sprites/s_animate_clock/s_animate_clock.yy | 8 +- .../92de400c-7d29-43f4-a04a-30a86d9cedb5.png | Bin 185 -> 0 bytes .../cd6ddb9e-a09d-4a61-9d57-835429d9c2d2.png | Bin 0 -> 201 bytes .../8161e07c-3644-435c-9239-26b118205916.png | Bin 171 -> 0 bytes .../40566cbf-9d94-48b7-88b4-72ea813b2e39.png | Bin 0 -> 184 bytes .../s_animate_node_go/s_animate_node_go.yy | 10 +- .../7eb9e04b-43ee-4426-ae7e-e3f372b5434d.png | Bin 0 -> 418 bytes .../33631190-45e5-48b4-a187-bdcc61666c0d.png | Bin 0 -> 410 bytes .../s_animation_setting.yy | 79 ++ .../0036fc84-2609-4ede-a1da-99fe455c93dc.png | Bin 0 -> 161 bytes .../24985394-dff3-4e31-ab3e-ee3b268b01ca.png | Bin 0 -> 159 bytes .../2ede824f-4c3c-46e1-9d49-a69b2f7b4514.png | Bin 151 -> 0 bytes .../3ac86053-822e-4a9c-83ac-8f4496727f8d.png | Bin 137 -> 0 bytes .../48c2cbdb-e084-4513-afb9-dfaf7b2f187b.png | Bin 0 -> 154 bytes .../7c87a4da-805c-4b6d-a46c-dad8c364287c.png | Bin 140 -> 0 bytes .../a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png | Bin 0 -> 165 bytes .../a67d1447-f781-4196-a796-2f8c9f718b26.png | Bin 140 -> 0 bytes .../919e42f6-cd99-49ff-957f-a63b9c5f81d1.png | Bin 0 -> 156 bytes .../919e42f6-cd99-49ff-957f-a63b9c5f81d1.png | Bin 0 -> 150 bytes .../947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png | Bin 145 -> 0 bytes .../947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png | Bin 134 -> 0 bytes .../919e42f6-cd99-49ff-957f-a63b9c5f81d1.png | Bin 0 -> 152 bytes .../947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png | Bin 144 -> 0 bytes .../919e42f6-cd99-49ff-957f-a63b9c5f81d1.png | Bin 0 -> 153 bytes .../947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png | Bin 137 -> 0 bytes sprites/s_arrow_16/s_arrow_16.yy | 42 +- .../4d09768c-c152-4511-acb5-65834a712a9d.png | Bin 0 -> 388 bytes .../9d5b9111-93a8-4fff-a9bb-c33f0cb0687b.png | Bin 379 -> 0 bytes .../56070c39-6742-4d39-bfea-116c9ec262c9.png | Bin 0 -> 365 bytes .../7c956b73-905f-4893-b507-a4ee57df8070.png | Bin 360 -> 0 bytes .../s_color_picker_dropper.yy | 14 +- .../51a3eea1-cd33-469f-895f-9ab00d94a99b.png | Bin 0 -> 228 bytes .../c0308bd3-e0d0-40f3-a8e6-7c1f254a437d.png | Bin 205 -> 0 bytes .../735b6f9e-00d8-41e3-a77c-4def6b6056b2.png | Bin 0 -> 218 bytes .../50b81ced-b5f8-4377-a48f-44b4fcb89f3b.png | Bin 199 -> 0 bytes sprites/s_fill_16/s_fill_16.yy | 38 +- .../a958894a-9531-481a-9762-e52778bcacc3.png | Bin 0 -> 391 bytes .../b34d7e9b-70e1-4d58-ab99-82962130cec0.png | Bin 377 -> 0 bytes .../cee74fd8-b2dd-455d-a082-de59739183ca.png | Bin 0 -> 369 bytes .../1e24fafa-0fda-41a9-99ce-f93ad2f4e48e.png | Bin 349 -> 0 bytes sprites/s_gear_24/s_gear_24.yy | 18 +- .../95d13b17-e3d4-4d49-bdd7-ce8beca43fc5.png | Bin 221 -> 0 bytes .../c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png | Bin 0 -> 256 bytes .../7cdc778c-ce50-41ca-916e-4bb9504dd319.png | Bin 215 -> 0 bytes .../81560a61-2258-4310-85ff-da3c8deae9f3.png | Bin 0 -> 253 bytes sprites/s_graph/s_graph.yy | 14 +- .../a6f0225a-56e5-4a85-8396-7ebb46b1742b.png | Bin 0 -> 190 bytes .../f519baa7-5340-4119-a1d4-d04fdc3ad6c4.png | Bin 132 -> 0 bytes .../ab31de2e-696d-457d-a36f-fe4bcae937c9.png | Bin 0 -> 184 bytes .../968a0483-66d2-4ea1-89c4-0320180f3552.png | Bin 131 -> 0 bytes sprites/s_group_16/s_group_16.yy | 10 +- .../1fedd5b4-7de3-4a3f-897f-75acde1f0fd1.png | Bin 0 -> 297 bytes .../88b21b07-6a93-49ae-af91-03cf8ed8cc05.png | Bin 207 -> 0 bytes .../5b8efdb4-6fc1-4ab4-a02a-9923a0842082.png | Bin 0 -> 291 bytes .../0bf88556-2e6e-49a4-b087-697b06b78058.png | Bin 207 -> 0 bytes sprites/s_group_24/s_group_24.yy | 10 +- .../32e11c60-5714-481b-9c73-69a334db55db.png | Bin 116 -> 0 bytes .../ed46d614-073e-485e-8542-2e61e3ee9bfb.png | Bin 0 -> 139 bytes .../0ec6a8a2-a38e-42f0-89dc-11aea558185e.png | Bin 117 -> 0 bytes .../66cf796b-b986-4a52-8abb-86687d72bcdf.png | Bin 0 -> 140 bytes sprites/s_hamburger/s_hamburger.yy | 10 +- .../bac68c60-aec2-48fa-b8fa-fec4de9053ab.png | Bin 246 -> 0 bytes .../d81ce6ec-d8c5-4874-a478-d68ed22d42b3.png | Bin 0 -> 248 bytes .../1b95b4e8-846d-46fc-8249-a42a9e2930e7.png | Bin 229 -> 0 bytes .../b445d5d4-5159-4b55-8eaa-e56394769183.png | Bin 0 -> 236 bytes sprites/s_icon_accept_24/s_icon_accept_24.yy | 12 +- .../12f5d6c2-95e3-410c-9d0d-ea175604d044.png | Bin 0 -> 344 bytes .../8907ffce-38c3-4514-98a5-6e8c6eaad7c1.png | Bin 329 -> 0 bytes .../a811c0f6-b35f-4da0-bb08-62eb8e388829.png | Bin 0 -> 327 bytes .../82fa62b2-7adb-43d1-bf49-ff7a0f6cc9a5.png | Bin 309 -> 0 bytes sprites/s_icon_accept_32/s_icon_accept_32.yy | 16 +- .../0ff91268-551a-43dc-bc3d-d9e818243db3.png | Bin 0 -> 230 bytes .../ea8927d0-67c9-4828-900b-5254f57c0caf.png | Bin 189 -> 0 bytes .../21a80121-fea0-4064-b3d6-1ddb4f32484e.png | Bin 0 -> 228 bytes .../5f7b9286-4551-4aac-b972-d489f02fd7d6.png | Bin 196 -> 0 bytes sprites/s_loop_16/s_loop_16.yy | 10 +- .../78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png | Bin 0 -> 201 bytes .../d70816ec-8d66-4e66-8e36-2169a15b611b.png | Bin 123 -> 0 bytes .../90ac81d7-28a5-4c36-af7a-628cb9a827f7.png | Bin 0 -> 182 bytes .../f370aec0-cac3-4ff9-bd55-36de5435fd0c.png | Bin 122 -> 0 bytes sprites/s_node_processor/s_node_processor.yy | 10 +- .../5b066e33-da7b-42ec-a92f-a319f76deca6.png | Bin 385 -> 0 bytes .../bcbad3b2-b025-4f22-9116-5886ad921432.png | Bin 0 -> 372 bytes .../53023999-963b-4d10-9c98-deb6a0308d95.png | Bin 348 -> 0 bytes .../1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45.png | Bin 0 -> 335 bytes sprites/s_refresh_16/s_refresh_16.yy | 10 +- .../c9de546c-873e-451a-bce8-38d85cec7488.png | Bin 0 -> 492 bytes .../e7ee85aa-379b-4ee9-87d6-e46180578f04.png | Bin 489 -> 0 bytes .../fa90d5a5-061b-4ced-9086-67fd45e21c27.png | Bin 0 -> 464 bytes .../827b806a-1726-45c3-bcdb-04bcbda69475.png | Bin 454 -> 0 bytes sprites/s_refresh_24/s_refresh_24.yy | 10 +- .../30a915fb-4ec4-4326-97d1-dc2331248396.png | Bin 323 -> 0 bytes .../5e2328bf-0a60-4b4f-8289-5aa9d08124fa.png | Bin 0 -> 331 bytes .../fcf2c977-6344-44c4-94e0-6c41bd9e5c92.png | Bin 289 -> 0 bytes .../8e8d4f0f-5729-4e35-90b7-35868c96a2c8.png | Bin 0 -> 298 bytes sprites/s_search_16/s_search_16.yy | 14 +- .../28935456-bec4-4226-9042-683715f21fa6.png | Bin 344 -> 0 bytes .../ef243a7e-3826-4778-bf95-d325981ff029.png | Bin 0 -> 348 bytes .../1ca5c3f7-1a3a-4ec8-999b-cdaa8114c155.png | Bin 316 -> 0 bytes .../0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea.png | Bin 0 -> 320 bytes sprites/s_sort_24/s_sort_24.yy | 12 +- .../3a577eb6-8720-4209-abf6-ad69a98699d7.png | Bin 259 -> 0 bytes .../45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d.png | Bin 0 -> 261 bytes .../5e93fdd8-bbd7-4302-a4c9-193686212ce2.png | Bin 240 -> 0 bytes .../ebc1a659-127b-4d29-9174-e85ace797e98.png | Bin 0 -> 251 bytes sprites/s_timeline_graph/s_timeline_graph.yy | 10 +- 126 files changed, 1886 insertions(+), 153 deletions(-) create mode 100644 datafiles/Sample Projects/0 introduction.pxc create mode 100644 datafiles/Sample Projects/1 image import.pxc create mode 100644 datafiles/Sample Projects/2 animation.pxc create mode 100644 datafiles/Sample Projects/3 Group and collection.pxc delete mode 100644 datafiles/Sample Projects/Bevel.pxc create mode 100644 scripts/textArea/textArea.gml create mode 100644 scripts/textArea/textArea.yy delete mode 100644 sprites/s_animate_clock/39218c13-6d67-4f8d-b48c-cb90a2c07653.png create mode 100644 sprites/s_animate_clock/6834d5b7-d54e-4c98-99b2-739ea2611aac.png delete mode 100644 sprites/s_animate_clock/layers/39218c13-6d67-4f8d-b48c-cb90a2c07653/238fe7b8-d41a-4828-8c7d-ab218160beb0.png create mode 100644 sprites/s_animate_clock/layers/6834d5b7-d54e-4c98-99b2-739ea2611aac/238fe7b8-d41a-4828-8c7d-ab218160beb0.png delete mode 100644 sprites/s_animate_node_go/92de400c-7d29-43f4-a04a-30a86d9cedb5.png create mode 100644 sprites/s_animate_node_go/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2.png delete mode 100644 sprites/s_animate_node_go/layers/92de400c-7d29-43f4-a04a-30a86d9cedb5/8161e07c-3644-435c-9239-26b118205916.png create mode 100644 sprites/s_animate_node_go/layers/cd6ddb9e-a09d-4a61-9d57-835429d9c2d2/40566cbf-9d94-48b7-88b4-72ea813b2e39.png create mode 100644 sprites/s_animation_setting/7eb9e04b-43ee-4426-ae7e-e3f372b5434d.png create mode 100644 sprites/s_animation_setting/layers/7eb9e04b-43ee-4426-ae7e-e3f372b5434d/33631190-45e5-48b4-a187-bdcc61666c0d.png create mode 100644 sprites/s_animation_setting/s_animation_setting.yy create mode 100644 sprites/s_arrow_16/0036fc84-2609-4ede-a1da-99fe455c93dc.png create mode 100644 sprites/s_arrow_16/24985394-dff3-4e31-ab3e-ee3b268b01ca.png delete mode 100644 sprites/s_arrow_16/2ede824f-4c3c-46e1-9d49-a69b2f7b4514.png delete mode 100644 sprites/s_arrow_16/3ac86053-822e-4a9c-83ac-8f4496727f8d.png create mode 100644 sprites/s_arrow_16/48c2cbdb-e084-4513-afb9-dfaf7b2f187b.png delete mode 100644 sprites/s_arrow_16/7c87a4da-805c-4b6d-a46c-dad8c364287c.png create mode 100644 sprites/s_arrow_16/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png delete mode 100644 sprites/s_arrow_16/a67d1447-f781-4196-a796-2f8c9f718b26.png create mode 100644 sprites/s_arrow_16/layers/0036fc84-2609-4ede-a1da-99fe455c93dc/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png create mode 100644 sprites/s_arrow_16/layers/24985394-dff3-4e31-ab3e-ee3b268b01ca/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png delete mode 100644 sprites/s_arrow_16/layers/2ede824f-4c3c-46e1-9d49-a69b2f7b4514/947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png delete mode 100644 sprites/s_arrow_16/layers/3ac86053-822e-4a9c-83ac-8f4496727f8d/947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png create mode 100644 sprites/s_arrow_16/layers/48c2cbdb-e084-4513-afb9-dfaf7b2f187b/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png delete mode 100644 sprites/s_arrow_16/layers/7c87a4da-805c-4b6d-a46c-dad8c364287c/947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png create mode 100644 sprites/s_arrow_16/layers/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2/919e42f6-cd99-49ff-957f-a63b9c5f81d1.png delete mode 100644 sprites/s_arrow_16/layers/a67d1447-f781-4196-a796-2f8c9f718b26/947efcaf-8d2e-442e-8a78-e3a9e8e0ad48.png create mode 100644 sprites/s_color_picker_dropper/4d09768c-c152-4511-acb5-65834a712a9d.png delete mode 100644 sprites/s_color_picker_dropper/9d5b9111-93a8-4fff-a9bb-c33f0cb0687b.png create mode 100644 sprites/s_color_picker_dropper/layers/4d09768c-c152-4511-acb5-65834a712a9d/56070c39-6742-4d39-bfea-116c9ec262c9.png delete mode 100644 sprites/s_color_picker_dropper/layers/9d5b9111-93a8-4fff-a9bb-c33f0cb0687b/7c956b73-905f-4893-b507-a4ee57df8070.png create mode 100644 sprites/s_fill_16/51a3eea1-cd33-469f-895f-9ab00d94a99b.png delete mode 100644 sprites/s_fill_16/c0308bd3-e0d0-40f3-a8e6-7c1f254a437d.png create mode 100644 sprites/s_fill_16/layers/51a3eea1-cd33-469f-895f-9ab00d94a99b/735b6f9e-00d8-41e3-a77c-4def6b6056b2.png delete mode 100644 sprites/s_fill_16/layers/c0308bd3-e0d0-40f3-a8e6-7c1f254a437d/50b81ced-b5f8-4377-a48f-44b4fcb89f3b.png create mode 100644 sprites/s_gear_24/a958894a-9531-481a-9762-e52778bcacc3.png delete mode 100644 sprites/s_gear_24/b34d7e9b-70e1-4d58-ab99-82962130cec0.png create mode 100644 sprites/s_gear_24/layers/a958894a-9531-481a-9762-e52778bcacc3/cee74fd8-b2dd-455d-a082-de59739183ca.png delete mode 100644 sprites/s_gear_24/layers/b34d7e9b-70e1-4d58-ab99-82962130cec0/1e24fafa-0fda-41a9-99ce-f93ad2f4e48e.png delete mode 100644 sprites/s_graph/95d13b17-e3d4-4d49-bdd7-ce8beca43fc5.png create mode 100644 sprites/s_graph/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png delete mode 100644 sprites/s_graph/layers/95d13b17-e3d4-4d49-bdd7-ce8beca43fc5/7cdc778c-ce50-41ca-916e-4bb9504dd319.png create mode 100644 sprites/s_graph/layers/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689/81560a61-2258-4310-85ff-da3c8deae9f3.png create mode 100644 sprites/s_group_16/a6f0225a-56e5-4a85-8396-7ebb46b1742b.png delete mode 100644 sprites/s_group_16/f519baa7-5340-4119-a1d4-d04fdc3ad6c4.png create mode 100644 sprites/s_group_16/layers/a6f0225a-56e5-4a85-8396-7ebb46b1742b/ab31de2e-696d-457d-a36f-fe4bcae937c9.png delete mode 100644 sprites/s_group_16/layers/f519baa7-5340-4119-a1d4-d04fdc3ad6c4/968a0483-66d2-4ea1-89c4-0320180f3552.png create mode 100644 sprites/s_group_24/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1.png delete mode 100644 sprites/s_group_24/88b21b07-6a93-49ae-af91-03cf8ed8cc05.png create mode 100644 sprites/s_group_24/layers/1fedd5b4-7de3-4a3f-897f-75acde1f0fd1/5b8efdb4-6fc1-4ab4-a02a-9923a0842082.png delete mode 100644 sprites/s_group_24/layers/88b21b07-6a93-49ae-af91-03cf8ed8cc05/0bf88556-2e6e-49a4-b087-697b06b78058.png delete mode 100644 sprites/s_hamburger/32e11c60-5714-481b-9c73-69a334db55db.png create mode 100644 sprites/s_hamburger/ed46d614-073e-485e-8542-2e61e3ee9bfb.png delete mode 100644 sprites/s_hamburger/layers/32e11c60-5714-481b-9c73-69a334db55db/0ec6a8a2-a38e-42f0-89dc-11aea558185e.png create mode 100644 sprites/s_hamburger/layers/ed46d614-073e-485e-8542-2e61e3ee9bfb/66cf796b-b986-4a52-8abb-86687d72bcdf.png delete mode 100644 sprites/s_icon_accept_24/bac68c60-aec2-48fa-b8fa-fec4de9053ab.png create mode 100644 sprites/s_icon_accept_24/d81ce6ec-d8c5-4874-a478-d68ed22d42b3.png delete mode 100644 sprites/s_icon_accept_24/layers/bac68c60-aec2-48fa-b8fa-fec4de9053ab/1b95b4e8-846d-46fc-8249-a42a9e2930e7.png create mode 100644 sprites/s_icon_accept_24/layers/d81ce6ec-d8c5-4874-a478-d68ed22d42b3/b445d5d4-5159-4b55-8eaa-e56394769183.png create mode 100644 sprites/s_icon_accept_32/12f5d6c2-95e3-410c-9d0d-ea175604d044.png delete mode 100644 sprites/s_icon_accept_32/8907ffce-38c3-4514-98a5-6e8c6eaad7c1.png create mode 100644 sprites/s_icon_accept_32/layers/12f5d6c2-95e3-410c-9d0d-ea175604d044/a811c0f6-b35f-4da0-bb08-62eb8e388829.png delete mode 100644 sprites/s_icon_accept_32/layers/8907ffce-38c3-4514-98a5-6e8c6eaad7c1/82fa62b2-7adb-43d1-bf49-ff7a0f6cc9a5.png create mode 100644 sprites/s_loop_16/0ff91268-551a-43dc-bc3d-d9e818243db3.png delete mode 100644 sprites/s_loop_16/ea8927d0-67c9-4828-900b-5254f57c0caf.png create mode 100644 sprites/s_loop_16/layers/0ff91268-551a-43dc-bc3d-d9e818243db3/21a80121-fea0-4064-b3d6-1ddb4f32484e.png delete mode 100644 sprites/s_loop_16/layers/ea8927d0-67c9-4828-900b-5254f57c0caf/5f7b9286-4551-4aac-b972-d489f02fd7d6.png create mode 100644 sprites/s_node_processor/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png delete mode 100644 sprites/s_node_processor/d70816ec-8d66-4e66-8e36-2169a15b611b.png create mode 100644 sprites/s_node_processor/layers/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d/90ac81d7-28a5-4c36-af7a-628cb9a827f7.png delete mode 100644 sprites/s_node_processor/layers/d70816ec-8d66-4e66-8e36-2169a15b611b/f370aec0-cac3-4ff9-bd55-36de5435fd0c.png delete mode 100644 sprites/s_refresh_16/5b066e33-da7b-42ec-a92f-a319f76deca6.png create mode 100644 sprites/s_refresh_16/bcbad3b2-b025-4f22-9116-5886ad921432.png delete mode 100644 sprites/s_refresh_16/layers/5b066e33-da7b-42ec-a92f-a319f76deca6/53023999-963b-4d10-9c98-deb6a0308d95.png create mode 100644 sprites/s_refresh_16/layers/bcbad3b2-b025-4f22-9116-5886ad921432/1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45.png create mode 100644 sprites/s_refresh_24/c9de546c-873e-451a-bce8-38d85cec7488.png delete mode 100644 sprites/s_refresh_24/e7ee85aa-379b-4ee9-87d6-e46180578f04.png create mode 100644 sprites/s_refresh_24/layers/c9de546c-873e-451a-bce8-38d85cec7488/fa90d5a5-061b-4ced-9086-67fd45e21c27.png delete mode 100644 sprites/s_refresh_24/layers/e7ee85aa-379b-4ee9-87d6-e46180578f04/827b806a-1726-45c3-bcdb-04bcbda69475.png delete mode 100644 sprites/s_search_16/30a915fb-4ec4-4326-97d1-dc2331248396.png create mode 100644 sprites/s_search_16/5e2328bf-0a60-4b4f-8289-5aa9d08124fa.png delete mode 100644 sprites/s_search_16/layers/30a915fb-4ec4-4326-97d1-dc2331248396/fcf2c977-6344-44c4-94e0-6c41bd9e5c92.png create mode 100644 sprites/s_search_16/layers/5e2328bf-0a60-4b4f-8289-5aa9d08124fa/8e8d4f0f-5729-4e35-90b7-35868c96a2c8.png delete mode 100644 sprites/s_sort_24/28935456-bec4-4226-9042-683715f21fa6.png create mode 100644 sprites/s_sort_24/ef243a7e-3826-4778-bf95-d325981ff029.png delete mode 100644 sprites/s_sort_24/layers/28935456-bec4-4226-9042-683715f21fa6/1ca5c3f7-1a3a-4ec8-999b-cdaa8114c155.png create mode 100644 sprites/s_sort_24/layers/ef243a7e-3826-4778-bf95-d325981ff029/0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea.png delete mode 100644 sprites/s_timeline_graph/3a577eb6-8720-4209-abf6-ad69a98699d7.png create mode 100644 sprites/s_timeline_graph/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d.png delete mode 100644 sprites/s_timeline_graph/layers/3a577eb6-8720-4209-abf6-ad69a98699d7/5e93fdd8-bbd7-4302-a4c9-193686212ce2.png create mode 100644 sprites/s_timeline_graph/layers/45fbe351-6ca5-47f7-ad2b-4cb84fe2cd9d/ebc1a659-127b-4d29-9174-e85ace797e98.png diff --git a/Pixels Composer.yyp b/Pixels Composer.yyp index aaaae0874..b74b27b10 100644 --- a/Pixels Composer.yyp +++ b/Pixels Composer.yyp @@ -21,6 +21,7 @@ {"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":"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":"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,}, @@ -143,6 +144,7 @@ {"id":{"name":"node_processor","path":"scripts/node_processor/node_processor.yy",},"order":1,}, {"id":{"name":"sh_zigzag","path":"shaders/sh_zigzag/sh_zigzag.yy",},"order":11,}, {"id":{"name":"sh_color_remove","path":"shaders/sh_color_remove/sh_color_remove.yy",},"order":27,}, + {"id":{"name":"textArea","path":"scripts/textArea/textArea.yy",},"order":20,}, {"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,}, @@ -696,7 +698,6 @@ {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"Shiny gem.pxc","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"tile_0067.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"Bevel.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"Bevel.pxc","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"arrowRight.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"Broken heart.pxc","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"Cards flipping.pxc","resourceType":"GMIncludedFile",}, @@ -722,6 +723,10 @@ {"CopyToMask":-1,"filePath":"datafiles/ImageMagick","resourceVersion":"1.0","name":"NOTICE.txt","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/ImageMagick","resourceVersion":"1.0","name":"policy.xml","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"Collections.zip","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"0 introduction.pxc","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"1 image import.pxc","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"2 animation.pxc","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Sample Projects","resourceVersion":"1.0","name":"3 Group and collection.pxc","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.7.606", diff --git a/datafiles/Sample Projects/0 introduction.pxc b/datafiles/Sample Projects/0 introduction.pxc new file mode 100644 index 000000000..95eadf0f1 --- /dev/null +++ b/datafiles/Sample Projects/0 introduction.pxc @@ -0,0 +1 @@ +{ "nodes": [ { "group": -1.0, "x": 192.0, "id": 733659073.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 3.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Outline", "y": -160.0, "name": "Outline" }, { "group": -1.0, "x": 352.0, "id": 16512342.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Double click on a node to preview it (orange bubble)", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -64.0, "name": "Display text" }, { "group": -1.0, "x": -192.0, "id": 440563485.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Each node comes with junctions", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 32.0, "name": "Display text" }, { "group": -1.0, "x": -352.0, "id": 308341973.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 32.0, 32.0, 16.0, 16.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 3.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Shape", "y": 0.0, "name": "Shape" }, { "group": -1.0, "x": 32.0, "id": 629359290.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "To remove a connection, click once on the input junction", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -192.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 820286206.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Middle mouse (or ctrl + left mouse) to pan around", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -96.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 660826364.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Use left mouse to select, move modes", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -128.0, "name": "Display text" }, { "group": -1.0, "x": 640.0, "id": 846782664.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Or you can use export node, which allow you to save multiple images, or animation", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 288.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 445759436.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Right click on empty space to add node", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -64.0, "name": "Display text" }, { "group": -1.0, "x": 352.0, "id": 413298552.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Left click on a node to inspect it (green bubble will appear)", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -96.0, "name": "Display text" }, { "group": -1.0, "x": -192.0, "id": 157161640.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Junctions on the left is input, right is output", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 64.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 676613630.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Sample project 0: basic control", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -192.0, "name": "Display text" }, { "group": -1.0, "x": 640.0, "id": 229004945.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "To save an image, you can right click on the preview panel", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 224.0, "name": "Display text" }, { "group": -1.0, "x": -192.0, "id": 9120082.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Click and drag from one junction to another to create connection", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 128.0, "name": "Display text" }, { "group": -1.0, "x": 480.0, "id": 31770096.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "%d%n", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.020000000000000000416333634234434, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Export", "y": 192.0, "name": "Export" }, { "group": -1.0, "x": -192.0, "id": 861790143.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "the color represent its' data type", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 96.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 593948373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Welcome to Pixel Composer", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -224.0, "name": "Display text" }, { "group": -1.0, "x": 352.0, "id": 948455280.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "You can inspect and preview a node", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -128.0, "name": "Display text" }, { "group": -1.0, "x": 672.0, "id": 316393662.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "and choose \"save current preview as...\"", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 256.0, "name": "Display text" } ], "version": 82.0, "animator": { "framerate": 15.0, "frames_total": 12.0 } } \ No newline at end of file diff --git a/datafiles/Sample Projects/1 image import.pxc b/datafiles/Sample Projects/1 image import.pxc new file mode 100644 index 000000000..0ff2ac001 --- /dev/null +++ b/datafiles/Sample Projects/1 image import.pxc @@ -0,0 +1,1177 @@ +{ + "nodes": [{ + "group": -1.0, + "x": 0.0, + "id": 935260331.0, + "inputs": [{ + "from node": 196481718.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 1.0, + "from index": 0.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [1.0, 1.0], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 1.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [32.0, 32.0], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [0.5, 0.5], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 1.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [0.5, 0.5], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 1.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Transform", + "y": 288.0, + "name": "Transform" + }, { + "group": -1.0, + "x": 704.0, + "id": 296836700.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "To export image array. Use export node,", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 320.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 160.0, + "id": 635100708.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Image array is a feature in Pixel Composer ", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 352.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -448.0, + "id": 524604531.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "there're different types of image node", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -96.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 704.0, + "id": 747812615.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "connect path data, and change the template ", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 352.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -416.0, + "id": 303101688.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "arrowRight.png", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [0.0, 0.0, 0.0, 0.0], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Image", + "y": 0.0, + "name": "arrowRight" + }, { + "group": -1.0, + "x": -448.0, + "id": 660826364.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "You can simply drag image file(s) into graph area to import ", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -128.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 544.0, + "id": 323839184.0, + "inputs": [{ + "from node": 935260331.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 1.0, + "from index": 0.0 + }, { + "from node": 196481718.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 1.0, + "from index": 1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "%d%n edited", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 1.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.020000000000000000416333634234434, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Export", + "y": 288.0, + "name": "Export" + }, { + "group": -1.0, + "x": 160.0, + "id": 168958151.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "preview this node to see the array content", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 416.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -448.0, + "id": 676613630.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Sample project 1: image import", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 1.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.5, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -192.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 96.0, + "id": 23159585.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Animation (press space to play)", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -32.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 448.0, + "id": 649987925.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Node with refresh symbol will not update by itself", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 256.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 96.0, + "id": 509856334.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, ["dice_1.png", "dice_2.png", "dice_3.png", "dice_4.png", "dice_5.png", "dice_6.png"], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [0.0, 0.0, 0.0, 0.0], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 1.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Image_Animated", + "y": 0.0, + "name": "dice_6" + }, { + "group": -1.0, + "x": 704.0, + "id": 280269363.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Then press refresh in the inspector to start export", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 384.0, + "name": "Display text" + }, { + "group": -1.0, + "x": 160.0, + "id": 617247868.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "That allow you to edit multiple images at once", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 384.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -224.0, + "id": 196481718.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, ["card_clubs_02.png", "card_clubs_03.png", "card_clubs_04.png", "card_clubs_05.png"], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, [0.0, 0.0, 0.0, 0.0], 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Image_Sequence", + "y": 0.0, + "name": "card_clubs_05" + }, { + "group": -1.0, + "x": -448.0, + "id": 593948373.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Welcome to Pixel Composer", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -224.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -416.0, + "id": 117256603.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Single image", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -32.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -224.0, + "id": 341819411.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "Image array (notice the different junction)", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": -32.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -224.0, + "id": 765870404.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "When dragging in multiple images", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 192.0, + "name": "Display text" + }, { + "group": -1.0, + "x": -224.0, + "id": 352554235.0, + "inputs": [{ + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 16777215.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, "a pop up will shows for you to choose what type of node you want to import", 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 2.0, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }, { + "from node": -1.0, + "on end": 0.0, + "data": [], + "raw value": [ + [0.0, 0.75, 0.0, 0.0] + ], + "anim": 0.0, + "visible": 0.0, + "from index": -1.0 + }], + "attri": {}, + "type": "Node_Display_Text", + "y": 224.0, + "name": "Display text" + }], + "version": 82.0, + "animator": { + "framerate": 15.0, + "frames_total": 12.0 + } +} \ No newline at end of file diff --git a/datafiles/Sample Projects/2 animation.pxc b/datafiles/Sample Projects/2 animation.pxc new file mode 100644 index 000000000..8857ce6ca --- /dev/null +++ b/datafiles/Sample Projects/2 animation.pxc @@ -0,0 +1 @@ +{ "nodes": [ { "group": -1.0, "x": 352.0, "id": 910768180.0, "inputs": [ { "from node": 527307449.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": true, "from index": 0.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "%d%n%3f", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, true, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, false, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.020000000000000000416333634234434, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, false, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Export", "y": 32.0, "name": "Export" }, { "group": -1.0, "x": -416.0, "id": 308341973.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 32.0, 32.0, 16.0, 16.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 3.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Shape", "y": 32.0, "name": "Shape" }, { "group": -1.0, "x": -448.0, "id": 660826364.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "(Almost) Every values in Pixel Composer can be animated by pressing clock icon in front of its name", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -128.0, "name": "Display text" }, { "group": -1.0, "x": -64.0, "id": 568010614.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "Click show graph to display curve", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 128.0, "name": "Display text" }, { "group": -1.0, "x": 512.0, "id": 422588735.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "Lastly, you can export animation as a image sequence of .gif", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 64.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 68195840.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "To change animation length, speed go to animation setting at the right of the timeline", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -32.0, "name": "Display text" }, { "group": -1.0, "x": -32.0, "id": 943934915.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "and drag your mouse the the left or right", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 96.0, "name": "Display text" }, { "group": -1.0, "x": 512.0, "id": 869685224.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "using export node", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 96.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 676613630.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Sample project 2: Animation", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -192.0, "name": "Display text" }, { "group": -1.0, "x": -224.0, "id": 308674514.0, "inputs": [ { "from node": 308341973.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": true, "from index": 0.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": false, "visible": true, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 32.0, 32.0 ], 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 0.5, 0.5 ], 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, true, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 1.0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ], [ 6.0, [ 0.5, 0.5 ], 0.0, 0.0 ] ], "anim": true, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, false, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, true, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, false, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Transform", "y": 224.0, "name": "Transform" }, { "group": -1.0, "x": -448.0, "id": 4741659.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Timeline panel below will show all animating values.", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -96.0, "name": "Display text" }, { "group": -1.0, "x": -224.0, "id": 527307449.0, "inputs": [ { "from node": 308341973.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": true, "from index": 0.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": false, "visible": true, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ], [ 4.0, [ 0.0, 15.27368450164794921875 ], 0.0, 0.0 ], [ 12.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": true, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, true, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, [ 1.0, 1.0 ], 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, false, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, true, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, false, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Transform", "y": 32.0, "name": "Transform" }, { "group": -1.0, "x": -64.0, "id": 829295007.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "To change easing curve. Double click the keyframe", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 64.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 593948373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Welcome to Pixel Composer", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -224.0, "name": "Display text" }, { "group": -1.0, "x": -64.0, "id": 944382448.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "You can also make the animation loop after it finished", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": 256.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 131274879.0, "inputs": [ { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, "Press space to start, stop animation", 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -64.0, "name": "Display text" } ], "version": 82.0, "animator": { "framerate": 24.0, "frames_total": 12.0 } } \ No newline at end of file diff --git a/datafiles/Sample Projects/3 Group and collection.pxc b/datafiles/Sample Projects/3 Group and collection.pxc new file mode 100644 index 000000000..bc4107e14 --- /dev/null +++ b/datafiles/Sample Projects/3 Group and collection.pxc @@ -0,0 +1 @@ +{ "nodes": [ { "group": -1.0, "x": -352.0, "id": 308341973.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 64.0, 64.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 1.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 32.0, 32.0, 16.0, 16.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 3.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Shape", "y": 0.0, "name": "Shape" }, { "group": -1.0, "x": -448.0, "id": 660826364.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "You combine multiple nodes in to one using group", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 2.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -128.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 676613630.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Sample project 3: Group and collection ", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 1.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.5, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -192.0, "name": "Display text" }, { "group": -1.0, "x": -448.0, "id": 593948373.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 16777215.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "Welcome to Pixel Composer", 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.75, 0.0, 0.0 ] ], "anim": 0.0, "visible": 0.0, "from index": -1.0 } ], "attri": { }, "type": "Node_Display_Text", "y": -224.0, "name": "Display text" } ], "version": 82.0, "animator": { "framerate": 15.0, "frames_total": 12.0 } } \ No newline at end of file diff --git a/datafiles/Sample Projects/Bevel.pxc b/datafiles/Sample Projects/Bevel.pxc deleted file mode 100644 index 66f912c3d..000000000 --- a/datafiles/Sample Projects/Bevel.pxc +++ /dev/null @@ -1 +0,0 @@ -{ "nodes": [ { "group": -1.0, "x": 64.0, "id": 2.0, "inputs": [ { "from node": 1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": true, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.32000000000000000666133814775094, 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.41999999999999998445687765524781, 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Level", "y": -96.0, "name": "Level" }, { "group": -1.0, "x": 224.0, "id": 3.0, "inputs": [ { "from node": 2.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": true, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ 0 ], "raw value": [ [ 0.0, 22677.0, 0.0, 0.0 ], [ 0.15120967741935484318638316381112, 2331102.0, 0.0, 0.0 ], [ 1.0, 10475775.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": false, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Colorize", "y": -96.0, "name": "Colorize" }, { "group": -1.0, "x": -96.0, "id": 1.0, "inputs": [ { "from node": 0.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 0.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": true, "from index": 0.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, 8.0, 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 6.0, 1.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Bevel", "y": -96.0, "name": "Bevel" }, { "group": -1.0, "x": -256.0, "id": 0.0, "inputs": [ { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, "arrowRight.png", 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 }, { "from node": -1.0, "on end": 0.0, "data": [ ], "raw value": [ [ 0.0, [ 0.0, 0.0, 0.0, 0.0 ], 0.0, 0.0 ] ], "anim": 0.0, "visible": false, "from index": -1.0 } ], "attri": { }, "type": "Node_Image", "y": -96.0, "name": "arrowRight" } ], "version": 82.0, "animator": { "framerate": 15.0, "frames_total": 12.0 } } \ No newline at end of file diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index 621a7a631..94eba2794 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -5,6 +5,8 @@ function Node_create_Canvas(_x, _y) { } function Node_Canvas(_x, _y) : Node(_x, _y) constructor { + display_reset(0, 1); + name = "Canvas"; color = c_ui_orange; diff --git a/scripts/node_export/node_export.gml b/scripts/node_export/node_export.gml index 08147545d..c23145bdf 100644 --- a/scripts/node_export/node_export.gml +++ b/scripts/node_export/node_export.gml @@ -227,7 +227,7 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { if(form == 2) { p = DIRECTORY + "temp\\" + string(i) + "\\" + string(100000 + ANIMATOR.current_frame) + ".png"; } else { - if(is_array(path)) + if(is_array(path) && array_length(path) == array_length(surf)) p = pathString(path[ safe_mod(i, array_length(path)) ], suff, i); else p = pathString(path, suff, i); @@ -253,6 +253,8 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { } static update = function() { + if(LOADING || APPENDING) return; + var path = inputs[| 1].getValue(); if(path == "") return; var anim = inputs[| 3].getValue(); diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 7a112440b..5d98eb794 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -120,7 +120,7 @@ function NodeObject(_name, _spr, _create, tags = []) constructor { addNodeObject(filter, "Time remap", s_node_time_map, "Node_Time_Remap", Node_create_Time_Remap); addNodeObject(filter, "2D light", s_node_2d_light, "Node_2D_light", Node_create_2D_light); addNodeObject(filter, "Atlas", s_node_atlas, "Node_Atlas", Node_create_Atlas); - addNodeObject(filter, "Scale algorithm", s_node_scale_algo, "Node_Scale_Algo", Node_create_Scale_Algo, ["Scale2x", "Scale3x"]); + addNodeObject(filter, "Scale algorithm", s_node_scale_algo, "Node_Scale_Algo", Node_create_Scale_Algo, ["scale2x", "scale3x"]); addNodeObject(filter, "Pixel cloud", s_node_pixel_cloud, "Node_Pixel_Cloud", Node_create_Pixel_Cloud); //addNodeObject(filter, "Corner", s_node_corner, "Node_Corner", Node_create_Corner); diff --git a/scripts/node_scale_algo/node_scale_algo.gml b/scripts/node_scale_algo/node_scale_algo.gml index 6c8792e26..0dbe7ed70 100644 --- a/scripts/node_scale_algo/node_scale_algo.gml +++ b/scripts/node_scale_algo/node_scale_algo.gml @@ -1,6 +1,12 @@ -function Node_create_Scale_Algo(_x, _y) { +function Node_create_Scale_Algo(_x, _y, _param = "") { var node = new Node_Scale_Algo(_x, _y); ds_list_add(PANEL_GRAPH.nodes_list, node); + + switch(_param) { + case "scale2x" : node.inputs[| 1].setValue(0); break; + case "scale3x" : node.inputs[| 1].setValue(1); break; + } + return node; } diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index 8f1234643..b2604b157 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -361,7 +361,7 @@ function NodeValue(_index, _name, _node, _connect, _type, _value, _tag = VALUE_T function(_modified) { setValue(_modified); }); break; case VALUE_TYPE.text : - editWidget = new textBox(TEXTBOX_INPUT.text, function(str) { + editWidget = new textArea(TEXTBOX_INPUT.text, function(str) { setValue(str); } ); break; diff --git a/scripts/panel_animation/panel_animation.gml b/scripts/panel_animation/panel_animation.gml index e016406fd..104e9d29a 100644 --- a/scripts/panel_animation/panel_animation.gml +++ b/scripts/panel_animation/panel_animation.gml @@ -886,7 +886,7 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor { } bx = w - 40; - if(buttonInstant(s_button_hide, bx, by, 32, 32, [mx, my], FOCUS == panel, HOVER == panel, "Animation settings", s_hamburger, 2) == 2) + if(buttonInstant(s_button_hide, bx, by, 32, 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) { diff --git a/scripts/panel_inspector/panel_inspector.gml b/scripts/panel_inspector/panel_inspector.gml index c7f2ee96e..1884a303b 100644 --- a/scripts/panel_inspector/panel_inspector.gml +++ b/scripts/panel_inspector/panel_inspector.gml @@ -294,9 +294,9 @@ function Panel_Inspector(_panel) : PanelContent(_panel) constructor { hh += 136 + padd; break; case VALUE_TYPE.text : - jun.editWidget.draw(32, _hsy, w - 80, 34, jun.showValue(), _m, jun.display_type); - _hey = _hsy + 34; - hh += 34 + padd; + var _hh = jun.editWidget.draw(32, _hsy, w - 80, 34, jun.showValue(), _m, jun.display_type); + _hey = _hsy + _hh; + hh += _hh + padd; break; default: _hey = _hsy + 34; diff --git a/scripts/textArea/textArea.gml b/scripts/textArea/textArea.gml new file mode 100644 index 000000000..12973beb1 --- /dev/null +++ b/scripts/textArea/textArea.gml @@ -0,0 +1,412 @@ +function textArea(_input, _onModify) constructor { + active = false; + hover = false; + font = f_p0; + hide = false; + line_width = 1000; + + auto_update = false; + + input = _input; + onModify = _onModify; + + _input_text_line = []; + _input_text = ""; + _prev_text = ""; + _last_value = ""; + + cursor = 0; + + cursor_pos_x = 0; + cursor_pos_x_to = 0; + cursor_pos_y = 0; + cursor_pos_y_to = 0; + cursor_line = 0; + + cursor_select = -1; + + click_block = 0; + + static apply = function() { + if(onModify) onModify(_input_text); + } + + static move_cursor = function(delta) { + var ll = string_length(_input_text); + cursor = clamp(cursor + delta, 0, ll + 1); + } + + static cut_line = function() { + _input_text_line = []; + + var ch, i = 1, ss = "", _txt = _prev_text; + var len = string_length(_prev_text); + + draw_set_font(font); + while(string_length(_txt) > 0) { + var sp = string_pos(" ", _txt); + if(sp == 0) sp = string_length(_txt); + + var _ps = string_copy(_txt, 1, sp); + _txt = string_copy(_txt, sp + 1, string_length(_txt) - sp); + + if(string_width(ss + _ps) >= line_width) { + array_push(_input_text_line, ss); + ss = _ps; + } else if(string_length(_txt) <= 0) { + array_push(_input_text_line, ss + _ps); + ss = ""; + } else { + ss += _ps; + } + } + } + + static editText = function() { + #region text editor + if(keyboard_check_released(ord("V")) && keyboard_check(vk_control)) { + _input_text = clipboard_get_text(); + cut_line(); + } + + if(keyboard_check(vk_control)) { + if(keyboard_check_pressed(ord("A"))) { + cursor_select = 0; + cursor = string_length(_input_text); + } + } else { + if(keyboard_check_pressed(vk_escape) || keyboard_check_pressed(vk_enter)) { + } else if(keyboard_check_pressed(vk_backspace)) { + if(cursor_select == -1) { + var str_before = string_copy(_input_text, 1, cursor - 1); + var str_after = string_copy(_input_text, cursor + 1, string_length(_input_text) - cursor); + + _input_text = str_before + str_after; + cut_line(); + } else { + var minc = min(cursor, cursor_select); + var maxc = max(cursor, cursor_select); + + var str_before = string_copy(_input_text, 1, minc); + var str_after = string_copy(_input_text, maxc + 1, string_length(_input_text) - maxc); + + cursor = minc + 1; + _input_text = str_before + str_after; + cut_line(); + } + + cursor_select = -1; + move_cursor(-1); + } else if(keyboard_check_pressed(vk_delete)) { + if(cursor_select == -1) { + var str_before = string_copy(_input_text, 1, cursor); + var str_after = string_copy(_input_text, cursor + 2, string_length(_input_text) - cursor - 1); + + _input_text = str_before + str_after; + cut_line(); + } else { + var minc = min(cursor, cursor_select); + var maxc = max(cursor, cursor_select); + + var str_before = string_copy(_input_text, 1, minc); + var str_after = string_copy(_input_text, maxc + 1, string_length(_input_text) - maxc); + + cursor = minc; + _input_text = str_before + str_after; + cut_line(); + } + cursor_select = -1; + } else if(keyboard_string != "") { + var ch = keyboard_string; + + if(cursor_select == -1) { + var str_before = string_copy(_input_text, 1, cursor); + var str_after = string_copy(_input_text, cursor + 1, string_length(_input_text) - cursor); + + _input_text = str_before + ch + str_after; + cut_line(); + move_cursor(string_length(ch)); + } else { + var minc = min(cursor, cursor_select); + var maxc = max(cursor, cursor_select); + + var str_before = string_copy(_input_text, 1, minc); + var str_after = string_copy(_input_text, maxc + 1, string_length(_input_text) - maxc); + + _input_text = str_before + ch + str_after; + cut_line(); + cursor = minc + string_length(ch); + } + + cursor_select = -1; + } + } + + keyboard_string = ""; + keyboard_lastkey = -1; + #endregion + + if(auto_update && keyboard_check_pressed(vk_anykey)) + apply(); + + if(keyboard_check_pressed(vk_escape)) { + _input_text = _last_value; + cut_line(); + apply(); + TEXTBOX_ACTIVE = noone; + } else if(keyboard_check_pressed(vk_enter)) { + apply(); + TEXTBOX_ACTIVE = noone; + } + } + + static display_text = function(_x, _y, _text, _w, _mx = -1, _my = -1) { + var _xx = _x, _ch, _chw; + var target = -999; + + draw_set_text(font, fa_left, fa_top, c_white); + + var ch_x = _x; + var ch_y = _y; + var _str; + + if(_prev_text != _text) { + _prev_text = _text; + cut_line(); + } + + for( var i = 0; i < array_length(_input_text_line); i++ ) { + _str = _input_text_line[i]; + draw_text(ch_x, ch_y, _str); + ch_y += string_height(_str); + } + //draw_text_ext(_x, _y, _text, -1, _w - 16); + + if(_mx != -1 && _my != -1) { + var char_run = 0, _l, _ch_w, _ch_h, _str, _chr; + var ch_x = _x; + var ch_cxo = _x, ch_cxn = _x; + var ch_y = _y; + + for( var i = 0; i < array_length(_input_text_line); i++ ) { + _str = _input_text_line[i]; + _l = string_length(_str); + _ch_h = string_height(_str); + + if(ch_y <= _my && ch_y + _ch_h >= _my) { + for( var j = 0; j < string_length(_str); j++ ) { + _chr = string_char_at(_str, j + 1); + _ch_w = string_width(_chr); + ch_cxn = ch_x + _ch_w / 2; + + if(ch_cxo <= _mx && ch_cxn >= _mx) { + target = char_run + j; + break; + } + + ch_x += _ch_w; + ch_cxo = ch_cxn; + } + break; + } + char_run += _l; + ch_y += _ch_h; + } + } + + if(target != -999) { + if(mouse_check_button_pressed(mb_left) || click_block == 1) { + cursor_select = -1; + cursor = target; + click_block = 0; + } else if(mouse_check_button(mb_left) && cursor != target) { + cursor_select = target; + } + } + } + + static draw = function(_x, _y, _w, _h, _text, _m) { + var tx = _x + 8; + var hh = _h; + line_width = _w - 16; + + draw_set_font(font); + var c_h = string_height("l"); + hh = max(_h, 14 + c_h * array_length(_input_text_line)); + + if(self == TEXTBOX_ACTIVE) { + draw_sprite_stretched(s_textbox, 2, _x, _y, _w, hh); + editText(); + + #region cursor + if(keyboard_check_pressed(vk_left)) { + if(keyboard_check(vk_shift)) { + if(cursor_select == -1) + cursor_select = cursor; + } else + cursor_select = -1; + + move_cursor(-1); + } + if(keyboard_check_pressed(vk_right)) { + if(keyboard_check(vk_shift)) { + if(cursor_select == -1) + cursor_select = cursor; + } else + cursor_select = -1; + + move_cursor(1); + } + + if(keyboard_check_pressed(vk_up)) { + if(cursor_line == 0) + cursor = 0; + else { + var _l = cursor_line - 1; + var _str = _input_text_line[_l]; + var _run = tx; + var _char = 0; + + for( var i = 0; i < _l - 1; i++ ) { + _char += string_length(_input_text_line[i]); + } + + for( var i = 0; i < string_length(_str); i++ ) { + var _chr = string_char_at(_str, i + 1); + _run += string_width(_chr); + if(_run > cursor_pos_x_to) { + _char += i; + break; + } + } + + cursor = _char; + } + } + + if(keyboard_check_pressed(vk_down)) { + if(cursor_line == array_length(_input_text_line) - 1) + cursor = string_length(_prev_text); + else { + var _l = cursor_line + 1; + var _str = _input_text_line[_l]; + var _run = tx; + var _char = 0; + + for( var i = 0; i < _l; i++ ) { + _char += string_length(_input_text_line[i]); + } + + for( var i = 0; i < string_length(_str); i++ ) { + var _chr = string_char_at(_str, i + 1); + _run += string_width(_chr); + if(_run > cursor_pos_x_to) { + _char += i; + break; + } + } + + cursor = _char; + } + } + #endregion + + #region draw + draw_set_text(font, fa_left, fa_top, c_white); + + #region draw cursor highlight + var char_run = 0, _l, _str; + var ch_x = tx; + var ch_y = _y + 7; + var ch_sel_min = -1; + var ch_sel_max = -1; + + if(cursor_select != -1) { + ch_sel_min = min(cursor_select, cursor); + ch_sel_max = max(cursor_select, cursor); + } + + for( var i = 0; i < array_length(_input_text_line); i++ ) { + _str = _input_text_line[i]; + _l = string_length(_str); + + if(cursor_select != -1) { + draw_set_color(c_ui_blue_grey); + + if(char_run <= ch_sel_min && char_run + _l > ch_sel_min) { + 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_rectangle(x1, ch_y, x2, ch_y + c_h, 0); + } else if(char_run >= ch_sel_min && char_run + _l < ch_sel_max) { + var x2 = tx + string_width(_str); + + draw_rectangle(tx, ch_y, x2, ch_y + c_h, 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_rectangle(tx, ch_y, x2, ch_y + c_h, 0); + } + } + + if(char_run <= cursor && char_run + _l >= cursor) { + cursor_pos_x_to = ch_x + string_width(string_copy(_str, 1, cursor - char_run)); + cursor_pos_y_to = ch_y; + cursor_line = i; + } + char_run += _l; + ch_y += string_height(_str); + } + + cursor_pos_x = cursor_pos_x == 0? cursor_pos_x_to : lerp_float(cursor_pos_x, cursor_pos_x_to, 3); + cursor_pos_y = cursor_pos_y == 0? cursor_pos_y_to : lerp_float(cursor_pos_y, cursor_pos_y_to, 3); + #endregion + + var _mx = -1; + var _my = -1; + if((mouse_check_button_pressed(mb_left) || mouse_check_button(mb_left)) && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh)) { + _mx = _m[0]; + _my = _m[1]; + } + + draw_set_color(c_white); + display_text(tx, _y + 7, _input_text, _w - 4, _mx, _my); + draw_set_color(c_ui_orange); + + draw_line_width(cursor_pos_x, cursor_pos_y, cursor_pos_x, cursor_pos_y + c_h, 2); + #endregion + + if(!point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh) && mouse_check_button_pressed(mb_left)) { + apply(); + TEXTBOX_ACTIVE = noone; + } + } else { + if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh)) { + if(hide) + draw_sprite_stretched_ext(s_textbox, 1, _x, _y, _w, hh, c_white, 0.5); + else + draw_sprite_stretched(s_textbox, 1, _x, _y, _w, hh); + if(active && mouse_check_button_pressed(mb_left)) { + TEXTBOX_ACTIVE = self; + click_block = 1; + keyboard_string = ""; + keyboard_lastkey = -1; + + _input_text = _text; + _last_value = _text; + + cut_line(); + } + } else if(!hide) { + draw_sprite_stretched(s_textbox, 0, _x, _y, _w, hh); + } + + display_text(tx, _y + 7, string(_text), _w - 4); + } + + hover = false; + active = false; + + return hh; + } +} \ No newline at end of file diff --git a/scripts/textArea/textArea.yy b/scripts/textArea/textArea.yy new file mode 100644 index 000000000..8ba0dbc31 --- /dev/null +++ b/scripts/textArea/textArea.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "widgets", + "path": "folders/widgets.yy", + }, + "resourceVersion": "1.0", + "name": "textArea", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/textBox/textBox.gml b/scripts/textBox/textBox.gml index 48b168374..5735c0dca 100644 --- a/scripts/textBox/textBox.gml +++ b/scripts/textBox/textBox.gml @@ -20,6 +20,8 @@ function textBox(_input, _onModify) constructor { slide_sx = 0; slide_speed = 1 / 16; + starting_char = 1; + input = _input; onModify = _onModify; @@ -81,8 +83,9 @@ function textBox(_input, _onModify) constructor { var maxc = max(cursor, cursor_select); var str_before = string_copy(_input_text, 1, minc); - var str_after = string_copy(_input_text, maxc + 2, string_length(_input_text) - maxc - 1); + var str_after = string_copy(_input_text, maxc + 1, string_length(_input_text) - maxc); + cursor = minc + 1; _input_text = str_before + str_after; } @@ -99,8 +102,9 @@ function textBox(_input, _onModify) constructor { var maxc = max(cursor, cursor_select); var str_before = string_copy(_input_text, 1, minc); - var str_after = string_copy(_input_text, maxc + 2, string_length(_input_text) - maxc - 1); + var str_after = string_copy(_input_text, maxc + 1, string_length(_input_text) - maxc); + cursor = minc; _input_text = str_before + str_after; } cursor_select = -1; @@ -121,7 +125,7 @@ function textBox(_input, _onModify) constructor { var str_after = string_copy(_input_text, maxc + 1, string_length(_input_text) - maxc); _input_text = str_before + ch + str_after; - cursor = min(cursor, cursor_select) + string_length(ch); + cursor = minc + string_length(ch); } cursor_select = -1; @@ -227,6 +231,10 @@ function textBox(_input, _onModify) constructor { static draw = function(_x, _y, _w, _h, _text, _m, _format = VALUE_DISPLAY._default) { var tx = _x; + + draw_set_text(font, fa_left, fa_top, c_white); + var hh = _h; + switch(align) { case fa_left : tx = _x + 8; break; case fa_center : tx = _x + _w / 2; break; @@ -265,7 +273,7 @@ function textBox(_input, _onModify) constructor { } if(self == TEXTBOX_ACTIVE) { - draw_sprite_stretched(s_textbox, 2, _x, _y, _w, _h); + draw_sprite_stretched(s_textbox, 2, _x, _y, _w, hh); editText(); #region cursor @@ -294,7 +302,7 @@ function textBox(_input, _onModify) constructor { 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 + _h)) { + if(point_in_rectangle(_m[0], _m[1], _x, _y, _x + 32, _y + hh)) { draw_set_alpha(1); if(active && mouse_check_button_pressed(mb_left)) { @@ -310,9 +318,9 @@ function textBox(_input, _onModify) constructor { } if(keyboard_check(vk_alt)) - draw_text(_x + 8, _y + _h / 2, "/2"); + draw_text(_x + 8, _y + hh / 2, "/2"); else - draw_text(_x + 8, _y + _h / 2, "x2"); + draw_text(_x + 8, _y + hh / 2, "x2"); draw_set_alpha(1); apply(); @@ -321,7 +329,7 @@ function textBox(_input, _onModify) constructor { #region draw var ss = string_cut(_input_text, _w - 4); - draw_set_text(font, fa_left, fa_center, c_white); + draw_set_text(font, fa_left, fa_top, c_white); var ww = string_width(ss); switch(align) { @@ -346,8 +354,10 @@ function textBox(_input, _onModify) constructor { } var _mx = -1; - if((mouse_check_button_pressed(mb_left) || mouse_check_button(mb_left)) && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h)) { + var _my = -1; + if((mouse_check_button_pressed(mb_left) || mouse_check_button(mb_left)) && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh)) { _mx = _m[0]; + _my = _m[1]; } draw_set_color(c_white); @@ -356,7 +366,7 @@ function textBox(_input, _onModify) constructor { draw_line_width(cursor_pos, c_y0, cursor_pos, c_y1, 2); #endregion - if(!point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h) && mouse_check_button_pressed(mb_left)) { + if(!point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh) && mouse_check_button_pressed(mb_left)) { apply(); TEXTBOX_ACTIVE = noone; } @@ -371,11 +381,11 @@ function textBox(_input, _onModify) constructor { case fa_right : tx -= ww; break; } - if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h)) { + if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh)) { if(hide) - draw_sprite_stretched_ext(s_textbox, 1, _x, _y, _w, _h, c_white, 0.5); + draw_sprite_stretched_ext(s_textbox, 1, _x, _y, _w, hh, c_white, 0.5); else - draw_sprite_stretched(s_textbox, 1, _x, _y, _w, _h); + draw_sprite_stretched(s_textbox, 1, _x, _y, _w, hh); if(active && mouse_check_button_pressed(mb_left)) { TEXTBOX_ACTIVE = self; click_block = 1; @@ -386,15 +396,15 @@ function textBox(_input, _onModify) constructor { _last_value = _text; } } else if(!hide) { - draw_sprite_stretched(s_textbox, 0, _x, _y, _w, _h); + draw_sprite_stretched(s_textbox, 0, _x, _y, _w, hh); } display_text(tx, _y + _h / 2, ss, _w - 4, _format); if(slidable) { - draw_sprite_ext(s_text_slider, 0, _x + 20, _y + _h / 2, 1, 1, 0, c_ui_blue_grey, 0.5); + draw_sprite_ext(s_text_slider, 0, _x + 20, _y + hh / 2, 1, 1, 0, c_ui_blue_grey, 0.5); - if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h)) { + if(hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + hh)) { if(active && mouse_check_button_pressed(mb_left)) { sliding = 1; slide_mx = _m[0]; @@ -406,5 +416,7 @@ function textBox(_input, _onModify) constructor { hover = false; active = false; + + return hh; } } \ No newline at end of file diff --git a/sprites/s_animate_clock/39218c13-6d67-4f8d-b48c-cb90a2c07653.png b/sprites/s_animate_clock/39218c13-6d67-4f8d-b48c-cb90a2c07653.png deleted file mode 100644 index 7e7237d809cb0e8b780cfa6ccd41eb5466105bb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@@P)UuvcA^?z}3M-#{zao_&3Q+(Q!hEi%CK%YQ-I|3K_E9P z_#(I6rM5KYF&A9VF3GS=<@ O0000@ZI6eq0Z^2~C9o}QFK-@hgn58il31Y7huZKBc^so>E^F98 z86+lg2#akDh5DI?EeSvk}OmUyO}Ol4Z*yeh zIGTSVOBIgCW`neoZK!KMtReuApbD#)eZL}k5QQWG4jqu%=u- z6?~D~?o!(#HKMA;KB$sdL8D+4U93!q9DrvbVT}K%d6au#^fh)5e%gqzx$2dG<#$-4cPB8a>1c7?pV&M7LAVsAnfF zP(|R7nCC1gQ9MW*Wju`&6FFfV61gp(0oh{pb(B>J(*Eb4DIy}EOVu?VWE^+$tpRy7 P00000NkvXXu0mjfu1kEn 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 new file mode 100644 index 0000000000000000000000000000000000000000..357b7d8da8dfbb15099cc49c2e382184c0fb1e88 GIT binary patch literal 331 zcmV-R0kr;!P)u{h;O-%dEXAW9{gci#1ggJ53*P-MTk03C=So(=DSV;dc@}l*art241b4jFH9ue81+g)XKg4D`x=-(TnrP>xS dLLUk7c>?hof3+nbqs0IK002ovPDHLkV1hOBi?09x literal 0 HcmV?d00001 diff --git a/sprites/s_animate_clock/s_animate_clock.yy b/sprites/s_animate_clock/s_animate_clock.yy index 5451087b9..b384f5622 100644 --- a/sprites/s_animate_clock/s_animate_clock.yy +++ b/sprites/s_animate_clock/s_animate_clock.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"39218c13-6d67-4f8d-b48c-cb90a2c07653","path":"sprites/s_animate_clock/s_animate_clock.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"39218c13-6d67-4f8d-b48c-cb90a2c07653","path":"sprites/s_animate_clock/s_animate_clock.yy",},"LayerId":{"name":"238fe7b8-d41a-4828-8c7d-ab218160beb0","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_animate_clock","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","name":"39218c13-6d67-4f8d-b48c-cb90a2c07653","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6834d5b7-d54e-4c98-99b2-739ea2611aac","path":"sprites/s_animate_clock/s_animate_clock.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6834d5b7-d54e-4c98-99b2-739ea2611aac","path":"sprites/s_animate_clock/s_animate_clock.yy",},"LayerId":{"name":"238fe7b8-d41a-4828-8c7d-ab218160beb0","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_animate_clock","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","name":"6834d5b7-d54e-4c98-99b2-739ea2611aac","tags":[],"resourceType":"GMSpriteFrame",}, {"compositeImage":{"FrameId":{"name":"815d2393-f810-4be3-959c-049e54282e54","path":"sprites/s_animate_clock/s_animate_clock.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ {"FrameId":{"name":"815d2393-f810-4be3-959c-049e54282e54","path":"sprites/s_animate_clock/s_animate_clock.yy",},"LayerId":{"name":"238fe7b8-d41a-4828-8c7d-ab218160beb0","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, ],"parent":{"name":"s_animate_clock","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","name":"815d2393-f810-4be3-959c-049e54282e54","tags":[],"resourceType":"GMSpriteFrame",}, @@ -47,7 +47,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"6f1894df-5307-4353-9287-c6d0acea9455","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"39218c13-6d67-4f8d-b48c-cb90a2c07653","path":"sprites/s_animate_clock/s_animate_clock.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, diff --git a/sprites/s_animate_node_go/92de400c-7d29-43f4-a04a-30a86d9cedb5.png b/sprites/s_animate_node_go/92de400c-7d29-43f4-a04a-30a86d9cedb5.png deleted file mode 100644 index bdc3e8f13913ea69c16b9f5269e02323b27e134a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4HF&x>hE&W+PIO@Y|Np-@LlApI zgnZ;2R*jGHM-o_=H2yMbJYh(g$C6~a!>L4gp#x)wYJks?q^*osvg{Q8u^iENP}}?< z;0XT_`9_H+E$j-0Vk)j&FS;7u?PZu+>|hqiI9q83`$W+u6&c4cMpd~5yJaIER;#2h i&|qSfUH9N114Gd--RRql5;uTuVeoYIb6Mw<&;$UwggZh2 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 new file mode 100644 index 0000000000000000000000000000000000000000..a574cc91e9b0af1d5bcfc609cf60d89f59bf127b GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4P4IMa45^rt{PX|+|4eKO2`MQ) z3>O{tF-)*xIP#0fqk*;K@xnJOE86%Sj`BG?^Hd0P4(s66VA#mAt5bs^V;19;EIWmN zEJySm)HXi|IKqEKzER>y3%i10i7@j7QO3K~j9CrLyACl2R5AMqo@p*{uKbLh*2~7ax<3d6J literal 0 HcmV?d00001 diff --git a/sprites/s_animate_node_go/layers/92de400c-7d29-43f4-a04a-30a86d9cedb5/8161e07c-3644-435c-9239-26b118205916.png b/sprites/s_animate_node_go/layers/92de400c-7d29-43f4-a04a-30a86d9cedb5/8161e07c-3644-435c-9239-26b118205916.png deleted file mode 100644 index 4e9ddec54c26bde2199b255f04731f171809d7a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f46?wWihE&W+{`vpEJ+qVm!y{&g zHT^m#n2s1s?FsnBEMU#>(NiJJIjnf4)qA=)hE&W+{`vp^e&C9QD@nY%y0O?dLpHy)xh",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"63206bde-f1b9-4d26-82d3-5078220922be","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"92de400c-7d29-43f4-a04a-30a86d9cedb5","path":"sprites/s_animate_node_go/s_animate_node_go.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8161e07c-3644-435c-9239-26b118205916","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"40566cbf-9d94-48b7-88b4-72ea813b2e39","tags":[],"resourceType":"GMImageLayer",}, ], "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 new file mode 100644 index 0000000000000000000000000000000000000000..e0d99b02703545cb6640152750cdc3154c9d08cc GIT binary patch literal 418 zcmV;T0bTxyP)x`xu93Jvl#Pu@9H3G!&>MvB zk!N9oo!U-1OeD|3MJ4T4^QYM zJSG8?!2mXYgbvUpkG*U2x$1-hl9st175+Xm0_wV^2|DIFiXvmtI6Vu^dkU7>JPXVkD(G;1Yf@Y#g%LjDB-)m^&0O?(MUxgX zFVtq&Yx)PG9+3v4f~vG^^o>66KtWV4e5Jjh;i4+uyloUwx5p*enk{jd-%K@ULOc!d3h$EOP?Mk^o1Xa2aaR4MPzzsHk zv|}+@Y<6vyk-lu~@qg^hdRuv((ZVi0b>3P?VxK}`&9dxox}o?lDUpG{{7qs;0=Dv3FK^=l;=U2e?T*63ALd< za=u8)R0gCna>7#?A~jC`AE6mH7klrRzX|ve>M+Dtq8k@PjE0zY=}_~fGUwPpFZSH2 z9-M*_d$5c3c~ zlzCl1w0RxCS>{!Mv&~(A1r_f(fAh1W>;?cy6Q(-;071=figAvlMF0Q*07*qoM6N<$ Ef`M_b$p8QV literal 0 HcmV?d00001 diff --git a/sprites/s_animation_setting/s_animation_setting.yy b/sprites/s_animation_setting/s_animation_setting.yy new file mode 100644 index 000000000..5be67e78c --- /dev/null +++ b/sprites/s_animation_setting/s_animation_setting.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 3, + "bbox_right": 22, + "bbox_top": 1, + "bbox_bottom": 22, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"7eb9e04b-43ee-4426-ae7e-e3f372b5434d","path":"sprites/s_animation_setting/s_animation_setting.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"7eb9e04b-43ee-4426-ae7e-e3f372b5434d","path":"sprites/s_animation_setting/s_animation_setting.yy",},"LayerId":{"name":"33631190-45e5-48b4-a187-bdcc61666c0d","path":"sprites/s_animation_setting/s_animation_setting.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_animation_setting","path":"sprites/s_animation_setting/s_animation_setting.yy",},"resourceVersion":"1.0","name":"7eb9e04b-43ee-4426-ae7e-e3f372b5434d","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"s_animation_setting","path":"sprites/s_animation_setting/s_animation_setting.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"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",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, + ], + "visibleRange": {"x":0.0,"y":0.0,}, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"s_animation_setting","path":"sprites/s_animation_setting/s_animation_setting.yy",}, + "resourceVersion": "1.3", + "name": "s_animation_setting", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"33631190-45e5-48b4-a187-bdcc61666c0d","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "icon", + "path": "folders/sprites/icon.yy", + }, + "resourceVersion": "1.0", + "name": "s_animation_setting", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/sprites/s_arrow_16/0036fc84-2609-4ede-a1da-99fe455c93dc.png b/sprites/s_arrow_16/0036fc84-2609-4ede-a1da-99fe455c93dc.png new file mode 100644 index 0000000000000000000000000000000000000000..b57061198cce2dce336028553151d9c3837bb5b4 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8J;eVAr*6y6Bh_<;7Mlw_y4~> z!xF9qcQ|``dgMFI7*_pc5P0p}%G8j=cZ27k0Yi5ho5pVjGv@%F0}CbBE56W+XmB>( zq^MxZxPyn`=DYsm3^SxG91Iy=Y~ggsVq#UUcMQP~c!W(DEOw3Juo4KvvVzY1(PRb*=U{y^ZqV=Q|%aVn&WI-GvSlCkc< zFTI(I6oOX>FX;Hm!ctiNK=FbQzY1H93Twv9t-rN>QuEHn18rjPboFyt=akR{0LR8R AI{*Lx diff --git a/sprites/s_arrow_16/3ac86053-822e-4a9c-83ac-8f4496727f8d.png b/sprites/s_arrow_16/3ac86053-822e-4a9c-83ac-8f4496727f8d.png deleted file mode 100644 index 2652672e6d418abde7f277535a22be8b834452c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`0iG_7Ar*6y6Bh_<;3;PQ_y7NX z1{Y%^Bee-R3?aofQ+h88tYK5gZfmNDX-kl3a5au|4&XVkSaP{y0dvQNo~r^o7y}wv j-c%JdJI@OpNexer9e=#LxI5THq!}3QKavc1oFlOrXc>d2tDnm{r-UW|jI1qN literal 0 HcmV?d00001 diff --git a/sprites/s_arrow_16/7c87a4da-805c-4b6d-a46c-dad8c364287c.png b/sprites/s_arrow_16/7c87a4da-805c-4b6d-a46c-dad8c364287c.png deleted file mode 100644 index 53066096c66ca3412aa642765ab66d0b277a761d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`!JaOTAr*7BUcAlApuoZG;BhC| z{j%pp#wEEFVdQ&MBb@0G-S*V*mgE diff --git a/sprites/s_arrow_16/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png b/sprites/s_arrow_16/a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2.png new file mode 100644 index 0000000000000000000000000000000000000000..72d04b6bf9ecf07e1770cb1d1c6a002524d40897 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar*6y6Bh_<;NfNd_y4~= zqlaxmO3ECEO^gm_xf?=krg+a{%$T*2X%3sfV#(z|LDnM~$6hlfF@`ZaEaWX|Wi(uO z;3d-nMNS822@c7o>)b~qoD6stwAC;e$xldSxH5rhQ>+6=Kn?>#*eSJ((}caA1MOw- MboFyt=akR{061ha>;M1& literal 0 HcmV?d00001 diff --git a/sprites/s_arrow_16/a67d1447-f781-4196-a796-2f8c9f718b26.png b/sprites/s_arrow_16/a67d1447-f781-4196-a796-2f8c9f718b26.png deleted file mode 100644 index 07a9f3b10356ff3147b683bfb7c4ed6578a56f55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`!JaOTAr*7po^j+lpuppDk@LyC zZy8mWuH(0B$7aZ+qk(BbL*4-v4K*pAcP%C^JPZsm{X*BaZr+yq>>e?;&eOl8=WCLw)TAct*1_OWb^U5q$z@O1TaS?83{1OP5;D!Bjv 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 new file mode 100644 index 0000000000000000000000000000000000000000..2e609f8d6650db4d5a7667b03838b62a7c19e412 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`@t!V@Ar*6yfBye(&#cqA6u(z& zGpqR0t3y*WJ}s0G2(L_vR$i166r9WWr80``$F*F+udFRQBqLgQ0+mX*!=K!g`u=D6 rbK)+LFk@iQyv27t`w~kf&@Ki~S3j3^P6v;1OCcPxUH5RerpoTiu=+=Nt_iERIf2`-+UyzKrt(a l(O9Y8JfSV_ft5VN3S}+cxYwU7m4Rk6c)I$ztaD0e0ssx@Esp>I diff --git a/sprites/s_arrow_16/s_arrow_16.yy b/sprites/s_arrow_16/s_arrow_16.yy index 135279dc6..29290ab8b 100644 --- a/sprites/s_arrow_16/s_arrow_16.yy +++ b/sprites/s_arrow_16/s_arrow_16.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 13, - "bbox_top": 2, - "bbox_bottom": 13, + "bbox_left": 3, + "bbox_right": 12, + "bbox_top": 3, + "bbox_bottom": 12, "HTile": false, "VTile": false, "For3D": false, @@ -24,18 +24,18 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"7c87a4da-805c-4b6d-a46c-dad8c364287c","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"7c87a4da-805c-4b6d-a46c-dad8c364287c","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"947efcaf-8d2e-442e-8a78-e3a9e8e0ad48","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"7c87a4da-805c-4b6d-a46c-dad8c364287c","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"3ac86053-822e-4a9c-83ac-8f4496727f8d","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3ac86053-822e-4a9c-83ac-8f4496727f8d","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"947efcaf-8d2e-442e-8a78-e3a9e8e0ad48","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"3ac86053-822e-4a9c-83ac-8f4496727f8d","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"2ede824f-4c3c-46e1-9d49-a69b2f7b4514","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"2ede824f-4c3c-46e1-9d49-a69b2f7b4514","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"947efcaf-8d2e-442e-8a78-e3a9e8e0ad48","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"2ede824f-4c3c-46e1-9d49-a69b2f7b4514","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"a67d1447-f781-4196-a796-2f8c9f718b26","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"a67d1447-f781-4196-a796-2f8c9f718b26","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"947efcaf-8d2e-442e-8a78-e3a9e8e0ad48","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"a67d1447-f781-4196-a796-2f8c9f718b26","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"48c2cbdb-e084-4513-afb9-dfaf7b2f187b","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"48c2cbdb-e084-4513-afb9-dfaf7b2f187b","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"919e42f6-cd99-49ff-957f-a63b9c5f81d1","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"48c2cbdb-e084-4513-afb9-dfaf7b2f187b","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0036fc84-2609-4ede-a1da-99fe455c93dc","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0036fc84-2609-4ede-a1da-99fe455c93dc","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"919e42f6-cd99-49ff-957f-a63b9c5f81d1","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"0036fc84-2609-4ede-a1da-99fe455c93dc","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"919e42f6-cd99-49ff-957f-a63b9c5f81d1","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"a4ca6b13-1b9a-4d4d-bc7a-e5bc9b4f1ba2","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"24985394-dff3-4e31-ab3e-ee3b268b01ca","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"24985394-dff3-4e31-ab3e-ee3b268b01ca","path":"sprites/s_arrow_16/s_arrow_16.yy",},"LayerId":{"name":"919e42f6-cd99-49ff-957f-a63b9c5f81d1","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","name":"24985394-dff3-4e31-ab3e-ee3b268b01ca","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_arrow_16","path":"sprites/s_arrow_16/s_arrow_16.yy",}, @@ -50,10 +50,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"71a349d8-e863-4dfa-ad59-6a6e57ed7197","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7c87a4da-805c-4b6d-a46c-dad8c364287c","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"bdf3bbb7-9d72-4a2b-950a-13cabcc6a007","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3ac86053-822e-4a9c-83ac-8f4496727f8d","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"e86e53ce-9db1-40f7-b7e6-fcc09e4253d4","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2ede824f-4c3c-46e1-9d49-a69b2f7b4514","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"d2fe3663-9631-4017-9257-553dc1cf0aac","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a67d1447-f781-4196-a796-2f8c9f718b26","path":"sprites/s_arrow_16/s_arrow_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -77,7 +77,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"947efcaf-8d2e-442e-8a78-e3a9e8e0ad48","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"919e42f6-cd99-49ff-957f-a63b9c5f81d1","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { 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 new file mode 100644 index 0000000000000000000000000000000000000000..4dc74eb69b97bf47a01b268ccec80b99578357d2 GIT binary patch literal 388 zcmV-~0ek+5P)NdfIf7Cb^`jJIIP3iU?=WL z#^8&-&u1I5p?{7|D$x1-_KNO+)?F^A_nQQO^m5w*QmF9;-BCT8{H+xn0U?IiaFuV6 zzs3q$1!KrF`km*uIa-`RW=u-rgL8CziC!Xy#1-wh(NTiF@A;I}S(fDslF0!G76|-0 zK6@(p((qt`1Hzp8 zC(BZ-3IN%nd!nKIAh<7P0)aE+5v{ogJ`*VT9<2qW!dOMa(LBV$Cjtk&z!+D+oAyn^ zx224M+ZEIv_@~VJCk8wb$m|*RkrHlK@QbzuoWFuEDd0xH5P*4!_@#NE;g6-f7j6V1 isYF64z%xN=@ECtJ&dCKsR0fhdEP)?!mEI3bfmOy<;jdy8Zt1aFYO#UcNSfRI>Jj$z!~!=Z5`TGxz|+38cl? zMD{)QTdSbqpB3a4^Go8{E#)QwPt21mNea&B_+c(lL=ubU(rA;Q?|a^ovM7q2WN5HS zAn;ax`a~wb8a`VPz_*w6SWo2k43bGf2uFE3y&sY2E1VbP;A*dq^n`O>FcZ$`5}CNE z48CW;M|)D1YEl3Q-!E&PZZ13(R|0_(@{Dm%>t^_sK*9O)Y5=LR#!{6sOz@E)0%_)_}7Fn7t@>xoQh|=gY7ff>(v+n>|0Dp2ZMOkP!M?9yIk4-#{%Z#ZfGC8xa8|FOew7Lu z21Cde)>YuQIiyTLPpp_E1jjJ=As&%O;)}*^v{Znnq=K9C5y{{HNCXJK+KWIZcMg{b zI6NPbtmyRgk{E#tH@xVP^hY>GFb20Z2`qfAy7$hBGADru?h0IZp}G!m(;fuX61Xd<0`MC>^-}_N1sTCE zDdAjz@gfnv1$QanT!0W95zct7x-sdga4x_&sn4HlGT0|b3byeE;SGuA-eC!Q00000 LNkvXXu0mjf`zV)i literal 0 HcmV?d00001 diff --git a/sprites/s_color_picker_dropper/layers/9d5b9111-93a8-4fff-a9bb-c33f0cb0687b/7c956b73-905f-4893-b507-a4ee57df8070.png b/sprites/s_color_picker_dropper/layers/9d5b9111-93a8-4fff-a9bb-c33f0cb0687b/7c956b73-905f-4893-b507-a4ee57df8070.png deleted file mode 100644 index 3c05513168cb22f8c2b35ed4c649d0063c049012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)gy0xGKGaJjNTg`oMr#FlO7a=Ww82^d!aI7e1Cl3) zYXlr#xK3$L==4mI7=aJ(c~Ow?BRnhk1$Q+oNg!thF>vGhLmU4~aEpL{)o5AD7y;fd z8T}ju4}~O139^H1S-%=C2^<_RFT8iG8J8-jRKb0L4=>Gl4dbT02x>KOUr-0&4;uAb z1C|6S!B&I&0*uUzOK?~N?hE+Z-px3ZMQ~qWm%`=*o5TmeDuf9#9&O",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ab8ee91a-f8ee-4ffb-8c99-637db686be4d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9d5b9111-93a8-4fff-a9bb-c33f0cb0687b","path":"sprites/s_color_picker_dropper/s_color_picker_dropper.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7c956b73-905f-4893-b507-a4ee57df8070","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"56070c39-6742-4d39-bfea-116c9ec262c9","tags":[],"resourceType":"GMImageLayer",}, ], "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 new file mode 100644 index 0000000000000000000000000000000000000000..123297ed77a291f6af9d857f28d38c3a9d20e244 GIT binary patch literal 228 zcmV_nKp5Q5-Ag6GFeuP`Hkp&bXx&#TVZEEOX_*g)n7~_cBhRdp+H^wa7 z-*KB&FW_3Se*$0R_ps<+e0{z0Soet*oh+P3>9osiGc6qB|NaL zrH8HY|NH{KbF&kT7Y7oOCIOBA?G?n@_?86@QXxRureqx|B(+%(P7+v$zIh1DNjV_f e?g_1DA+HPJ3OR}LUK$_(0000p5-sI3lI1hx9knf_$R~u-+aP^o_(#)&hKSvT{4}O z@6uYv)Y+3nRaNHhSD1C@!0ht>iW}6}J9BnVd-Sr=-~XpkFITVXa-jPdJYD@<);T3K F0RWM}PWS)- 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 new file mode 100644 index 0000000000000000000000000000000000000000..cc586a9207f7eb76bc7845f8b06ac1cab082b8f7 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3q4&NLn`L14L-=*puqFxpo3Lo zj*_xPm+}b>zXj5XvkQDxHO#6`vL?URYu%!^^h#~x>2&{?j>W57lTO^%E)3e*Yaz_f zGUb`ru{R(6{wDCui85rl%3Hqs@MEsTvoVhrX)>R2a4`Ah(%+E4Bk(srJfe4Qha98C zr0tB0{=em7;P=cH`xV7--pv2nx-9?Q4E-!0k|Mq_o>pPJv#s8s<=wMJ|N2_Fs-~^) R(}0d;@O1TaS?83{1OQ&3Q`i6i literal 0 HcmV?d00001 diff --git a/sprites/s_fill_16/layers/c0308bd3-e0d0-40f3-a8e6-7c1f254a437d/50b81ced-b5f8-4377-a48f-44b4fcb89f3b.png b/sprites/s_fill_16/layers/c0308bd3-e0d0-40f3-a8e6-7c1f254a437d/50b81ced-b5f8-4377-a48f-44b4fcb89f3b.png deleted file mode 100644 index 9a602a670fceff32b82347625e1e159e25124a00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`eV#6kAr*6yfBye(&#cLtza zkwsyf`=n%-;O?BujtY7VkGKt(FPI85eG9PV)A3+ZNZ>FMZC9Jo?Xb?4|MKCcWgOGf z=44&qRggTu",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"2927fd7e-5529-493f-a4e9-2ff3709e9713","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c0308bd3-e0d0-40f3-a8e6-7c1f254a437d","path":"sprites/s_fill_16/s_fill_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,9 +65,33 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"50b81ced-b5f8-4377-a48f-44b4fcb89f3b","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"735b6f9e-00d8-41e3-a77c-4def6b6056b2","tags":[],"resourceType":"GMImageLayer",}, ], - "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_gear_24/a958894a-9531-481a-9762-e52778bcacc3.png b/sprites/s_gear_24/a958894a-9531-481a-9762-e52778bcacc3.png new file mode 100644 index 0000000000000000000000000000000000000000..8a62f5cd4c0127a215d59e6fff204bd4e7085488 GIT binary patch literal 391 zcmV;20eJq2P);VAVpTuW}R2-uOczlEIkiYSK z3IUWIFu@A_%1Hc;ZosvR5-g#}OR(k@ng!5-Xt~h3rvSt`(_&RV28Hdd`|>E#od4iz zv%pwzXIyVV%pZUhkz=h?FYPg=#qC9$S*sT~i?QKqqU57B8W>~*pM@>GwEq_xSJH#u z#oVRtf;*22B#N%{0UliU*}@`{Z~RQ08<#BYguj10ROg@%3V>eAg*o@)1}l*@i#Fh^ zH=<;Rv4hrv74WKxbL>+9ZF{(hNY9-UR2X*majirI`9g^n2)edrQL+wt#swS~1Jt$> l04c`4Isl201z7aA?EOK(u!pA)b6p`B!in3_-hbLeprVq}Uy(*FQOJ=c8spKw&G?~Eq7a{Ql XT2-Md=4t5L00000NkvXXu0mjfi*KV9 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 new file mode 100644 index 0000000000000000000000000000000000000000..02ab6b27ece0996ed7406478075da6fbb205f7d4 GIT binary patch literal 369 zcmV-%0gnEOP)yaEevJ%h9n1BQYE}1?WWQ*Ke z31UhVO0Z^{&;+O~l`{vq(J_FxSO>?5KbbawwU| zKX<6+Zy$E@xc2YXzM&)%{Ax`gQRXbvVB8shxzR$9W-PxUKt^nM>|%rNp{qa!&%ZW8 P00000NkvXXu0mjfAQhwc literal 0 HcmV?d00001 diff --git a/sprites/s_gear_24/layers/b34d7e9b-70e1-4d58-ab99-82962130cec0/1e24fafa-0fda-41a9-99ce-f93ad2f4e48e.png b/sprites/s_gear_24/layers/b34d7e9b-70e1-4d58-ab99-82962130cec0/1e24fafa-0fda-41a9-99ce-f93ad2f4e48e.png deleted file mode 100644 index 161bc6be74da598dcf8a8444354433eb35a47a9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)eo6(Db1n2^o>s+q~a?!L*lCL~t#Jkvj| z%Fvp~`fI@Tmw>Z<4vBEDUIRefvvmv-)JuRA^<2Y z>cPiChqx(4o&2l=q$Wj2fVNLF@s3~%L4luNzEhu0k)>@IdJ*-9rNE-zJ zH$_21pXsOt^35V&_l8o^TF4LrAb4pP6BW)PbSRog&K=}j4m-zUvxv_Y`QN%0boA&| v013gMoM-8MDM|^Pq|fQ(E)$v!FeQLDFs4B$B&GU>00000NkvXXu0mjfCmNQZ diff --git a/sprites/s_gear_24/s_gear_24.yy b/sprites/s_gear_24/s_gear_24.yy index 4a8516e84..9953b9b8a 100644 --- a/sprites/s_gear_24/s_gear_24.yy +++ b/sprites/s_gear_24/s_gear_24.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 1, - "bbox_right": 22, - "bbox_top": 1, - "bbox_bottom": 22, + "bbox_left": 0, + "bbox_right": 23, + "bbox_top": 0, + "bbox_bottom": 23, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"b34d7e9b-70e1-4d58-ab99-82962130cec0","path":"sprites/s_gear_24/s_gear_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"b34d7e9b-70e1-4d58-ab99-82962130cec0","path":"sprites/s_gear_24/s_gear_24.yy",},"LayerId":{"name":"1e24fafa-0fda-41a9-99ce-f93ad2f4e48e","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_gear_24","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","name":"b34d7e9b-70e1-4d58-ab99-82962130cec0","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"a958894a-9531-481a-9762-e52778bcacc3","path":"sprites/s_gear_24/s_gear_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"a958894a-9531-481a-9762-e52778bcacc3","path":"sprites/s_gear_24/s_gear_24.yy",},"LayerId":{"name":"cee74fd8-b2dd-455d-a082-de59739183ca","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_gear_24","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","name":"a958894a-9531-481a-9762-e52778bcacc3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_gear_24","path":"sprites/s_gear_24/s_gear_24.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"5a9189eb-58b3-4f08-8d8a-ff38a5621367","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b34d7e9b-70e1-4d58-ab99-82962130cec0","path":"sprites/s_gear_24/s_gear_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1e24fafa-0fda-41a9-99ce-f93ad2f4e48e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"cee74fd8-b2dd-455d-a082-de59739183ca","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_graph/95d13b17-e3d4-4d49-bdd7-ce8beca43fc5.png b/sprites/s_graph/95d13b17-e3d4-4d49-bdd7-ce8beca43fc5.png deleted file mode 100644 index 6fe6daa815cae203c6f5d496215660993bd3dad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjOFUg1Ln`Lny?T+eK|!STAq#uP z|eO<^O5_{uJCl_pOs%1x+z_|byc>y z!nDV5GUJTa9sGGG)1??X(xurNe!QK>%^ULQ(BJ>;tY41oZoF3^ZXlG;=Jwc^LG2%B z!sE~eB|fH*k4g@b`b<*_ITX5`86x*^>`*w&lHJf@E?xHWtOTR8pk6Qg#WPNE@~4w# UzRR>s0=k#M)78&qol`;+02l{SjsO4v diff --git a/sprites/s_graph/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png b/sprites/s_graph/c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689.png new file mode 100644 index 0000000000000000000000000000000000000000..247dc2c4e6ec6d509cf755557d5f8d4b87e4efce GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj$30yfLn`JZCoV8dSlG>4TKbnw zVb{u)ADDb~7@8O~e5bMg|Nmc{A&52L9iyAuG3FOy6L=T2HS=6?7h2ZGYQf{qm=fJ^ z_(QjYO=A-G2Z?tKJpcJcA|1LOszf`idZ-fV(D%?K+F{*8mq>@shb+1at`zJM3piXb zM=aoU!5XoE%Mc<)EZ}Sbm?+`qYB0UcwxF?RibTihCRUyaQZE@UOyb-zRhZZ8z^eES wtPbaxGxpALU_BhjVAJ6+jbSBQRx|@cU1rXd3Z4~~KrbC83jGVR?-|=3tvyh%hgIR|euknw zY#WXkHt6;-<`nWIbSE=J%P@y|ZD3pRWpkkVe@Wp7mWP%KD*TE(!Fs30dV=6#)&D@3 OGI+ZBxvX zVGY7C5QgEAOu(Fg1SB8<33V{$pc0TU36lU0kbr~o4Q_;z9kji#moy#A@;(WFt_>kH zHK(mwUx2>%yZIglcc}tk4sw?Q9gdUdNlpYEVo&uQS{{VCR7eI+?04=Tow73S);u=7Ue*+GiZNygFSb`dG zZeAN{0^;@0lV@Dk?-Rg}o9yKyAs)^9FPaftCpPc^R(?kSh#3cg00000NkvXXu0mjf D4rgK9 literal 0 HcmV?d00001 diff --git a/sprites/s_graph/s_graph.yy b/sprites/s_graph/s_graph.yy index 517aed899..d8335479b 100644 --- a/sprites/s_graph/s_graph.yy +++ b/sprites/s_graph/s_graph.yy @@ -8,8 +8,8 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 1, - "bbox_right": 20, - "bbox_top": 3, + "bbox_right": 21, + "bbox_top": 2, "bbox_bottom": 22, "HTile": false, "VTile": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"95d13b17-e3d4-4d49-bdd7-ce8beca43fc5","path":"sprites/s_graph/s_graph.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"95d13b17-e3d4-4d49-bdd7-ce8beca43fc5","path":"sprites/s_graph/s_graph.yy",},"LayerId":{"name":"7cdc778c-ce50-41ca-916e-4bb9504dd319","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_graph","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","name":"95d13b17-e3d4-4d49-bdd7-ce8beca43fc5","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689","path":"sprites/s_graph/s_graph.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689","path":"sprites/s_graph/s_graph.yy",},"LayerId":{"name":"81560a61-2258-4310-85ff-da3c8deae9f3","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_graph","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","name":"c035d4ba-4d5f-4a73-a0d1-2ce4e0fd1689","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_graph","path":"sprites/s_graph/s_graph.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"14dd8648-71df-4443-a878-75d7a3d7151a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"95d13b17-e3d4-4d49-bdd7-ce8beca43fc5","path":"sprites/s_graph/s_graph.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7cdc778c-ce50-41ca-916e-4bb9504dd319","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"81560a61-2258-4310-85ff-da3c8deae9f3","tags":[],"resourceType":"GMImageLayer",}, ], "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 new file mode 100644 index 0000000000000000000000000000000000000000..903b095b969fec879d848cd64fe9cd8e056ac34f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar*7>PP)r^K!K-4_`_XM z*@J;rP1)clG$Mh=5 ouQB;`oSh@#d9x|Qhem1fOYM%LQ^OuE13HMo)78&qol`;+0N>e0ga7~l literal 0 HcmV?d00001 diff --git a/sprites/s_group_16/f519baa7-5340-4119-a1d4-d04fdc3ad6c4.png b/sprites/s_group_16/f519baa7-5340-4119-a1d4-d04fdc3ad6c4.png deleted file mode 100644 index e33617374194220c99c707ca96794e6f923a2089..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`-kvUwAr*6y6Bh_AxV6}?T*u~Tgn;rW`ArIERAvS$xvSHTn1w0SRGi_XZMmJUgDyPQJ}~K!L|K_``l} ztER;kPGKcYCi0vfFHK)Ivo#5R;b_km6s!t9dTrI+t>w4*-!3~Fd7x%y&bxAky2{O= zeg_0T?2s{dbM)qm8PB{9Ok|d_c)%)a*^sHrWA*EdbP0l+XkK4#`G* literal 0 HcmV?d00001 diff --git a/sprites/s_group_16/layers/f519baa7-5340-4119-a1d4-d04fdc3ad6c4/968a0483-66d2-4ea1-89c4-0320180f3552.png b/sprites/s_group_16/layers/f519baa7-5340-4119-a1d4-d04fdc3ad6c4/968a0483-66d2-4ea1-89c4-0320180f3552.png deleted file mode 100644 index 88a3d42fcb6c0fa6652ede325fbd0dc9e03b9fcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`UY;(FAr*6yfBye(&#ch;*D zbz%gwMj7L-UYFn9uk;S28lN**G>e;~&1{y{j_wuDn366twps03$~-60WqXOk7RHp_ e4L3>}7#Vy$c",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"ecfd6225-716e-4b78-aa1b-a05e9746368e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f519baa7-5340-4119-a1d4-d04fdc3ad6c4","path":"sprites/s_group_16/s_group_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"968a0483-66d2-4ea1-89c4-0320180f3552","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ab31de2e-696d-457d-a36f-fe4bcae937c9","tags":[],"resourceType":"GMImageLayer",}, ], "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 new file mode 100644 index 0000000000000000000000000000000000000000..fe7f3ab32ad94b8a71ef9a172a1e8a4189a0f892 GIT binary patch literal 297 zcmV+^0oMMBP)L&8O|g$dWWHP(3!U?x_=$Hj^R1kS7Z(GIRtvd*(( zG63%)yrWZH7ZtfeN9iLGf@kfdW(O%-+h@Okg0PF(+O0VN5-%siF4xwSuqzTZ>^`jk vD(rMz*8on#j#@YdAcY+nP!M)BKr4L#=DAx$mmCoi00000NkvXXu0mjfj|zEg literal 0 HcmV?d00001 diff --git a/sprites/s_group_24/88b21b07-6a93-49ae-af91-03cf8ed8cc05.png b/sprites/s_group_24/88b21b07-6a93-49ae-af91-03cf8ed8cc05.png deleted file mode 100644 index dee0d5c726ba0eb1331b6489d36d2d72130a07ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj(>z@qLn`K+o${KiL4n7OyXHX^ zWAQ$R{uph6l&7h?I-iGo6y8~SUgy+|#3pXfy<3#-GU?hi{n)lpE8AcE+@AZgf7?_& z3S7=>F)2(cJ9vM?{A~%dQ&_e>+4fHH%%uy=nY*q}iR%eFCiXyQ)7phS|1WwyaNDcP zcw?2;%XJI3_6r4q-SJpfJSGhdN&(a@r7q&6nDyx%mjfKgx`j&)kab?qhsJds$){j30Bdp72z@qLn`K6os!7cpuo{u`uV_J zhnS=+ z)KJxx*|5OBeJ;l;KI^qs5@#k1yHMI?bPWbkzLb6Mw< G&;$TxA5Gc- diff --git a/sprites/s_group_24/s_group_24.yy b/sprites/s_group_24/s_group_24.yy index 8fd9662c2..f6241d0fb 100644 --- a/sprites/s_group_24/s_group_24.yy +++ b/sprites/s_group_24/s_group_24.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"88b21b07-6a93-49ae-af91-03cf8ed8cc05","path":"sprites/s_group_24/s_group_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"88b21b07-6a93-49ae-af91-03cf8ed8cc05","path":"sprites/s_group_24/s_group_24.yy",},"LayerId":{"name":"0bf88556-2e6e-49a4-b087-697b06b78058","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_group_24","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","name":"88b21b07-6a93-49ae-af91-03cf8ed8cc05","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"1fedd5b4-7de3-4a3f-897f-75acde1f0fd1","path":"sprites/s_group_24/s_group_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1fedd5b4-7de3-4a3f-897f-75acde1f0fd1","path":"sprites/s_group_24/s_group_24.yy",},"LayerId":{"name":"5b8efdb4-6fc1-4ab4-a02a-9923a0842082","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_group_24","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","name":"1fedd5b4-7de3-4a3f-897f-75acde1f0fd1","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_group_24","path":"sprites/s_group_24/s_group_24.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fd1ebd0e-c270-4b91-a098-0522cb170784","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"88b21b07-6a93-49ae-af91-03cf8ed8cc05","path":"sprites/s_group_24/s_group_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0bf88556-2e6e-49a4-b087-697b06b78058","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5b8efdb4-6fc1-4ab4-a02a-9923a0842082","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_hamburger/32e11c60-5714-481b-9c73-69a334db55db.png b/sprites/s_hamburger/32e11c60-5714-481b-9c73-69a334db55db.png deleted file mode 100644 index 8adb984b3d6c2cc7b58662aaf539662c90803d22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj)}AhoAr*6y6BigJES$~yzp-H! zn=un(7wZlG4rJIVa4?uHlup0&VYdm;bOujXKbLh*2~7aiK`ZnC literal 0 HcmV?d00001 diff --git a/sprites/s_hamburger/layers/32e11c60-5714-481b-9c73-69a334db55db/0ec6a8a2-a38e-42f0-89dc-11aea558185e.png b/sprites/s_hamburger/layers/32e11c60-5714-481b-9c73-69a334db55db/0ec6a8a2-a38e-42f0-89dc-11aea558185e.png deleted file mode 100644 index 6989722698d890e0cb459d05eb071429371bbb46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjHl8kyAr*6yfBye(&#cSH?d$8l zx#3n^qRaLMwSAv_%hEqF>zPi3= p7bs$9+u3}ciDM^o^PPhe*>0MMMt7~7#Q`*)!PC{xWt~$(69B7lGgSZp literal 0 HcmV?d00001 diff --git a/sprites/s_hamburger/s_hamburger.yy b/sprites/s_hamburger/s_hamburger.yy index befe8a146..911e8a156 100644 --- a/sprites/s_hamburger/s_hamburger.yy +++ b/sprites/s_hamburger/s_hamburger.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"32e11c60-5714-481b-9c73-69a334db55db","path":"sprites/s_hamburger/s_hamburger.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"32e11c60-5714-481b-9c73-69a334db55db","path":"sprites/s_hamburger/s_hamburger.yy",},"LayerId":{"name":"0ec6a8a2-a38e-42f0-89dc-11aea558185e","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_hamburger","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","name":"32e11c60-5714-481b-9c73-69a334db55db","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ed46d614-073e-485e-8542-2e61e3ee9bfb","path":"sprites/s_hamburger/s_hamburger.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ed46d614-073e-485e-8542-2e61e3ee9bfb","path":"sprites/s_hamburger/s_hamburger.yy",},"LayerId":{"name":"66cf796b-b986-4a52-8abb-86687d72bcdf","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_hamburger","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","name":"ed46d614-073e-485e-8542-2e61e3ee9bfb","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_hamburger","path":"sprites/s_hamburger/s_hamburger.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"090bb80e-2517-485a-a58b-d2973b40d98f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"32e11c60-5714-481b-9c73-69a334db55db","path":"sprites/s_hamburger/s_hamburger.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0ec6a8a2-a38e-42f0-89dc-11aea558185e","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"66cf796b-b986-4a52-8abb-86687d72bcdf","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_icon_accept_24/bac68c60-aec2-48fa-b8fa-fec4de9053ab.png b/sprites/s_icon_accept_24/bac68c60-aec2-48fa-b8fa-fec4de9053ab.png deleted file mode 100644 index ed9311bf18ba8ad64cd0a3e8ff2bf1603bdb36de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjdp%toLn`LHy?j=%SwWyJamL0C zB~33CmM&q|RaA`#vQpSRIkw45>38GyH;$6^_u9Fett;E?C;0aiF1dZQ+P;ik#qQ)S z%}cB&9veAMOj{suJ@UsTmOmZwncs_r1BBZfZ&|QJJW4wtWzOhP!yeFLAG6JV!ADVr zj}PqHQ}TM%6}n&h^t_PjRX?!TKla8R?N;B9EFbtcJX{zu@S5z+v9B_zLGG|BDmcuH1?J6Zpc>LiCeeLYY;?Ci@5dTfa4y z&Wt-L;e3+ei1ZqxA9L6uI{O#1nLU~-b)zHv$N#llH#*HfcXM>~b~E_R;VpQq;~-Sd zpl84F)ywGq$&Z7U_gX8=Fy>RVQkwNc>Va}gtjA-!4~KR>j$w8Y1*+TA9^d57B@lXt waUzHHKh`%2i+(W85L`1`MT~XHy!-5SpLZv2&mdKI;Vst03`ur?EnA( literal 0 HcmV?d00001 diff --git a/sprites/s_icon_accept_24/layers/bac68c60-aec2-48fa-b8fa-fec4de9053ab/1b95b4e8-846d-46fc-8249-a42a9e2930e7.png b/sprites/s_icon_accept_24/layers/bac68c60-aec2-48fa-b8fa-fec4de9053ab/1b95b4e8-846d-46fc-8249-a42a9e2930e7.png deleted file mode 100644 index 20be51ffcda45dbaf5c912659a913100b4892d21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjYdl>XLn`K6y?mCpL4l_skdN<~ z+6%V6M{E{N$_A696;w z6l$>0akuGyr20V6q16@0Wey1u)o0{W>PvpW8+bIEK_PsO?f(2iKi@e_K76Yd%PhDp b#doLWpWamAuYX&B?q=|G^>bP0l+XkKmuOWG 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 new file mode 100644 index 0000000000000000000000000000000000000000..38a1a9a245fe46c24e67b2381a3ead4cf1f25918 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjn>}3|Ln`K6y?l_@!9e8LN4YyU zTLg0suq81|8#D>_B(Nw;v~s?hYF3#Ua_jo_X0`aH!~dsq%$yRm#3u66FZo8suotg= zdxaws=6>zrt?0hr&RlS`obQ0>`^0RW52EpBctt;S1v9?4VCCp)XF6EO|3AR$$*#9N_jlecpz|3#UHx3vIVCg!057y!iU0rr literal 0 HcmV?d00001 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 6bf98c415..dfe24bbd9 100644 --- a/sprites/s_icon_accept_24/s_icon_accept_24.yy +++ b/sprites/s_icon_accept_24/s_icon_accept_24.yy @@ -10,7 +10,7 @@ "bbox_left": 1, "bbox_right": 22, "bbox_top": 3, - "bbox_bottom": 20, + "bbox_bottom": 19, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"bac68c60-aec2-48fa-b8fa-fec4de9053ab","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"bac68c60-aec2-48fa-b8fa-fec4de9053ab","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"LayerId":{"name":"1b95b4e8-846d-46fc-8249-a42a9e2930e7","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_icon_accept_24","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","name":"bac68c60-aec2-48fa-b8fa-fec4de9053ab","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"d81ce6ec-d8c5-4874-a478-d68ed22d42b3","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"d81ce6ec-d8c5-4874-a478-d68ed22d42b3","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"LayerId":{"name":"b445d5d4-5159-4b55-8eaa-e56394769183","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_icon_accept_24","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","name":"d81ce6ec-d8c5-4874-a478-d68ed22d42b3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_icon_accept_24","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"fb77b778-15fa-443a-b528-9f52bb66b581","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bac68c60-aec2-48fa-b8fa-fec4de9053ab","path":"sprites/s_icon_accept_24/s_icon_accept_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1b95b4e8-846d-46fc-8249-a42a9e2930e7","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"b445d5d4-5159-4b55-8eaa-e56394769183","tags":[],"resourceType":"GMImageLayer",}, ], "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 new file mode 100644 index 0000000000000000000000000000000000000000..20a2ad606520fec2d352d0b21102df170f0bf794 GIT binary patch literal 344 zcmV-e0jK_nP)~qIGcbgoJGI~?k(U8_Y&ZM4+Jn_jwYAg$~KS- zt^_b)f##ysQ~9&VUk7l)l>p*wxON0g=n~v;U0`fNB@qIy3tW+@MPe(u#RMx{7oc0v zSOABKd7R)%fL12-&`n6N!jR(jJpZl^ka#8QvqqQ$RQx1cl}4BX0`W}N9$^L;i1!dCfQfiBZ<9MP zGybIbg%?o3(l`_l6Ndp};}AefJQbSmh{59@djAaTC$$YkiREN+WR2mqX0qhfA*R 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 new file mode 100644 index 0000000000000000000000000000000000000000..bf6a45169e493fcc5019aa75adf8b414b9a82a68 GIT binary patch literal 327 zcmV-N0l5B&P)SYsarE#x!dHhH>I;eHQZ6fT?&t2mO!|V2kVd zqy)I)ddgIQCGneD&lCW!I2zy`M*@Q4C_r!=0f>sn0;1zXK*5W6C)zB z8`==?xCDeEqT)kqYfGr;%H2@SJd4KQ`zW_*l&*!6$umpaDs7G$1*S1Z2fgfb2K|P!ul(6vs;dkoXdy<<(oqLx7eqzTtC?fW|dI$1e&2 zkNW@}ml4EZ5f^~mnU4F2ZeBZdTmbZAaB}av4UI`$05m-xV+eTM2jn1%;~J2HfW$+9 zH3(RI2@pd-<1v6B1`g79qMO$p8UF^Lp;z>bj-~+2r#j#XM}9`oIWbh800000NkvXX Hu0mjf3+sLY 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 6f73fe3da..6546d96d3 100644 --- a/sprites/s_icon_accept_32/s_icon_accept_32.yy +++ b/sprites/s_icon_accept_32/s_icon_accept_32.yy @@ -7,10 +7,10 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 31, + "bbox_left": 1, + "bbox_right": 30, "bbox_top": 3, - "bbox_bottom": 28, + "bbox_bottom": 27, "HTile": false, "VTile": false, "For3D": false, @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"8907ffce-38c3-4514-98a5-6e8c6eaad7c1","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"8907ffce-38c3-4514-98a5-6e8c6eaad7c1","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"LayerId":{"name":"82fa62b2-7adb-43d1-bf49-ff7a0f6cc9a5","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_icon_accept_32","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","name":"8907ffce-38c3-4514-98a5-6e8c6eaad7c1","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"12f5d6c2-95e3-410c-9d0d-ea175604d044","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"12f5d6c2-95e3-410c-9d0d-ea175604d044","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"LayerId":{"name":"a811c0f6-b35f-4da0-bb08-62eb8e388829","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_icon_accept_32","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","name":"12f5d6c2-95e3-410c-9d0d-ea175604d044","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_icon_accept_32","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"3f5bf50e-59f9-497c-8c8d-155dd8851f78","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8907ffce-38c3-4514-98a5-6e8c6eaad7c1","path":"sprites/s_icon_accept_32/s_icon_accept_32.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"82fa62b2-7adb-43d1-bf49-ff7a0f6cc9a5","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a811c0f6-b35f-4da0-bb08-62eb8e388829","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_loop_16/0ff91268-551a-43dc-bc3d-d9e818243db3.png b/sprites/s_loop_16/0ff91268-551a-43dc-bc3d-d9e818243db3.png new file mode 100644 index 0000000000000000000000000000000000000000..056d0595282f7b28039cc6bf649a1c98d86af517 GIT binary patch literal 230 zcmVFn#ecuPU685m17CP8kd3Ha4b3Zov731W;zI`I8UQW4Sj@S;FV*HTT~i3AWM@&ql_ z#E03K?3tJuL=Jj*A=shb^X44%@Jzt3?b)Ve<1A&iaQy~ZYAG~AuJ$6(QoowzYBd4> gBkH%nJn40yME+npIMX< zAKLa`YaLUKV%a&Jtsh!fJ3N|V`caC#;MJoF_UWOvFIr^ZDmH{=r&!;Lb+}hi_3~fG bGt+tAJl5;J=X@#wI-9}M)z4*}Q$iB}3pZGY literal 0 HcmV?d00001 diff --git a/sprites/s_loop_16/layers/ea8927d0-67c9-4828-900b-5254f57c0caf/5f7b9286-4551-4aac-b972-d489f02fd7d6.png b/sprites/s_loop_16/layers/ea8927d0-67c9-4828-900b-5254f57c0caf/5f7b9286-4551-4aac-b972-d489f02fd7d6.png deleted file mode 100644 index adf66db410261a5478865501b446ad65f7330cb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`-JULvAr*6yfBye(&#cx9S(SS%-hx2k*6%ypy*#JF5nd^@hPO3@kaiIj6-6*7Edq6GI(YFF=(|o;GUz` t(8$E5G|9-1c|m3kqugynhNF!f3@6#O%6f#az5zOm!PC{xWt~$(69C^}MFIc- diff --git a/sprites/s_loop_16/s_loop_16.yy b/sprites/s_loop_16/s_loop_16.yy index 5cdaf3858..e43f0485c 100644 --- a/sprites/s_loop_16/s_loop_16.yy +++ b/sprites/s_loop_16/s_loop_16.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ea8927d0-67c9-4828-900b-5254f57c0caf","path":"sprites/s_loop_16/s_loop_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ea8927d0-67c9-4828-900b-5254f57c0caf","path":"sprites/s_loop_16/s_loop_16.yy",},"LayerId":{"name":"5f7b9286-4551-4aac-b972-d489f02fd7d6","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_loop_16","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","name":"ea8927d0-67c9-4828-900b-5254f57c0caf","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0ff91268-551a-43dc-bc3d-d9e818243db3","path":"sprites/s_loop_16/s_loop_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0ff91268-551a-43dc-bc3d-d9e818243db3","path":"sprites/s_loop_16/s_loop_16.yy",},"LayerId":{"name":"21a80121-fea0-4064-b3d6-1ddb4f32484e","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_loop_16","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","name":"0ff91268-551a-43dc-bc3d-d9e818243db3","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_loop_16","path":"sprites/s_loop_16/s_loop_16.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"33ae9c26-2ebe-4a34-b32a-d30918691358","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ea8927d0-67c9-4828-900b-5254f57c0caf","path":"sprites/s_loop_16/s_loop_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5f7b9286-4551-4aac-b972-d489f02fd7d6","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"21a80121-fea0-4064-b3d6-1ddb4f32484e","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_node_processor/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png b/sprites/s_node_processor/78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d.png new file mode 100644 index 0000000000000000000000000000000000000000..65ed1102a838e3d9a720f2136e22d5b0886f92a1 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6FglULn`L1ophJ;fC5j8XifRl zyd}yOUhV}``<}3T3v&8+@WXf^CbhIX+myw&xeG!~Zuwx2jGRRG8W7Cd7CrvGPUe zg>TXirX3eK@L#5?x>s*%vzlcm!z+W99ZtI#=e|{`Vq6&h9OyO%Pgg&ebxsLQ0AR*X Al>h($ literal 0 HcmV?d00001 diff --git a/sprites/s_node_processor/d70816ec-8d66-4e66-8e36-2169a15b611b.png b/sprites/s_node_processor/d70816ec-8d66-4e66-8e36-2169a15b611b.png deleted file mode 100644 index 8799d3936356e84ca3190dbb08818f939d3843f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`PM$7~Ar*6y6Bh_&7^b|~O7@YQt VIC>hyY5+}R@O1TaS?83{1OU*{BWeHu 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 new file mode 100644 index 0000000000000000000000000000000000000000..1f2bb200af07c9c0c3d2de0e75d2f05504392cb8 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`wVp1HAr*6yfBye(&#cZQ)` zkwxLz@rCb{1;iOXGR3exxO|3T>g3Pi5pba|~kG$)?kAiSvn+fd5Ly z0tZuOhmSm5sWmHKDcdnSbhgZBX}R3M$`c{PY1lBwz(C;`kkhf^5G&uL*Gw~>G1aiC dI2bxIFm${ZttveEb2HE(44$rjF6*2UngF(HJFfr$ literal 0 HcmV?d00001 diff --git a/sprites/s_node_processor/layers/d70816ec-8d66-4e66-8e36-2169a15b611b/f370aec0-cac3-4ff9-bd55-36de5435fd0c.png b/sprites/s_node_processor/layers/d70816ec-8d66-4e66-8e36-2169a15b611b/f370aec0-cac3-4ff9-bd55-36de5435fd0c.png deleted file mode 100644 index e3226cfcffff9741ac57f29eb75608ef64cc1695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`j-D=#Ar*6yfBye(&#cLr}b zrL4!SQO4*ey?|jk_sLSmGY)R6suLw79Ew&gn#Emk)c$Ww1CIw6`>Y)eOFl3#T#Dkb UtF+%_0yK=l)78&qol`;+0C(pjzW@LL diff --git a/sprites/s_node_processor/s_node_processor.yy b/sprites/s_node_processor/s_node_processor.yy index 0307e4ccd..cff15f931 100644 --- a/sprites/s_node_processor/s_node_processor.yy +++ b/sprites/s_node_processor/s_node_processor.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"d70816ec-8d66-4e66-8e36-2169a15b611b","path":"sprites/s_node_processor/s_node_processor.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"d70816ec-8d66-4e66-8e36-2169a15b611b","path":"sprites/s_node_processor/s_node_processor.yy",},"LayerId":{"name":"f370aec0-cac3-4ff9-bd55-36de5435fd0c","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_node_processor","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","name":"d70816ec-8d66-4e66-8e36-2169a15b611b","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d","path":"sprites/s_node_processor/s_node_processor.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d","path":"sprites/s_node_processor/s_node_processor.yy",},"LayerId":{"name":"90ac81d7-28a5-4c36-af7a-628cb9a827f7","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_node_processor","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","name":"78d69566-0b9b-4f5e-a2c6-3b9a3e9c210d","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_node_processor","path":"sprites/s_node_processor/s_node_processor.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"b9082386-596b-47d2-b71c-991020024b94","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d70816ec-8d66-4e66-8e36-2169a15b611b","path":"sprites/s_node_processor/s_node_processor.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f370aec0-cac3-4ff9-bd55-36de5435fd0c","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"90ac81d7-28a5-4c36-af7a-628cb9a827f7","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_refresh_16/5b066e33-da7b-42ec-a92f-a319f76deca6.png b/sprites/s_refresh_16/5b066e33-da7b-42ec-a92f-a319f76deca6.png deleted file mode 100644 index 79125212c02eeac77cf625475f788ce7c3d70ddf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmV-{0e=38P) zWea|m(o1RQO7hq612Auhl~!QE69G^d3|S4p3*r|31-}vBD?txmiHZla!cmlI7e=T} z1OTMruoZldzIo)q6;3RkK^PWUFL?~6Fz^M-5ci&Wb$c!O@bq+sU;7+B?+O=iv!-CHUlmwxXYDlI- fWWLAw(KCJn#b%H;6{0Ok00000NkvXXu0mjf7qg^F diff --git a/sprites/s_refresh_16/bcbad3b2-b025-4f22-9116-5886ad921432.png b/sprites/s_refresh_16/bcbad3b2-b025-4f22-9116-5886ad921432.png new file mode 100644 index 0000000000000000000000000000000000000000..7f64168d8b29a26cbab9aa20ceabc1558ccf3b64 GIT binary patch literal 372 zcmV-)0gL{LP)Jie%XFr?`Jc38CCvfl5Bg&`>N`RnE z@s3APp~%>>ENg^kc%{?;@5{2B(%O&!HwY2F&G61R=UMbb!GZSzuX3uCKTsKJYa&y!93ZB3>cqEk>G;)8qbwn(zWW(=;OH}&`YPQlv`q%v& zl&%&1?!zg>#1h%@jBu597< zhegn@DapRKg%|H(-u#@|2HFVw=3VPo0zxTkzVg|yJTAAjpSq}0$Ox&4) ug=H#&wtRefacE#BC96@h)a^HHYZgD!aY!@p0-Xr}000018yVImagvv?JNv$w z*~J@%!8jry?MXh?EvX@O_Ce2DN2H1rJD@#sl?G`*hUCiC684YiED?wRq_Q?&(7F%P z8v7yXLAoAiWBgZT|Hw*rumO8LTA98Ybw0Rkz| h4Z|X}Ut_FUya9x&MU>Q!m{0%!002ovPDHLkV1k>0j&J|~ literal 0 HcmV?d00001 diff --git a/sprites/s_refresh_16/s_refresh_16.yy b/sprites/s_refresh_16/s_refresh_16.yy index 75fad517e..94914a719 100644 --- a/sprites/s_refresh_16/s_refresh_16.yy +++ b/sprites/s_refresh_16/s_refresh_16.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"5b066e33-da7b-42ec-a92f-a319f76deca6","path":"sprites/s_refresh_16/s_refresh_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"5b066e33-da7b-42ec-a92f-a319f76deca6","path":"sprites/s_refresh_16/s_refresh_16.yy",},"LayerId":{"name":"53023999-963b-4d10-9c98-deb6a0308d95","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_refresh_16","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","name":"5b066e33-da7b-42ec-a92f-a319f76deca6","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"bcbad3b2-b025-4f22-9116-5886ad921432","path":"sprites/s_refresh_16/s_refresh_16.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"bcbad3b2-b025-4f22-9116-5886ad921432","path":"sprites/s_refresh_16/s_refresh_16.yy",},"LayerId":{"name":"1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_refresh_16","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","name":"bcbad3b2-b025-4f22-9116-5886ad921432","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_refresh_16","path":"sprites/s_refresh_16/s_refresh_16.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c2a0617f-1663-4268-b61d-bda99964705e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5b066e33-da7b-42ec-a92f-a319f76deca6","path":"sprites/s_refresh_16/s_refresh_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"53023999-963b-4d10-9c98-deb6a0308d95","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1cdb01ed-60a8-4093-ad48-c7d5e5ed2f45","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_refresh_24/c9de546c-873e-451a-bce8-38d85cec7488.png b/sprites/s_refresh_24/c9de546c-873e-451a-bce8-38d85cec7488.png new file mode 100644 index 0000000000000000000000000000000000000000..bc7fbb2ed34e3c6d659c502f6b7299b9f5ba17b7 GIT binary patch literal 492 zcmV_c(DkaznZgYGK+a>BjhG99Ede_3TU=v>+$)T?U7E=# z%2PsY5O4P^wL}5ZhHqU$+zV-r3Gd5f7t#GgL^KG!AbA-vq<<&UAaMbgSV!O;oZF4( z20xqFM$AwJkEt&B0xwkDH7J`ety{VJL-X#pJp&Hbq@F?M>Zu8*;HycNVzK4Z@V4`Q z1o)pRc)Nq!dx}|?F&tRDurHG5fduof-d-T3sq1VMN#o501{KeQY4izhn6I?OHo>Y z>d63hosT&av4Gyu=fRJL%z5AefSpfGE+a?ZYm|3T10^Z|Q7GSDp$x7{HbHAbQ*#@% zd*ssj4|@P~BH-t&$l#0uqW|}?yba# z!#Wd92=?|JUKikts8=90O@MKa9ZG+B~Oq)I#Hr#pN0KR8R zey!p5o?)R&Em}@qh82ScjT-aK>W(0WbcEP)4y_cYsX;P=e_IU%8lh+F5xrS^osd z5+gl1*`1y5?T@{Swry$7Sj<}ezW@@}juo-i($=s_R>8{u3W%h@I?%Ud-HK8%@p%pa z173!lso1hUSP#_ACi1`#AUdPC4ve{E-LPs_+y}@5Z53-zZpjeX6D-ZO$$OM%<{K;k z)U9bdkXtezE75nr2;xhdv;ezNl_{=`#65sa|FHnLf@3T}VUtx3pqND}T1wxM`w+l8 zNU47bGzhtS1v)Vl0@UKLl;30FK_|ug02}I#X(a>837}YvC1U{X1jq1g1cbf7;qY%f za`HaFhIJn(;z7^k*4!G>pOf7XAPW>nyp#Lx*o_D5$+R8iXuwM7h#%I4>boMh;e|Yr zn^1Q=eKgjj2E^p125nfcW-y9{mQP1Q=HzKWLEX0on|3EK>oOFL6fbPY(0zbpd|5LZ zc7BkYI@CFKqt)UJZ)q$*ADCrHBX9iFI~hgv5>AfUFa2NFa#|PH&b-0^0000l~mv^P4h_hgwF z&+um6$hx2XR(n65v~5f0)a0zu{|g{zFWD)3E^Q6FVwddVuYgnn%#FS&`%e5UNqnCI zz=XG<%mOXgU+f3!zb5rS3y_`=JQU_!v2WQmJBtAdqiw@}rLJTU)&!-wQR5!v>3o9* zfVxm^YwAkoH52cQM4)Y$qy|*%OWI$!oDP+VExGW;Dp4%}I5GNn0-XiprqZ{UeGH&s zF#+VLTN@8@deG1|t&RXR=pc9ukWjx(H!`sr0WxI)!c4FYKaPN~7AR9;^=m-FUKv3= z=tY9*gjV9MycaQmBU_);-8*{k1NIcW(%3 wWQJ3k3D65)SyBAb8wKz}kg$ZKb@o5~UtSMbR+R~sYXATM07*qoM6N<$f+t$Xw*UYD diff --git a/sprites/s_refresh_24/s_refresh_24.yy b/sprites/s_refresh_24/s_refresh_24.yy index e1f36de65..93b747b1d 100644 --- a/sprites/s_refresh_24/s_refresh_24.yy +++ b/sprites/s_refresh_24/s_refresh_24.yy @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"e7ee85aa-379b-4ee9-87d6-e46180578f04","path":"sprites/s_refresh_24/s_refresh_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"e7ee85aa-379b-4ee9-87d6-e46180578f04","path":"sprites/s_refresh_24/s_refresh_24.yy",},"LayerId":{"name":"827b806a-1726-45c3-bcdb-04bcbda69475","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_refresh_24","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","name":"e7ee85aa-379b-4ee9-87d6-e46180578f04","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"c9de546c-873e-451a-bce8-38d85cec7488","path":"sprites/s_refresh_24/s_refresh_24.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"c9de546c-873e-451a-bce8-38d85cec7488","path":"sprites/s_refresh_24/s_refresh_24.yy",},"LayerId":{"name":"fa90d5a5-061b-4ced-9086-67fd45e21c27","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"s_refresh_24","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","name":"c9de546c-873e-451a-bce8-38d85cec7488","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"s_refresh_24","path":"sprites/s_refresh_24/s_refresh_24.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"af33ab0c-7c5d-40cd-b6c4-aedc880b2d7a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e7ee85aa-379b-4ee9-87d6-e46180578f04","path":"sprites/s_refresh_24/s_refresh_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"827b806a-1726-45c3-bcdb-04bcbda69475","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fa90d5a5-061b-4ced-9086-67fd45e21c27","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_search_16/30a915fb-4ec4-4326-97d1-dc2331248396.png b/sprites/s_search_16/30a915fb-4ec4-4326-97d1-dc2331248396.png deleted file mode 100644 index 0d1fe656af5da43c23ac91ed81c8fb7d0a9c46a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmV-J0lfZ+P)HxMU)4P*q33zSW81KfZSH1Qwb3s-W~LhzE8UaxoW-nET_ z1?&4h#zJI31GHfnzI0BsP-uXI3SZ>xhNZGZKLk?T0^1p31r;GLBZ*Ieaf+Wn2c*DW zVhL3M<%EE&j_fnK7Cfb2?ARR~vcEFl=hYq9!jaLs)fM>558^8`I0Tb`|MrX+|d~}kRogL=A zdF<}Q8Hu{CJuHL($brIj-AeXMMu;h}7UeyEJ7P(!P)C5t1u!2l7LgQ-Zx zY$$02)D=;@lvpzvFs+vea;(T1Uzu^*hnAzBOEv32p7@7MiGBxtVFj#e1=8UcsUyI) d^3l$LcmqnqV$MKm0Gmc#sy##+yFOl1Wf$LHr!`weUIQxZh)ruv=4}; zX`%%saL(@81AEjB(L%6g?^W%D>xJDokPnbx(k1|}u#tH50a_Ejvmfk?y+bX<7PSTB zX6++@8eXVP8Xv%^GhtDQ9=AyrdWnR!eHzvRwt;%0VHTjLmNXw>Ftt?oTYva0E=eV}EE#t^cDtG}jB13AVL0Xv*jTBmBDb99uJs>5Ee1e2JO#||rCUUesfmOwKlQg9H*sd5U*M3h z1r|9XF)~3e$O-yy?mDkU?lmNc#j}&-UoQdhL{{!b3askzQZm`ufcg^)Ra{Y$fzPGY w#1Jfy8|Px4YBX5DRyWrES5Zh%httCG23DUk&fr",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c110312e-f1b6-4225-ae72-c22fd44b0037","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"30a915fb-4ec4-4326-97d1-dc2331248396","path":"sprites/s_search_16/s_search_16.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fcf2c977-6344-44c4-94e0-6c41bd9e5c92","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8e8d4f0f-5729-4e35-90b7-35868c96a2c8","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_sort_24/28935456-bec4-4226-9042-683715f21fa6.png b/sprites/s_sort_24/28935456-bec4-4226-9042-683715f21fa6.png deleted file mode 100644 index 2f9a20d9f6a3c9c90e1d23654e16b6860375649d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmV-e0jK_nP)+b=Aq2wgA z4@f0u0IkX&^7RCNnQZaE4dH}u{(x$3!Vx7+b4R2tc&=BC4 z6#yRIVG`;D23lCm&$9a$7)b@k+-g=NLeWX5{v)Q=-Jk#Tx`r`=~q= q&HuF#sgI`-&_YCWd7NbN=lTtaZ({jVMCoKX z)$8cu84Q3)=mKTX6?(9~133=*8bIG#QYRg7T)8iRd%V)z=3D{@)*rbO$z_TyTs$K{ uw@-H=^GMzmG(DbHzyM+WaC*YxZa`k@q`%-#R`74oB( zq*>qhFsEg+Mz;VJ>VnEg{5n*P5{B>96ZfEfO#lVI^T)OcKGy(WaD6@iKO}YP$$%x z=RTwJC6BdzIQ0fA)RE^jQVwNGfEZbqsQ?tHu=WbxZ&LsyY744w_NW`E8%Wb>Du7fP z>(+J(0d^4}ua65LK$YB@6*B$IL<1zK#;GEL>mQPz05qhD1UPN>=lTUsf;9-a!6G#P O0000e`BQSy+ST}G4MsS3VAQND6P0n7SZ4~gy-2De_(|mCK z)2#1%wPa+AR`&oE=mJ`euup(`G+3tur82oYx0{RiL<{`L7P^ zr)Tg7Bmrnet->zqrUKCCXvHzNa364>&r^Lc0BH60c`C%YbDY5%^Z@NaPbmPCv8zkk z9E%3Dp=a$ch5#jPN&&W@Gri*z&(KH!($FL0VlDs{%DuUq=G!>{26RxiZ;qgwvVUOQ zq^ST@;fz~9DFrA6plD7App~`Uj+6?%X2bxaY%f%T;`~A8697XRAs`rwU)L`Ik~Wv- S(YHPT0000",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"99fabbbd-d341-4d59-8d53-e8cc1e8b0d93","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"28935456-bec4-4226-9042-683715f21fa6","path":"sprites/s_sort_24/s_sort_24.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1ca5c3f7-1a3a-4ec8-999b-cdaa8114c155","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0b7b37d7-fbf1-4f70-9aa6-64eee6bbeaea","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": { diff --git a/sprites/s_timeline_graph/3a577eb6-8720-4209-abf6-ad69a98699d7.png b/sprites/s_timeline_graph/3a577eb6-8720-4209-abf6-ad69a98699d7.png deleted file mode 100644 index 242a24c5b00c05c67e45408887c19eb8b0c7d256..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`r#xL8Ln`JZCoT}!Fk#V;|NsAU zIjmyn5N@boR#r}CI(=`ixU|EhbLW2XR+w-xXiliHJE_Nz#m5lD-7rI5t3;qfogw$W z!v%%~X%p6d4S44~;c}xCzra%_5dUMqJC_B=m~viikYd;>xy({<``r zx_7mOHoRr2V|ds_Oi?hSGP*` z-(cpRHOZKT&3NOtGJON}4@tkjbE@3ECfLXp@bKf)PMfuUADNW{oRqwD1wo!<@O1Ta JS?83{1OUK-V;%qi literal 0 HcmV?d00001 diff --git a/sprites/s_timeline_graph/layers/3a577eb6-8720-4209-abf6-ad69a98699d7/5e93fdd8-bbd7-4302-a4c9-193686212ce2.png b/sprites/s_timeline_graph/layers/3a577eb6-8720-4209-abf6-ad69a98699d7/5e93fdd8-bbd7-4302-a4c9-193686212ce2.png deleted file mode 100644 index 90a9617c3df1bf963fa381ad39488e3eb3436c37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+dW+zLn`JZ|NQ^oo>{e_)#WRf zLkz#0^7zS;>kaOU83dZ2d_Gy|$RME4kW{DfUqQgXVOPTfMuq6t z3*WT!2rQRZxW=jw{dnPi~#a;92R>T9blZH&gXEG n_ee&|Q`rfO>>pOCFfc4tP?>jY>ZyF77Z^NU{an^LB{Ts5ylYwM 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 new file mode 100644 index 0000000000000000000000000000000000000000..d251fc6a32f0d474af46719efafa5c848c9ac225 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hdf;zLn`JZ|NQ^oo>{da_5MC@ zHifpylkc%AUD0MJWE4I!iETOh3veRtYZv2csv{~&EYWR(LRvYz{Gr{-(YrO*0EFvW@eQGdPWZl z%`W6{#UmPyFlY3s+$;lnNIF;d+=Ls}5",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"87a0d630-e0c7-4ed8-8053-722259b8d1a6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3a577eb6-8720-4209-abf6-ad69a98699d7","path":"sprites/s_timeline_graph/s_timeline_graph.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"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",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, @@ -65,7 +65,7 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5e93fdd8-bbd7-4302-a4c9-193686212ce2","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ebc1a659-127b-4d29-9174-e85ace797e98","tags":[],"resourceType":"GMImageLayer",}, ], "nineSlice": null, "parent": {