Merge pull request #80 from Faless/bump/beta11

Update to Godot 4.0-beta11, libdatachannel v0.18.1
godotengine · Jan 12, 2023 · 2bc2a5d · 2bc2a5d
2 parents 7d260b1 + 7176344
commit 2bc2a5d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/SConstruct b/SConstruct
@@ -24,11 +24,6 @@ if env["godot_version"] == "3":
     if "platform" in ARGUMENTS and ARGUMENTS["platform"] == "macos":
         ARGUMENTS["platform"] = "osx"  # compatibility with old osx name
 
-    scons_cache_path = os.environ.get("SCONS_CACHE")
-    if scons_cache_path is not None:
-        CacheDir(scons_cache_path)
-        Decider("MD5")
-
     env = SConscript("godot-cpp-3.x/SConstruct")
 
     # Patch base env

diff --git a/godot-cpp b/godot-cpp
diff --git a/godot-cpp-3.x b/godot-cpp-3.x
diff --git a/thirdparty/libdatachannel b/thirdparty/libdatachannel
+1 −1		.github/workflows/ci.yml
+6 −7		CMakeLists.txt
+1 −1		LICENSE.md
+32 −15		SConstruct
+40 −34		binding_generator.py
+1,112 −469		gdextension/extension_api.json
+29 −29		gdextension/gdextension_interface.h
+29 −29		include/godot_cpp/classes/ref.hpp
+29 −29		include/godot_cpp/classes/wrapped.hpp
+47 −32		include/godot_cpp/core/binder_common.hpp
+29 −29		include/godot_cpp/core/builtin_ptrcall.hpp
+29 −29		include/godot_cpp/core/class_db.hpp
+29 −29		include/godot_cpp/core/defs.hpp
+29 −29		include/godot_cpp/core/engine_ptrcall.hpp
+29 −29		include/godot_cpp/core/error_macros.hpp
+29 −29		include/godot_cpp/core/math.hpp
+29 −29		include/godot_cpp/core/memory.hpp
+29 −29		include/godot_cpp/core/method_bind.hpp
+29 −29		include/godot_cpp/core/method_ptrcall.hpp
+29 −29		include/godot_cpp/core/mutex_lock.hpp
+29 −29		include/godot_cpp/core/object.hpp
+29 −29		include/godot_cpp/core/property_info.hpp
+29 −29		include/godot_cpp/core/type_info.hpp
+29 −29		include/godot_cpp/godot.hpp
+29 −29		include/godot_cpp/templates/cowdata.hpp
+29 −29		include/godot_cpp/templates/hash_map.hpp
+29 −29		include/godot_cpp/templates/hash_set.hpp
+29 −29		include/godot_cpp/templates/hashfuncs.hpp
+29 −29		include/godot_cpp/templates/list.hpp
+29 −29		include/godot_cpp/templates/pair.hpp
+29 −29		include/godot_cpp/templates/rb_map.hpp
+29 −29		include/godot_cpp/templates/rb_set.hpp
+29 −29		include/godot_cpp/templates/rid_owner.hpp
+29 −29		include/godot_cpp/templates/safe_refcount.hpp
+29 −29		include/godot_cpp/templates/search_array.hpp
+29 −29		include/godot_cpp/templates/self_list.hpp
+29 −29		include/godot_cpp/templates/sort_array.hpp
+29 −29		include/godot_cpp/templates/spin_lock.hpp
+30 −30		include/godot_cpp/templates/thread_work_pool.hpp
+29 −29		include/godot_cpp/templates/vector.hpp
+29 −29		include/godot_cpp/templates/vmap.hpp
+29 −29		include/godot_cpp/templates/vset.hpp
+29 −29		include/godot_cpp/variant/aabb.hpp
+29 −29		include/godot_cpp/variant/array_helpers.hpp
+29 −29		include/godot_cpp/variant/basis.hpp
+29 −29		include/godot_cpp/variant/char_string.hpp
+29 −29		include/godot_cpp/variant/char_utils.hpp
+29 −29		include/godot_cpp/variant/color.hpp
+29 −29		include/godot_cpp/variant/color_names.inc.hpp
+29 −29		include/godot_cpp/variant/plane.hpp
+29 −29		include/godot_cpp/variant/projection.hpp
+29 −29		include/godot_cpp/variant/quaternion.hpp
+29 −29		include/godot_cpp/variant/rect2.hpp
+29 −29		include/godot_cpp/variant/rect2i.hpp
+29 −29		include/godot_cpp/variant/transform2d.hpp
+29 −29		include/godot_cpp/variant/transform3d.hpp
+29 −29		include/godot_cpp/variant/typed_array.hpp
+29 −29		include/godot_cpp/variant/ucaps.hpp
+29 −29		include/godot_cpp/variant/variant.hpp
+29 −29		include/godot_cpp/variant/vector2.hpp
+29 −29		include/godot_cpp/variant/vector2i.hpp
+29 −29		include/godot_cpp/variant/vector3.hpp
+29 −29		include/godot_cpp/variant/vector3i.hpp
+29 −29		include/godot_cpp/variant/vector4.hpp
+29 −29		include/godot_cpp/variant/vector4i.hpp
+2 −2		misc/scripts/check_get_file_list.py
+29 −29		misc/scripts/copyright_headers.py
+29 −29		src/classes/wrapped.cpp
+29 −29		src/core/class_db.cpp
+29 −29		src/core/error_macros.cpp
+29 −29		src/core/memory.cpp
+29 −29		src/core/method_bind.cpp
+29 −29		src/core/object.cpp
+29 −29		src/godot.cpp
+29 −29		src/variant/aabb.cpp
+29 −29		src/variant/basis.cpp
+29 −29		src/variant/char_string.cpp
+29 −29		src/variant/color.cpp
+29 −29		src/variant/packed_arrays.cpp
+29 −29		src/variant/plane.cpp
+29 −29		src/variant/projection.cpp
+29 −29		src/variant/quaternion.cpp
+29 −29		src/variant/rect2.cpp
+29 −29		src/variant/rect2i.cpp
+29 −29		src/variant/transform2d.cpp
+29 −29		src/variant/transform3d.cpp
+29 −29		src/variant/variant.cpp
+29 −29		src/variant/vector2.cpp
+29 −29		src/variant/vector2i.cpp
+29 −29		src/variant/vector3.cpp
+29 −29		src/variant/vector3i.cpp
+29 −29		src/variant/vector4.cpp
+29 −29		src/variant/vector4i.cpp
+1 −0		test/demo/main.gd
+6 −0		test/src/example.cpp
+1 −0		test/src/example.h
+4 −29		test/src/tests.h
+22 −0		.github/actions/godot-cache/action.yml
+40 −11		.github/workflows/ci.yml
+4 −0		.gitignore
+22 −24		CMakeLists.txt
+1 −1		Makefile
+45 −30		SConstruct
+28 −23		binding_generator.py
+1 −1		godot-headers
+31 −0		misc/scripts/check_get_file_list.py
+17 −7		src/core/Rect2.cpp
+1 −1		CMakeLists.txt
+5 −0		Jamfile
+10 −1		src/impl/icetransport.cpp
+1 −1		src/impl/icetransport.hpp