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.

Sign up for GitHub

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

Jump to bottom

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

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

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

wants to merge 20 commits into from

Conversation

Spartan322
Copy link
Member

@Spartan322 Spartan322 commented Oct 25, 2024 •
edited
Loading

Closes #697
Related:

Includes:

@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
RadenTheFolf
RadenTheFolf approved these changes Oct 27, 2024
View reviewed changes
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 mentioned this pull request Nov 3, 2024
Draft
Spartan322 and others added 12 commits November 5, 2024 03:32
@Spartan322 @WhalesState
Remove superfluous ColorPicker Containers
166c1b4 
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>
@Spartan322 @WhalesState
Unify ColorPicker HSV Rectangle/Wheel draw
9c45ad6 
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 9db102a)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@Spartan322 @WhalesState
Remove ColorModeOKHSL.get_shape_override
cfaef35 
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>
@Spartan322 @WhalesState
Unify ColorPicker color mode slider colors
df80f8e 
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit e3650df)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@Spartan322 @WhalesState
Remove hide on ColorPicker color picking
081108c 
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 59101cb)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@Spartan322 @WhalesState
Fix ColorPicker inactive left side sample reset
6786445 
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit e3ac6fb)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@Spartan322 @WhalesState
Fix ColorPicker overbright indicator position
3aadb62 
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 3265e08)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@Spartan322 @WhalesState
Fix RGB/RAW ColorMode jank sliders and spinbox
b301ed7 
(cherry picked from commit blazium-engine/blazium@f7c6762)
(cherry picked from commit 7a16a43)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@WhalesState @Spartan322
Enable ColorPicker RGB+RAW modes to have greater values for over br…
fee6835 
…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>
@WhalesState @Spartan322
Fix ScrollBar grabber mouse ignores scroll margin
66a62e5 
(cherry picked from commit blazium-engine/blazium@ca09c1d)
(cherry picked from commit ad35df2)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@WhalesState @Spartan322
Fix EditorSpinSlider grabber doesn't follow parent when scrolling
9663987 
(cherry picked from commit blazium-engine/blazium@a501d9f)
(cherry picked from commit 8880ef6)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@WhalesState @Spartan322
Fix CanvasItemEditor redraw on key echo
cdee3ca 
(cherry picked from commit blazium-engine/blazium@5ca9caa)
(cherry picked from commit d09a29e)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
Spartan322 and others added 7 commits November 5, 2024 03:32
@Spartan322 @WhalesState
Unify CanvasItemEditor duplicate hovering behavior
b169153 
(cherry picked from commit blazium-engine/blazium@5ca9caa)
(cherry picked from commit 40d36f6)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@Spartan322 @WhalesState
Overhaul CanvasItemEditor snap lines drawing and input
4f6ea00 
(cherry picked from commit blazium-engine/blazium@5ca9caa)
(cherry picked from commit f6edeb0)

Co-authored-by: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
@chenasraf @Spartan322
Fix Linux desktop files
21a8584 
(cherry picked from commit 78ae5ca)
@decryptedchaos @Spartan322
Fix Godot Reference for update URL
456ccc7 
(cherry picked from commit 1ea7e4e)
@Spartan322
Fix Kotlin license headers referring to Godot
6dc5c31 
(cherry picked from commit 7e8c731)
@Spartan322
Fix templates treating official releases as dev releases
c5fc7c2 
Correct version.py to act as a dev version

(cherry picked from commit f615cbb)
@Spartan322
Fix ignoring status_version for updating
c94b922 
(cherry picked from commit 6c1a415)
@RadenTheFolf @Spartan322
Fix websocket dropping messages for WSLPeer
cc3a8e6 
Allows WSLPeer to grab the length of incoming messages
	Only accept them if they fit in in_buffer

(cherry picked from commit godotengine/godot@e11d581)
(cherry picked from commit 3c1f525)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SkogiB SkogiB SkogiB approved these changes

@RadenTheFolf RadenTheFolf RadenTheFolf approved these changes

Assignees
No one assigned
Labels
bug enhancement platform:linuxbsd rebranding issues and pr's related to engine rebranding topic:editor topic:gui topic:network topic:2d
Projects
Engine Overview
Status: Open
Roadmap 4.4
Status: In Progress
Milestone
4.4
Development

Successfully merging this pull request may close these issues.
7 participants
@Spartan322 @RadenTheFolf @SkogiB @tindrew @WhalesState @chenasraf @decryptedchaos