Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP 4.3 Rebranding #1

Open
wants to merge 5 commits into
base: 4.3
Choose a base branch
from
Open

WIP 4.3 Rebranding #1

wants to merge 5 commits into from

Conversation

trashguy
Copy link
Owner

Patching in the changes from 4.4 re-branding, still need to go through all the generated reject files and resolve them.

 3233 files changed, 13976 insertions(+), 6950 deletions(-)
 create mode 100644 .git-blame-ignore-revs.rej
 create mode 100644 .github/workflows/linux_builds.yml.rej
 create mode 100644 .github/workflows/macos_builds.yml.rej
 create mode 100644 .github/workflows/windows_builds.yml.rej
 create mode 100644 COPYRIGHT.txt.rej
 create mode 100644 REDOT_AUTHORS.md
 create mode 100644 SConstruct.rej
 create mode 100644 core/io/json.cpp.rej
 create mode 100644 core/math/transform_interpolator.cpp.rej
 create mode 100644 core/object/script_language.h.rej
 create mode 100644 doc/classes/Object.xml.rej
 create mode 100644 doc/classes/RenderingServer.xml.rej
 create mode 100644 drivers/gles3/rasterizer_gles3.cpp.rej
 create mode 100644 editor/editor_about.cpp.rej
 create mode 100644 editor/editor_file_system.cpp.rej
 create mode 100644 editor/editor_settings.cpp.rej
 create mode 100644 editor/export/export_template_manager.cpp.rej
 create mode 100644 editor/export/project_export.cpp.rej
 create mode 100644 editor/project_manager.cpp.rej
 create mode 100644 main/main.cpp.rej
 create mode 100644 misc/dist/linux/org.godotengine.Godot.desktop.rej
 create mode 100644 misc/dist/macos_tools.app/Contents/Info.plist.rej
 create mode 100644 misc/dist/windows/godot.iss.rej
 create mode 100644 misc/scripts/install_vulkan_sdk_macos.sh.rej
 create mode 100644 modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj.rej
 create mode 100644 modules/openxr/openxr_api.cpp.rej
 create mode 100644 platform/android/java/build.gradle.rej
 create mode 100644 platform/android/java/lib/src/org/godotengine/godot/Godot.kt.rej
 create mode 100644 platform/web/detect.py.rej
 create mode 100644 platform/web/export/export_plugin.cpp.rej
 create mode 100644 platform/windows/godot_res_wrap.rc.rej
 create mode 100644 servers/audio/effects/audio_effect_record.cpp.rej
 create mode 100644 servers/rendering/rendering_device_commons.h.rej
 create mode 100644 servers/xr/xr_interface.h.rej
 create mode 100644 tests/core/string/test_string.h.rej
 create mode 100644 thirdparty/miniupnpc/src/miniupnpcstrings.h.rej

@trashguy
Copy link
Owner Author

These are some that should be double checked

COPYRIGHT.txt
just double check

editor/editor_about.cpp
+#include "core/redot_authors.gen.h"

editor/editor_settings.cpp

  • Pretty different from 4.4/master

@Spartan322 Spartan322 force-pushed the 4.3-rebrand branch 4 times, most recently from 3a032ff to 0b8fbc7 Compare October 12, 2024 10:17
trashguy and others added 5 commits October 13, 2024 15:05
(cherry picked from commit e8542b0)

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants