Fix gomove_master build after upstream master merge#180
Merged
Conversation
…iable during revision_data.h generation (TrinityCore#31732) * Fixes more edge cases with localized output from Get-CimInstance
…g outfit has been filled
…s columns (should apply to all races/classes)
… of just sending packet
…ride transmog to characters still in Initial spec Closes TrinityCore#31749
…plate bloat * Replace std::enable_if with concept constraints * Move code not dependent on template arguments out of template function bodies * Reduce number of ChatCommandResult copies made during parsing * Changed ChatCommandTable subcommands argument from std::vector<> const& to std::span<> and convert command definitions to arrays * Allow ChatHandler arguments to be const
…ype_info args directly
…r of the Void (84998) and Blessings Be Upon You (85001) (TrinityCore#31689)
…layer::GetSpellModValues
…or The Candle King * ed71522 followup
…for The Candle King (TrinityCore#31773)
…s in WorldPacket (cherry picked from commit b758b56)
…tly always printed before battleground starts and replaced its trinity_string entry with proper battleground status packet
…ssage printed to chat
… fadeObject argument
by jildor, closes TrinityCore#28854 (cherry picked from commit fe81161)
by CraftedRO closes TrinityCore#28840 (cherry picked from commit ebceb9e)
Rochet2
force-pushed
the
fix/gomove_master-upstream-merge
branch
from
9db5839 to
9588ceb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The scheduled
mergeworkflow mergesTrinityCore/TrinityCoremasterintogomove_masterand builds with-DWITH_WARNINGS_AS_ERRORS=1. The branch had fallen behind upstream and needed a fresh merge before CI could push again.This PR merges the latest upstream
masterintogomove_master. The merge applied cleanly — no conflict resolution or source fixes were required.What was wrong
gomove_masterwas no longer an ancestor of upstreammaster, so the automerge job would attempt another merge/build cycle. The branch itself had already been updated for currentObjectGuidusage inGOMove.cpp(IsEmpty()checks and addon whisper path).What was fixed
No manual code changes beyond the merge commit itself.
GOMove.cppTest plan
gomove_master.mergeworkflow_master (gomove_master, …)jobs pass.