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

(re-)Adds the ability to lock action buttons #24852

Merged
merged 4 commits into from
Mar 29, 2024

Conversation

lewcc
Copy link
Contributor

@lewcc lewcc commented Mar 28, 2024

What Does This PR Do

Adds the ability to lock and unlock action buttons by ctrl-clicking them. When locked, buttons will be triggered if you drag off of them, making it easier to drag them somewhere when frantically combat clicking. Also adds a little blurb on the action palette that explains this.

Why It's Good For The Game

I've gotten a few people suggesting this, and it seems like a good idea, especially with the ability to drag. Sorry for the holdup on this!

Testing

Loaded in and dragged buttons around

Changelog

🆑
tweak: Action buttons can now be locked and unlocked with ctrl-click.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Mar 28, 2024
@Henri215 Henri215 added the Fix This PR will fix an issue in the game label Mar 28, 2024
@S34NW
Copy link
Member

S34NW commented Mar 28, 2024

!merge_upstream

@ParadiseSS13 ParadiseSS13 deleted a comment from paradisess13 bot Mar 28, 2024
@ParadiseSS13 ParadiseSS13 deleted a comment from paradisess13 bot Mar 28, 2024
Copy link
Contributor

paradisess13 bot commented Mar 28, 2024

GitHub Actions can not push to this branch as workflow files have been changed since your branch was last updated. Please update your branch past 89d6873 before using this command again.

Copy link
Contributor

paradisess13 bot commented Mar 28, 2024

Merging upstream failed, see the action run log for details: https://github.com/ParadiseSS13/Paradise/actions/runs/8475055036

@S34NW
Copy link
Member

S34NW commented Mar 29, 2024

!merge_upstream

Copy link
Contributor

paradisess13 bot commented Mar 29, 2024

Merging upstream failed, see the action run log for details: https://github.com/ParadiseSS13/Paradise/actions/runs/8475426914

@S34NW
Copy link
Member

S34NW commented Mar 29, 2024

!merge_upstream

@S34NW S34NW enabled auto-merge March 29, 2024 14:55
@S34NW S34NW added this pull request to the merge queue Mar 29, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Mar 29, 2024
Merged via the queue into ParadiseSS13:master with commit e6a5685 Mar 29, 2024
11 checks passed
Daylight2 pushed a commit to Daylight2/Paradise that referenced this pull request Apr 8, 2024
Co-authored-by: S34N <[email protected]>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Fix This PR will fix an issue in the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants