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

Move entityType_t in gamelogic #1631

Merged
merged 1 commit into from
Apr 13, 2025

Conversation

VReaperV
Copy link
Contributor

@VReaperV VReaperV commented Mar 30, 2025

Gamelogic-side pr: Unvanquished/Unvanquished#3359

Patch shared by freem, this moves entityType_t to gamelogic, since the engine doesn't need to know about it.

This should be fine to merge into master, since the ABI is still the same and merge conflicts from this change are unlikely.

@slipher
Copy link
Member

slipher commented Mar 30, 2025

If you push the branches to the origin repos with a name ending in /sync (same in both repos), we can see whether it compiles. (may have to re-create the PRs)

@illwieckz
Copy link
Member

CI was run in Unvanquished/Unvanquished#3362

@illwieckz illwieckz merged commit 76d9725 into DaemonEngine:master Apr 13, 2025
10 checks passed
@VReaperV VReaperV deleted the freem-entitytype branch April 13, 2025 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants