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.

Sign up for GitHub

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

Jump to bottom

Remove duplicate project settings definitions #61549

Merged
merged 1 commit into from
Nov 8, 2022
Merged

Remove duplicate project settings definitions #61549

merged 1 commit into from
Nov 8, 2022

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented May 30, 2022

Basically Project Settings version of #58847
It's much more invasive, as project settings are used everywhere.

From more notable changes:

  • I moved mono defines to project_settings.cpp. There was an ifndef MODULE_MONO_ENABLED that repeated the settings. If they are supposed to be in core, such hacks make no sense
    • alternative is just removing the repeated definition and leave only the one in mono module
  • fixed some wrongly defined properties in godot_space_2d/3d.cpp

@KoBeWi KoBeWi added this to the 4.0 milestone May 30, 2022
@KoBeWi KoBeWi requested review from a team as code owners May 30, 2022 22:41
@KoBeWi KoBeWi force-pushed the project_settings_mess branch 3 times, most recently from 31f24b6 to 15a8bc2 Compare June 1, 2022 13:19
@KoBeWi KoBeWi mentioned this pull request Jun 8, 2022
Merged
akien-mga
akien-mga reviewed Jun 27, 2022
View reviewed changes
main/main.cpp Outdated Show resolved Hide resolved
akien-mga
akien-mga reviewed Jun 27, 2022
View reviewed changes
main/main.cpp Outdated Show resolved Hide resolved
akien-mga
akien-mga reviewed Jun 27, 2022
View reviewed changes
main/main.cpp Outdated Show resolved Hide resolved
@akien-mga akien-mga mentioned this pull request Jun 28, 2022
Merged
@KoBeWi KoBeWi mentioned this pull request Jun 28, 2022
Open
@KoBeWi KoBeWi force-pushed the project_settings_mess branch 2 times, most recently from ede3fd4 to 9e4c9d3 Compare June 28, 2022 16:01
@KoBeWi KoBeWi force-pushed the project_settings_mess branch from 9e4c9d3 to 1b267b9 Compare October 20, 2022 13:35
@KoBeWi KoBeWi requested a review from a team as a code owner October 20, 2022 13:35
@KoBeWi
Copy link
Member Author

KoBeWi commented Oct 20, 2022

Rebased. But there were so many conflicts that something might be wrong.

@KoBeWi KoBeWi force-pushed the project_settings_mess branch from 1b267b9 to 4b49c44 Compare October 20, 2022 13:43
@KoBeWi KoBeWi force-pushed the project_settings_mess branch from 4b49c44 to c737848 Compare October 20, 2022 17:02
@KoBeWi KoBeWi force-pushed the project_settings_mess branch from c737848 to d9f066d Compare November 8, 2022 00:30
akien-mga
akien-mga approved these changes Nov 8, 2022
View reviewed changes
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

YOLO merging, let's see if anything breaks :)

@akien-mga akien-mga merged commit 2f0d3d5 into godotengine:master Nov 8, 2022
@akien-mga
Copy link
Member

Thanks!

@KoBeWi KoBeWi deleted the project_settings_mess branch November 8, 2022 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
enhancement topic:codestyle topic:core
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@KoBeWi @akien-mga