From b40f3f974077930daf683ccfd4a8fb6fd271bb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 24 Jul 2020 10:26:41 +0200 Subject: [PATCH] Style: Sync other changes from new fix_style.sh and clang_format.sh --- core/object_id.h | 2 +- doc/classes/Array.xml | 8 ++--- doc/classes/InputEventMouseMotion.xml | 2 +- doc/classes/KinematicBody.xml | 2 +- doc/classes/KinematicBody2D.xml | 2 +- doc/classes/RayCast.xml | 2 +- doc/classes/RayCast2D.xml | 2 +- drivers/gles2/rasterizer_array_gles2.h | 30 +++++++++++++++++++ drivers/unix/syslog_logger.cpp | 2 +- main/tests/test_astar.cpp | 8 ++--- main/tests/test_basis.cpp | 2 +- main/tests/test_basis.h | 2 +- .../dist/docker/scripts/install-android-tools | 2 +- .../LaunchImage.launchimage/Contents.json | 2 +- misc/dist/ios_xcode/godot_ios/dylibs/empty | 2 +- .../ios_xcode/godot_ios/export_options.plist | 2 +- .../dist/osx_template.app/Contents/Info.plist | 2 +- misc/dist/uwp_template/AppxManifest.xml | 2 +- modules/arkit/arkit_session_delegate.mm | 2 +- modules/assimp/import_utils.h | 2 +- modules/camera/camera_ios.h | 2 +- modules/gdnative/android/android_gdn.cpp | 2 +- .../gdnative/nativescript/api_generator.cpp | 2 +- modules/gridmap/doc_classes/README.md | 2 +- modules/mono/csharp_script.cpp | 6 ++-- .../GodotTools.IdeMessaging.CLI/Program.cs | 2 +- .../GodotTools.OpenVisualStudio/Program.cs | 2 +- .../GodotTools/Ides/Rider/RiderPathLocator.cs | 6 ++-- .../lib/res/layout/downloading_expansion.xml | 2 +- .../status_bar_ongoing_event_progress_bar.xml | 2 +- .../java/lib/res/mipmap-anydpi-v26/icon.xml | 2 +- .../java/lib/res/values-ar/strings.xml | 2 +- .../java/lib/res/values-bg/strings.xml | 2 +- .../java/lib/res/values-ca/strings.xml | 2 +- .../java/lib/res/values-cs/strings.xml | 2 +- .../java/lib/res/values-da/strings.xml | 2 +- .../java/lib/res/values-de/strings.xml | 2 +- .../java/lib/res/values-el/strings.xml | 2 +- .../java/lib/res/values-en/strings.xml | 2 +- .../java/lib/res/values-es-rES/strings.xml | 2 +- .../java/lib/res/values-es/strings.xml | 2 +- .../java/lib/res/values-fi/strings.xml | 2 +- .../java/lib/res/values-fr/strings.xml | 2 +- .../java/lib/res/values-hi/strings.xml | 2 +- .../java/lib/res/values-hr/strings.xml | 2 +- .../java/lib/res/values-hu/strings.xml | 2 +- .../java/lib/res/values-in/strings.xml | 2 +- .../java/lib/res/values-it/strings.xml | 2 +- .../java/lib/res/values-iw/strings.xml | 2 +- .../java/lib/res/values-ja/strings.xml | 2 +- .../java/lib/res/values-ko/strings.xml | 2 +- .../java/lib/res/values-lt/strings.xml | 2 +- .../java/lib/res/values-lv/strings.xml | 2 +- .../java/lib/res/values-nb/strings.xml | 2 +- .../java/lib/res/values-nl/strings.xml | 2 +- .../java/lib/res/values-pl/strings.xml | 2 +- .../java/lib/res/values-pt/strings.xml | 2 +- .../java/lib/res/values-ro/strings.xml | 2 +- .../java/lib/res/values-ru/strings.xml | 2 +- .../java/lib/res/values-sk/strings.xml | 2 +- .../java/lib/res/values-sl/strings.xml | 2 +- .../java/lib/res/values-sr/strings.xml | 2 +- .../java/lib/res/values-sv/strings.xml | 2 +- .../java/lib/res/values-th/strings.xml | 2 +- .../java/lib/res/values-tl/strings.xml | 2 +- .../java/lib/res/values-tr/strings.xml | 2 +- .../java/lib/res/values-uk/strings.xml | 2 +- .../java/lib/res/values-vi/strings.xml | 2 +- .../android/java/lib/res/values/strings.xml | 2 +- .../android/java/lib/res/values/styles.xml | 2 +- .../godotengine/godot/plugin/GodotPlugin.java | 4 +-- .../godot/plugin/GodotPluginRegistry.java | 4 +-- .../godotengine/godot/plugin/SignalInfo.java | 4 +-- platform/osx/os_osx.mm | 2 +- 74 files changed, 116 insertions(+), 86 deletions(-) diff --git a/core/object_id.h b/core/object_id.h index ae3f2980729..575731258d9 100644 --- a/core/object_id.h +++ b/core/object_id.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* object_rc.h */ +/* object_id.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/doc/classes/Array.xml b/doc/classes/Array.xml index 54cd4109cc0..f7c1d678a20 100644 --- a/doc/classes/Array.xml +++ b/doc/classes/Array.xml @@ -203,10 +203,10 @@ 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 + ["inside", 7].has("inside") # True + ["inside", 7].has("outside") # False + ["inside", 7].has(7) # True + ["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/InputEventMouseMotion.xml b/doc/classes/InputEventMouseMotion.xml index ec3fd670d72..e72334cac78 100644 --- a/doc/classes/InputEventMouseMotion.xml +++ b/doc/classes/InputEventMouseMotion.xml @@ -17,7 +17,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/KinematicBody.xml b/doc/classes/KinematicBody.xml index b238f530dcb..62a2f623b1c 100644 --- a/doc/classes/KinematicBody.xml +++ b/doc/classes/KinematicBody.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 [KinematicBody] or [RigidBody], 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/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml index 666a4bcf404..5f6edae536f 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/RayCast.xml b/doc/classes/RayCast.xml index b33afa0305d..72a718e3af8 100644 --- a/doc/classes/RayCast.xml +++ b/doc/classes/RayCast.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] [code]enabled[/code] is not required for this to work. diff --git a/doc/classes/RayCast2D.xml b/doc/classes/RayCast2D.xml index 2c67931e6d0..dd20e25f4e0 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] [code]enabled[/code] is not required for this to work. diff --git a/drivers/gles2/rasterizer_array_gles2.h b/drivers/gles2/rasterizer_array_gles2.h index 30a4dd823a9..b7f8615c917 100644 --- a/drivers/gles2/rasterizer_array_gles2.h +++ b/drivers/gles2/rasterizer_array_gles2.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* rasterizer_array_gles2.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + #pragma once /*************************************************************************/ diff --git a/drivers/unix/syslog_logger.cpp b/drivers/unix/syslog_logger.cpp index 59001f057d8..dc9112bf140 100644 --- a/drivers/unix/syslog_logger.cpp +++ b/drivers/unix/syslog_logger.cpp @@ -68,4 +68,4 @@ void SyslogLogger::print_error(const char *p_function, const char *p_file, int p SyslogLogger::~SyslogLogger() { } -#endif \ No newline at end of file +#endif diff --git a/main/tests/test_astar.cpp b/main/tests/test_astar.cpp index dee107f0afc..a0f23888e70 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); @@ -177,7 +177,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/main/tests/test_basis.cpp b/main/tests/test_basis.cpp index ac25151fd8c..5904fc386a1 100644 --- a/main/tests/test_basis.cpp +++ b/main/tests/test_basis.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* test_fbx.cpp */ +/* test_basis.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/main/tests/test_basis.h b/main/tests/test_basis.h index 67c9db88770..63297bd3b8b 100644 --- a/main/tests/test_basis.h +++ b/main/tests/test_basis.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* test_fbx.h */ +/* test_basis.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/misc/dist/docker/scripts/install-android-tools b/misc/dist/docker/scripts/install-android-tools index 8a617d9942b..c8c2dd99f7b 100644 --- a/misc/dist/docker/scripts/install-android-tools +++ b/misc/dist/docker/scripts/install-android-tools @@ -87,4 +87,4 @@ fi echo echo "Done!" -echo \ No newline at end of file +echo 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 ce81d76027a..f3ac82189f3 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/ios_xcode/godot_ios/dylibs/empty b/misc/dist/ios_xcode/godot_ios/dylibs/empty index 4b5614362b6..bd3e8943336 100644 --- a/misc/dist/ios_xcode/godot_ios/dylibs/empty +++ b/misc/dist/ios_xcode/godot_ios/dylibs/empty @@ -1 +1 @@ -Dummy file to make dylibs folder exported \ No newline at end of file +Dummy file to make dylibs folder exported diff --git a/misc/dist/ios_xcode/godot_ios/export_options.plist b/misc/dist/ios_xcode/godot_ios/export_options.plist index 3878a4dbe6c..26624bfafe2 100644 --- a/misc/dist/ios_xcode/godot_ios/export_options.plist +++ b/misc/dist/ios_xcode/godot_ios/export_options.plist @@ -17,4 +17,4 @@ compileBitcode - \ No newline at end of file + diff --git a/misc/dist/osx_template.app/Contents/Info.plist b/misc/dist/osx_template.app/Contents/Info.plist index eefaf8e1ad1..300dc28e526 100755 --- a/misc/dist/osx_template.app/Contents/Info.plist +++ b/misc/dist/osx_template.app/Contents/Info.plist @@ -46,4 +46,4 @@ NSHighResolutionCapable $highres - \ No newline at end of file + diff --git a/misc/dist/uwp_template/AppxManifest.xml b/misc/dist/uwp_template/AppxManifest.xml index cf26387f22c..c25be4add26 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/arkit/arkit_session_delegate.mm b/modules/arkit/arkit_session_delegate.mm index d3c12ad582e..f44f46b7b7f 100644 --- a/modules/arkit/arkit_session_delegate.mm +++ b/modules/arkit/arkit_session_delegate.mm @@ -53,4 +53,4 @@ } } -@end \ No newline at end of file +@end diff --git a/modules/assimp/import_utils.h b/modules/assimp/import_utils.h index c522b01727d..fd6f4dc176c 100644 --- a/modules/assimp/import_utils.h +++ b/modules/assimp/import_utils.h @@ -189,7 +189,7 @@ public: } /** - * Converts aiMatrix4x4 to godot Transform + * Converts aiMatrix4x4 to godot Transform */ static const Transform assimp_matrix_transform(const aiMatrix4x4 p_matrix) { aiMatrix4x4 matrix = p_matrix; diff --git a/modules/camera/camera_ios.h b/modules/camera/camera_ios.h index 89620f788b8..7da43e4851f 100644 --- a/modules/camera/camera_ios.h +++ b/modules/camera/camera_ios.h @@ -42,4 +42,4 @@ public: void update_feeds(); }; -#endif /* CAMERAIOS_H */ \ No newline at end of file +#endif /* CAMERAIOS_H */ diff --git a/modules/gdnative/android/android_gdn.cpp b/modules/gdnative/android/android_gdn.cpp index 4be489cd461..6e0358342f9 100644 --- a/modules/gdnative/android/android_gdn.cpp +++ b/modules/gdnative/android/android_gdn.cpp @@ -83,4 +83,4 @@ bool GDAPI godot_android_is_activity_resumed() { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/modules/gdnative/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp index 256c44febcd..f9dc3392663 100644 --- a/modules/gdnative/nativescript/api_generator.cpp +++ b/modules/gdnative/nativescript/api_generator.cpp @@ -140,7 +140,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/gridmap/doc_classes/README.md b/modules/gridmap/doc_classes/README.md index b1ec9058c8a..37ad93b6d32 100644 --- a/modules/gridmap/doc_classes/README.md +++ b/modules/gridmap/doc_classes/README.md @@ -1 +1 @@ -Doc classes will appear here when generating \ No newline at end of file +Doc classes will appear here when generating diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 98a43bdf538..d233e7f20bf 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1864,7 +1864,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 = NULL; @@ -2203,7 +2203,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 == NULL); @@ -3015,7 +3015,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(NULL); r_error.error = Variant::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 99a55c471b9..4db71500da1 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 affb2a47e79..ce2b378623a 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/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs index e3a4fa7b453..a6427fa485a 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs @@ -141,7 +141,7 @@ namespace GodotTools.Ides.Rider if (OS.IsOSX) { var home = Environment.GetEnvironmentVariable("HOME"); - if (string.IsNullOrEmpty(home)) + if (string.IsNullOrEmpty(home)) return string.Empty; var localAppData = Path.Combine(home, @"Library/Application Support"); return GetToolboxRiderRootPath(localAppData); @@ -150,7 +150,7 @@ namespace GodotTools.Ides.Rider if (OS.IsUnixLike()) { var home = Environment.GetEnvironmentVariable("HOME"); - if (string.IsNullOrEmpty(home)) + if (string.IsNullOrEmpty(home)) return string.Empty; var localAppData = Path.Combine(home, @".local/share"); return GetToolboxRiderRootPath(localAppData); @@ -322,7 +322,7 @@ namespace GodotTools.Ides.Rider class SettingsJson { public string install_location; - + [CanBeNull] public static string GetInstallLocationFromJson(string json) { diff --git a/platform/android/java/lib/res/layout/downloading_expansion.xml b/platform/android/java/lib/res/layout/downloading_expansion.xml index 4a9700965f1..34c27575984 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 fae1faeb602..426e1bd8418 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 1ed40370353..cfdcca2ab58 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 9f3dc6d6ac9..77cd61ea51d 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 bd8109277ee..0f42d1f22b6 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 494cb884685..291a44d5e2e 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 30ce00f8952..83ff73e12a3 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 4c2a1cf0f45..fd251a7c90f 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 52946d4cceb..f6e80b0b1ab 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 181dc517628..adcdf13eb1c 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 976a5650136..1b251c9ab65 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 73f63a08f8b..b580a8270b1 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 07b718a6414..6aedd6870bc 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 323d82aff14..bd7ef059ab6 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 32bead26615..03994099cf8 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 8aab2a8c63d..60d3b468618 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 caf55e2241f..e552a6f6ec2 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 e7f9e51226f..ed21411acbd 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 9e9a8b0c03f..169b65decb7 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 1f5e5a049e6..880b87e030b 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 f52ede20855..b4826798c7e 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 7f85f57df75..27d3ba521ee 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 fab0bdd753a..efc5c7e015d 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 6e3677fde74..10a93926db0 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 701fc271ac2..4f230b97f87 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 73147ca1af3..a85a3da39a4 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 e501928a354..c459f643976 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 ea5da73b6f3..34a846cc78b 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 bdda7cd2c7f..5f7a875eb54 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 3686da4c192..de990e789be 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 954067658bc..73d8a27443c 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 37d1283124b..053960efeda 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 0bb249c3756..d6dff8289a0 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 0e83cab1a13..b7e79e89ea8 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 e3a04ac2ec3..9436c3870ac 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 0aa893b8bf0..629d77b9c25 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 e7e2af49090..f8832d6b1fb 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 97af1243a63..f3a8f57de46 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 3dea6908a9e..8ba2bf86aa6 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 a6552130b08..8bf063ed823 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 a1b81a61861..590b066d8ab 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 a442f61e7e9..b798373bc66 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/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java index e1ea4b854b7..70322b882e3 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java index a6412d4dfe3..af8665ec6f5 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java index 99571839bec..0e0fa082329 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 6180a14d913..49c4f755d38 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -3135,7 +3135,7 @@ void OS_OSX::run() { process_events(); // get rid of pending events joypad_osx->process_joypads(); - if (Main::iteration() == true) { + if (Main::iteration()) { quit = true; } } @catch (NSException *exception) {