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

update (passive_anticheat): build fix #106

Closed
wants to merge 20 commits into from
Closed

update (passive_anticheat): build fix #106

wants to merge 20 commits into from

Conversation

acidmanifesto
Copy link
Contributor

@acidmanifesto acidmanifesto commented Aug 13, 2023

Changes proposed:

  • Build Fix due to recent alignments.
  • No Further Changes.

Target branch(es): 335-passive_anticheat

Issues addressed: Fixes #

Tests performed: (Does it build, tested in-game, etc)

Known issues and TODO list:

  • [ ]
  • [ ]

Shauren and others added 19 commits August 12, 2023 14:24
(cherry picked from commit ba9bbbc9d0c3b80d8954ad6390d23ae3d0f804b2)
Closes #28607

(cherry picked from commit 85d5f4bc0683d99cfaab244a8f0355b463f93267)
(cherry picked from commit 74dc88eb54751d5cd3eb8c379cdf9b2bdbbaa1ec)
GCC: 10
Clang: 11
MSVC: 2022
(cherry picked from commit 0a1b40241a12b2b2f4549edf0ee263e91236145b)
(cherry picked from commit 989f84c5f2db4d1ea75e5b2020be6ef4bf770366)
…its from it

(cherry picked from commit 585900f42d064b9f6adc08015605931163ea79c8)
(cherry picked from commit dcb589946bf55fee1c1a78d99f4ee721ac799ef8)
(cherry picked from commit 42fbcf2fc58690346ef1db12803b79634985d44f)
… with plain vector with custom static storage allocatlr

(cherry picked from commit b65c3f5f4a4edbc953c405bfacd33f186f3a1931)
(cherry picked from commit e8e330addd55dffa8e34716c7e1969ad243d65b3)
…ur headers

(cherry picked from commit 1afec8be634fc3fd09fc5ea38ba71f0cc9259c7e)
(cherry picked from commit cd62dc44916cd2d3e9522e1373e27bd01b27c84f)
(cherry picked from commit 7830e5a7a1b93b0cd083baa3b70a0cfeb475f5f5)
(cherry picked from commit a53e4a57565d3375a978effbbc32d3eed6aac7e3)
(cherry picked from commit 92ed5e8af1f8b1aac085fd9b0ea93afb2b6795d4)
@acidmanifesto acidmanifesto changed the base branch from 3.3.5 to 3.3.5-passive_anticheat August 13, 2023 17:36
@jackpoz
Copy link
Contributor

jackpoz commented Aug 13, 2023

It shouldn't be 3.3.5 merged into 3.3.5-passive_anticheat but 3.3.5-base from https://github.com/TrinityCore/TrinityCoreCustomChanges/commits/3.3.5-base_patch (and 3.3.5 into 3.3.5-base first) to keep the autoupdating GitHub Action to work (see 453d141 as example)

@acidmanifesto
Copy link
Contributor Author

It shouldn't be 3.3.5 merged into 3.3.5-passive_anticheat but 3.3.5-base from https://github.com/TrinityCore/TrinityCoreCustomChanges/commits/3.3.5-base_patch (and 3.3.5 into 3.3.5-base first) to keep the autoupdating GitHub Action to work (see 453d141 as example)

oof. ill close the pr and reopen with a different branch to pr to..

@acidmanifesto acidmanifesto deleted the 3.3.5-passive_anticheat branch August 13, 2023 17:54
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.

3 participants