From 353f53d81aa08ca710d915b6dca3f39ebd8d203c Mon Sep 17 00:00:00 2001 From: Paul Joannon Date: Thu, 14 Sep 2023 20:38:00 +0200 Subject: [PATCH 1/2] Upgrade to Godot 4.1.1 --- GodotInk.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GodotInk.csproj b/GodotInk.csproj index 7796a57..79e329d 100644 --- a/GodotInk.csproj +++ b/GodotInk.csproj @@ -1,4 +1,4 @@ - + net6.0 true From 452b8bccaa5307d9e6a17ba611b6315c313f81e1 Mon Sep 17 00:00:00 2001 From: Paul Joannon Date: Thu, 14 Sep 2023 20:42:44 +0200 Subject: [PATCH 2/2] Define `InkStory` as a global class --- addons/GodotInk/GodotInk.svg | 1 + addons/GodotInk/GodotInk.svg.import | 37 +++++++++++++++++++++++++++++ addons/GodotInk/Src/InkChoice.cs | 2 -- addons/GodotInk/Src/InkStory.cs | 3 ++- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 addons/GodotInk/GodotInk.svg create mode 100644 addons/GodotInk/GodotInk.svg.import diff --git a/addons/GodotInk/GodotInk.svg b/addons/GodotInk/GodotInk.svg new file mode 100644 index 0000000..099c837 --- /dev/null +++ b/addons/GodotInk/GodotInk.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/addons/GodotInk/GodotInk.svg.import b/addons/GodotInk/GodotInk.svg.import new file mode 100644 index 0000000..c56e2f6 --- /dev/null +++ b/addons/GodotInk/GodotInk.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://op2d8aagi35f" +path="res://.godot/imported/GodotInk.svg-0c8ec83d82b5d336ec3fed92ffcbc8bc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/GodotInk/GodotInk.svg" +dest_files=["res://.godot/imported/GodotInk.svg-0c8ec83d82b5d336ec3fed92ffcbc8bc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/addons/GodotInk/Src/InkChoice.cs b/addons/GodotInk/Src/InkChoice.cs index 857cb2d..5ff6115 100644 --- a/addons/GodotInk/Src/InkChoice.cs +++ b/addons/GodotInk/Src/InkChoice.cs @@ -5,9 +5,7 @@ namespace GodotInk; -#if TOOLS [Tool] -#endif public partial class InkChoice : GodotObject { public string Text => inner.text; diff --git a/addons/GodotInk/Src/InkStory.cs b/addons/GodotInk/Src/InkStory.cs index 75d0bf8..ed7ae26 100644 --- a/addons/GodotInk/Src/InkStory.cs +++ b/addons/GodotInk/Src/InkStory.cs @@ -10,8 +10,9 @@ namespace GodotInk; -#if TOOLS [Tool] +#if GODOT4_1_1_OR_GREATER +[GlobalClass, Icon("res://addons/GodotInk/GodotInk.svg")] #endif public partial class InkStory : Resource {