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

Cherry-picks for the master (4.4) branch - 2nd batch #804

Merged
merged 30 commits into from
Dec 4, 2024

Conversation

Spartan322
Copy link
Member

@Spartan322 Spartan322 commented Oct 25, 2024

Closes #697
Closes #838
Closes #840
Fixes #712
Fixes #857

Related:

Includes:

Removed:

@Spartan322 Spartan322 added cherrypick:master Considered for cherry-picking into a master bug topic:gui enhancement labels Oct 25, 2024
@Spartan322 Spartan322 added rebranding issues and pr's related to engine rebranding platform:linuxbsd topic:editor topic:2d labels Oct 26, 2024
Copy link
Contributor

@RadenTheFolf RadenTheFolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why some of the changes are just switching if statements from if condition {} else {} to the conditional op ? . guess it does look cleaner

@tindrew tindrew added this to the 4.4 milestone Oct 29, 2024
@Spartan322 Spartan322 removed the cherrypick:master Considered for cherry-picking into a master label Oct 31, 2024
@Spartan322 Spartan322 force-pushed the cherry-pick/4.3 branch 2 times, most recently from 7b8a341 to f3cd889 Compare November 3, 2024 10:49
@Spartan322 Spartan322 force-pushed the cherry-pick/4.3 branch 2 times, most recently from cc3a8e6 to 5c98f88 Compare November 7, 2024 15:57
@kayofontinhas
Copy link

not sure why some of the changes are just switching if statements from if condition {} else {} to the conditional op ? . guess it does look cleaner

I prefer this ternary operator.

Could it be set as good pattern from now on here?

@Spartan322 Spartan322 force-pushed the cherry-pick/4.3 branch 2 times, most recently from 3544cc7 to d5f587c Compare November 12, 2024 18:31
@Spartan322 Spartan322 force-pushed the cherry-pick/4.3 branch 2 times, most recently from 78f68ab to 90274d0 Compare November 14, 2024 13:15
Spartan322 and others added 25 commits November 27, 2024 13:55
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 59101cb)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit e3ac6fb)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 3265e08)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 7a16a43)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
…ight.

(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 72ade00)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit blazium-engine/blazium@5ca9caa)
(cherry picked from commit d09a29e)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit blazium-engine/blazium@5ca9caa)
(cherry picked from commit 40d36f6)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit blazium-engine/blazium@5ca9caa)
(cherry picked from commit f6edeb0)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(cherry picked from commit 78ae5ca)
(cherry picked from commit 1ea7e4e)
Correct version.py to act as a dev version

(cherry picked from commit f615cbb)
(cherry picked from commit 621c8c8)

Co-authored-by: Spartan322 <Megacake1234@gmail.com>
(cherry picked from commit 3158d1b)
(cherry picked from commit 8ad3922)
@Spartan322 Spartan322 merged commit c866a48 into Redot-Engine:master Dec 4, 2024
20 checks passed
@Spartan322 Spartan322 deleted the cherry-pick/4.3 branch December 4, 2024 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Status: Done