diff --git a/build/Windows/0/output/PixelComposer.win b/build/Windows/0/output/PixelComposer.win index b70fcd218..9cdc15421 100644 Binary files a/build/Windows/0/output/PixelComposer.win and b/build/Windows/0/output/PixelComposer.win differ diff --git a/build/Windows/0/output/PixelComposer.yydebug b/build/Windows/0/output/PixelComposer.yydebug index 420042b22..2f5edbfb7 100644 Binary files a/build/Windows/0/output/PixelComposer.yydebug and b/build/Windows/0/output/PixelComposer.yydebug differ diff --git a/build/Windows/0/output/log_temp.txt b/build/Windows/0/output/log_temp.txt index a5c73fd2e..9ed724bde 100644 --- a/build/Windows/0/output/log_temp.txt +++ b/build/Windows/0/output/log_temp.txt @@ -81,3 +81,26 @@ [MESSAGE] 2024/12/8 13:38:53 > session begin [MESSAGE] 2024/12/8 13:41:51 > session begin [MESSAGE] 2024/12/8 13:46:11 > session begin +[MESSAGE] 2024/12/8 13:49:18 > session begin +[MESSAGE] 2024/12/8 13:52:20 > session begin +[MESSAGE] 2024/12/8 13:53:04 > session begin +[MESSAGE] 2024/12/8 13:55:02 > session begin +[MESSAGE] 2024/12/8 13:56:04 > session begin +[MESSAGE] 2024/12/8 13:56:56 > session begin +[MESSAGE] 2024/12/8 13:57:51 > session begin +[MESSAGE] 2024/12/8 14:02:14 > session begin +[MESSAGE] 2024/12/8 14:14:53 > session begin +[MESSAGE] 2024/12/8 14:15:27 > session begin +[MESSAGE] 2024/12/8 14:16:04 > session begin +[MESSAGE] 2024/12/8 14:20:15 > session begin +[MESSAGE] 2024/12/8 14:35:59 > session begin +[MESSAGE] 2024/12/8 14:51:18 > session begin +[MESSAGE] 2024/12/8 14:51:59 > session begin +[MESSAGE] 2024/12/8 14:52:33 > session begin +[MESSAGE] 2024/12/8 15:01:25 > session begin +[MESSAGE] 2024/12/8 15:06:06 > session begin +[MESSAGE] 2024/12/8 15:08:17 > session begin +[MESSAGE] 2024/12/8 15:11:31 > session begin +[MESSAGE] 2024/12/8 15:15:31 > session begin +[MESSAGE] 2024/12/8 15:29:03 > session begin +[MESSAGE] 2024/12/8 15:32:59 > session begin diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 400390e71..4b6ee7dec 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -46,7 +46,7 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_05_0; SAVE_VERSION = 1_18_05_0; - VERSION_STRING = MAC? "1.18.003m" : "1.18.5.012"; + VERSION_STRING = MAC? "1.18.003m" : "1.18.5.013"; BUILD_NUMBER = 1_18_04_1; HOTKEYS = ds_map_create(); diff --git a/scripts/node_group_output/node_group_output.gml b/scripts/node_group_output/node_group_output.gml index 615068863..bc1c6aa5a 100644 --- a/scripts/node_group_output/node_group_output.gml +++ b/scripts/node_group_output/node_group_output.gml @@ -88,6 +88,7 @@ function Node_Group_Output(_x, _y, _group = noone) : Node(_x, _y, _group) constr _in0.setType(_typ); _in0.display_type = _dis; + if(!is(outParent, NodeValue)) return; outParent.setType(_in0.type); outParent.display_type = _in0.display_type; diff --git a/scripts/panel_test/panel_test.gml b/scripts/panel_test/panel_test.gml index 7c6a43061..9947f2d14 100644 --- a/scripts/panel_test/panel_test.gml +++ b/scripts/panel_test/panel_test.gml @@ -92,7 +92,7 @@ function Panel_Test() : PanelContent() constructor { draw_text_add(ui(8), yy + wh / 2, _n); draw_set_text(f_p3, fa_left, fa_center, COLORS._main_text_sub, 0.5); - draw_text_add(ui(8 + 144), yy + wh / 2, _d); + draw_text_add(ww - ui(100), yy + wh / 2, _d); draw_set_alpha(1); _h += wh; @@ -177,7 +177,7 @@ function Panel_Test() : PanelContent() constructor { if(!directory_exists(dir)) return; var f = file_find_first($"{dir}/*", fa_none); - var v = filename_name_only(dir); + var v = filename_name(dir); while(f != "") { var path = $"{dir}/{f}";