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

Update to Godot Engine 4.3 dev #24

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

fire
Copy link
Collaborator

@fire fire commented Mar 10, 2024

Probably want to wait til 4.3 is released.

fire added 3 commits March 9, 2024 20:07
…Gitignore rules. Adjust code style settings for C++, ObjC, and Java. Update CI workflow to generate wiki documentation from XML files. Add comprehensive Gitignore rules for various generated files and IDE-specific files.
Changed include paths for physics related classes to match new directory structure.
…nheritance for HydroRigidBody, WaterArea3D, WatercraftBallast, WatercraftPropulsion, and WatercraftRudder.
Copy link
Collaborator

@jonri jonri left a comment

Choose a reason for hiding this comment

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

@fire In reference to bd29413, I don't see any of the updated files mentioned in the description, and on the other hand it seems all of the copyright blocks have been changed to the boilerplate from Godot itself.

Regarding the other two, thanks for keeping things up with the upcoming 4.3 changes

- Added a missing newline at the end of the file.
Include third-party types in the hydro module for better functionality.
"thirdparty/src/water_area.cpp",
"thirdparty/src/watercraft_ballast.cpp",
"thirdparty/src/watercraft_propulsion.cpp",
"thirdparty/src/watercraft_rudder.cpp",
Copy link
Collaborator

Choose a reason for hiding this comment

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

What advantage does moving these files bring?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm not sure how to disable the copyright header replacement.

Copy link
Collaborator Author

@fire fire Mar 15, 2024

Choose a reason for hiding this comment

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

Another way is to add your copyright with SPDX short tag.

GODOT ENGINE license boiler plate

Copyright (c) 2019 Jon Ring
SPDX-License-Identifier: MIT

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

And move it back.


#include "src/register_types.h"
#include "modules/hydro/thirdparty/src/register_types.h"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This appears to be incompatible with building the module using custom_modules=... with a directory not named modules.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Will investigate.

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