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

Open
wants to merge 17 commits into
base: master
Choose a base branch
from

Conversation

Spartan322
Copy link
Member

@Spartan322 Spartan322 commented Oct 25, 2024

@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

@Spartan322 Spartan322 removed the cherrypick:master Considered for cherry-picking into a master label Oct 31, 2024
Spartan322 and others added 15 commits October 31, 2024 02:21
Remove vbl child from `ColorPicker`
Remove vbr child from `ColorPicker`, prefer `real_vbox`

(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 18d0193)

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

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
It seems to be vestigial inherited from the ColorPicker refactor

(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 86eb475)

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

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
(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@ca09c1d)
(cherry picked from commit ad35df2)

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

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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Open
Status: In Progress
Development

Successfully merging this pull request may close these issues.

7 participants