diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6313b56 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj index 508ae05..52cd2cc 100644 --- a/Dear ImGui for Godot Demo.csproj +++ b/Dear ImGui for Godot Demo.csproj @@ -1,4 +1,4 @@ - + net472 DearImGuiforGodotDemo @@ -13,6 +13,6 @@ true - + \ No newline at end of file diff --git a/addons/imgui-godot/ImGuiGD.cs b/addons/imgui-godot/ImGuiGD.cs index 231b977..01d6eb4 100644 --- a/addons/imgui-godot/ImGuiGD.cs +++ b/addons/imgui-godot/ImGuiGD.cs @@ -1,4 +1,4 @@ -using Godot; +using Godot; using ImGuiNET; using System; using System.Collections.Generic; @@ -104,7 +104,7 @@ public static void Init(Viewport vp) io.KeyMap[(int)ImGuiKey.Space] = FixKey(KeyList.Space); io.KeyMap[(int)ImGuiKey.Enter] = FixKey(KeyList.Enter); io.KeyMap[(int)ImGuiKey.Escape] = FixKey(KeyList.Escape); - io.KeyMap[(int)ImGuiKey.KeyPadEnter] = FixKey(KeyList.KpEnter); + io.KeyMap[(int)ImGuiKey.KeypadEnter] = FixKey(KeyList.KpEnter); io.KeyMap[(int)ImGuiKey.A] = (int)KeyList.A; io.KeyMap[(int)ImGuiKey.C] = (int)KeyList.C; io.KeyMap[(int)ImGuiKey.V] = (int)KeyList.V; diff --git a/demo.tscn b/demo.tscn index 7f2dbed..f80f41e 100644 --- a/demo.tscn +++ b/demo.tscn @@ -53,6 +53,7 @@ texture = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="Button" to="Button" method="_on_Button_pressed"] -[connection signal="IGLayout" from="ImGui" to="SomeOtherNode" method="_onLayout"] [connection signal="IGLayout" from="ImGui" to="Button" method="_on_ImGui_IGLayout"] +[connection signal="IGLayout" from="ImGui" to="SomeOtherNode" method="_onLayout"] diff --git a/icon.png.import b/icon.png.import index 96cbf46..a4c02e6 100644 --- a/icon.png.import +++ b/icon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project.godot b/project.godot index 442f6d7..c08cc6a 100644 --- a/project.godot +++ b/project.godot @@ -10,7 +10,6 @@ config_version=4 _global_script_classes=[ ] _global_script_class_icons={ - } [application]