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 000000000..4b2ae7ef9 Binary files /dev/null and b/sprites/s_node_grid_pentagonal/99351001-eab3-42ef-a153-622fa7e76984.png differ diff --git a/sprites/s_node_grid_pentagonal/layers/99351001-eab3-42ef-a153-622fa7e76984/b438765a-9fa5-41f9-8c44-d879402767c3.png b/sprites/s_node_grid_pentagonal/layers/99351001-eab3-42ef-a153-622fa7e76984/b438765a-9fa5-41f9-8c44-d879402767c3.png new file mode 100644 index 000000000..4b2ae7ef9 Binary files /dev/null and b/sprites/s_node_grid_pentagonal/layers/99351001-eab3-42ef-a153-622fa7e76984/b438765a-9fa5-41f9-8c44-d879402767c3.png differ diff --git a/sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy b/sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy new file mode 100644 index 000000000..68de2d2d4 --- /dev/null +++ b/sprites/s_node_grid_pentagonal/s_node_grid_pentagonal.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_grid_pentagonal", + "bboxMode":0, + "bbox_bottom":63, + "bbox_left":0, + "bbox_right":63, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"99351001-eab3-42ef-a153-622fa7e76984","name":"99351001-eab3-42ef-a153-622fa7e76984","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b438765a-9fa5-41f9-8c44-d879402767c3","blendMode":0,"displayName":"default","isLocked":false,"name":"b438765a-9fa5-41f9-8c44-d879402767c3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_grid_pentagonal", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"generator", + "path":"folders/nodes/icons/generator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_grid_pentagonal", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_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