diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 1 | ||||
| -rw-r--r-- | modules/bullet/shape_bullet.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_editor.cpp | 8 | ||||
| -rw-r--r-- | modules/mono/glue/Managed/Files/Colors.cs | 2 | ||||
| -rw-r--r-- | modules/tinyexr/image_loader_tinyexr.cpp | 6 | ||||
| -rw-r--r-- | modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml | 2 | ||||
| -rw-r--r-- | modules/webm/libvpx/SCsub | 2 | ||||
| -rw-r--r-- | modules/websocket/emws_client.cpp | 4 |
8 files changed, 18 insertions, 9 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index 0117bb375f..3dc9f3fce5 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -304,6 +304,7 @@ btScalar GodotRestInfoContactResultCallback::addSingleResult(btManifoldPoint &cp colObj = static_cast<CollisionObjectBullet *>(colObj1Wrap->getCollisionObject()->getUserPointer()); m_result->shape = cp.m_index1; B_TO_G(cp.getPositionWorldOnB(), m_result->point); + B_TO_G(cp.m_normalWorldOnB, m_result->normal); m_rest_info_bt_point = cp.getPositionWorldOnB(); m_rest_info_collision_object = colObj1Wrap->getCollisionObject(); } else { diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp index 2027d8e1eb..55dcd9c323 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -487,7 +487,7 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) { PoolByteArray im_data = l_image->get_data(); - l_heights.resize(l_image->get_width() * l_image->get_width()); + l_heights.resize(l_image->get_width() * l_image->get_height()); PoolRealArray::Write w = l_heights.write(); PoolByteArray::Read r = im_data.read(); diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index cce86efbf5..a1f4bb3c4c 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -251,6 +251,14 @@ Error GodotSharpEditor::open_in_external_editor(const Ref<Script> &p_script, int // Try to search it again if it wasn't found last time or if it was removed from its location vscode_path = path_which("code"); } + if (vscode_path.empty() || !FileAccess::exists(vscode_path)) { + // On some Linux distro the executable has the name vscode + vscode_path = path_which("vscode"); + } + if (vscode_path.empty() || !FileAccess::exists(vscode_path)) { + // Executable name when installing VSCode directly from MS on Linux + vscode_path = path_which("visual-studio-code"); + } List<String> args; diff --git a/modules/mono/glue/Managed/Files/Colors.cs b/modules/mono/glue/Managed/Files/Colors.cs index 942375b0fe..bc2a1a3bd7 100644 --- a/modules/mono/glue/Managed/Files/Colors.cs +++ b/modules/mono/glue/Managed/Files/Colors.cs @@ -8,7 +8,7 @@ namespace Godot // Color names and values are derived from core/color_names.inc internal static readonly Dictionary<string, Color> namedColors = new Dictionary<string, Color> { {"aliceblue", new Color(0.94f, 0.97f, 1.00f)}, - {"antiqueWhite", new Color(0.98f, 0.92f, 0.84f)}, + {"antiquewhite", new Color(0.98f, 0.92f, 0.84f)}, {"aqua", new Color(0.00f, 1.00f, 1.00f)}, {"aquamarine", new Color(0.50f, 1.00f, 0.83f)}, {"azure", new Color(0.94f, 1.00f, 1.00f)}, diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index 63f0781028..81f61c1d4d 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -131,7 +131,7 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f Image::Format format; int output_channels = 0; - if (idxA > 0) { + if (idxA != -1) { imgdata.resize(exr_image.width * exr_image.height * 8); //RGBA16 format = Image::FORMAT_RGBAH; @@ -187,7 +187,7 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f const float *b_channel_start = reinterpret_cast<const float *>(tile.images[idxB]); const float *a_channel_start = NULL; - if (idxA > 0) { + if (idxA != -1) { a_channel_start = reinterpret_cast<const float *>(tile.images[idxA]); } @@ -216,7 +216,7 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f *row_w++ = Math::make_half_float(color.g); *row_w++ = Math::make_half_float(color.b); - if (idxA > 0) { + if (idxA != -1) { *row_w++ = Math::make_half_float(*a_channel++); } } diff --git a/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml b/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml index 399ba8ef5d..ac3aec6c14 100644 --- a/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml +++ b/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml @@ -154,7 +154,7 @@ Return the lesser of the two numbers, also known as their minimum. </constant> <constant name="LOGIC_CLAMP" value="46" enum="BuiltinFunc"> - Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to `min(max(input, range_low), range_high)` + Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to [code]min(max(input, range_low), range_high)[/code]. </constant> <constant name="LOGIC_NEAREST_PO2" value="47" enum="BuiltinFunc"> Return the nearest power of 2 to the input. diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 36de31828d..df75dca310 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -271,7 +271,7 @@ if env["platform"] == 'uwp': else: import platform is_x11_or_server_arm = ((env["platform"] == 'x11' or env["platform"] == 'server') and (platform.machine().startswith('arm') or platform.machine().startswith('aarch'))) - is_ios_x86 = (env["platform"] == 'iphone' and env["ios_sim"]) + is_ios_x86 = (env["platform"] == 'iphone' and ("arch" in env and env["arch"].startswith('x86'))) is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86') if is_android_x86: cpu_bits = '32' diff --git a/modules/websocket/emws_client.cpp b/modules/websocket/emws_client.cpp index 82a577790e..522b810721 100644 --- a/modules/websocket/emws_client.cpp +++ b/modules/websocket/emws_client.cpp @@ -205,8 +205,8 @@ int EMWSClient::get_max_packet_size() const { } EMWSClient::EMWSClient() { - _in_buf_size = GLOBAL_GET(WSC_IN_BUF); - _in_pkt_size = GLOBAL_GET(WSC_IN_PKT); + _in_buf_size = nearest_shift((int)GLOBAL_GET(WSC_IN_BUF) - 1) + 10; + _in_pkt_size = nearest_shift((int)GLOBAL_GET(WSC_IN_PKT) - 1); _is_connecting = false; _peer = Ref<EMWSPeer>(memnew(EMWSPeer)); /* clang-format off */ |