2
42
Fork
You've already forked Retiled
1

WIP: rounded-tiles-with-wallpaper #517

Draft
DrewNaylor wants to merge 4 commits from rounded-tiles-with-wallpaper into main
pull from: rounded-tiles-with-wallpaper
merge into: DrewNaylor:main
DrewNaylor:main
DrewNaylor:drawer-dx
DrewNaylor:allow-alternate-styles
DrewNaylor:rust-stuff
DrewNaylor:use-tiledmenu-tilesgrid
DrewNaylor:tilesgrid-integration
DrewNaylor:parallax-background-test
No description provided.
Author
Owner
Copy link

I was going to merge this right now but I remembered that it needs to have a thing to pull in the ShaderEffectSource and put properties in the ShaderEffectSource-based file so that both can be used with a toggle.

I was going to merge this right now but I remembered that it needs to have a thing to pull in the ShaderEffectSource and put properties in the ShaderEffectSource-based file so that both can be used with a toggle.
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rounded-tiles-with-wallpaper:rounded-tiles-with-wallpaper
git switch rounded-tiles-with-wallpaper

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff rounded-tiles-with-wallpaper
git switch rounded-tiles-with-wallpaper
git rebase main
git switch main
git merge --ff-only rounded-tiles-with-wallpaper
git switch rounded-tiles-with-wallpaper
git rebase main
git switch main
git merge --no-ff rounded-tiles-with-wallpaper
git switch main
git merge --squash rounded-tiles-with-wallpaper
git switch main
git merge --ff-only rounded-tiles-with-wallpaper
git switch main
git merge rounded-tiles-with-wallpaper
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
accessibility
Anything relating to Accessibility/Ease of Access.
app
Non-shell applications. Does not include RetiledStart even though it's a regular window because it's too close to being a shell component.
archived
This discussion, issue, or pr is archived and locked.
bug
Something isn't working
documentation
Improvements or additions to documentation, or this pr/issue is basically documentation until the next version is ready
duplicate
This issue or pull request already exists
enhancement
New feature or request
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
known issue
overhaul
Massive changes, additions, or removals
performance
question
Further information is requested
regression
Bug that wasn't there before.
shell
Shell components, specifically things like the status bar and navbar. RetiledStart shouldn't count since it's an application window but I include it here.
still has cool ideas
Closed issues that might still have some cool ideas.
themes+styles
Theme-related issues.
todo
Reminder for something to do later.
wontfix
I'm not really feeling it.
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
DrewNaylor/Retiled!517
Reference in a new issue
DrewNaylor/Retiled
No description provided.
Delete branch "rounded-tiles-with-wallpaper"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?