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

Rename free mode to floating mode #57103

Merged
merged 1 commit into from
Jan 24, 2022

Conversation

fabriceci
Copy link
Contributor

@fabriceci fabriceci commented Jan 23, 2022

As discussed here, to be more explicit.

Edit: I also remove the property group for Floating Mode in 2D that contained wall_min_slide_angle.

Unlike in 3D, in 2D, this property is only used for the floating mode. Even is a group was was clearer, I think consistency between 2-3D is better (as a group implies changing the property name).

@fabriceci fabriceci added this to the 4.0 milestone Jan 23, 2022
@fabriceci fabriceci requested a review from a team January 23, 2022 22:40
@fabriceci fabriceci requested review from a team as code owners January 23, 2022 22:40
@fabriceci fabriceci force-pushed the rename-free-mode-floating branch 3 times, most recently from b1bf89a to 6fef5ad Compare January 24, 2022 12:48
@fabriceci fabriceci force-pushed the rename-free-mode-floating branch 2 times, most recently from 3dee874 to 66b72ad Compare January 24, 2022 13:16
@fabriceci
Copy link
Contributor Author

@akien-mga For the android builds, is this a cache issue?

@akien-mga
Copy link
Member

Looks like it yeah :|

It's pretty difficult to fix as GitHub Actions don't provide an easy way to invalidate a corrupted cache. I'll figure something out.

@akien-mga
Copy link
Member

You could try to rebase and force push. It looks like a more recent PR doesn't have a broken cache for Android: https://github.com/godotengine/godot/runs/4922801853?check_suite_focus=true

Rebasing should force the PR to get a cache from the latest master build I think.

@fabriceci fabriceci force-pushed the rename-free-mode-floating branch from 66b72ad to 856142a Compare January 24, 2022 14:19
@akien-mga
Copy link
Member

Didn't work... but let's see if the merge commit would pass CI when merging. Otherwise the only option is to change the cache key in the workflow configuration and invalidate CI for all PRs :| (+ pollute git diff with CI related config tweaks)

@akien-mga akien-mga merged commit 233699f into godotengine:master Jan 24, 2022
@akien-mga
Copy link
Member

Thanks!

@fabriceci fabriceci deleted the rename-free-mode-floating branch August 26, 2022 14:31
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.

2 participants