X Tutup
Skip to content

Add project setting and build option to disable override.cfg and related CLI arguments.#108818

Merged
Repiteo merged 1 commit intogodotengine:masterfrom
bruvzg:no_cli_over
Oct 8, 2025
Merged

Add project setting and build option to disable override.cfg and related CLI arguments.#108818
Repiteo merged 1 commit intogodotengine:masterfrom
bruvzg:no_cli_over

Conversation

@bruvzg
Copy link
Member

@bruvzg bruvzg commented Jul 21, 2025

Salvaged remaining parts of #76161 (PCK encryption for Android is already implemented).

  • Adds application/config/disable_project_settings_override project setting to disable override.cfg and --script, --main-loop arguments.
  • Adds disable_overrides build option to disable project setting overrides and more CLI options.

Partially implements godotengine/godot-proposals#12036
Fixes godotengine/godot-proposals#12037

@bruvzg bruvzg added this to the 4.x milestone Jul 21, 2025
@bruvzg bruvzg requested review from a team as code owners July 21, 2025 06:19
Copy link
Member

@adamscott adamscott left a comment

Choose a reason for hiding this comment

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

The double-negation really trips me off.

#ifndef OVERRIDE_DISABLED

I think instead we should use OVERRIDE_ENABLED instead and put the default build value to true. It makes it clear that the code inside the #ifdef is really when overrides are enabled.

@bruvzg
Copy link
Member Author

bruvzg commented Aug 1, 2025

Switched it to OVERRIDE_ENABLED.

Copy link
Member

@adamscott adamscott left a comment

Choose a reason for hiding this comment

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

Overall, it seems OK with me!

@adamscott adamscott added the cherrypick:4.4 Considered for cherry-picking into a future 4.4.x release label Aug 1, 2025
@bruvzg bruvzg modified the milestones: 4.x, 4.6 Aug 14, 2025
@Repiteo Repiteo added the cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release label Aug 18, 2025
Copy link
Contributor

@Repiteo Repiteo left a comment

Choose a reason for hiding this comment

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

Implementation looks good, but we should be marking our #endif ranges explicitly

@akien-mga akien-mga removed cherrypick:4.4 Considered for cherry-picking into a future 4.4.x release cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release labels Oct 7, 2025
@Repiteo Repiteo merged commit 0091d30 into godotengine:master Oct 8, 2025
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Oct 8, 2025

Thanks!

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.

Allow to opt out of override.cfg configs with exceptions

4 participants

X Tutup