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

feat: add water parallax, caustics, and improved cubemaps #177

Merged
merged 77 commits into from
Feb 19, 2024

Conversation

doodlum
Copy link
Owner

@doodlum doodlum commented Feb 8, 2024

Contains significant refactoring and fixes to support new features.

@Pentalimbed Pentalimbed mentioned this pull request Feb 8, 2024
@doodlum doodlum marked this pull request as draft February 9, 2024 14:14
@alandtse
Copy link
Collaborator

We should really remain the PR if you're starting to do other stuff or just cherry pick what you want into a new branch.

@alandtse alandtse changed the title feat: Terrain Blending and refactor feat: add water parallax and improved cubemaps Feb 17, 2024
@doodlum doodlum changed the title feat: add water parallax and improved cubemaps feat: add water parallax, caustics, and improved cubemaps Feb 19, 2024
@doodlum doodlum marked this pull request as ready for review February 19, 2024 01:09
@alandtse
Copy link
Collaborator

Squash when you're ready

@alandtse
Copy link
Collaborator

@doodlum Oh wait, is there a missing #endif?
0d44249 (#177)

Copy link
Collaborator

@alandtse alandtse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please double check my conflict merge is right.
#177 (comment)

@doodlum
Copy link
Owner Author

doodlum commented Feb 19, 2024

it's fine, idk why it looks like that in the preview

@doodlum doodlum merged commit b1c5587 into dev Feb 19, 2024
4 checks passed
@alandtse alandtse deleted the terrain-blending-pr branch March 11, 2024 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants