diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index d5153fb6c041..c1439733b1ce 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -1782,7 +1782,7 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport } else { min_sdk_int = min_sdk_str.to_int(); if (min_sdk_int < OPENGL_MIN_SDK_VERSION) { - return vformat(TTR("\"Min SDK\" cannot be lower than %d, which is the version needed by the Godot library."), OPENGL_MIN_SDK_VERSION); + return vformat(TTR("\"Min SDK\" cannot be lower than %d, which is the version needed by the Blazium library."), OPENGL_MIN_SDK_VERSION); } } } diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml index 0cc929d226c6..ae11e484eec4 100644 --- a/platform/android/java/app/AndroidManifest.xml +++ b/platform/android/java/app/AndroidManifest.xml @@ -29,7 +29,7 @@ android:enabled="true" tools:targetApi="29" /> - + diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 01d5d9ef9294..45bc45ce1878 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -282,7 +282,7 @@ task copyAndRenameReleaseAab(type: Copy) { */ task validateJavaVersion { if (JavaVersion.current() != versions.javaVersion) { - throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Godot gradle builds.") + throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Blazium gradle builds.") } } diff --git a/platform/android/java/app/gradle.properties b/platform/android/java/app/gradle.properties index 2b6468c95e17..bb4d852575ac 100644 --- a/platform/android/java/app/gradle.properties +++ b/platform/android/java/app/gradle.properties @@ -1,5 +1,5 @@ -# Godot gradle build settings. -# These properties apply when running a gradle build from the Godot editor. +# Blazium gradle build settings. +# These properties apply when running a gradle build from the Blazium editor. # NOTE: This should be kept in sync with 'godot/platform/android/java/gradle.properties' except # where otherwise specified. diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index f5555289fd17..e22653745ce9 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -152,7 +152,7 @@ task copyReleaseAARToBin(type: Copy) { task zipGradleBuild(type: Zip) { onlyIf { generateGodotTemplates.state.executed || generateDevTemplate.state.executed } doFirst { - logger.lifecycle("Generating Godot gradle build template") + logger.lifecycle("Generating Blazium gradle build template") } from(fileTree(dir: 'app', excludes: ['**/build/**', '**/.gradle/**', '**/*.iml']), fileTree(dir: '.', includes: ['gradlew', 'gradlew.bat', 'gradle/**'])) include '**/*' diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle index 37f68d295ac2..c92b4f9975a9 100644 --- a/platform/android/java/editor/build.gradle +++ b/platform/android/java/editor/build.gradle @@ -95,7 +95,7 @@ android { missingDimensionStrategy 'products', 'editor' manifestPlaceholders += [ - editorAppName: "Godot Editor 4", + editorAppName: "Blazium Editor 4", editorBuildSuffix: "" ] } diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt index 0476f4a3b53c..570d836789e4 100644 --- a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt +++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt @@ -233,7 +233,7 @@ open class GodotEditor : GodotActivity() { for (runningProcess in runningProcesses) { if (runningProcess.processName == processName) { // Killing process directly - Log.v(TAG, "Killing Godot process ${runningProcess.processName}") + Log.v(TAG, "Killing Blazium process ${runningProcess.processName}") Process.killProcess(runningProcess.pid) return true } diff --git a/platform/android/java/gradle.properties b/platform/android/java/gradle.properties index c8abb52614cd..18719a5e659f 100644 --- a/platform/android/java/gradle.properties +++ b/platform/android/java/gradle.properties @@ -24,7 +24,7 @@ org.gradle.jvmargs=-Xmx4536m org.gradle.warning.mode=all # Disable resource optimizations for template release build. -# NOTE: This is turned on for Godot Editor's gradle builds in order to improve the release build. +# NOTE: This is turned on for Blazium Editor's gradle builds in order to improve the release build. android.enableResourceOptimizations=false # Fix gradle build errors when the build path contains non-ASCII characters diff --git a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch index 49cc41e817fb..e620f9584ef2 100644 --- a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch +++ b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch @@ -297,4 +297,4 @@ index 4babe476f..8d41a7690 100644 + @SuppressLint("MissingPermission") NetworkInfo activeInfo = mConnectivityManager .getActiveNetworkInfo(); - updateNetworkState(activeInfo); + updateNetworkState(activeInfo); \ No newline at end of file diff --git a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch index 4adb81d95199..7a0e0ca0a476 100644 --- a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch +++ b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch @@ -39,4 +39,4 @@ import org.godotengine.godot.BuildConfig; + // -- GODOT end -- return outBuff; } - + \ 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 03752e092ecd..4be9518b2acb 100644 --- a/platform/android/java/lib/res/values/strings.xml +++ b/platform/android/java/lib/res/values/strings.xml @@ -13,7 +13,7 @@ Cancel Cancel Verification Error! - Unable to setup the Godot Engine! Aborting… + Unable to setup the Blazium Engine! Aborting… Warning - this device does not meet the requirements for Vulkan support diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java index 452c7d148392..8fa89d3056bc 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java @@ -32,9 +32,9 @@ import android.os.RemoteException; import android.util.Log; -// -- GODOT start -- +// -- BLAZIUM start -- import java.lang.ref.WeakReference; -// -- GODOT end -- +// -- BLAZIUM end -- /** @@ -121,7 +121,7 @@ private static class Stub implements IStub { /** * Target we publish for clients to send messages to IncomingHandler. */ - // -- GODOT start -- + // -- BLAZIUM start -- private final MessengerHandlerClient mMsgHandler = new MessengerHandlerClient(this); final Messenger mMessenger = new Messenger(mMsgHandler); @@ -160,7 +160,7 @@ private void handleMessage(Message msg) { break; } } - // -- GODOT end -- + // -- BLAZIUM end -- public Stub(IDownloaderClient itf, Class downloaderService) { mItf = itf; diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java index 3771d19c9b53..91dae60a5e1f 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java @@ -25,9 +25,9 @@ import android.os.Messenger; import android.os.RemoteException; -// -- GODOT start -- +// -- BLAZIUM start -- import java.lang.ref.WeakReference; -// -- GODOT end -- +// -- BLAZIUM end -- /** @@ -111,7 +111,7 @@ public void onClientUpdated(Messenger clientMessenger) { private static class Stub implements IStub { private IDownloaderService mItf = null; - // -- GODOT start -- + // -- BLAZIUM start -- private final MessengerHandlerServer mMsgHandler = new MessengerHandlerServer(this); final Messenger mMessenger = new Messenger(mMsgHandler); @@ -153,7 +153,7 @@ private void handleMessage(Message msg) { break; } } - // -- GODOT end -- + // -- BLAZIUM end -- public Stub(IDownloaderService itf) { mItf = itf; diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java index c7ebe099d0e2..d0a5fb38ad8a 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java @@ -24,10 +24,10 @@ import android.os.SystemClock; import android.util.Log; -// -- GODOT start -- +// -- BLAZIUM start -- //import com.android.vending.expansion.downloader.R; import org.godotengine.godot.R; -// -- GODOT end -- +// -- BLAZIUM end -- import java.io.File; import java.text.SimpleDateFormat; @@ -152,14 +152,14 @@ static public String getDownloadProgressString(long overallProgress, long overal } return ""; } - // -- GODOT start -- + // -- BLAZIUM start -- return String.format(Locale.ENGLISH, "%.2f", (float) overallProgress / (1024.0f * 1024.0f)) + "MB /" + String.format(Locale.ENGLISH, "%.2f", (float) overallTotal / (1024.0f * 1024.0f)) + "MB"; - // -- GODOT end -- + // -- BLAZIUM end -- } /** @@ -192,9 +192,9 @@ public static String getDownloadProgressPercent(long overallProgress, long overa } public static String getSpeedString(float bytesPerMillisecond) { - // -- GODOT start -- + // -- BLAZIUM start -- return String.format(Locale.ENGLISH, "%.2f", bytesPerMillisecond * 1000 / 1024); - // -- GODOT end -- + // -- BLAZIUM end -- } public static String getTimeRemaining(long durationInMilliseconds) { diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/SystemFacade.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/SystemFacade.java index a0e1165cc40d..bee3b439ca3a 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/SystemFacade.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/SystemFacade.java @@ -26,9 +26,9 @@ import android.telephony.TelephonyManager; import android.util.Log; -// -- GODOT start -- +// -- BLAZIUM start -- import android.annotation.SuppressLint; -// -- GODOT end -- +// -- BLAZIUM end -- /** * Contains useful helper functions, typically tied to the application context. diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java index d481c222042a..eef06445922c 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java @@ -16,10 +16,10 @@ package com.google.android.vending.expansion.downloader.impl; -// -- GODOT start -- +// -- BLAZIUM start -- //import com.android.vending.expansion.downloader.R; import org.godotengine.godot.R; -// -- GODOT end -- +// -- BLAZIUM end -- import com.google.android.vending.expansion.downloader.DownloadProgressInfo; import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller; diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java index 8ca03c2514bb..c107efeff65d 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java @@ -149,12 +149,12 @@ public void run() { try { PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); - // -- GODOT start -- + // -- BLAZIUM start -- //wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, Constants.TAG); //wakeLock.acquire(); wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "org.godot.game:wakelock"); wakeLock.acquire(20 * 60 * 1000L /*20 minutes*/); - // -- GODOT end -- + // -- BLAZIUM end -- if (Constants.LOGV) { Log.v(Constants.TAG, "initiating download for " + mInfo.mFileName); diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java index ce89678cd3d5..ef995d00a0d2 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java @@ -50,9 +50,9 @@ import android.telephony.TelephonyManager; import android.util.Log; -// -- GODOT start -- +// -- BLAZIUM start -- import android.annotation.SuppressLint; -// -- GODOT end -- +// -- BLAZIUM end -- import java.io.File; diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/PreferenceObfuscator.java b/platform/android/java/lib/src/com/google/android/vending/licensing/PreferenceObfuscator.java index feb579af049b..812400fccde6 100644 --- a/platform/android/java/lib/src/com/google/android/vending/licensing/PreferenceObfuscator.java +++ b/platform/android/java/lib/src/com/google/android/vending/licensing/PreferenceObfuscator.java @@ -45,9 +45,9 @@ public PreferenceObfuscator(SharedPreferences sp, Obfuscator o) { public void putString(String key, String value) { if (mEditor == null) { mEditor = mPreferences.edit(); - // -- GODOT start -- + // -- BLAZIUM start -- mEditor.apply(); - // -- GODOT end -- + // -- BLAZIUM end -- } String obfuscatedValue = mObfuscator.obfuscate(value, key); mEditor.putString(key, obfuscatedValue); diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java index 010905966895..bf23ea80b19a 100644 --- a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java +++ b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java @@ -31,9 +31,9 @@ * @version 1.3 */ -// -- GODOT start -- +// -- BLAZIUM start -- import org.godotengine.godot.BuildConfig; -// -- GODOT end -- +// -- BLAZIUM end -- /** * Base64 converter class. This code is not a full-blown MIME encoder; @@ -345,11 +345,11 @@ public static byte[] encode(byte[] source, int off, int len, byte[] alphabet, e += 4; } - // -- GODOT start -- + // -- BLAZIUM start -- //assert (e == outBuff.length); if (BuildConfig.DEBUG && e != outBuff.length) throw new RuntimeException(); - // -- GODOT end -- + // -- BLAZIUM end -- return outBuff; } 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 fa39ccb546f0..a3981cc584d1 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt @@ -209,7 +209,7 @@ class Godot(private val context: Context) : SensorEventListener { val window = activity.window window.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON) - Log.v(TAG, "Initializing Godot plugin registry") + Log.v(TAG, "Initializing Blazium plugin registry") GodotPluginRegistry.initializePluginRegistry(this, primaryHost.getHostPlugins(this)) if (io == null) { io = GodotIO(activity) @@ -353,15 +353,15 @@ class Godot(private val context: Context) : SensorEventListener { fileAccessHandler, useApkExpansion, ) - Log.v(TAG, "Godot native layer initialization completed: $nativeLayerInitializeCompleted") + Log.v(TAG, "Blazium 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 Blazium engine! Aborting...") } else { - Log.v(TAG, "Godot native layer setup completed") + Log.v(TAG, "Blazium native layer setup completed") } } } finally { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java index d447e449e1dd..5b9ef50ac0db 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java @@ -48,12 +48,12 @@ public class GodotDownloaderAlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Log.d("GODOT", "Alarma recivida"); + Log.d("BLAZIUM", "Alarma recivida"); try { DownloaderClientMarshaller.startDownloadServiceIfRequired(context, intent, GodotDownloaderService.class); } catch (NameNotFoundException e) { e.printStackTrace(); - Log.d("GODOT", "Exception: " + e.getClass().getName() + ":" + e.getMessage()); + Log.d("BLAZIUM", "Exception: " + e.getClass().getName() + ":" + e.getMessage()); } } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java index 8e3fb85cdefe..dfac93ceb8a7 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java @@ -56,7 +56,7 @@ public class GodotDownloaderService extends DownloaderService { @Override public String getPublicKey() { SharedPreferences prefs = getApplicationContext().getSharedPreferences("app_data_keys", Context.MODE_PRIVATE); - Log.d("GODOT", "getting public key:" + prefs.getString("store_public_key", null)); + Log.d("BLAZIUM", "getting public key:" + prefs.getString("store_public_key", null)); return prefs.getString("store_public_key", null); //return BASE64_PUBLIC_KEY; @@ -79,7 +79,7 @@ public byte[] getSALT() { */ @Override public String getAlarmReceiverClassName() { - Log.d("GODOT", "getAlarmReceiverClassName()"); + Log.d("BLAZIUM", "getAlarmReceiverClassName()"); return GodotDownloaderAlarmReceiver.class.getName(); } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java index 6a4e9da699e3..5fc993fd56fc 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java @@ -568,7 +568,7 @@ public void surfaceRedrawNeeded(SurfaceHolder holder) { } - // -- GODOT start -- + // -- BLAZIUM start -- /** * Pause the rendering thread, optionally tearing down the EGL context * depending upon the value of {@link #setPreserveEGLContextOnPause(boolean)}. @@ -604,7 +604,7 @@ protected final void requestRenderThreadExitAndWait() { mGLThread.requestExitAndWait(); } } - // -- GODOT end -- + // -- BLAZIUM end -- /** * Queue a runnable to be run on the GL rendering thread. This can be used @@ -772,7 +772,7 @@ public interface Renderer { */ void onSurfaceChanged(GL10 gl, int width, int height); - // -- GODOT start -- + // -- BLAZIUM start -- /** * Called to draw the current frame. *

@@ -797,7 +797,7 @@ public interface Renderer { * Invoked when the render thread is in the process of shutting down. */ void onRenderThreadExiting(); - // -- GODOT end -- + // -- BLAZIUM end -- } /** @@ -1552,7 +1552,7 @@ private void guardedRun() throws InterruptedException { createGlInterface = false; } - // -- GODOT start -- + // -- BLAZIUM start -- if (createEglContext) { if (LOG_RENDERER) { Log.w("GLThread", "onSurfaceCreated"); @@ -1622,7 +1622,7 @@ private void guardedRun() throws InterruptedException { break; } } - // -- GODOT end -- + // -- BLAZIUM end -- if (wantRenderNotification) { doRenderNotification = true; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java b/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java index dca190a2fc9b..8bd1d07e1c98 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java @@ -83,7 +83,7 @@ public void multicastLockRelease() { try { multicastLock.release(); } catch (RuntimeException e) { - Log.e("Godot", "Exception during multicast lock release: " + e); + Log.e("Blazium", "Exception during multicast lock release: " + e); } } @@ -112,7 +112,7 @@ public void multicastLockRelease() { } return writer.toString(); } catch (Exception e) { - Log.e("Godot", "Exception while reading CA certificates: " + e); + Log.e("Blazium", "Exception while reading CA certificates: " + e); return ""; } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java b/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java index b1bce45fbbad..709ed9db56f9 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java @@ -75,7 +75,7 @@ public static void triggerRebirth(Context context, Intent... nextIntents) { context.startActivity(intent); } - // -- GODOT start -- + // -- BLAZIUM start -- /** * Finish the activity and kill its process */ @@ -94,7 +94,7 @@ public static void forceQuit(Activity activity, int pid) { Runtime.getRuntime().exit(0); // Kill kill kill! } - // -- GODOT end -- + // -- BLAZIUM end -- private static Intent getRestartIntent(Context context) { String packageName = context.getPackageName(); @@ -111,11 +111,11 @@ private static Intent getRestartIntent(Context context) { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // -- GODOT start -- + // -- BLAZIUM start -- ArrayList intents = getIntent().getParcelableArrayListExtra(KEY_RESTART_INTENTS); startActivities(intents.toArray(new Intent[intents.size()])); forceQuit(this, getIntent().getIntExtra(KEY_MAIN_PROCESS_PID, -1)); - // -- GODOT end -- + // -- BLAZIUM end -- } /** 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 a93a7dbe0971..87fe0feb2281 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 Blazium Engine") GodotLib.ondestroy() } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java b/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java index 2c2c9f39d649..271dc7e631e0 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java @@ -31,7 +31,7 @@ package org.godotengine.godot.xr; /** - * Godot available XR modes. + * Blazium available XR modes. */ public enum XRMode { REGULAR(0, "Regular", "--xr_mode_regular", "Default Android Gamepad"), // Regular/flatscreen diff --git a/platform/android/java/nativeSrcsConfigs/README.md b/platform/android/java/nativeSrcsConfigs/README.md index 9d884415cc00..79e9939ceeeb 100644 --- a/platform/android/java/nativeSrcsConfigs/README.md +++ b/platform/android/java/nativeSrcsConfigs/README.md @@ -1,4 +1,4 @@ ## Native sources configs -This is a non-functional Android library used to provide Android Studio editor support to the Godot project native files. +This is a non-functional Android library used to provide Android Studio editor support to the Blazium project native files. Nothing else should be added to this library. diff --git a/platform/android/java/settings.gradle b/platform/android/java/settings.gradle index 3137e742441b..6b8ed8339219 100644 --- a/platform/android/java/settings.gradle +++ b/platform/android/java/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } } -rootProject.name = "Godot" +rootProject.name = "Blazium" include ':app' include ':lib' diff --git a/platform/android/string_android.h b/platform/android/string_android.h index 3f30b8ec3de4..de1a2e3d9eff 100644 --- a/platform/android/string_android.h +++ b/platform/android/string_android.h @@ -38,10 +38,10 @@ #include /** - * Converts JNI jstring to Godot String. + * Converts JNI jstring to Blazium String. * @param source Source JNI string. If null an empty string is returned. * @param env JNI environment instance. If null obtained by get_jni_env(). - * @return Godot string instance. + * @return Blazium string instance. */ static inline String jstring_to_string(jstring source, JNIEnv *env = nullptr) { String result; diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index 580e3ba78911..ac60278ea0c0 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -1977,7 +1977,7 @@ Error EditorExportPlatformIOS::_export_ios_plugins(const Ref plugin_format["initialization"] = plugin_initialization_cpp_code; plugin_format["deinitialization"] = plugin_deinitialization_cpp_code; - String plugin_cpp_code = "\n// Godot Plugins\n" + String plugin_cpp_code = "\n// Blazium Plugins\n" "void godot_ios_plugins_initialize();\n" "void godot_ios_plugins_deinitialize();\n" "// Exported Plugins\n\n" diff --git a/platform/ios/godot_app_delegate.m b/platform/ios/godot_app_delegate.m index 74e8705bc3f6..c45cdd1105c2 100644 --- a/platform/ios/godot_app_delegate.m +++ b/platform/ios/godot_app_delegate.m @@ -112,7 +112,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( return result; } -/* Can be handled by Info.plist. Not yet supported by Godot. +/* Can be handled by Info.plist. Not yet supported by Blazium. // MARK: Scene diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index d1de760f3480..4ae4a087eda9 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -33,7 +33,7 @@ def get_opts(): EnumVariable("linker", "Linker program", "default", ("default", "bfd", "gold", "lld", "mold")), BoolVariable("use_llvm", "Use the LLVM compiler", False), BoolVariable("use_static_cpp", "Link libgcc and libstdc++ statically for better portability", True), - BoolVariable("use_coverage", "Test Godot coverage", False), + BoolVariable("use_coverage", "Test Blazium coverage", False), BoolVariable("use_ubsan", "Use LLVM/GCC compiler undefined behavior sanitizer (UBSAN)", False), BoolVariable("use_asan", "Use LLVM/GCC compiler address sanitizer (ASAN)", False), BoolVariable("use_lsan", "Use LLVM/GCC compiler leak sanitizer (LSAN)", False), diff --git a/platform/linuxbsd/freedesktop_screensaver.cpp b/platform/linuxbsd/freedesktop_screensaver.cpp index cf179b573519..d2c7317ab6d1 100644 --- a/platform/linuxbsd/freedesktop_screensaver.cpp +++ b/platform/linuxbsd/freedesktop_screensaver.cpp @@ -61,9 +61,9 @@ void FreeDesktopScreenSaver::inhibit() { String app_name_string = GLOBAL_GET("application/config/name"); CharString app_name_utf8 = app_name_string.utf8(); - const char *app_name = app_name_string.is_empty() ? "Godot Engine" : app_name_utf8.get_data(); + const char *app_name = app_name_string.is_empty() ? "Blazium Engine" : app_name_utf8.get_data(); - const char *reason = "Running Godot Engine project"; + const char *reason = "Running Blazium Engine project"; DBusMessage *message = dbus_message_new_method_call( BUS_OBJECT_NAME, BUS_OBJECT_PATH, BUS_INTERFACE, diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 6355562febdf..b40835efee90 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -687,7 +687,7 @@ Vector OS_LinuxBSD::get_system_fonts() const { } return ret; #else - ERR_FAIL_V_MSG(Vector(), "Godot was compiled without fontconfig, system font support is disabled."); + ERR_FAIL_V_MSG(Vector(), "Blazium was compiled without fontconfig, system font support is disabled."); #endif } @@ -793,7 +793,7 @@ Vector OS_LinuxBSD::get_system_font_path_for_text(const String &p_font_n return ret; #else - ERR_FAIL_V_MSG(Vector(), "Godot was compiled without fontconfig, system font support is disabled."); + ERR_FAIL_V_MSG(Vector(), "Blazium was compiled without fontconfig, system font support is disabled."); #endif } @@ -849,7 +849,7 @@ String OS_LinuxBSD::get_system_font_path(const String &p_font_name, int p_weight return String(); #else - ERR_FAIL_V_MSG(String(), "Godot was compiled without fontconfig, system font support is disabled."); + ERR_FAIL_V_MSG(String(), "Blazium was compiled without fontconfig, system font support is disabled."); #endif } diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp index 93096fcdcc66..239aafcb5ec5 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.cpp +++ b/platform/linuxbsd/wayland/display_server_wayland.cpp @@ -68,7 +68,7 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) { if (config_name.length() != 0) { app_id = config_name; } else { - app_id = "org.godotengine.Godot"; + app_id = "org.godotengine.Blazium"; } } } @@ -1413,7 +1413,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win if (prime_idx) { print_line(vformat("Found discrete GPU, setting DRI_PRIME=%d to use it.", prime_idx)); - print_line("Note: Set DRI_PRIME=0 in the environment to disable Godot from using the discrete GPU."); + print_line("Note: Set DRI_PRIME=0 in the environment to disable Blazium from using the discrete GPU."); setenv("DRI_PRIME", itos(prime_idx).utf8().ptr(), 1); } } @@ -1462,7 +1462,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win wd.flags = p_flags; wd.vsync_mode = p_vsync_mode; wd.rect.size = p_resolution; - wd.title = "Godot"; + wd.title = "Blazium"; _show_window(); diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 8a2f83be2d99..b6657ed024d6 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -5228,13 +5228,13 @@ void DisplayServerX11::_update_context(WindowData &wd) { CharString name_str; switch (context) { case CONTEXT_EDITOR: - name_str = "Godot_Editor"; + name_str = "Blazium_Editor"; break; case CONTEXT_PROJECTMAN: - name_str = "Godot_ProjectList"; + name_str = "Blazium_ProjectList"; break; case CONTEXT_ENGINE: - name_str = "Godot_Engine"; + name_str = "Blazium_Engine"; break; } @@ -5242,12 +5242,12 @@ void DisplayServerX11::_update_context(WindowData &wd) { if (context == CONTEXT_ENGINE) { String config_name = GLOBAL_GET("application/config/name"); if (config_name.length() == 0) { - class_str = "Godot_Engine"; + class_str = "Blazium_Engine"; } else { class_str = config_name.utf8(); } } else { - class_str = "Godot"; + class_str = "Blazium"; } classHint->res_class = class_str.ptrw(); @@ -5638,7 +5638,7 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V } /* set the titlebar name */ - XStoreName(x11_display, wd.x11_window, "Godot"); + XStoreName(x11_display, wd.x11_window, "Blazium"); XSetWMProtocols(x11_display, wd.x11_window, &wm_delete, 1); if (xdnd_aware != None) { XChangeProperty(x11_display, wd.x11_window, xdnd_aware, XA_ATOM, 32, PropModeReplace, (unsigned char *)&xdnd_version, 1); @@ -6217,7 +6217,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode if (use_prime) { print_line("Found discrete GPU, setting DRI_PRIME=1 to use it."); - print_line("Note: Set DRI_PRIME=0 in the environment to disable Godot from using the discrete GPU."); + print_line("Note: Set DRI_PRIME=0 in the environment to disable Blazium from using the discrete GPU."); setenv("DRI_PRIME", "1", 1); } } diff --git a/platform/macos/README.md b/platform/macos/README.md index 205c59e05d62..243f40966015 100644 --- a/platform/macos/README.md +++ b/platform/macos/README.md @@ -15,5 +15,5 @@ packaging macOS export templates. - Instructions on building this platform port from source. - [Exporting for macOS](https://docs.godotengine.org/en/latest/tutorials/export/exporting_for_macos.html) - Instructions on using the compiled export templates to export a project. -- [Running Godot apps on macOS](https://docs.godotengine.org/en/latest/tutorials/export/running_on_macos.html) - - Instructions on running Godot projects on macOS. +- [Running Blazium apps on macOS](https://docs.godotengine.org/en/latest/tutorials/export/running_on_macos.html) + - Instructions on running Blazium projects on macOS. diff --git a/platform/macos/SCsub b/platform/macos/SCsub index a10262c524e6..8d78b22bce7a 100644 --- a/platform/macos/SCsub +++ b/platform/macos/SCsub @@ -34,7 +34,7 @@ def generate_bundle(target, source, env): if not os.path.isdir(app_dir + "/Contents/MacOS"): os.mkdir(app_dir + "/Contents/MacOS") if target_bin != "": - shutil.copy(target_bin, app_dir + "/Contents/MacOS/Godot") + shutil.copy(target_bin, app_dir + "/Contents/MacOS/Blazium") if "mono" in env.module_version_string: shutil.copytree(Dir("#bin/GodotSharp").abspath, app_dir + "/Contents/Resources/GodotSharp") version = get_build_version(False) diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index cd2d8a60ace3..760520065c27 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -1698,8 +1698,8 @@ if (p_enable) { String app_name_string = GLOBAL_GET("application/config/name"); - NSString *name = [NSString stringWithUTF8String:(app_name_string.is_empty() ? "Godot Engine" : app_name_string.utf8().get_data())]; - NSString *reason = @"Godot Engine running with display/window/energy_saving/keep_screen_on = true"; + NSString *name = [NSString stringWithUTF8String:(app_name_string.is_empty() ? "Blazium Engine" : app_name_string.utf8().get_data())]; + NSString *reason = @"Blazium Engine running with display/window/energy_saving/keep_screen_on = true"; IOPMAssertionCreateWithDescription(kIOPMAssertPreventUserIdleDisplaySleep, (__bridge CFStringRef)name, (__bridge CFStringRef)reason, (__bridge CFStringRef)reason, nullptr, 0, nullptr, &screen_keep_on_assertion); } } diff --git a/platform/macos/doc_classes/EditorExportPlatformMacOS.xml b/platform/macos/doc_classes/EditorExportPlatformMacOS.xml index 34ad52bbf615..120bb0502985 100644 --- a/platform/macos/doc_classes/EditorExportPlatformMacOS.xml +++ b/platform/macos/doc_classes/EditorExportPlatformMacOS.xml @@ -7,7 +7,7 @@ $DOCS_URL/tutorials/export/exporting_for_macos.html - $DOCS_URL/tutorials//export/running_on_macos.html + $DOCS_URL/tutorials//export/running_on_macos.html diff --git a/platform/web/detect.py b/platform/web/detect.py index bf75c2f9fcf3..b2c4c412e047 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -278,8 +278,8 @@ def configure(env: "SConsEnvironment"): # Reduce code size by generating less support code (e.g. skip NodeJS support). env.Append(LINKFLAGS=["-sENVIRONMENT=web,worker"]) - # Wrap the JavaScript support code around a closure named Godot. - env.Append(LINKFLAGS=["-sMODULARIZE=1", "-sEXPORT_NAME='Godot'"]) + # Wrap the JavaScript support code around a closure named Blazium. + env.Append(LINKFLAGS=["-sMODULARIZE=1", "-sEXPORT_NAME='Blazium'"]) # Force long jump mode to 'wasm' env.Append(CCFLAGS=["-sSUPPORT_LONGJMP='wasm'"]) diff --git a/platform/web/doc_classes/EditorExportPlatformWeb.xml b/platform/web/doc_classes/EditorExportPlatformWeb.xml index 755308de9a9e..82dd4f423baf 100644 --- a/platform/web/doc_classes/EditorExportPlatformWeb.xml +++ b/platform/web/doc_classes/EditorExportPlatformWeb.xml @@ -5,7 +5,7 @@ The Web exporter customizes how a web build is handled. In the editor's "Export" window, it is created when adding a new "Web" preset. - [b]Note:[/b] Godot on Web is rendered inside a [code]<canvas>[/code] tag. Normally, the canvas cannot be positioned or resized manually, but otherwise acts as the main [Window] of the application. + [b]Note:[/b] Blazium on Web is rendered inside a [code]<canvas>[/code] tag. Normally, the canvas cannot be positioned or resized manually, but otherwise acts as the main [Window] of the application. $DOCS_URL/tutorials/export/exporting_for_web.html @@ -19,7 +19,7 @@ File path to the custom export template used for release builds. If left empty, the default template is used. - Determines how the canvas should be resized by Godot. + Determines how the canvas should be resized by Blazium. - [b]None:[/b] The canvas is not automatically resized. - [b]Project:[/b] The size of the canvas is dependent on the [ProjectSettings]. - [b]Adaptive:[/b] The canvas is automatically resized to fit as much of the web page as possible. diff --git a/platform/web/eslint.config.cjs b/platform/web/eslint.config.cjs index 8913a738f635..03d0af032ef7 100644 --- a/platform/web/eslint.config.cjs +++ b/platform/web/eslint.config.cjs @@ -7,7 +7,7 @@ const pluginReference = require('eslint-plugin-html'); const stylistic = require('@stylistic/eslint-plugin'); if (process && process.env && process.env.npm_command && !fs.existsSync('./platform/web/eslint.config.cjs')) { - throw Error('eslint must be run from the Godot project root folder'); + throw Error('eslint must be run from the Blazium project root folder'); } const emscriptenGlobals = { diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp index d8c1b6033d0a..f6f858bf4f6e 100644 --- a/platform/web/export/export_plugin.cpp +++ b/platform/web/export/export_plugin.cpp @@ -217,7 +217,7 @@ Error EditorExportPlatformWeb::_add_manifest_icon(const String &p_path, const St Error EditorExportPlatformWeb::_build_pwa(const Ref &p_preset, const String p_path, const Vector &p_shared_objects) { String proj_name = GLOBAL_GET("application/config/name"); if (proj_name.is_empty()) { - proj_name = "Godot Game"; + proj_name = "Blazium Game"; } // Service worker @@ -387,7 +387,7 @@ Ref EditorExportPlatformWeb::get_logo() const { bool EditorExportPlatformWeb::has_valid_export_configuration(const Ref &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const { #ifdef MODULE_MONO_ENABLED // Don't check for additional errors, as this particular error cannot be resolved. - r_error += TTR("Exporting to Web is currently not supported in Godot 4 when using C#/.NET. Use Godot 3 to target Web with C#/Mono instead.") + "\n"; + r_error += TTR("Exporting to Web is currently not supported in Blazium 4 when using C#/.NET.") + "\n"; r_error += TTR("If this project does not use C#, use a non-C# editor build to export the project.") + "\n"; return false; #else diff --git a/platform/web/js/engine/config.js b/platform/web/js/engine/config.js index 61b488cf81cb..c41edec694ce 100644 --- a/platform/web/js/engine/config.js +++ b/platform/web/js/engine/config.js @@ -64,14 +64,14 @@ const InternalConfig = function (initConfig) { // eslint-disable-line no-unused- */ locale: null, /** - * The canvas resize policy determines how the canvas should be resized by Godot. + * The canvas resize policy determines how the canvas should be resized by Blazium. * - * ``0`` means Godot won't do any resizing. This is useful if you want to control the canvas size from + * ``0`` means Blazium won't do any resizing. This is useful if you want to control the canvas size from * javascript code in your template. * - * ``1`` means Godot will resize the canvas on start, and when changing window size via engine functions. + * ``1`` means Blazium will resize the canvas on start, and when changing window size via engine functions. * - * ``2`` means Godot will adapt the canvas size to match the whole browser window. + * ``2`` means Blazium will adapt the canvas size to match the whole browser window. * * @memberof EngineConfig * @type {number} diff --git a/platform/web/package.json b/platform/web/package.json index 588af2ff3b6a..856e32413d02 100644 --- a/platform/web/package.json +++ b/platform/web/package.json @@ -2,8 +2,8 @@ "name": "godot", "private": true, "version": "1.0.0", - "description": "Development and linting setup for Godot's Web platform code", - "author": "Godot Engine contributors", + "description": "Development and linting setup for Blazium's Web platform code", + "author": "Blazium & Godot Engine contributors", "license": "MIT", "scripts": { "docs": "jsdoc --template js/jsdoc2rst/ js/engine/engine.js js/engine/config.js js/engine/features.js --destination ''", diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 74d651d495ba..b59c493d041c 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -679,7 +679,7 @@ Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title } String appname; if (Engine::get_singleton()->is_editor_hint()) { - appname = "Godot.GodotEditor." + String(VERSION_BRANCH); + appname = "Blazium.GodotEditor." + String(VERSION_BRANCH); } else { String name = GLOBAL_GET("application/config/name"); String version = GLOBAL_GET("application/config/version"); @@ -693,7 +693,7 @@ Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title } } clean_app_name = clean_app_name.substr(0, 120 - version.length()).trim_suffix("."); - appname = "Godot." + clean_app_name + "." + version; + appname = "Blazium." + clean_app_name + "." + version; } FileDialogData *fd = memnew(FileDialogData); @@ -1388,7 +1388,7 @@ void DisplayServerWindows::screen_set_keep_on(bool p_enable) { } if (p_enable) { - const String reason = "Godot Engine running with display/window/energy_saving/keep_screen_on = true"; + const String reason = "Blazium Engine running with display/window/energy_saving/keep_screen_on = true"; Char16String reason_utf16 = reason.utf16(); REASON_CONTEXT context; @@ -5725,7 +5725,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode, PROPVARIANT val; String appname; if (Engine::get_singleton()->is_editor_hint()) { - appname = "Godot.GodotEditor." + String(VERSION_FULL_CONFIG); + appname = "Blazium.GodotEditor." + String(VERSION_FULL_CONFIG); } else { String name = GLOBAL_GET("application/config/name"); String version = GLOBAL_GET("application/config/version"); @@ -5739,7 +5739,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode, } } clean_app_name = clean_app_name.substr(0, 120 - version.length()).trim_suffix("."); - appname = "Godot." + clean_app_name + "." + version; + appname = "Blazium." + clean_app_name + "." + version; } InitPropVariantFromString((PCWSTR)appname.utf16().get_data(), &val); prop_store->SetValue(PKEY_AppUserModel_ID, val); @@ -6247,7 +6247,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win String appname; if (Engine::get_singleton()->is_editor_hint()) { - appname = "Godot.GodotEditor." + String(VERSION_FULL_CONFIG); + appname = "Blazium.GodotEditor." + String(VERSION_FULL_CONFIG); } else { String name = GLOBAL_GET("application/config/name"); String version = GLOBAL_GET("application/config/version"); @@ -6261,7 +6261,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win } } clean_app_name = clean_app_name.substr(0, 120 - version.length()).trim_suffix("."); - appname = "Godot." + clean_app_name + "." + version; + appname = "Blazium." + clean_app_name + "." + version; #ifndef TOOLS_ENABLED // Set for exported projects only. diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index 86191ad9d98c..7d098cfe8551 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -17,13 +17,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Godot Engine" + VALUE "CompanyName", "Blazium Engine" VALUE "FileDescription", VERSION_NAME VALUE "FileVersion", VERSION_NUMBER VALUE "ProductName", VERSION_NAME VALUE "Licence", "MIT" - VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors" - VALUE "Info", "https://godotengine.org" + VALUE "LegalCopyright", "(c) 2024-present Blazium Engine & 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors" + VALUE "Info", "https://blazium.app" VALUE "ProductVersion", VERSION_FULL_BUILD END END diff --git a/platform/windows/godot_res_wrap.rc b/platform/windows/godot_res_wrap.rc index 27ad26cbc549..6d858543b9c4 100644 --- a/platform/windows/godot_res_wrap.rc +++ b/platform/windows/godot_res_wrap.rc @@ -12,13 +12,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Godot Engine" + VALUE "CompanyName", "Blazium Engine" VALUE "FileDescription", VERSION_NAME " (Console)" VALUE "FileVersion", VERSION_NUMBER VALUE "ProductName", VERSION_NAME " (Console)" VALUE "Licence", "MIT" - VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors" - VALUE "Info", "https://godotengine.org" + VALUE "LegalCopyright", "(c) 2024-present Blazium Engine & 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors" + VALUE "Info", "https://blazium.app" VALUE "ProductVersion", VERSION_FULL_BUILD END END diff --git a/scene/SCsub b/scene/SCsub index b4b2d6dd0a42..020e4ff3a7a2 100644 --- a/scene/SCsub +++ b/scene/SCsub @@ -4,7 +4,7 @@ Import("env") env.scene_sources = [] -# Godot source files +# Blazium source files env.add_source_files(env.scene_sources, "*.cpp") # Chain load SCsubs diff --git a/scene/animation/SCsub b/scene/animation/SCsub index d0aa0bc8aa65..5a3c36729f5b 100644 --- a/scene/animation/SCsub +++ b/scene/animation/SCsub @@ -10,7 +10,7 @@ env_thirdparty = env.Clone() env_thirdparty.disable_warnings() env.scene_sources += thirdparty_obj -# Godot source files +# Blazium source files scene_obj = [] diff --git a/scene/main/node.h b/scene/main/node.h index ee195ddef965..f94c2c528f94 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -814,7 +814,7 @@ Error Node::rpc_id(int p_peer_id, const StringName &p_method, VarArgs... p_args) #endif // Add these macro to your class's 'get_configuration_warnings' function to have warnings show up in the scene tree inspector. -#define DEPRECATED_NODE_WARNING warnings.push_back(RTR("This node is marked as deprecated and will be removed in future versions.\nPlease check the Godot documentation for information about migration.")); +#define DEPRECATED_NODE_WARNING warnings.push_back(RTR("This node is marked as deprecated and will be removed in future versions.\nPlease check the Blazium documentation for information about migration.")); #define EXPERIMENTAL_NODE_WARNING warnings.push_back(RTR("This node is marked as experimental and may be subject to removal or major changes in future versions.")); #endif // NODE_H diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 2b6aa88d2c0c..51d1418ab777 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -13,7 +13,7 @@ env_thirdparty.disable_warnings() env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env.scene_sources += thirdparty_obj -# Godot source files +# Blazium source files scene_obj = []