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

[3.x] Add shape data to Bullet Area overlap data. #42712

Merged
merged 1 commit into from
Nov 22, 2021
Merged

[3.x] Add shape data to Bullet Area overlap data. #42712

merged 1 commit into from
Nov 22, 2021

Conversation

madmiraal
Copy link
Contributor

3.2 version of #42711.

@madmiraal madmiraal added this to the 3.2 milestone Oct 11, 2020
@madmiraal madmiraal requested a review from a team as a code owner March 12, 2021 12:26
Base automatically changed from 3.2 to 3.x March 16, 2021 11:11
@akien-mga akien-mga modified the milestones: 3.2, 3.3 Mar 17, 2021
@akien-mga akien-mga modified the milestones: 3.3, 3.4 Mar 26, 2021
@akien-mga akien-mga changed the title [3.2] Add shape data to Bullet Area overlap data. [3.x] Add shape data to Bullet Area overlap data. Mar 26, 2021
@Chaosus Chaosus modified the milestones: 3.4, 3.5 Nov 8, 2021
@pouleyKetchoupp
Copy link
Contributor

Closing for now as #42711 can probably be cherry-picked directly.

@akien-mga akien-mga mentioned this pull request Nov 20, 2021
Merged
@akien-mga
Copy link
Member

Reopening as this does warrant a dedicated 3.x PR as seen in #42711 (comment) - and generally speaking since Bullet doesn't build in master, we might want to exceptionally reverse our usual workflow and merge changes in 3.x first, and then forward port to master.

@akien-mga akien-mga reopened this Nov 20, 2021
@akien-mga akien-mga merged commit 4a4def0 into godotengine:3.x Nov 22, 2021
@akien-mga
Copy link
Member

Thanks!

@madmiraal madmiraal deleted the fix-19290-3.2 branch November 22, 2021 09:37
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

@AndreaCatania AndreaCatania Awaiting requested review from AndreaCatania

Assignees
No one assigned
Labels
bug topic:physics
Projects
None yet
Milestone
3.5
Development

Successfully merging this pull request may close these issues.
4 participants
@madmiraal @pouleyKetchoupp @akien-mga @Chaosus