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

Merge gameside changes into OSS scriptcomp #116

Merged
merged 3 commits into from
Apr 4, 2024
Merged

Conversation

mtijanic
Copy link
Collaborator

@mtijanic mtijanic commented Apr 3, 2024

With this change, neverwinter.nim repo becomes the source of truth and is strictly newer than the game.

Testing

Scriptcomp test suite.

Licence

  • I am licencing my change under the project's MIT licence, including all changes to GPL-3.0 licenced parts of the codebase.

@mtijanic mtijanic requested a review from niv April 3, 2024 19:39
@mtijanic
Copy link
Collaborator Author

mtijanic commented Apr 3, 2024

Oh, there's already #107 that died on the CI for reasons. I just retriggered that, if it passes I'll merge it first so this diff will be smaller.

Copy link
Owner

@niv niv left a comment

Choose a reason for hiding this comment

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

Hm ok, but nw.nim will never be the only source of truth. Even if we keep all compiler changes here, we'll always diverge in the future when scaffolding changes.

@mtijanic
Copy link
Collaborator Author

mtijanic commented Apr 4, 2024

True, but we don't have to be perfect. Try and keep the integration as nw.nim->game, and if something has to go the other way, handle it manually. Basically same as now, except hopefully better.

@mtijanic mtijanic merged commit 1c8f4b3 into niv:master Apr 4, 2024
2 checks passed
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.

2 participants