From d5fc3d1e8c1f8f904e1fbe8bd1c402d560bfb596 Mon Sep 17 00:00:00 2001 From: "Randolph W. Aarseth II" Date: Fri, 4 Oct 2024 01:37:26 -0700 Subject: Rebrand Godot to Redot Add Linux Editor tests workflow matrix Add Windows Editor w/ Mono workflow matrix Add Generate Glue Code job to Windows workflow Add Build GodotSharp job to Windows workflow Add godot compatibility version references Add Godot author info Add Godot version compatibility info Add Godot donor info Add Godot authors and donors to editor_about.cpp Credits: Co-authored-by: Skogi Co-authored-by: Spartan322 Co-authored-by: swashberry Co-authored-by: Christoffer Sundbom Co-authored-by: Dubhghlas McLaughlin <103212704+mcdubhghlas@users.noreply.github.com> Co-authored-by: McDubh <103212704+mcdubhghlas@users.noreply.github.com> Co-authored-by: Dubhghlas McLaughlin <103212704+mcdubhghlas@users.noreply.github.com> Co-authored-by: radenthefolf Co-authored-by: John Knight <80524176+Tekisasu-JohnK@users.noreply.github.com> Co-authored-by: Adam Vondersaar Co-authored-by: decryptedchaos Co-authored-by: zaftnotameni <122100803+zaftnotameni@users.noreply.github.com> Co-authored-by: Aaron Benjamin Co-authored-by: wesam <108880473+wesamdev@users.noreply.github.com> Co-authored-by: Mister Puma Co-authored-by: Aaron Benjamin Co-authored-by: SingleError Co-authored-by: Bioblaze Payne --- platform/android/java/lib/src/org/godotengine/godot/Godot.kt | 8 ++++---- .../java/lib/src/org/godotengine/godot/GodotActivity.kt | 10 +++++----- .../java/lib/src/org/godotengine/godot/gl/GodotRenderer.java | 2 +- .../lib/src/org/godotengine/godot/input/GodotInputHandler.java | 2 +- .../src/org/godotengine/godot/plugin/GodotPluginRegistry.java | 10 +++++----- .../java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'platform/android/java/lib/src') diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt index 567b134234..4566658011 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt @@ -229,7 +229,7 @@ class Godot(private val context: Context) { val window = activity.window window.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON) - Log.v(TAG, "Initializing Godot plugin registry") + Log.v(TAG, "Initializing Redot plugin registry") val runtimePlugins = mutableSetOf(AndroidRuntimePlugin(this)) runtimePlugins.addAll(primaryHost.getHostPlugins(this)) GodotPluginRegistry.initializePluginRegistry(this, runtimePlugins) @@ -417,15 +417,15 @@ class Godot(private val context: Context) { fileAccessHandler, useApkExpansion, ) - Log.v(TAG, "Godot native layer initialization completed: $nativeLayerInitializeCompleted") + Log.v(TAG, "Redot native layer initialization completed: $nativeLayerInitializeCompleted") } if (nativeLayerInitializeCompleted && !nativeLayerSetupCompleted) { nativeLayerSetupCompleted = GodotLib.setup(commandLine.toTypedArray(), tts) if (!nativeLayerSetupCompleted) { - throw IllegalStateException("Unable to setup the Godot engine! Aborting...") + throw IllegalStateException("Unable to setup the Redot engine! Aborting...") } else { - Log.v(TAG, "Godot native layer setup completed") + Log.v(TAG, "Redot native layer setup completed") } } } finally { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt index 474c6e9b2f..89489fd9c3 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt @@ -70,10 +70,10 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { val currentFragment = supportFragmentManager.findFragmentById(R.id.godot_fragment_container) if (currentFragment is GodotFragment) { - Log.v(TAG, "Reusing existing Godot fragment instance.") + Log.v(TAG, "Reusing existing Redot fragment instance.") godotFragment = currentFragment } else { - Log.v(TAG, "Creating new Godot fragment instance.") + Log.v(TAG, "Creating new Redot fragment instance.") godotFragment = initGodotInstance() supportFragmentManager.beginTransaction().replace(R.id.godot_fragment_container, godotFragment!!).setPrimaryNavigationFragment(godotFragment).commitNowAllowingStateLoss() } @@ -83,7 +83,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { protected open fun getGodotAppLayout() = R.layout.godot_app_layout override fun onDestroy() { - Log.v(TAG, "Destroying GodotActivity $this...") + Log.v(TAG, "Destroying RedotActivity $this...") super.onDestroy() } @@ -94,7 +94,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { private fun terminateGodotInstance(instance: Godot) { godotFragment?.let { if (instance === it.godot) { - Log.v(TAG, "Force quitting Godot instance") + Log.v(TAG, "Force quitting Redot instance") ProcessPhoenix.forceQuit(this) } } @@ -109,7 +109,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { // // Restarting only the activity, wouldn't be enough unless it did proper cleanup (including // releasing and reloading native libs or resetting their state somehow and clearing static data). - Log.v(TAG, "Restarting Godot instance...") + Log.v(TAG, "Restarting Redot instance...") ProcessPhoenix.triggerRebirth(this) } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java index 7e5e262b2d..42496a9025 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java @@ -68,7 +68,7 @@ public class GodotRenderer implements GLSurfaceView.Renderer { @Override public void onRenderThreadExiting() { - Log.d(TAG, "Destroying Godot Engine"); + Log.d(TAG, "Destroying Redot Engine"); GodotLib.ondestroy(); } diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java index fb41cd00c0..c8857d93c5 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java @@ -380,7 +380,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens Collections.sort(joystick.axes); for (int idx = 0; idx < joystick.axes.size(); idx++) { //Helps with creating new joypad mappings. - Log.i(TAG, " - Mapping Android axis " + joystick.axes.get(idx) + " to Godot axis " + idx); + Log.i(TAG, " - Mapping Android axis " + joystick.axes.get(idx) + " to Redot axis " + idx); } mJoysticksDevices.put(deviceId, joystick); 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 8976dd65db..0a9dea5d4e 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 @@ -151,11 +151,11 @@ public final class GodotPluginRegistry { pluginName = metaDataName.substring(GODOT_PLUGIN_V2_NAME_PREFIX.length()).trim(); } else if (metaDataName.startsWith(GODOT_PLUGIN_V1_NAME_PREFIX)) { pluginName = metaDataName.substring(GODOT_PLUGIN_V1_NAME_PREFIX.length()).trim(); - Log.w(TAG, "Godot v1 plugin are deprecated in Godot 4.2 and higher: " + pluginName); + Log.w(TAG, "Redot v1 plugin are deprecated in Redot 4.2 and higher: " + pluginName); } if (!TextUtils.isEmpty(pluginName)) { - Log.i(TAG, "Initializing Godot plugin " + pluginName); + Log.i(TAG, "Initializing Redot plugin " + pluginName); // Retrieve the plugin class full name. String pluginHandleClassFullName = metaData.getString(metaDataName); @@ -175,9 +175,9 @@ public final class GodotPluginRegistry { "Meta-data plugin name does not match the value returned by the plugin handle: " + pluginName + " =/= " + pluginHandle.getPluginName()); } registry.put(pluginName, pluginHandle); - Log.i(TAG, "Completed initialization for Godot plugin " + pluginHandle.getPluginName()); + Log.i(TAG, "Completed initialization for Redot plugin " + pluginHandle.getPluginName()); } catch (Exception e) { - Log.w(TAG, "Unable to load Godot plugin " + pluginName, e); + Log.w(TAG, "Unable to load Redot plugin " + pluginName, e); } } else { Log.w(TAG, "Invalid plugin loader class for " + pluginName); @@ -185,7 +185,7 @@ public final class GodotPluginRegistry { } } } catch (Exception e) { - Log.e(TAG, "Unable load Godot Android plugins from the manifest file.", e); + Log.e(TAG, "Unable load Redot Android plugins from the manifest file.", e); } } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt index a93a7dbe09..0cb03cc871 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt @@ -107,7 +107,7 @@ internal class VkRenderer { * Invoked when the render thread is in the process of shutting down. */ fun onRenderThreadExiting() { - Log.d(TAG, "Destroying Godot Engine") + Log.d(TAG, "Destroying Redot Engine") GodotLib.ondestroy() } } -- cgit v1.2.3