Open
Conversation
conan513
pushed a commit
that referenced
this pull request
Aug 22, 2018
(cherry picked from commit 7dc4b7e)
(cherry picked from commit 15fbb6f)
(cherry picked from commit 7272e42)
(cherry picked from commit b485dc7)
(cherry picked from commit e64da76)
closes #31344 by danaton
closes #31326 by AlexPro54
closes #31347 by Foldor1
closes #31348 by Foldor1
…tead of only failing after first login attempt
closes #31355 by CraftedRO
closes #31354 by CraftedRO
This reverts commit fa061c8.
Drakkari Colossus implementation cleanup
error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else]
("ambiguous", right)
…grip on third phase (right now its only casted once) take a breath sindra... hehe (if anyone has better timers, feel free)
… fight beaconed, that's a verb
unstaged change
…Jump - she pulls everyone up and into the model, not just to the unit's margin
… summoner reference
(cherry picked from commit f4926e0)
…ENTS_INFO to packet classes
general cleanup that enables the script intended purpose, but this needs much more work
…ould not despawn (#31719)
… (currently does nothing) (cherry picked from commit 3e85598)
(cherry picked from commit 6965b2)
Co-authored-by: Mykhailo Redko <ovitnez@gmail.com>
…handling (cherry-picked from commit 80d72a2)
…ndling (cherry picked from commit c2fedbb)
…eartbeat and movement handling (cherry picked from commit 5a169f6)
"Safely" goes through all combat references validating if in fact the unit should remain in combat or not Any edge case that may get affected by this, are scenarios in which the charmed unit must keep the combat and threat references prior to their charm.... I can't think of any. -> And honestly if there was any such case... imo it should be handled script wise, not core wise. closes #31747 updates #30169
Co-authored-by: Shauren <shauren.trinity@gmail.com>
…ebug builds (cherry picked from commit 2b38f40)
(cherry picked from commit 1c487de)
… to reduce number of replacements needed when upgrading fmt to new major version (cherry-picked from commit d2d0995)
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
20 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.
Changes proposed:
Target branch(es): 335/6x
Issues addressed: Fixes #
Tests performed: (Does it build, tested in-game, etc)
Known issues and TODO list: