diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 124d89577..088b39d3a 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -1074,11 +1074,10 @@ {"name":"node_warp","order":2,"path":"scripts/node_warp/node_warp.yy",}, {"name":"node_wav_file_read","order":15,"path":"scripts/node_wav_file_read/node_wav_file_read.yy",}, {"name":"node_wav_file_write","order":16,"path":"scripts/node_wav_file_write/node_wav_file_write.yy",}, - {"name":"node_wave_table","order":6,"path":"scripts/node_wave_table/node_wave_table.yy",}, + {"name":"node_wave_table","order":1,"path":"scripts/node_wave_table/node_wave_table.yy",}, {"name":"node_wavelet_noise","order":13,"path":"scripts/node_wavelet_noise/node_wavelet_noise.yy",}, {"name":"node_websocket_sender","order":1,"path":"scripts/node_websocket_sender/node_websocket_sender.yy",}, {"name":"node_widget_test","order":16,"path":"scripts/node_widget_test/node_widget_test.yy",}, - {"name":"node_wiggler","order":2,"path":"scripts/node_wiggler/node_wiggler.yy",}, {"name":"node_wrap_area","order":10,"path":"scripts/node_wrap_area/node_wrap_area.yy",}, {"name":"node_wrap_perspective","order":15,"path":"scripts/node_wrap_perspective/node_wrap_perspective.yy",}, {"name":"node_zigzag","order":5,"path":"scripts/node_zigzag/node_zigzag.yy",}, diff --git a/scripts/node_wave_table/node_wave_table.yy b/scripts/node_wave_table/node_wave_table.yy index 0ca64f80d..6e055b654 100644 --- a/scripts/node_wave_table/node_wave_table.yy +++ b/scripts/node_wave_table/node_wave_table.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"node_wave_table", "parent":{ - "name":"animation", - "path":"folders/nodes/data/animation.yy", + "name":"value", + "path":"folders/nodes/data/animation/value.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_wiggler/node_wiggler.yy b/scripts/node_wiggler/node_wiggler.yy index dc41e5a5b..e1712ace8 100644 --- a/scripts/node_wiggler/node_wiggler.yy +++ b/scripts/node_wiggler/node_wiggler.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"node_wiggler", "parent":{ - "name":"animation", - "path":"folders/nodes/data/animation.yy", + "name":"value", + "path":"folders/nodes/data/animation/value.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/sprites/s_node_wave/590c15bd-eff6-46fb-887d-6158004741b8.png b/sprites/s_node_wave/590c15bd-eff6-46fb-887d-6158004741b8.png deleted file mode 100644 index 2b5be9d50..000000000 Binary files a/sprites/s_node_wave/590c15bd-eff6-46fb-887d-6158004741b8.png and /dev/null differ diff --git a/sprites/s_node_wave/f286e97c-06a3-4f70-ac8f-acb7849ee795.png b/sprites/s_node_wave/f286e97c-06a3-4f70-ac8f-acb7849ee795.png new file mode 100644 index 000000000..bce0c6805 Binary files /dev/null and b/sprites/s_node_wave/f286e97c-06a3-4f70-ac8f-acb7849ee795.png differ diff --git a/sprites/s_node_wave/layers/590c15bd-eff6-46fb-887d-6158004741b8/5fd93566-21dc-4646-9b9e-3305a97c1a22.png b/sprites/s_node_wave/layers/590c15bd-eff6-46fb-887d-6158004741b8/5fd93566-21dc-4646-9b9e-3305a97c1a22.png deleted file mode 100644 index 2b5be9d50..000000000 Binary files a/sprites/s_node_wave/layers/590c15bd-eff6-46fb-887d-6158004741b8/5fd93566-21dc-4646-9b9e-3305a97c1a22.png and /dev/null differ diff --git a/sprites/s_node_wave/layers/f286e97c-06a3-4f70-ac8f-acb7849ee795/d6b453f9-991f-4abc-9705-54d03262538a.png b/sprites/s_node_wave/layers/f286e97c-06a3-4f70-ac8f-acb7849ee795/d6b453f9-991f-4abc-9705-54d03262538a.png new file mode 100644 index 000000000..bce0c6805 Binary files /dev/null and b/sprites/s_node_wave/layers/f286e97c-06a3-4f70-ac8f-acb7849ee795/d6b453f9-991f-4abc-9705-54d03262538a.png differ diff --git a/sprites/s_node_wave/s_node_wave.yy b/sprites/s_node_wave/s_node_wave.yy index 00b0a6090..69063d467 100644 --- a/sprites/s_node_wave/s_node_wave.yy +++ b/sprites/s_node_wave/s_node_wave.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_wave", "bboxMode":0, - "bbox_bottom":60, - "bbox_left":3, - "bbox_right":60, - "bbox_top":1, + "bbox_bottom":59, + "bbox_left":4, + "bbox_right":59, + "bbox_top":5, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"590c15bd-eff6-46fb-887d-6158004741b8","name":"590c15bd-eff6-46fb-887d-6158004741b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"f286e97c-06a3-4f70-ac8f-acb7849ee795","name":"f286e97c-06a3-4f70-ac8f-acb7849ee795","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"5fd93566-21dc-4646-9b9e-3305a97c1a22","blendMode":0,"displayName":"default","isLocked":false,"name":"5fd93566-21dc-4646-9b9e-3305a97c1a22","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"d6b453f9-991f-4abc-9705-54d03262538a","blendMode":0,"displayName":"default","isLocked":false,"name":"d6b453f9-991f-4abc-9705-54d03262538a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_wave", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"590c15bd-eff6-46fb-887d-6158004741b8","path":"sprites/s_node_wave/s_node_wave.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f9b1d4-13f4-4257-a2bb-458f9a298931","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f286e97c-06a3-4f70-ac8f-acb7849ee795","path":"sprites/s_node_wave/s_node_wave.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"93a8d3db-b991-435b-8c0e-2178137aa864","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,