projects/oil-is-thicker-than-water
Watch
2
0
Fork
You've already forked oil-is-thicker-than-water
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

cleaning up color palette implementation #15

Open
laurin wants to merge 8 commits from color-palette into development
pull from: color-palette
merge into: projects:development
Conversation 2 Commits 8 Files changed 33 +2158 -179
laurin commented 2026-09-09 11:34:46 +02:00
Owner
Copy link

This enhances the Color Palette Implementation.

It is now a global autoload that is available in the editor and provides the generated textures as global shader variables.

Note that this has to be a tool if I don't want to mage a bunch of annoying workarounds every time I am creating a shader with this palette system.

This enhances the Color Palette Implementation. It is now a global autoload that is available in the editor and provides the generated textures as global shader variables. Note that this has to be a tool if I don't want to mage a bunch of annoying workarounds every time I am creating a shader with this palette system.
laurin requested review from fio 2026-09-09 11:35:17 +02:00
laurin force-pushed color-palette from 32d53220df to 963fe16bfd 2026-09-09 14:46:52 +02:00 Compare
laurin removed review request for fio 2026-09-09 14:51:46 +02:00
fio commented 2026-09-11 10:04:18 +02:00
Owner
Copy link

@laurin there's numerous errors on project startup and the main menu is broken. please fix before merge

image

image

@laurin there's numerous errors on project startup and the main menu is broken. please fix before merge ![image](/attachments/41e334dd-4877-4627-8c7a-cd87c62d72d9) ![image](/attachments/2c7f813e-b8a2-40f9-8e1d-fabcd3c9ece9)
image.png
116 KiB
image.png
457 KiB
fio commented 2026-09-11 11:07:34 +02:00
Owner
Copy link

update: main menu is broken because ScreenManager in the globals list is the gd file, not tscn

Please fix this

update: main menu is broken because ScreenManager in the globals list is the gd file, not tscn Please fix this
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin color-palette:color-palette
git switch color-palette

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 development
git merge --no-ff color-palette
git switch color-palette
git rebase development
git switch development
git merge --ff-only color-palette
git switch color-palette
git rebase development
git switch development
git merge --no-ff color-palette
git switch development
git merge --squash color-palette
git switch development
git merge --ff-only color-palette
git switch development
git merge color-palette
git push origin development
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
fio
2 participants
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
projects/oil-is-thicker-than-water!15
No description provided.