From 99864393525a8a61afc4de384650930ef8d3c70f Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Mon, 13 Jul 2020 14:13:38 -0400 Subject: [PATCH] Commit other files changed by file_format.sh --- .appveyor.yml | 4 ++-- .github/workflows/main.yml | 8 ++++---- core/oa_hash_map.h | 2 +- doc/classes/Array.xml | 8 ++++---- doc/classes/Decal.xml | 4 ++-- doc/classes/InputEventMouseMotion.xml | 2 +- doc/classes/KinematicBody2D.xml | 2 +- doc/classes/KinematicBody3D.xml | 2 +- doc/classes/RayCast2D.xml | 2 +- doc/classes/RayCast3D.xml | 2 +- main/tests/test_astar.cpp | 8 ++++---- .../Images.xcassets/LaunchImage.launchimage/Contents.json | 2 +- misc/dist/uwp_template/AppxManifest.xml | 2 +- modules/gdnative/nativescript/api_generator.cpp | 2 +- modules/mono/csharp_script.cpp | 6 +++--- .../GodotTools/GodotTools.IdeMessaging.CLI/Program.cs | 2 +- .../GodotTools/GodotTools.OpenVisualStudio/Program.cs | 2 +- .../android/java/lib/res/layout/downloading_expansion.xml | 2 +- .../res/layout/status_bar_ongoing_event_progress_bar.xml | 2 +- platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml | 2 +- platform/android/java/lib/res/values-ar/strings.xml | 2 +- platform/android/java/lib/res/values-bg/strings.xml | 2 +- platform/android/java/lib/res/values-ca/strings.xml | 2 +- platform/android/java/lib/res/values-cs/strings.xml | 2 +- platform/android/java/lib/res/values-da/strings.xml | 2 +- platform/android/java/lib/res/values-de/strings.xml | 2 +- platform/android/java/lib/res/values-el/strings.xml | 2 +- platform/android/java/lib/res/values-en/strings.xml | 2 +- platform/android/java/lib/res/values-es-rES/strings.xml | 2 +- platform/android/java/lib/res/values-es/strings.xml | 2 +- platform/android/java/lib/res/values-fi/strings.xml | 2 +- platform/android/java/lib/res/values-fr/strings.xml | 2 +- platform/android/java/lib/res/values-hi/strings.xml | 2 +- platform/android/java/lib/res/values-hr/strings.xml | 2 +- platform/android/java/lib/res/values-hu/strings.xml | 2 +- platform/android/java/lib/res/values-in/strings.xml | 2 +- platform/android/java/lib/res/values-it/strings.xml | 2 +- platform/android/java/lib/res/values-iw/strings.xml | 2 +- platform/android/java/lib/res/values-ja/strings.xml | 2 +- platform/android/java/lib/res/values-ko/strings.xml | 2 +- platform/android/java/lib/res/values-lt/strings.xml | 2 +- platform/android/java/lib/res/values-lv/strings.xml | 2 +- platform/android/java/lib/res/values-nb/strings.xml | 2 +- platform/android/java/lib/res/values-nl/strings.xml | 2 +- platform/android/java/lib/res/values-pl/strings.xml | 2 +- platform/android/java/lib/res/values-pt/strings.xml | 2 +- platform/android/java/lib/res/values-ro/strings.xml | 2 +- platform/android/java/lib/res/values-ru/strings.xml | 2 +- platform/android/java/lib/res/values-sk/strings.xml | 2 +- platform/android/java/lib/res/values-sl/strings.xml | 2 +- platform/android/java/lib/res/values-sr/strings.xml | 2 +- platform/android/java/lib/res/values-sv/strings.xml | 2 +- platform/android/java/lib/res/values-th/strings.xml | 2 +- platform/android/java/lib/res/values-tl/strings.xml | 2 +- platform/android/java/lib/res/values-tr/strings.xml | 2 +- platform/android/java/lib/res/values-uk/strings.xml | 2 +- platform/android/java/lib/res/values-vi/strings.xml | 2 +- platform/android/java/lib/res/values/strings.xml | 2 +- platform/android/java/lib/res/values/styles.xml | 2 +- platform/osx/os_osx.mm | 2 +- 60 files changed, 73 insertions(+), 73 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c39a485d35..0173657e80 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,8 +48,8 @@ after_build: - cd bin - mv godot.windows.opt.tools.64.exe godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.exe - 7z a -mx9 godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.zip *.exe - + artifacts: - path: bin/godot_${APPVEYOR_REPO_BRANCH}-${VERSION_HASH}_win64.zip name: Win64 release_debug editor build - type: zip \ No newline at end of file + type: zip diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ef335fe02..3b5d39bb12 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,9 +44,9 @@ jobs: uses: actions/setup-python@v2 with: # Semantic version range syntax or exact version of a Python version - python-version: '3.x' + python-version: '3.x' # Optional - x64 or x86 architecture, defaults to x64 - architecture: 'x64' + architecture: 'x64' # Setup scons, print python version and scons version info, so if anything is broken it won't run the build. - name: Configuring Python packages @@ -99,9 +99,9 @@ jobs: uses: actions/setup-python@v2 with: # Semantic version range syntax or exact version of a Python version - python-version: '3.x' + python-version: '3.x' # Optional - x64 or x86 architecture, defaults to x64 - architecture: 'x64' + architecture: 'x64' # You can test your matrix by printing the current Python version - name: Configuring Python packages diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index 775e17fdb5..6061366ab3 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -48,7 +48,7 @@ * * Only used keys and values are constructed. For free positions there's space * in the arrays for each, but that memory is kept uninitialized. - * + * * The assignment operator copy the pairs from one map to the other. */ template Returns [code]true[/code] if the array contains the given value. [codeblock] - ["inside", 7].has("inside") == true - ["inside", 7].has("outside") == false - ["inside", 7].has(7) == true - ["inside", 7].has("7") == false + print(["inside", 7].has("inside")) # True + print(["inside", 7].has("outside")) # False + print(["inside", 7].has(7)) # True + print(["inside", 7].has("7")) # False [/codeblock] [b]Note:[/b] This is equivalent to using the [code]in[/code] operator as follows: [codeblock] diff --git a/doc/classes/Decal.xml b/doc/classes/Decal.xml index f7329d1537..f9baa3b09a 100644 --- a/doc/classes/Decal.xml +++ b/doc/classes/Decal.xml @@ -17,7 +17,7 @@ - Returns the [Texture2D] associated with the specified [enum DecalTexture]. This is a convenience method, in most cases you should access the texture directly. + Returns the [Texture2D] associated with the specified [enum DecalTexture]. This is a convenience method, in most cases you should access the texture directly. For example, instead of [code]albedo_tex = $Decal.get_texture(Decal.TEXTURE_ALBEDO)[/code], use [code]albedo_tex = $Decal.texture_albedo[/code]. One case where this is better than accessing the texture directly is when you want to copy one Decal's textures to another. For example: [codeblock] @@ -34,7 +34,7 @@ - Sets the [Texture2D] associated with the specified [enum DecalTexture]. This is a convenience method, in most cases you should access the texture directly. + Sets the [Texture2D] associated with the specified [enum DecalTexture]. This is a convenience method, in most cases you should access the texture directly. For example, instead of [code]$Decal.set_texture(Decal.TEXTURE_ALBEDO, albedo_tex)[/code], use [code]$Decal.texture_albedo = albedo_tex[/code]. One case where this is better than accessing the texture directly is when you want to copy one Decal's textures to another. For example: [codeblock] diff --git a/doc/classes/InputEventMouseMotion.xml b/doc/classes/InputEventMouseMotion.xml index 97b9d5247a..53e6517c7a 100644 --- a/doc/classes/InputEventMouseMotion.xml +++ b/doc/classes/InputEventMouseMotion.xml @@ -16,7 +16,7 @@ Represents the pressure the user puts on the pen. Ranges from [code]0.0[/code] to [code]1.0[/code]. - The mouse position relative to the previous position (position at the last frame). + The mouse position relative to the previous position (position at the last frame). [b]Note:[/b] Since [InputEventMouseMotion] is only emitted when the mouse moves, the last event won't have a relative position of [code]Vector2(0, 0)[/code] when the user stops moving the mouse. diff --git a/doc/classes/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml index f0f4d83821..455fdad771 100644 --- a/doc/classes/KinematicBody2D.xml +++ b/doc/classes/KinematicBody2D.xml @@ -104,7 +104,7 @@ Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [KinematicBody2D] or [RigidBody2D], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes. This method should be used in [method Node._physics_process] (or in a method called by [method Node._physics_process]), as it uses the physics step's [code]delta[/code] value automatically in calculations. Otherwise, the simulation will run at an incorrect speed. - [code]linear_velocity[/code] is the velocity vector in pixels per second. Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. + [code]linear_velocity[/code] is the velocity vector in pixels per second. Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. [code]up_direction[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector2(0, 0)[/code], everything is considered a wall. This is useful for topdown games. If [code]stop_on_slope[/code] is [code]true[/code], body will not slide on slopes when you include gravity in [code]linear_velocity[/code] and the body is standing still. If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops. diff --git a/doc/classes/KinematicBody3D.xml b/doc/classes/KinematicBody3D.xml index 5477c6bab6..01cce907f9 100644 --- a/doc/classes/KinematicBody3D.xml +++ b/doc/classes/KinematicBody3D.xml @@ -106,7 +106,7 @@ Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [KinematicBody3D] or [RigidBody3D], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes. This method should be used in [method Node._physics_process] (or in a method called by [method Node._physics_process]), as it uses the physics step's [code]delta[/code] value automatically in calculations. Otherwise, the simulation will run at an incorrect speed. - [code]linear_velocity[/code] is the velocity vector (typically meters per second). Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. + [code]linear_velocity[/code] is the velocity vector (typically meters per second). Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. [code]up_direction[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector3(0, 0, 0)[/code], everything is considered a wall. If [code]stop_on_slope[/code] is [code]true[/code], body will not slide on slopes when you include gravity in [code]linear_velocity[/code] and the body is standing still. If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops. diff --git a/doc/classes/RayCast2D.xml b/doc/classes/RayCast2D.xml index 4a594d3e1a..6a11630c0e 100644 --- a/doc/classes/RayCast2D.xml +++ b/doc/classes/RayCast2D.xml @@ -44,7 +44,7 @@ Updates the collision information for the ray. Use this method to update the collision information immediately instead of waiting for the next [code]_physics_process[/code] call, for example if the ray or its parent has changed state. - [b]Note:[/b] [code]enabled == true[/code] is not required for this to work. + [b]Note:[/b] [member enabled] does not need to be [code]true[/code] for this to work. diff --git a/doc/classes/RayCast3D.xml b/doc/classes/RayCast3D.xml index 3512da9d77..e7ee1d284f 100644 --- a/doc/classes/RayCast3D.xml +++ b/doc/classes/RayCast3D.xml @@ -45,7 +45,7 @@ Updates the collision information for the ray. Use this method to update the collision information immediately instead of waiting for the next [code]_physics_process[/code] call, for example if the ray or its parent has changed state. - [b]Note:[/b] [code]enabled == true[/code] is not required for this to work. + [b]Note:[/b] [member enabled] does not need to be [code]true[/code] for this to work. diff --git a/main/tests/test_astar.cpp b/main/tests/test_astar.cpp index fe335589b0..cb5fcfe37b 100644 --- a/main/tests/test_astar.cpp +++ b/main/tests/test_astar.cpp @@ -102,9 +102,9 @@ bool test_add_remove() { a.connect_points(1, 3, true); a.connect_points(1, 4, false); - ok = ok && (a.are_points_connected(2, 1) == true); - ok = ok && (a.are_points_connected(4, 1) == true); - ok = ok && (a.are_points_connected(2, 1, false) == true); + ok = ok && (a.are_points_connected(2, 1)); + ok = ok && (a.are_points_connected(4, 1)); + ok = ok && (a.are_points_connected(2, 1, false)); ok = ok && (a.are_points_connected(4, 1, false) == false); a.disconnect_points(1, 2, true); @@ -179,7 +179,7 @@ bool test_add_remove() { if (Math::rand() % 2 == 1) { // Add a (possibly existing) directed edge and confirm connectivity a.connect_points(u, v, false); - ok = ok && (a.are_points_connected(u, v, false) == true); + ok = ok && (a.are_points_connected(u, v, false)); } else { // Remove a (possibly nonexistent) directed edge and confirm disconnectivity a.disconnect_points(u, v, false); diff --git a/misc/dist/ios_xcode/godot_ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/misc/dist/ios_xcode/godot_ios/Images.xcassets/LaunchImage.launchimage/Contents.json index ce81d76027..f3ac82189f 100644 --- a/misc/dist/ios_xcode/godot_ios/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/misc/dist/ios_xcode/godot_ios/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -99,4 +99,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/misc/dist/uwp_template/AppxManifest.xml b/misc/dist/uwp_template/AppxManifest.xml index cf26387f22..c25be4add2 100644 --- a/misc/dist/uwp_template/AppxManifest.xml +++ b/misc/dist/uwp_template/AppxManifest.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/modules/gdnative/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp index 62f2ec5024..ae0b5222f0 100644 --- a/modules/gdnative/nativescript/api_generator.cpp +++ b/modules/gdnative/nativescript/api_generator.cpp @@ -139,7 +139,7 @@ static String get_type_name(const PropertyInfo &info) { } /* - * Some comparison helper functions we need + * Some comparison helper functions we need */ struct MethodInfoComparator { diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 22e4d84e98..7d3ae31588 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1963,7 +1963,7 @@ MonoObject *CSharpInstance::_internal_new_managed() { bool die = _unreference_owner_unsafe(); // Not ok for the owner to die here. If there is a situation where this can happen, it will be considered a bug. - CRASH_COND(die == true); + CRASH_COND(die); owner = nullptr; @@ -2298,7 +2298,7 @@ CSharpInstance::~CSharpInstance() { // Unreference the owner here, before the new "instance binding" references it. // Otherwise, the unsafe reference debug checks will incorrectly detect a bug. bool die = _unreference_owner_unsafe(); - CRASH_COND(die == true); // `owner_keep_alive` holds a reference, so it can't die + CRASH_COND(die); // `owner_keep_alive` holds a reference, so it can't die void *data = owner->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index()); CRASH_COND(data == nullptr); @@ -3136,7 +3136,7 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg bool die = instance->_unreference_owner_unsafe(); // Not ok for the owner to die here. If there is a situation where this can happen, it will be considered a bug. - CRASH_COND(die == true); + CRASH_COND(die); p_owner->set_script_instance(nullptr); r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL; diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs index 99a55c471b..4db71500da 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Reflection; diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs index affb2a47e7..ce2b378623 100644 --- a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs +++ b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; diff --git a/platform/android/java/lib/res/layout/downloading_expansion.xml b/platform/android/java/lib/res/layout/downloading_expansion.xml index 4a9700965f..34c2757598 100644 --- a/platform/android/java/lib/res/layout/downloading_expansion.xml +++ b/platform/android/java/lib/res/layout/downloading_expansion.xml @@ -162,4 +162,4 @@ - \ No newline at end of file + diff --git a/platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml b/platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml index fae1faeb60..426e1bd841 100644 --- a/platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml +++ b/platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml @@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml b/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml index 1ed4037035..cfdcca2ab5 100644 --- a/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml +++ b/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-ar/strings.xml b/platform/android/java/lib/res/values-ar/strings.xml index 9f3dc6d6ac..77cd61ea51 100644 --- a/platform/android/java/lib/res/values-ar/strings.xml +++ b/platform/android/java/lib/res/values-ar/strings.xml @@ -1,4 +1,4 @@ godot-project-name-ar - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-bg/strings.xml b/platform/android/java/lib/res/values-bg/strings.xml index bd8109277e..0f42d1f22b 100644 --- a/platform/android/java/lib/res/values-bg/strings.xml +++ b/platform/android/java/lib/res/values-bg/strings.xml @@ -1,4 +1,4 @@ godot-project-name-bg - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-ca/strings.xml b/platform/android/java/lib/res/values-ca/strings.xml index 494cb88468..291a44d5e2 100644 --- a/platform/android/java/lib/res/values-ca/strings.xml +++ b/platform/android/java/lib/res/values-ca/strings.xml @@ -1,4 +1,4 @@ godot-project-name-ca - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-cs/strings.xml b/platform/android/java/lib/res/values-cs/strings.xml index 30ce00f895..83ff73e12a 100644 --- a/platform/android/java/lib/res/values-cs/strings.xml +++ b/platform/android/java/lib/res/values-cs/strings.xml @@ -1,4 +1,4 @@ godot-project-name-cs - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-da/strings.xml b/platform/android/java/lib/res/values-da/strings.xml index 4c2a1cf0f4..fd251a7c90 100644 --- a/platform/android/java/lib/res/values-da/strings.xml +++ b/platform/android/java/lib/res/values-da/strings.xml @@ -1,4 +1,4 @@ godot-project-name-da - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-de/strings.xml b/platform/android/java/lib/res/values-de/strings.xml index 52946d4cce..f6e80b0b1a 100644 --- a/platform/android/java/lib/res/values-de/strings.xml +++ b/platform/android/java/lib/res/values-de/strings.xml @@ -1,4 +1,4 @@ godot-project-name-de - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-el/strings.xml b/platform/android/java/lib/res/values-el/strings.xml index 181dc51762..adcdf13eb1 100644 --- a/platform/android/java/lib/res/values-el/strings.xml +++ b/platform/android/java/lib/res/values-el/strings.xml @@ -1,4 +1,4 @@ godot-project-name-el - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-en/strings.xml b/platform/android/java/lib/res/values-en/strings.xml index 976a565013..1b251c9ab6 100644 --- a/platform/android/java/lib/res/values-en/strings.xml +++ b/platform/android/java/lib/res/values-en/strings.xml @@ -1,4 +1,4 @@ godot-project-name-en - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-es-rES/strings.xml b/platform/android/java/lib/res/values-es-rES/strings.xml index 73f63a08f8..b580a8270b 100644 --- a/platform/android/java/lib/res/values-es-rES/strings.xml +++ b/platform/android/java/lib/res/values-es-rES/strings.xml @@ -1,4 +1,4 @@ godot-project-name-es_ES - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-es/strings.xml b/platform/android/java/lib/res/values-es/strings.xml index 07b718a641..6aedd6870b 100644 --- a/platform/android/java/lib/res/values-es/strings.xml +++ b/platform/android/java/lib/res/values-es/strings.xml @@ -1,4 +1,4 @@ godot-project-name-es - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-fi/strings.xml b/platform/android/java/lib/res/values-fi/strings.xml index 323d82aff1..bd7ef059ab 100644 --- a/platform/android/java/lib/res/values-fi/strings.xml +++ b/platform/android/java/lib/res/values-fi/strings.xml @@ -1,4 +1,4 @@ godot-project-name-fi - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-fr/strings.xml b/platform/android/java/lib/res/values-fr/strings.xml index 32bead2661..03994099cf 100644 --- a/platform/android/java/lib/res/values-fr/strings.xml +++ b/platform/android/java/lib/res/values-fr/strings.xml @@ -1,4 +1,4 @@ godot-project-name-fr - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-hi/strings.xml b/platform/android/java/lib/res/values-hi/strings.xml index 8aab2a8c63..60d3b46861 100644 --- a/platform/android/java/lib/res/values-hi/strings.xml +++ b/platform/android/java/lib/res/values-hi/strings.xml @@ -1,4 +1,4 @@ godot-project-name-hi - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-hr/strings.xml b/platform/android/java/lib/res/values-hr/strings.xml index caf55e2241..e552a6f6ec 100644 --- a/platform/android/java/lib/res/values-hr/strings.xml +++ b/platform/android/java/lib/res/values-hr/strings.xml @@ -1,4 +1,4 @@ godot-project-name-hr - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-hu/strings.xml b/platform/android/java/lib/res/values-hu/strings.xml index e7f9e51226..ed21411acb 100644 --- a/platform/android/java/lib/res/values-hu/strings.xml +++ b/platform/android/java/lib/res/values-hu/strings.xml @@ -1,4 +1,4 @@ godot-project-name-hu - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-in/strings.xml b/platform/android/java/lib/res/values-in/strings.xml index 9e9a8b0c03..169b65decb 100644 --- a/platform/android/java/lib/res/values-in/strings.xml +++ b/platform/android/java/lib/res/values-in/strings.xml @@ -1,4 +1,4 @@ godot-project-name-id - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-it/strings.xml b/platform/android/java/lib/res/values-it/strings.xml index 1f5e5a049e..880b87e030 100644 --- a/platform/android/java/lib/res/values-it/strings.xml +++ b/platform/android/java/lib/res/values-it/strings.xml @@ -1,4 +1,4 @@ godot-project-name-it - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-iw/strings.xml b/platform/android/java/lib/res/values-iw/strings.xml index f52ede2085..b4826798c7 100644 --- a/platform/android/java/lib/res/values-iw/strings.xml +++ b/platform/android/java/lib/res/values-iw/strings.xml @@ -1,4 +1,4 @@ godot-project-name-he - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-ja/strings.xml b/platform/android/java/lib/res/values-ja/strings.xml index 7f85f57df7..27d3ba521e 100644 --- a/platform/android/java/lib/res/values-ja/strings.xml +++ b/platform/android/java/lib/res/values-ja/strings.xml @@ -1,4 +1,4 @@ godot-project-name-ja - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-ko/strings.xml b/platform/android/java/lib/res/values-ko/strings.xml index fab0bdd753..efc5c7e015 100644 --- a/platform/android/java/lib/res/values-ko/strings.xml +++ b/platform/android/java/lib/res/values-ko/strings.xml @@ -52,4 +52,4 @@ %1$s KB/s 남은 시간: %1$s %1$s 남음 - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-lt/strings.xml b/platform/android/java/lib/res/values-lt/strings.xml index 6e3677fde7..10a93926db 100644 --- a/platform/android/java/lib/res/values-lt/strings.xml +++ b/platform/android/java/lib/res/values-lt/strings.xml @@ -1,4 +1,4 @@ godot-project-name-lt - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-lv/strings.xml b/platform/android/java/lib/res/values-lv/strings.xml index 701fc271ac..4f230b97f8 100644 --- a/platform/android/java/lib/res/values-lv/strings.xml +++ b/platform/android/java/lib/res/values-lv/strings.xml @@ -1,4 +1,4 @@ godot-project-name-lv - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-nb/strings.xml b/platform/android/java/lib/res/values-nb/strings.xml index 73147ca1af..a85a3da39a 100644 --- a/platform/android/java/lib/res/values-nb/strings.xml +++ b/platform/android/java/lib/res/values-nb/strings.xml @@ -1,4 +1,4 @@ godot-project-name-nb - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-nl/strings.xml b/platform/android/java/lib/res/values-nl/strings.xml index e501928a35..c459f64397 100644 --- a/platform/android/java/lib/res/values-nl/strings.xml +++ b/platform/android/java/lib/res/values-nl/strings.xml @@ -1,4 +1,4 @@ godot-project-name-nl - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-pl/strings.xml b/platform/android/java/lib/res/values-pl/strings.xml index ea5da73b6f..34a846cc78 100644 --- a/platform/android/java/lib/res/values-pl/strings.xml +++ b/platform/android/java/lib/res/values-pl/strings.xml @@ -1,4 +1,4 @@ godot-project-name-pl - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-pt/strings.xml b/platform/android/java/lib/res/values-pt/strings.xml index bdda7cd2c7..5f7a875eb5 100644 --- a/platform/android/java/lib/res/values-pt/strings.xml +++ b/platform/android/java/lib/res/values-pt/strings.xml @@ -1,4 +1,4 @@ godot-project-name-pt - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-ro/strings.xml b/platform/android/java/lib/res/values-ro/strings.xml index 3686da4c19..de990e789b 100644 --- a/platform/android/java/lib/res/values-ro/strings.xml +++ b/platform/android/java/lib/res/values-ro/strings.xml @@ -1,4 +1,4 @@ godot-project-name-ro - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-ru/strings.xml b/platform/android/java/lib/res/values-ru/strings.xml index 954067658b..73d8a27443 100644 --- a/platform/android/java/lib/res/values-ru/strings.xml +++ b/platform/android/java/lib/res/values-ru/strings.xml @@ -1,4 +1,4 @@ godot-project-name-ru - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-sk/strings.xml b/platform/android/java/lib/res/values-sk/strings.xml index 37d1283124..053960efed 100644 --- a/platform/android/java/lib/res/values-sk/strings.xml +++ b/platform/android/java/lib/res/values-sk/strings.xml @@ -1,4 +1,4 @@ godot-project-name-sk - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-sl/strings.xml b/platform/android/java/lib/res/values-sl/strings.xml index 0bb249c375..d6dff8289a 100644 --- a/platform/android/java/lib/res/values-sl/strings.xml +++ b/platform/android/java/lib/res/values-sl/strings.xml @@ -1,4 +1,4 @@ godot-project-name-sl - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-sr/strings.xml b/platform/android/java/lib/res/values-sr/strings.xml index 0e83cab1a1..b7e79e89ea 100644 --- a/platform/android/java/lib/res/values-sr/strings.xml +++ b/platform/android/java/lib/res/values-sr/strings.xml @@ -1,4 +1,4 @@ godot-project-name-sr - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-sv/strings.xml b/platform/android/java/lib/res/values-sv/strings.xml index e3a04ac2ec..9436c3870a 100644 --- a/platform/android/java/lib/res/values-sv/strings.xml +++ b/platform/android/java/lib/res/values-sv/strings.xml @@ -1,4 +1,4 @@ godot-project-name-sv - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-th/strings.xml b/platform/android/java/lib/res/values-th/strings.xml index 0aa893b8bf..629d77b9c2 100644 --- a/platform/android/java/lib/res/values-th/strings.xml +++ b/platform/android/java/lib/res/values-th/strings.xml @@ -1,4 +1,4 @@ godot-project-name-th - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-tl/strings.xml b/platform/android/java/lib/res/values-tl/strings.xml index e7e2af4909..f8832d6b1f 100644 --- a/platform/android/java/lib/res/values-tl/strings.xml +++ b/platform/android/java/lib/res/values-tl/strings.xml @@ -1,4 +1,4 @@ godot-project-name-tl - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-tr/strings.xml b/platform/android/java/lib/res/values-tr/strings.xml index 97af1243a6..f3a8f57de4 100644 --- a/platform/android/java/lib/res/values-tr/strings.xml +++ b/platform/android/java/lib/res/values-tr/strings.xml @@ -1,4 +1,4 @@ godot-project-name-tr - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-uk/strings.xml b/platform/android/java/lib/res/values-uk/strings.xml index 3dea6908a9..8ba2bf86aa 100644 --- a/platform/android/java/lib/res/values-uk/strings.xml +++ b/platform/android/java/lib/res/values-uk/strings.xml @@ -1,4 +1,4 @@ godot-project-name-uk - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values-vi/strings.xml b/platform/android/java/lib/res/values-vi/strings.xml index a6552130b0..8bf063ed82 100644 --- a/platform/android/java/lib/res/values-vi/strings.xml +++ b/platform/android/java/lib/res/values-vi/strings.xml @@ -1,4 +1,4 @@ godot-project-name-vi - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values/strings.xml b/platform/android/java/lib/res/values/strings.xml index a1b81a6186..590b066d8a 100644 --- a/platform/android/java/lib/res/values/strings.xml +++ b/platform/android/java/lib/res/values/strings.xml @@ -52,4 +52,4 @@ %1$s KB/s Time remaining: %1$s %1$s left - \ No newline at end of file + diff --git a/platform/android/java/lib/res/values/styles.xml b/platform/android/java/lib/res/values/styles.xml index a442f61e7e..b798373bc6 100644 --- a/platform/android/java/lib/res/values/styles.xml +++ b/platform/android/java/lib/res/values/styles.xml @@ -22,4 +22,4 @@ @android:color/background_dark - \ No newline at end of file + diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 4ca89ff4b2..c4eb5407af 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -320,7 +320,7 @@ void OS_OSX::run() { } joypad_osx->process_joypads(); - if (Main::iteration() == true) { + if (Main::iteration()) { quit = true; } } @catch (NSException *exception) {