Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,529 Commits 4 Branches 146 Tags
c23a6085c35f41240bde1eaf3e002a99fa6cdbcc
Commit Graph

14090 Commits

Author SHA1 Message Date
treeston
c23a6085c3 Core/AI: Fix an edge case crash with PlayerAI. Again. Sheesh. 
(cherry picked from commit fe707db96f)
 2016-04-08 23:38:49 +02:00
Treeston
9476726edc Merge pull request #16676 from ccrs/summonsinit 
Core/TempSummons: avoid use MoveInLineOfSight before InitSummon
(cherry picked from commit 472e78d682)
 2016-04-08 22:58:28 +02:00
treeston
3b67e57e0e Core/Creature: Prevent friendly vehicles from trying to attack their rider after dismounting. 
(cherry picked from commit 89e2afb8f9)
 2016-04-08 22:48:06 +02:00
Nyeriah
bedd2f4236 Scripts/Karazhan: Use the correct method to access Opera's side entrance door 
(cherry picked from commit ecd9dec384)
 2016-04-08 22:47:50 +02:00
Nyeriah
39c6f1ce3b Scripts/Karazhan: Clean up instance script 
Closes: #16533
(cherry picked from commit f9eff81388)
 2016-04-08 22:22:32 +02:00
Shauren
a168a2d442 Build fix 2016-04-08 22:08:23 +02:00
Aokromes
8adf24605d Merge pull request #16692 from tkrokli/headless_horseman_emote 
Core/Scripts/boss_headless_horseman: remove hardcoded text
(cherry picked from commit 5accd69863)
 2016-04-08 22:02:11 +02:00
Aokromes
9bf507e592 Merge pull request #16699 from tkrokli/triple_zone_cleanup 
Core/Scripts: triple zone cleanup
(cherry picked from commit 2387dbdda9)
 2016-04-08 22:01:40 +02:00
treeston
caa1b82b88 Unit/AI: Making Nayd happy. 
(cherry picked from commit 59d02322a7)
 2016-04-08 20:39:53 +02:00
treeston
3f6b215fca Fix some behavioral weirdness resulting from 79a945d5 - thanks ccrs. 
(cherry picked from commit bfac62c5c9)
 2016-04-08 20:39:42 +02:00
treeston
f4baf7c180 Unit/AI: Move CharmedPlayerAI logic from the SetCharmedBy/RemoveCharmedBy hooks to Player::Update -> Unit::UpdateCharmAI to guarantee thread safety and prevent race condition crashes. 
(cherry picked from commit 5354b585e3)
 2016-04-08 20:39:30 +02:00
treeston
4726116dbc Core/Threat: Prevent bosses (and other stuff using DoZoneInCombat) from switching off of the person pulling if they are pulled without generating threat. 
(cherry picked from commit b5b7ce44cf)
 2016-04-08 20:38:22 +02:00
jackpoz
8046d5a94f Scripts/Ulduar: Fix crash 
Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload.
Close #16662

(cherry picked from commit 31cd082833)
 2016-04-08 20:38:09 +02:00
treeston
c25222c428 Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680) 
(cherry picked from commit d1a9d7765c)
 2016-04-08 20:32:01 +02:00
MitchesD
50ffea4d8f Merge pull request #16671 from tkrokli/zone_terokkar_forest 
Core/Scripts: zone_terokkar_forest cleanup
(cherry picked from commit b7e93f68c3)
 2016-04-08 20:30:10 +02:00
Treeston
42a01d62e6 Merge pull request #16457 from Treeston/3.3.5-standstatecondition 
[3.3.5] Add condition for unit sitting/standing
(cherry picked from commit b6720af4cb)
 2016-04-08 20:28:55 +02:00
Aokromes
7c51859214 Core/Misc: Fix header 
(cherry picked from commit 2eb9621f19)
 2016-04-08 20:24:52 +02:00
Shauren
cc2a683193 Core/PlayerAI: 6.x specific spec checks 2016-04-08 20:21:44 +02:00
treeston
604d08db52 build fix 
(cherry picked from commit d10c698430)
 2016-04-08 20:18:07 +02:00
treeston
e394cd298b Core/PlayerAI: Some more helper methods added. Also, charmed players no longer break crowd control. 
(cherry picked from commit a8f760b692)
 2016-04-08 20:17:56 +02:00
treeston
f5a1b75fbd Core/PlayerAI: More follow-up. Helper functions and some internal cleanup. 
(cherry picked from commit 5a3a21c2d0)
 2016-04-08 20:17:40 +02:00
Treeston
adc7ee0c51 Merge pull request #16644 from Treeston/3.3.5-customcharmai 
Core/UnitAI: Rework creature-controlled player behavior.
(cherry picked from commit 4e4b2b9a13)
 2016-04-08 20:16:15 +02:00
joschiwald
e06d4d424c Merge pull request #16651 from ariel-/movespeedfix 
Core/Unit: Fix typo
(cherry picked from commit 31b1da4a14)
 2016-04-08 20:01:21 +02:00
Shauren
06734ebce9 Build fix 2016-04-08 19:49:06 +02:00
Aokromes
d4146a23ac Merge pull request #16038 from tkrokli/grammar_and_spelling_corrections_335 
[3.3.5] Core/Logs: English text corrections
(cherry picked from commit 4cd937140b)
 2016-04-08 19:48:58 +02:00
Shauren
1460b01dde Core/Misc: Fixed a crash happening when a db string array was NULL 
Closes #15670

(cherry picked from commit e60f575ac8)
 2016-04-08 18:45:20 +02:00
treeston
9e07adccf4 I don't like drycoding. It's coarse and rough and irritating and it gets everywhere. 
(cherry picked from commit d4184065b6)
 2016-04-08 18:43:18 +02:00
treeston
b2e4a962d9 Incorrect AI aggression as a consequence of the LineOfSight change, episode three, revenge of the special AIs. Also, hopefully the last. No original trilogy please. 
(cherry picked from commit ab194d5ae3)
 2016-04-08 18:43:03 +02:00
Treeston
aca9efc47a Merge pull request #16633 from Treeston/3.3.5-talentinspect 
Core/Packets: Adjust 'TalentsInspecting' option
(cherry picked from commit 3e250fe4e8)
 2016-04-08 18:42:59 +02:00
Shauren
14ed593019 Build fix 2016-04-08 18:37:59 +02:00
Kittnz
d9d2778eb8 Core/Pets: Move Egbert & Pandaren Monk into pet_generic.cpp 
(cherry picked from commit 542f5264d3)
 2016-04-08 18:33:47 +02:00
MitchesD
a5330017a8 Merge pull request #16258 from sirikfoll/feast 
Core/Spells Implemented SpellScripts Needed for Achievement Pilgrim's…
(cherry picked from commit 408572c472)
 2016-04-08 18:23:40 +02:00
Treeston
a931c7c906 Merge pull request #16637 from P-Kito/lfg_quest 
[3.3.5/6.x] Core/Player: Fix dungeonfinder quests not rewarding
(cherry picked from commit 59e59e412f)
 2016-04-08 18:22:37 +02:00
treeston
c9b24515a5 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528) 
(cherry picked from commit c70e3e31a7)
 2016-04-08 18:07:34 +02:00
Shauren
da0dec4294 Merge pull request #16585 from Treeston/3.3.5-flightform 
Core/Spells: Disallow druid flight form while shapeshifted
(cherry picked from commit 101c3f9303)
 2016-04-08 18:01:35 +02:00
Shauren
1d45b2c384 Core/Items: Fixed transmog not saving item to db 2016-04-08 16:47:56 +02:00
Shauren
f4029faece Core/Spells: Implemented spell effect 243 - SPELL_EFFECT_APPLY_ENCHANT_ILLUSION (and fixed enchant visuals, for real this time) 2016-04-07 21:36:36 +02:00
MitchesD
8b1428cca6 Core/BattlePets: updated enums to 6.2.4 2016-04-07 16:16:26 +02:00
Shauren
08c27d3205 Core/Misc: MSVC /W4 warning fixes 2016-04-06 18:40:41 +02:00
Shauren
4a3a178d7f Buildsystem: Initial changes to support building with vs clang toolset 2016-04-05 22:43:41 +02:00
Kittnz
b33afb6958 Pet/Misc: Improve Egbert's AI even more 
(cherry picked from commit af5f4ae85b)
 2016-04-05 22:15:54 +02:00
Kittnz
a6a8b5b3d4 Pet/Misc: Improve Egbert's AI 
(cherry picked from commit 2322ef3f50)
 2016-04-05 22:15:06 +02:00
treeston
0654b3b816 Check to make sure we aren't dispelling a buff for _all_ dispel types, not just magic. Closes #15321. 
(cherry picked from commit 98860911e2)
 2016-04-05 22:14:45 +02:00
treeston
60b98ecc27 Revert "Merge pull request #16483 from Treeston/3.3.5-debuffimmunity" to fix #16589 while I investigate the retail behavior of SPELL_ATTR_0_UNAFFECTED_BY_INVULERABILITY further. 
This reverts commit d67e87733b, reversing
changes made to cfed2d7a3d.

(cherry picked from commit 26bbba4b8d)
 2016-04-05 22:12:11 +02:00
Keader
f63db31c42 Fix multiple summon of Omen (Lunar Festival) 
(cherry picked from commit 8130de1b9a)
 2016-04-05 22:11:33 +02:00
treeston
845f81daa5 Core/AI: Fully move react state check from CreatureUnitRelocationWorker to CreatureAI::MoveInLineOfSight. This means that AI for passive/defensive creatures can now once again use MoveInLineOfSight (and fixes that weird thing where triggers decided it would be funny to attack players). 
(cherry picked from commit 8e6fb3b1c5)
 2016-04-05 21:51:17 +02:00
joschiwald
d729fc31c6 Core/Spells: spells with SPELL_ATTR1_NO_THREAT also causes no initial aggro 
(cherry picked from commit b4b43d03b3)
 2016-04-05 20:55:08 +02:00
Shauren
4e67383621 Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392) 
(cherry picked from commit 62aff401f6)
 2016-04-05 20:35:59 +02:00
Treeston
ac034a51da Merge pull request #16483 from Treeston/3.3.5-debuffimmunity 
[3.3.5] Make Web Wrap / Mutating Injection (and others) properly cancel on immunity (Divine Shield/Ice Block)
(cherry picked from commit d67e87733b)
 2016-04-05 19:56:26 +02:00
treeston
73b917e122 Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments 
(cherry picked from commit cfed2d7a3d)
 2016-04-05 19:02:11 +02:00