godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Commit other files changed by file_format.sh

Browse Source
This commit is contained in:
Aaron Franke
2020-07-13 14:13:38 -04:00
parent d8b65461e3
commit 9986439352
60 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@@ -48,8 +48,8 @@ after_build:
- cd bin - cd bin
- mv godot.windows.opt.tools.64.exe godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.exe - 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 - 7z a -mx9 godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.zip *.exe
artifacts: artifacts:
- path: bin/godot_${APPVEYOR_REPO_BRANCH}-${VERSION_HASH}_win64.zip - path: bin/godot_${APPVEYOR_REPO_BRANCH}-${VERSION_HASH}_win64.zip
name: Win64 release_debug editor build name: Win64 release_debug editor build
type: zip type: zip

8
.github/workflows/main.yml vendored
View File

@@ -44,9 +44,9 @@ jobs:
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
# Semantic version range syntax or exact version of a Python version # 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 # 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. # Setup scons, print python version and scons version info, so if anything is broken it won't run the build.
- name: Configuring Python packages - name: Configuring Python packages
@@ -99,9 +99,9 @@ jobs:
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
# Semantic version range syntax or exact version of a Python version # 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 # Optional - x64 or x86 architecture, defaults to x64
architecture: 'x64' architecture: 'x64'
# You can test your matrix by printing the current Python version # You can test your matrix by printing the current Python version
- name: Configuring Python packages - name: Configuring Python packages

2
core/oa_hash_map.h
View File

@@ -48,7 +48,7 @@
* *
* Only used keys and values are constructed. For free positions there's space * Only used keys and values are constructed. For free positions there's space
* in the arrays for each, but that memory is kept uninitialized. * in the arrays for each, but that memory is kept uninitialized.
* *
* The assignment operator copy the pairs from one map to the other. * The assignment operator copy the pairs from one map to the other.
*/ */
template <class TKey, class TValue, template <class TKey, class TValue,

8
doc/classes/Array.xml
View File

@@ -227,10 +227,10 @@
<description> <description>
Returns [code]true[/code] if the array contains the given value. Returns [code]true[/code] if the array contains the given value.
[codeblock] [codeblock]
["inside", 7].has("inside") == true print(["inside", 7].has("inside")) # True
["inside", 7].has("outside") == false print(["inside", 7].has("outside")) # False
["inside", 7].has(7) == true print(["inside", 7].has(7)) # True
["inside", 7].has("7") == false print(["inside", 7].has("7")) # False
[/codeblock] [/codeblock]
[b]Note:[/b] This is equivalent to using the [code]in[/code] operator as follows: [b]Note:[/b] This is equivalent to using the [code]in[/code] operator as follows:
[codeblock] [codeblock]

4
doc/classes/Decal.xml
View File

@@ -17,7 +17,7 @@
<argument index="0" name="type" type="int" enum="Decal.DecalTexture"> <argument index="0" name="type" type="int" enum="Decal.DecalTexture">
</argument> </argument>
<description> <description>
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]. 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: 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] [codeblock]
@@ -34,7 +34,7 @@
<argument index="1" name="texture" type="Texture2D"> <argument index="1" name="texture" type="Texture2D">
</argument> </argument>
<description> <description>
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]. 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: 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] [codeblock]

2
doc/classes/InputEventMouseMotion.xml
View File

@@ -16,7 +16,7 @@
Represents the pressure the user puts on the pen. Ranges from [code]0.0[/code] to [code]1.0[/code]. Represents the pressure the user puts on the pen. Ranges from [code]0.0[/code] to [code]1.0[/code].
</member> </member>
<member name="relative" type="Vector2" setter="set_relative" getter="get_relative" default="Vector2( 0, 0 )"> <member name="relative" type="Vector2" setter="set_relative" getter="get_relative" default="Vector2( 0, 0 )">
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. [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.
</member> </member>
<member name="speed" type="Vector2" setter="set_speed" getter="get_speed" default="Vector2( 0, 0 )"> <member name="speed" type="Vector2" setter="set_speed" getter="get_speed" default="Vector2( 0, 0 )">

2
doc/classes/KinematicBody2D.xml
View File

@@ -104,7 +104,7 @@
<description> <description>
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. 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. 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. [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 [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. If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops.

2
doc/classes/KinematicBody3D.xml
View File

@@ -106,7 +106,7 @@
<description> <description>
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. 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. 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. [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 [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. If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops.

2
doc/classes/RayCast2D.xml
View File

@@ -44,7 +44,7 @@
</return> </return>
<description> <description>
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. 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.
</description> </description>
</method> </method>
<method name="get_collider" qualifiers="const"> <method name="get_collider" qualifiers="const">

2
doc/classes/RayCast3D.xml
View File

@@ -45,7 +45,7 @@
<description> <description>
Updates the collision information for the ray. 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. 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.
</description> </description>
</method> </method>
<method name="get_collider" qualifiers="const"> <method name="get_collider" qualifiers="const">

8
main/tests/test_astar.cpp
View File

@@ -102,9 +102,9 @@ bool test_add_remove() {
a.connect_points(1, 3, true); a.connect_points(1, 3, true);
a.connect_points(1, 4, false); a.connect_points(1, 4, false);
ok = ok && (a.are_points_connected(2, 1) == true); ok = ok && (a.are_points_connected(2, 1));
ok = ok && (a.are_points_connected(4, 1) == true); ok = ok && (a.are_points_connected(4, 1));
ok = ok && (a.are_points_connected(2, 1, false) == true); ok = ok && (a.are_points_connected(2, 1, false));
ok = ok && (a.are_points_connected(4, 1, false) == false); ok = ok && (a.are_points_connected(4, 1, false) == false);
a.disconnect_points(1, 2, true); a.disconnect_points(1, 2, true);
@@ -179,7 +179,7 @@ bool test_add_remove() {
if (Math::rand() % 2 == 1) { if (Math::rand() % 2 == 1) {
// Add a (possibly existing) directed edge and confirm connectivity // Add a (possibly existing) directed edge and confirm connectivity
a.connect_points(u, v, false); 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 { } else {
// Remove a (possibly nonexistent) directed edge and confirm disconnectivity // Remove a (possibly nonexistent) directed edge and confirm disconnectivity
a.disconnect_points(u, v, false); a.disconnect_points(u, v, false);

2
misc/dist/ios_xcode/godot_ios/Images.xcassets/LaunchImage.launchimage/Contents.json vendored
View File

@@ -99,4 +99,4 @@
"version" : 1, "version" : 1,
"author" : "xcode" "author" : "xcode"
} }
} }

2
misc/dist/uwp_template/AppxManifest.xml vendored
View File

@@ -29,4 +29,4 @@
<build:Metadata> <build:Metadata>
<build:Item Name="GodotEngine" Version="$godot_version$" /> <build:Item Name="GodotEngine" Version="$godot_version$" />
</build:Metadata> </build:Metadata>
</Package> </Package>

2
modules/gdnative/nativescript/api_generator.cpp
View File

@@ -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 { struct MethodInfoComparator {

6
modules/mono/csharp_script.cpp
View File

@@ -1963,7 +1963,7 @@ MonoObject *CSharpInstance::_internal_new_managed() {
bool die = _unreference_owner_unsafe(); 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. // 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; owner = nullptr;
@@ -2298,7 +2298,7 @@ CSharpInstance::~CSharpInstance() {
// Unreference the owner here, before the new "instance binding" references it. // Unreference the owner here, before the new "instance binding" references it.
// Otherwise, the unsafe reference debug checks will incorrectly detect a bug. // Otherwise, the unsafe reference debug checks will incorrectly detect a bug.
bool die = _unreference_owner_unsafe(); 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()); void *data = owner->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index());
CRASH_COND(data == nullptr); 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(); 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. // 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); p_owner->set_script_instance(nullptr);
r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL; r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;

2
modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;

2
modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes; using System.Runtime.InteropServices.ComTypes;

2
platform/android/java/lib/res/layout/downloading_expansion.xml
View File

@@ -162,4 +162,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml
View File

@@ -105,4 +105,4 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

2
platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml
View File

@@ -2,4 +2,4 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/icon_background"/> <background android:drawable="@mipmap/icon_background"/>
<foreground android:drawable="@mipmap/icon_foreground"/> <foreground android:drawable="@mipmap/icon_foreground"/>
</adaptive-icon> </adaptive-icon>

2
platform/android/java/lib/res/values-ar/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-ar</string> <string name="godot_project_name_string">godot-project-name-ar</string>
</resources> </resources>

2
platform/android/java/lib/res/values-bg/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-bg</string> <string name="godot_project_name_string">godot-project-name-bg</string>
</resources> </resources>

2
platform/android/java/lib/res/values-ca/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-ca</string> <string name="godot_project_name_string">godot-project-name-ca</string>
</resources> </resources>

2
platform/android/java/lib/res/values-cs/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-cs</string> <string name="godot_project_name_string">godot-project-name-cs</string>
</resources> </resources>

2
platform/android/java/lib/res/values-da/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-da</string> <string name="godot_project_name_string">godot-project-name-da</string>
</resources> </resources>

2
platform/android/java/lib/res/values-de/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-de</string> <string name="godot_project_name_string">godot-project-name-de</string>
</resources> </resources>

2
platform/android/java/lib/res/values-el/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-el</string> <string name="godot_project_name_string">godot-project-name-el</string>
</resources> </resources>

2
platform/android/java/lib/res/values-en/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-en</string> <string name="godot_project_name_string">godot-project-name-en</string>
</resources> </resources>

2
platform/android/java/lib/res/values-es-rES/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-es_ES</string> <string name="godot_project_name_string">godot-project-name-es_ES</string>
</resources> </resources>

2
platform/android/java/lib/res/values-es/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-es</string> <string name="godot_project_name_string">godot-project-name-es</string>
</resources> </resources>

2
platform/android/java/lib/res/values-fi/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-fi</string> <string name="godot_project_name_string">godot-project-name-fi</string>
</resources> </resources>

2
platform/android/java/lib/res/values-fr/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-fr</string> <string name="godot_project_name_string">godot-project-name-fr</string>
</resources> </resources>

2
platform/android/java/lib/res/values-hi/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-hi</string> <string name="godot_project_name_string">godot-project-name-hi</string>
</resources> </resources>

2
platform/android/java/lib/res/values-hr/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-hr</string> <string name="godot_project_name_string">godot-project-name-hr</string>
</resources> </resources>

2
platform/android/java/lib/res/values-hu/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-hu</string> <string name="godot_project_name_string">godot-project-name-hu</string>
</resources> </resources>

2
platform/android/java/lib/res/values-in/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-id</string> <string name="godot_project_name_string">godot-project-name-id</string>
</resources> </resources>

2
platform/android/java/lib/res/values-it/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-it</string> <string name="godot_project_name_string">godot-project-name-it</string>
</resources> </resources>

2
platform/android/java/lib/res/values-iw/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-he</string> <string name="godot_project_name_string">godot-project-name-he</string>
</resources> </resources>

2
platform/android/java/lib/res/values-ja/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-ja</string> <string name="godot_project_name_string">godot-project-name-ja</string>
</resources> </resources>

2
platform/android/java/lib/res/values-ko/strings.xml
View File

@@ -52,4 +52,4 @@
<string name="kilobytes_per_second">%1$s KB/s</string> <string name="kilobytes_per_second">%1$s KB/s</string>
<string name="time_remaining">남은 시간: %1$s</string> <string name="time_remaining">남은 시간: %1$s</string>
<string name="time_remaining_notification">%1$s 남음</string> <string name="time_remaining_notification">%1$s 남음</string>
</resources> </resources>

2
platform/android/java/lib/res/values-lt/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-lt</string> <string name="godot_project_name_string">godot-project-name-lt</string>
</resources> </resources>

2
platform/android/java/lib/res/values-lv/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-lv</string> <string name="godot_project_name_string">godot-project-name-lv</string>
</resources> </resources>

2
platform/android/java/lib/res/values-nb/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-nb</string> <string name="godot_project_name_string">godot-project-name-nb</string>
</resources> </resources>

2
platform/android/java/lib/res/values-nl/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-nl</string> <string name="godot_project_name_string">godot-project-name-nl</string>
</resources> </resources>

2
platform/android/java/lib/res/values-pl/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-pl</string> <string name="godot_project_name_string">godot-project-name-pl</string>
</resources> </resources>

2
platform/android/java/lib/res/values-pt/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-pt</string> <string name="godot_project_name_string">godot-project-name-pt</string>
</resources> </resources>

2
platform/android/java/lib/res/values-ro/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-ro</string> <string name="godot_project_name_string">godot-project-name-ro</string>
</resources> </resources>

2
platform/android/java/lib/res/values-ru/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-ru</string> <string name="godot_project_name_string">godot-project-name-ru</string>
</resources> </resources>

2
platform/android/java/lib/res/values-sk/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-sk</string> <string name="godot_project_name_string">godot-project-name-sk</string>
</resources> </resources>

2
platform/android/java/lib/res/values-sl/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-sl</string> <string name="godot_project_name_string">godot-project-name-sl</string>
</resources> </resources>

2
platform/android/java/lib/res/values-sr/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-sr</string> <string name="godot_project_name_string">godot-project-name-sr</string>
</resources> </resources>

2
platform/android/java/lib/res/values-sv/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-sv</string> <string name="godot_project_name_string">godot-project-name-sv</string>
</resources> </resources>

2
platform/android/java/lib/res/values-th/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-th</string> <string name="godot_project_name_string">godot-project-name-th</string>
</resources> </resources>

2
platform/android/java/lib/res/values-tl/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-tl</string> <string name="godot_project_name_string">godot-project-name-tl</string>
</resources> </resources>

2
platform/android/java/lib/res/values-tr/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-tr</string> <string name="godot_project_name_string">godot-project-name-tr</string>
</resources> </resources>

2
platform/android/java/lib/res/values-uk/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-uk</string> <string name="godot_project_name_string">godot-project-name-uk</string>
</resources> </resources>

2
platform/android/java/lib/res/values-vi/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="godot_project_name_string">godot-project-name-vi</string> <string name="godot_project_name_string">godot-project-name-vi</string>
</resources> </resources>

2
platform/android/java/lib/res/values/strings.xml
View File

@@ -52,4 +52,4 @@
<string name="kilobytes_per_second">%1$s KB/s</string> <string name="kilobytes_per_second">%1$s KB/s</string>
<string name="time_remaining">Time remaining: %1$s</string> <string name="time_remaining">Time remaining: %1$s</string>
<string name="time_remaining_notification">%1$s left</string> <string name="time_remaining_notification">%1$s left</string>
</resources> </resources>

2
platform/android/java/lib/res/values/styles.xml
View File

@@ -22,4 +22,4 @@
<item name="android:background">@android:color/background_dark</item> <item name="android:background">@android:color/background_dark</item>
</style> </style>
</resources> </resources>

2
platform/osx/os_osx.mm
View File

@@ -320,7 +320,7 @@ void OS_OSX::run() {
} }
joypad_osx->process_joypads(); joypad_osx->process_joypads();
if (Main::iteration() == true) { if (Main::iteration()) {
quit = true; quit = true;
} }
} @catch (NSException *exception) { } @catch (NSException *exception) {