diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 6c65f417a..083e4d77f 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -10,9 +10,9 @@ {"name":"GMD3D11","order":3,"path":"folders/__extensions/GMD3D11.yy",}, {"name":"MAC","order":4,"path":"folders/__extensions/MAC.yy",}, {"name":"patreon","order":5,"path":"folders/__extensions/patreon.yy",}, - {"name":"SNAP","order":18,"path":"folders/__extensions/SNAP.yy",}, + {"name":"SNAP","order":7,"path":"folders/__extensions/SNAP.yy",}, {"name":"XML","order":1,"path":"folders/__extensions/SNAP/XML.yy",}, - {"name":"Steamworks","order":21,"path":"folders/__extensions/Steamworks.yy",}, + {"name":"Steamworks","order":8,"path":"folders/__extensions/Steamworks.yy",}, {"name":"VCT","order":1,"path":"folders/__extensions/VCT.yy",}, {"name":"WinMan","order":6,"path":"folders/__extensions/WinMan.yy",}, {"name":"addons","order":336,"path":"folders/addons.yy",}, @@ -240,27 +240,27 @@ "ResourceOrderSettings":[ {"name":"ac_disappear","order":2,"path":"animcurves/ac_disappear/ac_disappear.yy",}, {"name":"ac_ripple","order":1,"path":"animcurves/ac_ripple/ac_ripple.yy",}, - {"name":"Apollo","order":8,"path":"extensions/Apollo/Apollo.yy",}, - {"name":"clipboard","order":10,"path":"extensions/clipboard/clipboard.yy",}, - {"name":"discordBridge","order":11,"path":"extensions/discordBridge/discordBridge.yy",}, + {"name":"Apollo","order":10,"path":"extensions/Apollo/Apollo.yy",}, + {"name":"clipboard","order":12,"path":"extensions/clipboard/clipboard.yy",}, + {"name":"discordBridge","order":13,"path":"extensions/discordBridge/discordBridge.yy",}, {"name":"display_measure","order":1,"path":"extensions/display_measure/display_measure.yy",}, {"name":"display_screenshot","order":4,"path":"extensions/display_screenshot/display_screenshot.yy",}, - {"name":"dllTest","order":19,"path":"extensions/dllTest/dllTest.yy",}, - {"name":"file_dropper","order":20,"path":"extensions/file_dropper/file_dropper.yy",}, - {"name":"FLIP","order":17,"path":"extensions/FLIP/FLIP.yy",}, + {"name":"dllTest","order":20,"path":"extensions/dllTest/dllTest.yy",}, + {"name":"file_dropper","order":21,"path":"extensions/file_dropper/file_dropper.yy",}, + {"name":"FLIP","order":19,"path":"extensions/FLIP/FLIP.yy",}, {"name":"gameframe_native","order":2,"path":"extensions/gameframe_native/gameframe_native.yy",}, - {"name":"GMSSimpleMIDI","order":15,"path":"extensions/GMSSimpleMIDI/GMSSimpleMIDI.yy",}, + {"name":"GMSSimpleMIDI","order":17,"path":"extensions/GMSSimpleMIDI/GMSSimpleMIDI.yy",}, {"name":"GMSysinfo","order":22,"path":"extensions/GMSysinfo/GMSysinfo.yy",}, {"name":"libborderless","order":1,"path":"extensions/libborderless/libborderless.yy",}, - {"name":"libdlgmodule","order":13,"path":"extensions/libdlgmodule/libdlgmodule.yy",}, - {"name":"libfilesystem","order":12,"path":"extensions/libfilesystem/libfilesystem.yy",}, - {"name":"libxprocess","order":7,"path":"extensions/libxprocess/libxprocess.yy",}, + {"name":"libdlgmodule","order":15,"path":"extensions/libdlgmodule/libdlgmodule.yy",}, + {"name":"libfilesystem","order":14,"path":"extensions/libfilesystem/libfilesystem.yy",}, + {"name":"libxprocess","order":9,"path":"extensions/libxprocess/libxprocess.yy",}, {"name":"macMinimize","order":2,"path":"extensions/macMinimize/macMinimize.yy",}, {"name":"patreon_key","order":1,"path":"extensions/patreon_key/patreon_key.yy",}, - {"name":"Regex","order":9,"path":"extensions/Regex/Regex.yy",}, - {"name":"Spout","order":14,"path":"extensions/Spout/Spout.yy",}, + {"name":"Regex","order":11,"path":"extensions/Regex/Regex.yy",}, + {"name":"Spout","order":16,"path":"extensions/Spout/Spout.yy",}, {"name":"Steamworks","order":4,"path":"extensions/Steamworks/Steamworks.yy",}, - {"name":"TabletStuff","order":16,"path":"extensions/TabletStuff/TabletStuff.yy",}, + {"name":"TabletStuff","order":18,"path":"extensions/TabletStuff/TabletStuff.yy",}, {"name":"winwin","order":5,"path":"extensions/winwin/winwin.yy",}, {"name":"YYFirebaseFirestore","order":1,"path":"extensions/YYFirebaseFirestore/YYFirebaseFirestore.yy",}, {"name":"_f_code_s","order":18,"path":"fonts/_f_code_s/_f_code_s.yy",}, diff --git a/scripts/node_palette/node_palette.gml b/scripts/node_palette/node_palette.gml index d0d8b6fd0..04c919e65 100644 --- a/scripts/node_palette/node_palette.gml +++ b/scripts/node_palette/node_palette.gml @@ -1,6 +1,6 @@ function Node_Palette(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Palette"; - setDimension(96); + setDimension(96, 48); newInput(0, nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE))); @@ -14,7 +14,7 @@ function Node_Palette(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ]; static processData_prebatch = function() { - setDimension(96, process_length[0] * 32); + setDimension(96, 16 + process_length[0] * 32); } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index e4ebdfad3..2d60d1ee4 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -671,7 +671,7 @@ function __initNodes() { addNodeObject(filter, "Colorize", s_node_colorize, "Node_Colorize", [1, Node_Colorize], ["recolor"], "Map brightness of a pixel to a color from a gradient."); addNodeObject(filter, "Posterize", s_node_posterize, "Node_Posterize", [1, Node_Posterize],, "Reduce and remap color to match a palette."); addNodeObject(filter, "Dither", s_node_dithering, "Node_Dither", [1, Node_Dither],, "Reduce color and use dithering to preserve original color."); - addNodeObject(filter, "Error Diffuse Dither",s_node_error_diffuse, "Node_Dither_Diffuse", [1, Node_Dither_Diffuse],, "Dither image using error diffusion algorithm."); + addNodeObject(filter, "Error Diffuse Dither",s_node_error_diffuse, "Node_Dither_Diffuse", [1, Node_Dither_Diffuse],, "Dither image using error diffusion algorithm.").setVersion(1_18_05_1); addNodeObject(filter, "Color Adjust", s_node_color_adjust, "Node_Color_adjust", [1, Node_Color_adjust], ["brightness", "contrast", "hue", "saturation", "value", "color blend", "alpha"], "Adjust brightness, contrast, hue, saturation, value, alpha, and blend image with color."); addNodeObject(filter, "Palette Shift", s_node_palette_shift, "Node_Palette_Shift", [1, Node_Palette_Shift],, "Shift the order of color in palette.").setVersion(1147); addNodeObject(filter, "BW", s_node_BW, "Node_BW", [1, Node_BW], ["black and white"], "Convert color image to black and white."); diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 4a8d4fa9d..07faf6f77 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -751,6 +751,7 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { menu_open_group = MENU_ITEMS.graph_enter_group; menu_open_group_tab = MENU_ITEMS.graph_open_in_new_tab; menu_group_group = MENU_ITEMS.graph_group; + menu_group_ungroup = MENU_ITEMS.graph_ungroup; menu_group_tool = MENU_ITEMS.graph_set_as_tool; menu_node_delete_cut = MENU_ITEMS.graph_delete_break;