Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,251 Commits 4 Branches 146 Tags
050f95043a4ea213d0ec00a7323dd741e4ef92e6
Commit Graph

30251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shauren
5c0517c6ef Merge branch 'Golrag-sindragosa_ice_tomb_target' into 3.3.5 
(cherry picked from commit 895878010e)
 2016-04-09 17:05:24 +02:00
Dr-J
7cf6eca425 Remove Lady Jaina Proudmores CPP script from zone_dustwallow_marsh.cpp 
(cherry picked from commit c9f9e93c22)
 2016-04-09 17:04:02 +02:00
Dr-J
1507b19e20 DB/Misc: Move Lady Jaina Proudmoore script (cw) to sai 
(cherry picked from commit 2b04a9c9d8)
 2016-04-09 17:00:19 +02:00
Aokromes
16e9e2aa41 DB/Gameobject: Fix respawn time of few Quest GameObjects 
By Tauriella, closes #16701
(cherry picked from commit f7a05eba63)
 2016-04-09 16:52:52 +02:00
Killyana
6d4c6e74f1 DB: Revert last commit 2016-04-09 15:33:55 +02:00
Killyana
a5c366679e DB/Conditions: Fix Mid-screen error spam in Blade's Edge Mountains 
By @tkrokli
Updates #16889
 2016-04-09 15:22:46 +02:00
Shauren
2a7a2a1b65 Core/Misc: gcc 5.3 nopch build fix 
Closes #16878
 2016-04-09 12:42:57 +02:00
Shauren
fdba1344ad SQL import fix 2016-04-09 00:48:58 +02:00
Shauren
3ebec1e2ce oops, pushed too soon (now with proper msbuild check) 2016-04-09 00:40:43 +02:00
Shauren
509a27fd51 Buildsystem: Improved logic for _BUILD_DIRECTIVE in msvc builds 2016-04-09 00:37:41 +02:00
Dr-J
6b9d74ae63 DB/Quest: Troll Patrol: High Standards 
Closes #16734
(cherry picked from commit 83e8deaa8f)
 2016-04-09 00:31:49 +02:00
Dr-J
b16e4bbd0f DB/Misc: A few updates 
1) Delete the duplicated spawns from 8aabb087f0
2) Correct targeting for text which was bought up on irc yesterday
3) Correct phasing for objects involved with http://www.wowhead.com/quest=13220/putting-olakin-back-together-again
(cherry picked from commit ce0e1c0fbe)
 2016-04-09 00:30:43 +02:00
jackpoz
76bbf5fc0c Scripts/Misc: Fix issues reported by static analysis 
(cherry picked from commit 510bb30b2c)
 2016-04-09 00:26:41 +02:00
Shauren
911e81ed9e Warning fix 
(cherry picked from commit 7fe5a77f5e)
 2016-04-09 00:25:40 +02:00
Shauren
593bbb0c99 Core/Commands: Fixed a crash in .wp mod by @Magnifikator 
Closes #16732

(cherry picked from commit 3d0b065135)
 2016-04-09 00:23:38 +02:00
Shauren
d92cad6973 Core/Commands: Fixed incorrect use of GetGUID instead of GetSpawnId in waypoint commands 
Updates #16732

(cherry picked from commit e73d5a7bf4)
 2016-04-09 00:23:35 +02:00
treeston
6eb49e4bb2 Unit/PlayerAI: Yeah, we allow charmer to be null now, should probably check for that. 
Fixes and closes #16728.

(cherry picked from commit 49de12b1cf)
 2016-04-08 23:58:45 +02:00
Dr-J
8e8758d857 DB/Quest: Drag and Drop 
Updates my previous script from before I actually sniffed this

The Aldur'thar Sentry will now actually grab the Dark Subjugator and drop of edge,
(cherry picked from commit 431da2ffc9)
 2016-04-08 23:58:10 +02:00
sirikfoll
c66d3714f1 Core/Scripts: Fixed Yogg-Saron Portals 
Closes #16390
Closes #16708

(cherry picked from commit c4e4ee3ae1)
 2016-04-08 23:57:12 +02:00
Aokromes
32bf8e26f8 Misc/Extractor: Add batch file for extractors 
You must copy it to your wow directory with the tools and run it.
Linux version is welcomed.
(cherry picked from commit d55d32fa0f)
 2016-04-08 23:54:36 +02:00
MitchesD
92b74d6bdc Merge pull request #16523 from tkrokli/smart_action_set_corpse_delay 
[3.3.5][6.x]Core/SmartScript: create SMART_ACTION_SET_CORPSE_DELAY
(cherry picked from commit 8e152e0d4a)
 2016-04-08 23:51:18 +02:00
Dr-J
c0ec641d1a DB/Quest: Killing Two Scourge with One Skeleton 
* script turn in event with ghostwing grabbing Olakin Sainrith
* phasing at Blackwatch

will also kill Table `vehicle_template_accessory`: creature template entry 31432 has no data in npc_spellclick_spells from previous commit
(cherry picked from commit 1cb718d9e7)
 2016-04-08 23:50:42 +02:00
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
Shauren
3d668ffa8a Rename sql 2016-04-08 23:32:41 +02:00
MitchesD
9d47981e5f Rename 2016_03_03_00_world.sql to 2016_03_03_00_world.sql (cherry picked from commit c7dded13a7) 2016-04-08 23:23:20 +02:00
Dr-J
181450bff7 DB/Quest: Troll Patrol: Can You Dig it? 
Script http://www.wowhead.com/quest=12588/troll-patrol-can-you-dig-it
Also fixes http://www.wowhead.com/quest=12519/troll-patrol-whatdya-want-a-medal
And fixes some issues with http://www.wowhead.com/quest=12568/troll-patrol-done-to-death

Also fixes run time error 'able `event_scripts` has gameobject type (175584) unsupported by command SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id 4845'
(cherry picked from commit 8aabb087f0)
 2016-04-08 23:15:51 +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
cf7436b644 Util/Random: Add randtime(Milliseconds const&, Milliseconds const&) to supersede urandms(uint32,uint32) for scripts being ported to std::chrono. 
(cherry picked from commit 224b42c53a)
 2016-04-08 22:57:01 +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
430698d203 DB/Spells: "Val'anyr, Hammer of Ancient Kings" now properly shields targets healed by Glyph of Holy Light, Earth Shield and others. 
Fixes & closes #16478.

(cherry picked from commit 8267e493d1)
 2016-04-08 20:37:36 +02:00
Nyeriah
94ee1ff827 DB/EventScripts: Clean up the Scryer's Orb no longer used event script 
* Ref #13208

(cherry picked from commit 1c86d286d4)
 2016-04-08 20:36:53 +02:00
Dr-J
41c560c874 DB/Quest: Bombard the Ballistae 
Add missing visuals for http://www.wowhead.com/quest=12232/bombard-the-ballistae
(cherry picked from commit 50223ea04f)
 2016-04-08 20:36:19 +02:00
Dr-J
b703fd0784 DB/Quest: Fire Upon the Waters 
Properly script http://www.wowhead.com/quest=12243/fire-upon-the-waters
1) Delete the kill credit npcs which do not exist in sniff
2) Spawn the proper bunnies for this quest
3) Add missing burning effect
(cherry picked from commit a3b2144750)
 2016-04-08 20:35:08 +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