From bc9a2fc05fbc822d42b9a184fd84f3bfcd3b134a Mon Sep 17 00:00:00 2001 From: Tanasart Date: Wed, 15 May 2024 18:59:31 +0700 Subject: [PATCH] pentagonal grid --- PixelComposer.resource_order | 3 +- PixelComposer.yyp | 3 +- scripts/globals/globals.gml | 8 +- .../99351001-eab3-42ef-a153-622fa7e76984.png | Bin 0 -> 2342 bytes .../b438765a-9fa5-41f9-8c44-d879402767c3.png | Bin 0 -> 2342 bytes .../s_node_grid_pentagonal.yy | 90 ++++++++++++++++++ 6 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 sprites/s_node_grid_pentagonal/99351001-eab3-42ef-a153-622fa7e76984.png create mode 100644 sprites/s_node_grid_pentagonal/layers/99351001-eab3-42ef-a153-622fa7e76984/b438765a-9fa5-41f9-8c44-d879402767c3.png create mode 100644 sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index e2e47de8f..fc219ad6f 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -1347,6 +1347,7 @@ {"name":"sh_greyscale","order":13,"path":"shaders/sh_greyscale/sh_greyscale.yy",}, {"name":"sh_grid_hex","order":1,"path":"shaders/sh_grid_hex/sh_grid_hex.yy",}, {"name":"sh_grid_noise","order":2,"path":"shaders/sh_grid_noise/sh_grid_noise.yy",}, + {"name":"sh_grid_pentagonal","order":7,"path":"shaders/sh_grid_pentagonal/sh_grid_pentagonal.yy",}, {"name":"sh_grid_tri","order":3,"path":"shaders/sh_grid_tri/sh_grid_tri.yy",}, {"name":"sh_herringbone_tile","order":5,"path":"shaders/sh_herringbone_tile/sh_herringbone_tile.yy",}, {"name":"sh_image_trace","order":34,"path":"shaders/sh_image_trace/sh_image_trace.yy",}, @@ -1478,7 +1479,6 @@ {"name":"sh_widget_rotator_range","order":5,"path":"shaders/sh_widget_rotator_range/sh_widget_rotator_range.yy",}, {"name":"sh_widget_rotator","order":4,"path":"shaders/sh_widget_rotator/sh_widget_rotator.yy",}, {"name":"sh_zigzag","order":2,"path":"shaders/sh_zigzag/sh_zigzag.yy",}, - {"name":"sh_grid_pentagonal","order":7,"path":"shaders/sh_grid_pentagonal/sh_grid_pentagonal.yy",}, {"name":"credit_badge_popular","order":2,"path":"sprites/credit_badge_popular/credit_badge_popular.yy",}, {"name":"credit_badge_value","order":1,"path":"sprites/credit_badge_value/credit_badge_value.yy",}, {"name":"s_biterator_b_grey_long","order":7,"path":"sprites/s_biterator_b_grey_long/s_biterator_b_grey_long.yy",}, @@ -1679,6 +1679,7 @@ {"name":"s_node_grid_hex_noise","order":21,"path":"sprites/s_node_grid_hex_noise/s_node_grid_hex_noise.yy",}, {"name":"s_node_grid_hex","order":4,"path":"sprites/s_node_grid_hex/s_node_grid_hex.yy",}, {"name":"s_node_grid_noise","order":5,"path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",}, + {"name":"s_node_grid_pentagonal","order":49,"path":"sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy",}, {"name":"s_node_grid_tri_noise","order":22,"path":"sprites/s_node_grid_tri_noise/s_node_grid_tri_noise.yy",}, {"name":"s_node_grid_tri","order":6,"path":"sprites/s_node_grid_tri/s_node_grid_tri.yy",}, {"name":"s_node_grid","order":3,"path":"sprites/s_node_grid/s_node_grid.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 63b92b3bc..80d24e5d7 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -1861,6 +1861,7 @@ {"id":{"name":"sh_greyscale","path":"shaders/sh_greyscale/sh_greyscale.yy",},}, {"id":{"name":"sh_grid_hex","path":"shaders/sh_grid_hex/sh_grid_hex.yy",},}, {"id":{"name":"sh_grid_noise","path":"shaders/sh_grid_noise/sh_grid_noise.yy",},}, + {"id":{"name":"sh_grid_pentagonal","path":"shaders/sh_grid_pentagonal/sh_grid_pentagonal.yy",},}, {"id":{"name":"sh_grid_tri","path":"shaders/sh_grid_tri/sh_grid_tri.yy",},}, {"id":{"name":"sh_grid","path":"shaders/sh_grid/sh_grid.yy",},}, {"id":{"name":"sh_herringbone_tile","path":"shaders/sh_herringbone_tile/sh_herringbone_tile.yy",},}, @@ -2015,7 +2016,6 @@ {"id":{"name":"sh_widget_rotator_range","path":"shaders/sh_widget_rotator_range/sh_widget_rotator_range.yy",},}, {"id":{"name":"sh_widget_rotator","path":"shaders/sh_widget_rotator/sh_widget_rotator.yy",},}, {"id":{"name":"sh_zigzag","path":"shaders/sh_zigzag/sh_zigzag.yy",},}, - {"id":{"name":"sh_grid_pentagonal","path":"shaders/sh_grid_pentagonal/sh_grid_pentagonal.yy",},}, {"id":{"name":"credit_badge_popular","path":"sprites/credit_badge_popular/credit_badge_popular.yy",},}, {"id":{"name":"credit_badge_value","path":"sprites/credit_badge_value/credit_badge_value.yy",},}, {"id":{"name":"node_credit","path":"sprites/node_credit/node_credit.yy",},}, @@ -2241,6 +2241,7 @@ {"id":{"name":"s_node_grid_hex_noise","path":"sprites/s_node_grid_hex_noise/s_node_grid_hex_noise.yy",},}, {"id":{"name":"s_node_grid_hex","path":"sprites/s_node_grid_hex/s_node_grid_hex.yy",},}, {"id":{"name":"s_node_grid_noise","path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",},}, + {"id":{"name":"s_node_grid_pentagonal","path":"sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy",},}, {"id":{"name":"s_node_grid_tri_noise","path":"sprites/s_node_grid_tri_noise/s_node_grid_tri_noise.yy",},}, {"id":{"name":"s_node_grid_tri","path":"sprites/s_node_grid_tri/s_node_grid_tri.yy",},}, {"id":{"name":"s_node_grid","path":"sprites/s_node_grid/s_node_grid.yy",},}, diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 5fa7837ed..1d4bc3949 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -35,11 +35,11 @@ globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION; - LATEST_VERSION = 11600; - VERSION = 11703; + LATEST_VERSION = 11700; + VERSION = 11710; SAVE_VERSION = 11690; - VERSION_STRING = "1.17.0.3"; - BUILD_NUMBER = 11708; + VERSION_STRING = "1.17.1.0"; + BUILD_NUMBER = 11710; globalvar HOTKEYS, HOTKEY_CONTEXT; HOTKEYS = ds_map_create(); diff --git a/sprites/s_node_grid_pentagonal/99351001-eab3-42ef-a153-622fa7e76984.png b/sprites/s_node_grid_pentagonal/99351001-eab3-42ef-a153-622fa7e76984.png new file mode 100644 index 0000000000000000000000000000000000000000..4b2ae7ef9f7cf3dd3f08f6bbdf4d8395226ac6f7 GIT binary patch literal 2342 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_grid_pentagonal", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99351001-eab3-42ef-a153-622fa7e76984","path":"sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"68af92f1-e34a-4794-9d00-3f2178f51b23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":32, + "yorigin":32, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file