Skip to content

Fix duplicate RGB colours in palette#18299

Merged
duncanspumpkin merged 5 commits into
OpenRCT2:developfrom
Gymnasiast:fix/duplicate-palette-colours
Apr 16, 2023
Merged

Fix duplicate RGB colours in palette#18299
duncanspumpkin merged 5 commits into
OpenRCT2:developfrom
Gymnasiast:fix/duplicate-palette-colours

Conversation

@Gymnasiast

Copy link
Copy Markdown
Member

Would like confirmation from @spacek531 that this is indeed sufficient, and that I didn’t miss any of the duplicates (water or otherwise).

@spacek531

Copy link
Copy Markdown
Collaborator

I would like larger contrast with the unique colors but LGTM otherwise.

@Gymnasiast

Copy link
Copy Markdown
Member Author

You can create a PR against my branch if you like.

@Gymnasiast Gymnasiast added the squash merge A PR that should be squashed on merge. label Nov 2, 2022
@Gymnasiast Gymnasiast force-pushed the fix/duplicate-palette-colours branch from 9ff9513 to 99851fa Compare November 2, 2022 18:17
@Gymnasiast Gymnasiast force-pushed the fix/duplicate-palette-colours branch 2 times, most recently from a551268 to e7c704c Compare February 14, 2023 00:25
@duncanspumpkin

Copy link
Copy Markdown
Contributor

Well thats just pointed out that a good chunk of the tests aren't being run on cmake builds.

@Gymnasiast

Copy link
Copy Markdown
Member Author

@duncanspumpkin Seems like it, yes. If you have time, could you perhaps take a look at my branch and update the tests? As far as I can see, the logo looks exactly the same, but due to the nature of the PR (deduplicating indices) it’s inevitable that some pixels now have a different palette index than they had before.

@github-actions

github-actions Bot commented Mar 7, 2023

Copy link
Copy Markdown

This pull request is stale and will be closed in 14 days if no action is taken. To keep it open, leave a comment or remove the stale-pr label. If you're awaiting feedback from a developer, please send us a reminder (either here or on Discord).

@Gymnasiast

Copy link
Copy Markdown
Member Author

Keeps this open please.

@github-actions

Copy link
Copy Markdown

This pull request is stale and will be closed in 14 days if no action is taken. To keep it open, leave a comment or remove the stale-pr label. If you're awaiting feedback from a developer, please send us a reminder (either here or on Discord).

@733737

733737 commented Mar 22, 2023

Copy link
Copy Markdown
Contributor

will this interfere with kyphii's pr?

@spacek531

Copy link
Copy Markdown
Collaborator

no

@github-actions github-actions Bot removed the stale-pr label Mar 23, 2023
@duncanspumpkin

Copy link
Copy Markdown
Contributor

Can you rebase this?

@duncanspumpkin duncanspumpkin added this to the v0.4.5 milestone Apr 16, 2023
@Gymnasiast Gymnasiast force-pushed the fix/duplicate-palette-colours branch from e7c704c to 4f61d48 Compare April 16, 2023 11:57
@duncanspumpkin duncanspumpkin enabled auto-merge (squash) April 16, 2023 13:19
@duncanspumpkin duncanspumpkin merged commit 812ea15 into OpenRCT2:develop Apr 16, 2023
@Gymnasiast Gymnasiast deleted the fix/duplicate-palette-colours branch April 16, 2023 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squash merge A PR that should be squashed on merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants