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

Blazium rebranding started .md, and .github should be good to go #3

Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b318afc
Rebrand top level files, and .github folders
RandomOfNoWhere Oct 12, 2024
0801163
Rebrand top level files, and .github folders part2
RandomOfNoWhere Oct 12, 2024
ae2efa0
Revert "Rebrand top level files, and .github folders part2"
RandomOfNoWhere Oct 12, 2024
9c8749d
Rebranding for /core folder
RandomOfNoWhere Oct 12, 2024
0638ba9
Fixes for errors found during verification
RandomOfNoWhere Oct 12, 2024
836521a
Type on base branch fixed
RandomOfNoWhere Oct 12, 2024
d5003f7
Removed redot remains
RandomOfNoWhere Oct 12, 2024
4b92a50
Discord link update, and removed one one redot reference in README.md
RandomOfNoWhere Oct 12, 2024
30cdc7a
Delete pom.xml
RandomOfNoWhere Oct 12, 2024
bb9e26d
Removed copyright change
RandomOfNoWhere Oct 12, 2024
9984c29
Merge branch 'blazium-rebranding' of https://github.com/RandomOfNoWhe…
RandomOfNoWhere Oct 12, 2024
9e99705
Restored new line at end of file
RandomOfNoWhere Oct 12, 2024
994704a
One more newline at end of file restored
RandomOfNoWhere Oct 12, 2024
72ce8b1
Update SCsub
RandomOfNoWhere Oct 12, 2024
eaafcba
Update SCsub
RandomOfNoWhere Oct 12, 2024
836b0d1
Update SCsub
RandomOfNoWhere Oct 12, 2024
e662733
Update SCsub
RandomOfNoWhere Oct 12, 2024
bfd2ff6
Update SCsub
RandomOfNoWhere Oct 12, 2024
9d635b5
Removed trash
RandomOfNoWhere Oct 12, 2024
8126d30
Merge branch 'blazium-rebranding' of https://github.com/RandomOfNoWhe…
RandomOfNoWhere Oct 12, 2024
a4639db
Updated .gitignore to ensure no local netbeans files are pushed
RandomOfNoWhere Oct 12, 2024
14577a7
Update SCsub
RandomOfNoWhere Oct 12, 2024
f519d0b
Update SCsub
RandomOfNoWhere Oct 12, 2024
a074c68
Update SCsub
RandomOfNoWhere Oct 12, 2024
c669e9c
Update SCsub
RandomOfNoWhere Oct 12, 2024
2fa518a
Update SCsub
RandomOfNoWhere Oct 12, 2024
b8bb1e8
Update SCsub
RandomOfNoWhere Oct 12, 2024
3ca972d
Update SCsub
RandomOfNoWhere Oct 12, 2024
c51a350
Update SCsub
RandomOfNoWhere Oct 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cache-name: linux-editor-mono
target: editor
sconsflags: module_mono_enabled=yes
bin: "./bin/godot.linuxbsd.editor.x86_64.mono"
bin: "./bin/blazium.linuxbsd.editor.x86_64.mono"
build-mono: true
tests: false # Disabled due freeze caused by mix Mono build and CI
doc-test: true
Expand All @@ -40,11 +40,11 @@ jobs:
target: editor
# Debug symbols disabled as they're huge on this build and we hit the 14 GB limit for runners.
sconsflags: dev_build=yes scu_build=yes debug_symbols=no precision=double use_asan=yes use_ubsan=yes linker=gold
bin: "./bin/godot.linuxbsd.editor.dev.double.x86_64.san"
bin: "./bin/blazium.linuxbsd.editor.dev.double.x86_64.san"
build-mono: false
tests: true
proj-test: true
# Generate an API dump for godot-cpp tests.
# Generate an API dump for blazium-cpp tests.
api-dump: true
# Skip 2GiB artifact speeding up action.
artifact: false
Expand All @@ -53,7 +53,7 @@ jobs:
cache-name: linux-editor-llvm-sanitizers
target: editor
sconsflags: dev_build=yes use_asan=yes use_ubsan=yes use_llvm=yes linker=lld
bin: "./bin/godot.linuxbsd.editor.dev.x86_64.llvm.san"
bin: "./bin/blazium.linuxbsd.editor.dev.x86_64.llvm.san"
build-mono: false
tests: true
# Skip 2GiB artifact speeding up action.
Expand All @@ -66,7 +66,7 @@ jobs:
target: editor
tests: true
sconsflags: dev_build=yes use_tsan=yes use_llvm=yes linker=lld
bin: "./bin/godot.linuxbsd.editor.dev.x86_64.llvm.san"
bin: "./bin/blazium.linuxbsd.editor.dev.x86_64.llvm.san"
build-mono: false
# Skip 2GiB artifact speeding up action.
artifact: false
Expand All @@ -75,7 +75,7 @@ jobs:
cache-name: linux-template-mono
target: template_release
sconsflags: module_mono_enabled=yes tests=yes
bin: "./bin/godot.linuxbsd.template_release.x86_64.mono"
bin: "./bin/blazium.linuxbsd.template_release.x86_64.mono"
build-mono: false
tests: true
artifact: true
Expand All @@ -84,7 +84,7 @@ jobs:
cache-name: linux-template-minimal
target: template_release
sconsflags: modules_enabled_by_default=no disable_3d=yes disable_advanced_gui=yes deprecated=no minizip=no tests=yes
bin: "./bin/godot.linuxbsd.template_release.x86_64"
bin: "./bin/blazium.linuxbsd.template_release.x86_64"
tests: true
artifact: true

Expand Down Expand Up @@ -161,8 +161,8 @@ jobs:
- name: Prepare artifact
if: ${{ matrix.artifact }}
run: |
strip bin/godot.*
chmod +x bin/godot.*
strip bin/blazium.*
chmod +x bin/blazium.*

- name: Upload artifact
uses: ./.github/actions/upload-artifact
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
cache-name: macos-editor
target: editor
tests: true
bin: "./bin/godot.macos.editor.universal"
bin: "./bin/blazium.macos.editor.universal"

- name: Template (target=template_release)
cache-name: macos-template
target: template_release
tests: true
sconsflags: debug_symbols=no tests=yes
bin: "./bin/godot.macos.template_release.universal"
bin: "./bin/blazium.macos.template_release.universal"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -75,10 +75,10 @@ jobs:

- name: Prepare artifact
run: |
lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal
rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
strip bin/godot.*
chmod +x bin/godot.*
lipo -create ./bin/blazium.macos.${{ matrix.target }}.x86_64 ./bin/blazium.macos.${{ matrix.target }}.arm64 -output ./bin/blazium.macos.${{ matrix.target }}.universal
rm ./bin/blazium.macos.${{ matrix.target }}.x86_64 ./bin/blazium.macos.${{ matrix.target }}.arm64
strip bin/blazium.*
chmod +x bin/blazium.*

- name: Upload artifact
uses: ./.github/actions/upload-artifact
Expand Down
50 changes: 41 additions & 9 deletions .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
env:
# Used for the cache key. Add version suffix to force clean build.
GODOT_BASE_BRANCH: 4.3
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes d3d12=yes "angle_libs=${{github.workspace}}/"
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes d3d12=yes strict_checks=yes "angle_libs=${{ github.workspace }}/"
SCONS_CACHE_MSVC_CONFIG: true

concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-windows
cancel-in-progress: true

jobs:
Expand All @@ -29,17 +29,39 @@ jobs:
tests: true
# Skip debug symbols, they're way too big with MSVC.
sconsflags: debug_symbols=no vsproj=yes vsproj_gen_only=no windows_subsystem=console
bin: "./bin/godot.windows.editor.x86_64.exe"
bin: "./bin/blazium.windows.editor.x86_64.exe"
artifact: true

- name: Template (target=template_release)
- name: Editor w/ Mono (target=editor)
cache-name: windows-editor-mono
target: editor
sconsflags: module_mono_enabled=yes
bin: "./bin/blazium.windows.editor.x86_64.mono.exe"
build-mono: true
tests: false # Disabled due freeze caused by mix Mono build and CI
doc-test: true
proj-conv: true
api-compat: true
artifact: true

- name: Editor w/ clang-cl (target=editor, tests=yes, use_llvm=yes)
cache-name: windows-editor-clang
target: editor
tests: true
sconsflags: debug_symbols=no windows_subsystem=console use_llvm=yes
bin: "./bin/blazium.windows.editor.x86_64.llvm.exe"

- name: Template (target=template_release, tests=yes)
cache-name: windows-template
target: template_release
tests: true
sconsflags: debug_symbols=no tests=yes
bin: "./bin/godot.windows.template_release.x86_64.console.exe"
sconsflags: debug_symbols=no
bin: "./bin/blazium.windows.template_release.x86_64.console.exe"
artifact: true

steps:
- uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -64,7 +86,7 @@ jobs:
target: angle/angle.zip

- name: Extract pre-built ANGLE static libraries
run: Expand-Archive -Force angle/angle.zip ${{github.workspace}}/
run: Expand-Archive -Force angle/angle.zip ${{ github.workspace }}/

- name: Setup MSVC problem matcher
uses: ammaraskar/msvc-problem-matcher@master
Expand All @@ -77,17 +99,27 @@ jobs:
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}

- name: Generate Glue Code
if: ${{ matrix.cache-name == 'windows-editor-mono' }}
run: ./bin/blazium.windows.editor.x86_64.mono.exe --headless --generate-mono-glue modules/mono/glue

- name: Build GodotSharp
if: ${{ matrix.cache-name == 'windows-editor-mono' }}
run: python modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true

- name: Prepare artifact
if: ${{ matrix.artifact }}
run: |
Remove-Item bin/* -Include *.exp,*.lib,*.pdb -Force

- name: Upload artifact
if: ${{ matrix.artifact }}
uses: ./.github/actions/upload-artifact
with:
name: ${{ matrix.cache-name }}
Expand All @@ -97,4 +129,4 @@ jobs:
run: |
${{ matrix.bin }} --version
${{ matrix.bin }} --help
${{ matrix.bin }} --test --force-colors
${{ matrix.bin }} --test --force-colors
79 changes: 27 additions & 52 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,41 @@
# Contributors guidelines

This document summarizes the most important points for people interested in
contributing to Godot, especially via bug reports or pull requests.
contributing to Blazium, especially via bug reports or pull requests.

The Godot documentation has a dedicated [Contributing section](https://docs.godotengine.org/en/latest/contributing/how_to_contribute.html)
The [Blazium Discord](https://discord.gg/redot) documentation has a dedicated Contributing section
which details these points and more, and is a recommended read.

## Table of contents

- [Reporting bugs](#reporting-bugs)
- [Proposing features or improvements](#proposing-features-or-improvements)
- [Contributing pull requests](#contributing-pull-requests)
- [Contributing to Godot translations](#contributing-to-godot-translations)
- [Contributing to Blazium translations](#contributing-to-blazium-translations)
- [Communicating with developers](#communicating-with-developers)

## Reporting bugs

Report bugs [here](https://github.com/godotengine/godot/issues/new?assignees=&labels=&template=bug_report.yml).
Report bugs [here](https://github.com/blazium-engine/blazium/issues/new?assignees=&labels=&template=bug_report.yml).
Please follow the instructions in the template when you do.

Notably, please include a Minimal Reproduction Project (MRP), which is a small
Godot project which reproduces the issue, with no unnecessary files included.
Be sure to not include the `.godot` folder in the archive to save space.
Blazium project which reproduces the issue, with no unnecessary files included.
Be sure to not include the `.blazium` folder in the archive to save space.

Make sure that the bug you are experiencing is reproducible in the latest Godot
releases. You can find an overview of all Godot releases [on the website](https://godotengine.org/download/archive/)
to confirm whether your current version is the latest one. It's worth testing
against both the latest stable release and the latest dev snapshot for the next
Godot release.
Make sure that the bug you are experiencing is reproducible in the latest Blazium
releases. It's worth testing against both the latest stable release and the
latest dev snapshot for the next Blazium release.

If you run into a bug which wasn't present in an earlier Godot version (what we
If you run into a bug which wasn't present in an earlier Blazium version (what we
call a _regression_), please mention it and clarify which versions you tested
(both the one(s) working and the one(s) exhibiting the bug).

## Proposing features or improvements

**The main issue tracker is for bug reports and does not accept feature proposals.**

Instead, head to the [Godot Proposals repository](https://github.com/godotengine/godot-proposals)
and follow the instructions in the README file and issue template.
Instead, head to the [Blazium Discord](https://discord.gg/redot).
RandomOfNoWhere marked this conversation as resolved.
Show resolved Hide resolved

## Contributing pull requests

Expand All @@ -55,18 +52,7 @@ Similar rules can be applied when contributing bug fixes - it's always best to
discuss the implementation in the bug report first if you are not 100% about
what would be the best fix.

You can refer to the [Pull request review process](https://docs.godotengine.org/en/latest/contributing/workflow/pr_review_guidelines.html)
for insights into the intended lifecycle of pull requests. This should help you
ensure that your pull request fulfills the requirements.

In addition to the following tips, also take a look at the
[Engine development guide](https://docs.godotengine.org/en/latest/contributing/development/index.html)
for an introduction to developing on Godot.

The [Contributing docs](https://docs.godotengine.org/en/latest/contributing/how_to_contribute.html)
also have important information on the [PR workflow](https://docs.godotengine.org/en/latest/contributing/workflow/pr_workflow.html)
(with a helpful guide for Git usage), and our [Code style guidelines](https://docs.godotengine.org/en/latest/contributing/development/code_style_guidelines.html)
which all contributions need to follow.
Visit the [Blazium Discord](https://discord.gg/redot) for information and guides related to contribution and pull requests.
RandomOfNoWhere marked this conversation as resolved.
Show resolved Hide resolved

### Be mindful of your commits

Expand All @@ -84,9 +70,6 @@ stable state, i.e. if your first commit has a bug that you fixed in the second
commit, try to merge them together before making your pull request. This
includes fixing build issues or typos, adding documentation, etc.

See our [PR workflow](https://docs.godotengine.org/en/latest/contributing/workflow/pr_workflow.html)
documentation for tips on using Git, amending commits and rebasing branches.

This [Git style guide](https://github.com/agis-/git-style-guide) also has some
good practices to have in mind.

Expand Down Expand Up @@ -125,12 +108,12 @@ description is also manually wrapped at 80 chars for readability):
```text
Prevent French fries carbonization by fixing heat regulation

When using the French fries frying module, Godot would not regulate the heat
When using the French fries frying module, Blazium would not regulate the heat
and thus bring the oil bath to supercritical liquid conditions, thus causing
unwanted side effects in the physics engine.

By fixing the regulation system via an added binding to the internal feature,
this commit now ensures that Godot will not go past the ebullition temperature
this commit now ensures that Blazium will not go past the ebullition temperature
of cooking oil under normal atmospheric conditions.
```

Expand All @@ -145,10 +128,10 @@ scripting APIs, you **must** update the class reference to document those.
This is to ensure the documentation coverage doesn't decrease as contributions
are merged.

[Update documentation XML files](https://docs.godotengine.org/en/latest/contributing/documentation/updating_the_class_reference.html)
[Update documentation XML files](https://docs.blaziumengine.org/en/latest/contributing/documentation/updating_the_class_reference.html)
using your compiled binary, then fill in the descriptions.
Follow the style guide described in the
[Documentation writing guidelines](https://docs.godotengine.org/en/latest/contributing/documentation/docs_writing_guidelines.html).
[Documentation writing guidelines](https://docs.blaziumengine.org/en/latest/contributing/documentation/docs_writing_guidelines.html).

If your pull request modifies parts of the code in a non-obvious way, make sure
to add comments in the code as well. This helps other people understand the
Expand All @@ -174,40 +157,32 @@ applicable.
Feel free to contribute standalone pull requests to add new tests or improve
existing tests as well.

See [Unit testing](https://docs.godotengine.org/en/latest/contributing/development/core_and_modules/unit_testing.html)
for information on writing tests in Godot's C++ codebase.
See [Unit testing](https://docs.blaziumengine.org/en/latest/contributing/development/core_and_modules/unit_testing.html)
for information on writing tests in Blazium's C++ codebase.

## Contributing to Godot translations
## Contributing to Blazium translations

You can contribute to Godot translations on [Hosted Weblate](https://hosted.weblate.org/projects/godot-engine/),
You can contribute to Blazium translations on [Hosted Weblate](https://hosted.weblate.org/projects/blazium-engine/),
an open source and web-based translation platform.

Please refer to our [editor and documentation localization guidelines](https://docs.godotengine.org/en/latest/contributing/documentation/editor_and_docs_localization.html)
Please refer to Blazium's [editor and documentation localization guidelines](https://docs.blaziumengine.org/en/latest/contributing/documentation/editor_and_docs_localization.html)
for an overview of the translation resources and what they correspond to.

## Communicating with developers

The Godot Engine community has [many communication
channels](https://godotengine.org/community), some used more for user-level
discussions and support, others more for development discussions.
The Blazium Engine community is largely centralized on the [Blazium Discord](https://discord.gg/redot) at this time, feel free to drop by!

To communicate with developers (e.g. to discuss a feature you want to implement
or a bug you want to fix), the following channels can be used:

- [Godot Contributors Chat](https://chat.godotengine.org): You will
find most core developers there, so it's the go-to platform for direct chat
about Godot Engine development. Browse the [Directory](https://chat.godotengine.org/directory/channels)
for an overview of public channels focusing on various engine areas which you
might be interested in.
- [Bug tracker](https://github.com/godotengine/godot/issues): If there is an
- [Blazium Discord](https://discord.gg/redot): General community chat and development can all be found here.
RandomOfNoWhere marked this conversation as resolved.
Show resolved Hide resolved
- [Bug tracker](https://github.com/Blazium-Engine/blazium-engine/issues): If there is an
RandomOfNoWhere marked this conversation as resolved.
Show resolved Hide resolved
existing issue about a topic you want to discuss, you can participate directly.
If not, you can open a new issue. Please mind the guidelines outlined above
for bug reporting.
- [Feature proposals](https://github.com/godotengine/godot-proposals/issues):
To propose a new feature, we have a dedicated issue tracker for that. Don't
hesitate to start by talking about your idea on the Godot Contributors Chat
to make sure that it makes sense in Godot's context.
- Feature Proposals should be made on the [Blazium Discord](https://discord.gg/redot) for now.
- [Blazium](https://github.com/blazium-engine/) on X (Twitter)

Thanks for your interest in contributing!

The Godot development team
Blazium Development Community
Loading