郑佩茹
|
ff0e5d5e3b
|
Merge branch 'questXPHook' into Playerbot
|
2022-03-21 14:47:43 -06:00 |
|
郑佩茹
|
60f11b3671
|
Merge branch 'master' into Playerbot
# Conflicts:
# apps/ci/ci-install-modules.sh
# src/common/Collision/Management/MMapMgr.cpp
# src/common/Debugging/Errors.h
# src/server/game/AI/SmartScripts/SmartScript.cpp
# src/server/game/Battlegrounds/Arena.cpp
# src/server/game/Battlegrounds/ArenaScore.h
# src/server/game/Battlegrounds/Battleground.cpp
# src/server/game/Battlegrounds/BattlegroundMgr.cpp
# src/server/game/Battlegrounds/BattlegroundMgr.h
# src/server/game/Battlegrounds/BattlegroundQueue.cpp
# src/server/game/Battlegrounds/BattlegroundQueue.h
# src/server/game/Battlegrounds/Zones/BattlegroundAB.h
# src/server/game/Battlegrounds/Zones/BattlegroundEY.h
# src/server/game/Battlegrounds/Zones/BattlegroundIC.h
# src/server/game/Conditions/ConditionMgr.cpp
# src/server/game/DataStores/M2Stores.cpp
# src/server/game/DungeonFinding/LFGMgr.cpp
# src/server/game/Entities/Creature/Creature.cpp
# src/server/game/Entities/Creature/CreatureData.h
# src/server/game/Entities/GameObject/GameObject.cpp
# src/server/game/Entities/GameObject/GameObject.h
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Player/Player.h
# src/server/game/Entities/Player/PlayerStorage.cpp
# src/server/game/Entities/Unit/Unit.cpp
# src/server/game/Entities/Unit/Unit.h
# src/server/game/Globals/ObjectMgr.cpp
# src/server/game/Groups/Group.cpp
# src/server/game/Groups/Group.h
# src/server/game/Guilds/Guild.cpp
# src/server/game/Guilds/Guild.h
# src/server/game/Handlers/BattleGroundHandler.cpp
# src/server/game/Handlers/CharacterHandler.cpp
# src/server/game/Scripting/ScriptDefines/BGScript.cpp
# src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp
# src/server/game/Scripting/ScriptDefines/PlayerScript.cpp
# src/server/game/Scripting/ScriptDefines/ServerScript.cpp
# src/server/game/Scripting/ScriptMgr.cpp
# src/server/game/Scripting/ScriptMgrMacros.h
# src/server/game/Server/Packets/MiscPackets.cpp
# src/server/game/Server/Packets/MiscPackets.h
# src/server/game/Server/WorldSession.cpp
# src/server/game/Spells/SpellEffects.cpp
# src/server/game/World/IWorld.h
# src/server/game/World/World.cpp
# src/server/game/World/World.h
# src/server/scripts/Commands/cs_npc.cpp
# src/server/scripts/Commands/cs_server.cpp
# src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
# src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
# src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
# src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
|
2022-03-21 13:57:37 -06:00 |
|
AzerothCoreBot
|
9f4f824336
|
chore(DB): import pending files
Referenced commit(s): b0bcfc18bc
|
2022-03-21 12:35:11 +00:00 |
|
Voicot Kaczynski
|
b0bcfc18bc
|
fix(DB/Quest): Kim'jael Indeed! GO loot (#10350)
|
2022-03-21 13:33:13 +01:00 |
|
UltraNix
|
9c780588c4
|
fix(Scripts/Spells): Earthliving Weapon should no proc from Earth Shield. (#11094)
|
2022-03-21 05:13:37 -03:00 |
|
AzerothCoreBot
|
73c5375469
|
chore(DB): import pending files
Referenced commit(s): 8358a5d68e
|
2022-03-21 07:44:48 +00:00 |
|
UltraNix
|
8358a5d68e
|
fix(DB/Creatures): Control Onyxia's movement flags via script. (#11095)
|
2022-03-21 04:42:59 -03:00 |
|
IntelligentQuantum
|
86e438a1e7
|
Core/Packet: SMSG_LEVELUP_INFO (#10884)
|
2022-03-21 04:43:45 +07:00 |
|
AzerothCoreBot
|
204043ccd2
|
chore(DB): import pending files
Referenced commit(s): 534056f561
|
2022-03-18 23:33:05 +00:00 |
|
Kosiak
|
534056f561
|
fix(DB/creature_template): Love is in the Air Creatures Level (#11009)
|
2022-03-18 20:30:51 -03:00 |
|
AzerothCoreBot
|
03ba247bc5
|
chore(DB): import pending files
Referenced commit(s): 9d11928673
|
2022-03-18 23:18:53 +00:00 |
|
ZhengPeiRu21
|
9d11928673
|
fix(DB): Blood Elf Mage Trainers Incorrect Dialog (#10524)
|
2022-03-18 20:17:06 -03:00 |
|
Francesco Borzì
|
96bf37ea1b
|
docs(LICENSE): remove old GPLv2 license (#11076)
|
2022-03-18 19:57:39 -03:00 |
|
AzerothCoreBot
|
31c5d76a1c
|
chore(DB): import pending files
Referenced commit(s): d298e11803
|
2022-03-18 22:39:57 +00:00 |
|
Kosiak
|
d298e11803
|
fix(DB/SAI/Quest): Stranglethorn Fever (#11010)
|
2022-03-18 19:38:11 -03:00 |
|
UltraNix
|
3c9e8d4eb1
|
fix(Core): Crash related to reset instances (#11003)
|
2022-03-18 19:32:28 -03:00 |
|
AzerothCoreBot
|
52427b4ec2
|
chore(DB): import pending files
Referenced commit(s): 15f68959dd
|
2022-03-18 22:29:04 +00:00 |
|
UltraNix
|
15f68959dd
|
fix(DB/Creatures): Adjusted ground position for some mobs in Swamp of Sorrows. (#11004)
|
2022-03-18 19:27:16 -03:00 |
|
AzerothCoreBot
|
8a027c0939
|
chore(DB): import pending files
Referenced commit(s): 199d2159e8
|
2022-03-18 22:25:17 +00:00 |
|
Kosiak
|
199d2159e8
|
fix(DB/SAI): The Touch of Zanzil (#11046)
|
2022-03-18 19:23:27 -03:00 |
|
AzerothCoreBot
|
dc3c117034
|
chore(DB): import pending files
Referenced commit(s): b0e6bae8d0
|
2022-03-18 22:20:24 +00:00 |
|
Bogir[rus]
|
b0e6bae8d0
|
feat (DB/locale): zhTW CompletedText locale text (#11007)
|
2022-03-18 19:18:39 -03:00 |
|
AzerothCoreBot
|
71777403b3
|
chore(DB): import pending files
Referenced commit(s): 16f89e13af
|
2022-03-18 22:16:36 +00:00 |
|
Bogir[rus]
|
16f89e13af
|
fix(DB/Locale): esES & esMX quest texts (#11044)
|
2022-03-18 19:14:38 -03:00 |
|
AzerothCoreBot
|
7fb5af24de
|
chore(DB): import pending files
Referenced commit(s): ce7b6c5a26
|
2022-03-18 22:13:07 +00:00 |
|
Bogir[rus]
|
ce7b6c5a26
|
fix(DB/Locale): Add missing esES & esMX quest texts (#11042)
|
2022-03-18 19:11:10 -03:00 |
|
AzerothCoreBot
|
8359a14f6b
|
chore(DB): import pending files
Referenced commit(s): 5cc5499336
|
2022-03-18 22:08:40 +00:00 |
|
Kosiak
|
5cc5499336
|
fix(DB/SAI): The Stone Watcher (#11045)
|
2022-03-18 19:06:36 -03:00 |
|
AzerothCoreBot
|
b2e9f8d1da
|
chore(DB): import pending files
Referenced commit(s): 9d4cc721b4
|
2022-03-18 22:05:14 +00:00 |
|
ZhengPeiRu21
|
9d4cc721b4
|
fix(DB/pathing): Stranglethorn Missing Pathing (#11012)
|
2022-03-18 19:03:22 -03:00 |
|
AzerothCoreBot
|
bd039d9b80
|
chore(DB): import pending files
Referenced commit(s): a067b4cf5c
|
2022-03-18 21:57:15 +00:00 |
|
Kosiak
|
a067b4cf5c
|
fix(DB/quest_template): Rat Catching (#11008)
|
2022-03-18 18:55:19 -03:00 |
|
Nefertumm
|
c2b70e3927
|
fix(Core/Events): Corrections to Apothecary Hummel (#10674)
|
2022-03-18 18:42:56 -03:00 |
|
UltraNix
|
68891ccd74
|
fix(Core/Loot): Fixed some chests inside dungeons not being bound only to participants. (#10995)
|
2022-03-18 18:33:04 -03:00 |
|
AzerothCoreBot
|
c11a96b775
|
chore(DB): import pending files
Referenced commit(s): 3ae0769858
|
2022-03-18 21:31:59 +00:00 |
|
Kosiak
|
3ae0769858
|
fix(DB/Quest): The Tome of Divinity (#10990)
|
2022-03-18 18:30:09 -03:00 |
|
AzerothCoreBot
|
2d6e618b1a
|
chore(DB): import pending files
Referenced commit(s): 55ef7ce5a3
|
2022-03-18 21:22:38 +00:00 |
|
Kosiak
|
55ef7ce5a3
|
fix(DB/smart_scripts): The Restless Souls (#10989)
|
2022-03-18 18:20:34 -03:00 |
|
UltraNix
|
acaa76d9c1
|
fix(Core/Spells): Heal from Bloodthirst should be affected by healing mods. (#10915)
|
2022-03-18 18:17:01 -03:00 |
|
UltraNix
|
da0f2e3ae2
|
fix(Core/Spells): Nature's Swiftness should not be consumed by instant spells. (#10909)
|
2022-03-18 18:15:56 -03:00 |
|
AzerothCoreBot
|
63fee0abf9
|
chore(DB): import pending files
Referenced commit(s): e5f9c8c0af
|
2022-03-18 21:15:11 +00:00 |
|
UltraNix
|
e5f9c8c0af
|
fix(Core/Mails): Do not load expired mails from database. (#10917)
|
2022-03-18 18:13:17 -03:00 |
|
ZhengPeiRu21
|
f2ab17f591
|
fix(DB/pathing): Blasted Lands Missing Pathing (#11028)
|
2022-03-18 18:11:46 -03:00 |
|
AzerothCoreBot
|
b4fd87ebb2
|
chore(DB): import pending files
Referenced commit(s): 87441c7aa0
|
2022-03-18 21:10:11 +00:00 |
|
Bogir[rus]
|
87441c7aa0
|
fix(DB/Locale): zhTW locale texts for quests 13068-13090 (#11036)
|
2022-03-18 18:08:16 -03:00 |
|
AzerothCoreBot
|
da8b2826f4
|
chore(DB): import pending files
Referenced commit(s): c0dd59b432
|
2022-03-18 21:07:26 +00:00 |
|
Bogir[rus]
|
c0dd59b432
|
fix (DB/Locale): Fix zhTW locale texts for death knight quests 12593-13189 (#11035)
|
2022-03-18 18:05:25 -03:00 |
|
AzerothCoreBot
|
15355de979
|
chore(DB): import pending files
Referenced commit(s): 43e3f5d6ac
|
2022-03-18 21:04:55 +00:00 |
|
Bogir[rus]
|
43e3f5d6ac
|
fix(DB/Locale): wrong zhTW locale texts for quests 11560-11631 (#11034)
|
2022-03-18 18:02:55 -03:00 |
|
AzerothCoreBot
|
f295cb98d5
|
chore(DB): import pending files
Referenced commit(s): e17eba2f3f
|
2022-03-18 20:44:17 +00:00 |
|