diff options
| author | Randolph W. Aarseth II <bioblazepayne@gmail.com> | 2024-10-04 01:37:26 -0700 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-11 02:25:54 -0400 |
| commit | d5fc3d1e8c1f8f904e1fbe8bd1c402d560bfb596 (patch) | |
| tree | e3d74332dbb7b5fe280d370b94e0fde913d78be8 /platform/web/js | |
| parent | b52811b83478bd06c5bcf39a93bbf53dd03cc9bf (diff) | |
| download | redot-engine-d5fc3d1e8c1f8f904e1fbe8bd1c402d560bfb596.tar.gz | |
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 <skogi.b@gmail.com>
Co-authored-by: Spartan322 <Megacake1234@gmail.com>
Co-authored-by: swashberry <swashdev@pm.me>
Co-authored-by: Christoffer Sundbom <christoffer_karlsson@live.se>
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 <radenthefolf@gmail.com>
Co-authored-by: John Knight <80524176+Tekisasu-JohnK@users.noreply.github.com>
Co-authored-by: Adam Vondersaar <adam.vondersaar@uphold.com>
Co-authored-by: decryptedchaos <nixgod@gmail.com>
Co-authored-by: zaftnotameni <122100803+zaftnotameni@users.noreply.github.com>
Co-authored-by: Aaron Benjamin <lifeartstudios@gmail.com>
Co-authored-by: wesam <108880473+wesamdev@users.noreply.github.com>
Co-authored-by: Mister Puma <MisterPuma80@gmail.com>
Co-authored-by: Aaron Benjamin <lifeartstudios@gmail.com>
Co-authored-by: SingleError <isaaconeoneone@gmail.com>
Co-authored-by: Bioblaze Payne <BioblazePayne@gmail.com>
Diffstat (limited to 'platform/web/js')
| -rw-r--r-- | platform/web/js/engine/config.js | 2 | ||||
| -rw-r--r-- | platform/web/js/engine/engine.externs.js | 2 | ||||
| -rw-r--r-- | platform/web/js/engine/engine.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/web/js/engine/config.js b/platform/web/js/engine/config.js index 61b488cf81..e4aec319c5 100644 --- a/platform/web/js/engine/config.js +++ b/platform/web/js/engine/config.js @@ -293,7 +293,7 @@ const InternalConfig = function (initConfig) { // eslint-disable-line no-unused- return {}; }, 'locateFile': function (path) { - if (!path.startsWith('godot.')) { + if (!path.startsWith('godot.') && !path.startsWith('redot.')) { return path; } else if (path.endsWith('.worker.js')) { return `${loadPath}.worker.js`; diff --git a/platform/web/js/engine/engine.externs.js b/platform/web/js/engine/engine.externs.js index 35a66a93ae..a0d38fcd3b 100644 --- a/platform/web/js/engine/engine.externs.js +++ b/platform/web/js/engine/engine.externs.js @@ -1,4 +1,4 @@ -var Godot; +var Redot; var WebAssembly = {}; WebAssembly.instantiate = function(buffer, imports) {}; WebAssembly.instantiateStreaming = function(response, imports) {}; diff --git a/platform/web/js/engine/engine.js b/platform/web/js/engine/engine.js index 04c4c44c5e..9718c9fd5a 100644 --- a/platform/web/js/engine/engine.js +++ b/platform/web/js/engine/engine.js @@ -93,7 +93,7 @@ const Engine = (function () { return new Promise(function (resolve, reject) { promise.then(function (response) { const cloned = new Response(response.clone().body, { 'headers': [['content-type', 'application/wasm']] }); - Godot(me.config.getModuleConfig(loadPath, cloned)).then(function (module) { + Redot(me.config.getModuleConfig(loadPath, cloned)).then(function (module) { const paths = me.config.persistentPaths; module['initFS'](paths).then(function (err) { me.rtenv = module; |