merge #48
Merged
merge #48
Conversation
This file contains 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
…layer logout via AFK timeout while in dungeon (creature gets deleted) (cherry picked from commit 60e301190d1a854585917a93b1584152e2b6e752) # Conflicts: # src/server/game/AI/NpcBots/bot_ai.cpp
fix(Scripts/ZulAman)HalazziLynxAbilityTimers
… Hungry Nether Rays (azerothcore#20753) * Created File * Removed the prequiste quests * Space correction
Referenced commit(s): 2ff4788
Referenced commit(s): 9d42213
Referenced commit(s): 6ec4eb5
…azerothcore#20776) add prepared statements to escape special characters in branch name
azerothcore#20780) * fix(Scripts/ZulAman): Fix Vortex not following players and also spell missing * Update boss_zuljin.cpp
azerothcore#20782) fix(Scripts/ZulAman): Reset threat after Zuljin does his phase transition transformation
…e cast is valid. (azerothcore#20712) * Initial fix for azerothcore#20509 * small revert * Two way visibility between ghosts. * clean up temporary changes. * clean up debug code. * small typo * revert .gitignore * fix codestyle * Add missing flag, resolve issue where cast was failing while alive. * Update SpellInfo.cpp Co-authored-by: Kitzunu <[email protected]> --------- Co-authored-by: Kitzunu <[email protected]>
azerothcore#20784) fix(Scripts/ZulAman): Hex Lord Malacrass shouldn't use previous class abilities after siphon
Referenced commit(s): 7d3b3ae
…core#20785) * fix(Script/Commands): tele add should only check exact match * closes azerothcore#20268 * better describe the variable
* Create scarlet_infantrymen.sql Fix Scarlet Infantrymen. * Update scarlet_infantrymen.sql * Update scarlet_infantrymen.sql * Update scarlet_infantrymen.sql
Referenced commit(s): 6c8c0cf
…othcore#20796) refactor(Scripts/VioletHold): Move all spell scripts to spelldifficultydbc
Referenced commit(s): 938c637
* sql * add script handling cmangos/mangos-wotlk@4b890a4 Co-authored-by: MantisLord <[email protected]> * set Akilzon call for help boss should pull trash * style: remove blank lines * add passiveAI header and sort * Revert "set Akilzon call for help" This reverts commit 9914333. line of sight blocks call for help --------- Co-authored-by: MantisLord <[email protected]>
Referenced commit(s): 81d1fca
Referenced commit(s): 3acf687
Referenced commit(s): 5dfe897
Referenced commit(s): d949192
Referenced commit(s): 8f7fc6d
Referenced commit(s): 0e6fffa
Referenced commit(s): e6cf00a
…zerothcore#21057) Co-authored-by: Nicholas Lee <[email protected]> Co-authored-by: blinkysc <[email protected]>
Referenced commit(s): b6c9573
Referenced commit(s): e837fa8
Referenced commit(s): 106e0ed
Co-authored-by: Rocco Silipo <[email protected]>
Referenced commit(s): 3c19ab5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
This PR proposes changes to:
Issues Addressed:
SOURCE:
The changes have been validated through:
Tests Performed:
This PR has been:
How to Test the Changes:
Known Issues and TODO List:
How to Test AzerothCore PRs
When a PR is ready to be tested, it will be marked as [WAITING TO BE TESTED].
You can help by testing PRs and writing your feedback here on the PR's page on GitHub. Follow the instructions here:
http://www.azerothcore.org/wiki/How-to-test-a-PR
REMEMBER: when testing a PR that changes something generic (i.e. a part of code that handles more than one specific thing), the tester should not only check that the PR does its job (e.g. fixing spell XXX) but especially check that the PR does not cause any regression (i.e. introducing new bugs).
For example: if a PR fixes spell X by changing a part of code that handles spells X, Y, and Z, we should not only test X, but we should test Y and Z as well.