diff --git a/.gitignore b/.gitignore index 0af181c..e16d88f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ # Godot 4+ specific ignores .godot/ /android/ + +# godot_cpp specific ignores +*.dll diff --git a/.vscode/launch.json b/.vscode/launch.json index 22a5591..2839367 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,7 +15,7 @@ "environment": [], "console": "internalConsole", "visualizerFile": "${workspaceFolder}/platform/windows/godot.natvis", - "preLaunchTask": "build" + "preLaunchTask": "Build [template_debug]" }, { "name": "Debug [editor]", @@ -28,7 +28,7 @@ "environment": [], "console": "internalConsole", "visualizerFile": "${workspaceFolder}/platform/windows/godot.natvis", - "preLaunchTask": "build" + "preLaunchTask": "Build [template_debug]" }, { "name": "Debug [debug-collisions]", @@ -41,7 +41,7 @@ "environment": [], "console": "internalConsole", "visualizerFile": "${workspaceFolder}/platform/windows/godot.natvis", - "preLaunchTask": "build" + "preLaunchTask": "Build [template_debug]" } ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 902c437..99f56ad 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ "version": "2.0.0", "tasks": [ { - "label": "build", + "label": "Build [template_debug]", "group": { "kind": "build", "isDefault": true diff --git a/Assets/Classes/Character3D.tscn b/Assets/Classes/Character3D.tscn index 7a9bd26..db96ff3 100644 --- a/Assets/Classes/Character3D.tscn +++ b/Assets/Classes/Character3D.tscn @@ -32,3 +32,7 @@ platform_floor_layers = 15 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.89956665, 0) shape = SubResource("CapsuleShape3D_6ql8e") debug_color = Color(0.39215687, 0.78431374, 0, 1) + +[node name="VisibleOnScreenEnabler3D" type="VisibleOnScreenEnabler3D" parent="." unique_id=473129082] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) +aabb = AABB(-0.5, -1, -0.5, 1, 2, 1) diff --git a/addons/godotsteam/win64/steam_api64.dll~RFbd093476.TMP b/addons/godotsteam/win64/steam_api64.dll~RFbd093476.TMP deleted file mode 100644 index 43e7291..0000000 Binary files a/addons/godotsteam/win64/steam_api64.dll~RFbd093476.TMP and /dev/null differ diff --git a/addons/godotsteam/win64/steam_api64.dll~RFf1aead9d.TMP b/addons/godotsteam/win64/steam_api64.dll~RFf1aead9d.TMP deleted file mode 100644 index c90a4e7..0000000 Binary files a/addons/godotsteam/win64/steam_api64.dll~RFf1aead9d.TMP and /dev/null differ diff --git a/addons/liborng b/addons/liborng index 52c2aab..306db05 160000 --- a/addons/liborng +++ b/addons/liborng @@ -1 +1 @@ -Subproject commit 52c2aab73c9e60745c37a8a91cd938f8faa6447d +Subproject commit 306db05bfc442ca29a51ba5fb4aefb2cc1a10db8 diff --git a/export_presets.cfg b/export_presets.cfg index 83ff215..92f6ddf 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -10,8 +10,8 @@ dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" -exclude_filter="" -export_path="C:/Users/Jamie Greunbaum/Desktop/playing_around_with_exports/mesh-slice.exe" +exclude_filter="addons/liborng/src/, addons/liborng/windows_x86_64/, Raw Files, " +export_path="C:/Users/Jamie Greunbaum/Desktop/playing_around_with_exports/project-vivi.exe" patches=PackedStringArray() patch_delta_encoding=false patch_delta_compression_level_zstd=19