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

Backport #70945 and #71001 #73960

Merged
merged 2 commits into from
May 27, 2024
Merged

Backport #70945 and #71001 #73960

merged 2 commits into from
May 27, 2024

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented May 20, 2024 •
edited
Loading

Summary

None

Purpose of change

Solves a stable blocker

Describe the solution

Backport #70945 and #71001

Describe alternatives you've considered

Testing

Additional context

@github-actions github-actions bot added Vehicles Vehicles, parts, mechanics & interactions [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 20, 2024
@dseguin
Copy link
Member

dseguin commented May 22, 2024

Could you include commit 4ddc33e (#71001) in this backport as well? It fixes a line introduced in this PR.

@Procyonae Procyonae marked this pull request as draft May 23, 2024 10:28
@Procyonae Procyonae changed the title Backport #70945 Backport #70945 and #71001 May 24, 2024
@Procyonae Procyonae marked this pull request as ready for review May 24, 2024 11:08
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 24, 2024
Ramza13 and others added 2 commits May 26, 2024 14:18
@Ramza13 @kevingranade
Fix segfault when using vehicle tool to hacksaw (CleverRaven#70945)
461a43f 
* Fix

* fix

* Update activity_actor_definitions.h
@inogenous @kevingranade
Merge pull request CleverRaven#71001 from inogenous/fix-uninitialized…
97a82de 
…-qual-gcc13

Fix: Prevent uninitialized int
@kevingranade
Copy link
Member

Just rebased it so hopefully basic build can pass now.

@kevingranade kevingranade merged commit a2de40b into CleverRaven:0.H-branch May 27, 2024
20 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 27, 2024
@Procyonae Procyonae deleted the Backport70945 branch December 1, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Enhancement / Feature> New features, or enhancements on existing Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Procyonae @dseguin @kevingranade @Ramza13 @inogenous