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

Art/FountainHogeweg #29

Merged
merged 6 commits into from
Apr 19, 2024
Merged

Art/FountainHogeweg #29

merged 6 commits into from
Apr 19, 2024

Conversation

Smokey1987
Copy link
Contributor

No description provided.

@Smokey1987 Smokey1987 added art A pull request that is art related. (models, textures, sprites, VFX) new New feature or improvement on something ready for review A code owner may review the pull request labels Apr 19, 2024
@Smokey1987 Smokey1987 self-assigned this Apr 19, 2024
Copy link
Member

@bas-boop bas-boop left a comment

Choose a reason for hiding this comment

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

Update van develop, je heb conflicts op het moment.

@bas-boop
Copy link
Member

Ik mis wel een water particle. Net zoals de scoure matireal.
image

Assets/Materials/blue.png Outdated Show resolved Hide resolved
Assets/Models/Egg.obj Outdated Show resolved Hide resolved
Copy link
Member

@bas-boop bas-boop left a comment

Choose a reason for hiding this comment

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

drawing

@Smokey1987 Smokey1987 merged commit 95ef226 into develop Apr 19, 2024
1 check passed
@bas-boop bas-boop added ready for merge Pull request is ready to merge (don't forget to update from develop) and removed ready for review A code owner may review the pull request labels Apr 19, 2024
@bas-boop bas-boop deleted the Art/Fountainhogeweg branch April 19, 2024 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
art A pull request that is art related. (models, textures, sprites, VFX) new New feature or improvement on something ready for merge Pull request is ready to merge (don't forget to update from develop)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants