Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,208 Commits 4 Branches 146 Tags
c791bc04549fe0244bdcf0a37fa5d4ff7a2310de
Commit Graph

8123 Commits

Author SHA1 Message Date
Rat
17bd724559 Core/Phases: phaseMask remove part 1 2015-03-29 19:25:13 +02:00
Rat
3d84ab74b0 Core/Phases: updated packet handling to new format 2015-03-29 15:36:56 +02:00
Rat
3660c3a37f Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
 2015-03-29 11:25:48 +02:00
Rushor
e2c393673d DB/Quest: Calming the Kodo (Desolace) 2015-03-29 00:18:36 +01:00
Rushor
2add8bb8d0 DB/Quest: Get Me Out of Here! (Desolace) 2015-03-28 22:55:58 +01:00
Rushor
28209a853e DB/Creature: Twilight Element Warden + Conflagration 
* Add two visuals for Blackrock Cavern
 2015-03-28 22:26:05 +01:00
Dr-J
58805427a3 DB/Misc: Slight update to commit 
This does not make any difference but fixes a error with a bad delete statement when trying to re-apply.
(cherry picked from commit aa255a6cb1)
 2015-03-27 02:17:51 +00:00
Dr-J
25f461664b DB/Misc: Quest end scripts 
Script quest complete scripts for: -

* Kael'thas and the Verdant Sphere
* The Fall of Magtheridon (Horde and Alliance)
(cherry picked from commit 95f3717151)

Conflicts:
	sql/updates/world/2015_03_26_02_world.sql
 2015-03-27 02:17:41 +00:00
Aokromes
e8a9c7de57 DB/Instance: Waypoints and corrections in Uldaman 
By Kittnz, closes #14447
(cherry picked from commit 7a17907450)

Conflicts:
	sql/updates/world/2015_03_26_00_world.sql
 2015-03-27 02:11:43 +00:00
Dr-J
b4caa6cfb4 DB/Quest: The Secret Compromised 
Script turn in event
(cherry picked from commit ca73634e44)

Conflicts:
	sql/updates/world/2015_03_25_03_world.sql
 2015-03-27 02:08:39 +00:00
Aokromes
acfb7c742b DB/Misc: Fix startup errors 
(cherry picked from commit 9a2e9ecccc)

Conflicts:
	sql/updates/world/2015_03_25_00_world.sql
 2015-03-27 02:04:28 +00:00
Aokromes
2a8292bbc9 DB/Creature: Make Clockwork Mechanic ride Arachnopod 
By Malcrom.
(cherry picked from commit 0e828909d1)
 2015-03-27 02:02:45 +00:00
Aokromes
f753cdc085 DB/Misc: Fix startup errors 
Updates #13707
Code is welcome to fix the remaining core errors.
(cherry picked from commit d37f52c93e)
 2015-03-27 02:02:33 +00:00
Aokromes
b026f99418 DB/Misc: Fix startup errors 
By Kilyana, updates #13707
(cherry picked from commit 41fe24e9ad)
 2015-03-27 02:02:22 +00:00
Dr-J
016dfcad65 DB/Misc: More error fixes 
(cherry picked from commit 5594dad4d8)
 2015-03-27 02:02:11 +00:00
Dr-J
7d80f1a8de DB/Misc: Another error 
As Aokromes suggested when I originally committed fix for Teleport This! I must have accidentally searched for creature guid instead of go guid.
(cherry picked from commit 1944b3bce5)

Conflicts:
	sql/updates/world/2015_03_24_01_world.sql
 2015-03-27 02:01:55 +00:00
Dr-J
3499f43bed DB/Misc: Fix error 
(cherry picked from commit 151dbb3084)

Conflicts:
	sql/updates/world/2015_03_24_00_world.sql
 2015-03-27 02:00:34 +00:00
Rushor
7d67613062 DB/Spawning: Dragon Soul * Spawns for the first Part of the instance * Includes Paths, SAIs, Auras, Visuals, small Events 2015-03-27 00:00:29 +01:00
Carbenium
1262072949 Core/Misc: Update base stuff for V6.1.2 build 19802 2015-03-26 17:18:43 +01:00
Rushor
01ee7ecc69 Scripts/Bloodmyst Isle: Script Quest: Ending Their World 
closes #1815

* Add missing Waypoint
* Improve Aggrobehaviour
* Add BroascasttextIDs
* Update to current GUID-Handling

Original Patch by @trickerer

(cherry picked from commit f1101b145b)
 2015-03-26 16:14:38 +01:00
Rushor
8fc6e45c49 DB/Spawning: Add Chill-Out Zone in Feralas 2015-03-26 14:30:43 +01:00
Rushor
9d7591e9db DB/Creature: Spawn some 'Shakers' (4.3.4+) 2015-03-26 00:44:11 +01:00
Rushor
cd4d1f076e DB/Creature: Finish Pathing and Emotes for Feralas 2015-03-25 23:39:09 +01:00
joschiwald
766eb599ea Scripts/Spells: implement some eject passenger spells 2015-03-25 17:43:59 +01:00
Rushor
e88f276946 Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation 
closes #12165

(cherry picked from commit 6080234e98)
 2015-03-25 16:37:21 +01:00
Rushor
7977ab8580 DB/Spawning: Feralas 2015-03-25 00:24:24 +01:00
Rat
eebc468e62 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
 2015-03-24 20:01:02 +01:00
Aokromes
bf4e71a008 DB/Misc: Avoid friendly fire on Ulduar 
By @Trista, Closes #3292 if anyone have a better solution for this, you are free to share it.
(cherry picked from commit 6a15216380)
 2015-03-24 10:55:14 +00:00
Rushor
4f576b0ea8 DB/Creature: Emissary of Hate 
* Add Conditions for Emissary of Hate - Spawn, increade Despawntimer, remove unneeded actions from Irespeakers

(cherry picked from commit 78dc32c031)
 2015-03-24 10:37:26 +00:00
Dr-J
d91fd684b5 DB/Creature: Akama (21700) 
Script quest turn in cut scenes for: -
Scripts quests in first part of chain

* http://www.wowhead.com/quest=10628/akama
* http://www.wowhead.com/quest=10707/the-atamal-terrace

I dont have sniffs of second part of chain, know of http://www.wowhead.com/quest=10944/the-secret-compromised#comments
(cherry picked from commit f2f93e1f41)
 2015-03-24 10:37:13 +00:00
Aokromes
5ce552ba09 DB/Quest: Lohn'goron, Bow of the Torn-hear 
By Kilyana
(cherry picked from commit 6f46660bbc)
 2015-03-24 10:36:45 +00:00
Dr-J
4b59ae7de6 DB/Creature: Altruis the Sufferer 
Add a few missing texts for this npc
(cherry picked from commit 956e3b6819)
 2015-03-24 10:35:57 +00:00
Dr-J
4f3e08dc36 DB/Creature: Tobias the Filth Gorger 
Script event for return of turn in of http://www.wowhead.com/quest=10547/of-thistleheads-and-eggs and taking of http://www.wowhead.com/quest=10550/the-bundle-of-bloodthistle
(cherry picked from commit 7ee61140bf)
 2015-03-24 10:35:35 +00:00
Dr-J
cdfa8b16d0 DB/Quest: The Cipher of Damnation - Ar'tor's Charge 
(cherry picked from commit 010bbfc0a6)
 2015-03-24 10:34:40 +00:00
Aokromes
b2888363ed DB/Quest: Vision Guide 
By Killyana, closes #10309
(cherry picked from commit 5ac2f87c14)
 2015-03-24 10:34:03 +00:00
Aokromes
e26ddf79ce DB/Creature: Guard Roberts 
By Killyana, closes #13676
(cherry picked from commit 5ae6b9dc50)
 2015-03-24 10:30:57 +00:00
Aokromes
d90a161619 DB/Quest Veil Lithic: Preemptive Strike 
By Killyana, closes #12564
(cherry picked from commit 15492ecaf2)
 2015-03-24 10:26:51 +00:00
Aokromes
cdb037c0b9 DB/Item: Fix Item D.I.S.C.O. 
By Killyana, closes #4214
(cherry picked from commit b495b0f0b4)
 2015-03-24 10:26:15 +00:00
Aokromes
a4846a04e0 DB/Quest: Into the Pit / Back to the Pit 
By Killyana closes #14345
(cherry picked from commit 4af0a51877)

Conflicts:
	sql/updates/world/2015_03_23_02_world.sql
 2015-03-24 10:25:48 +00:00
Aokromes
741aa01160 DB/Item: Fix Bloodthistle Withdrawal 
By Killyana, closes #9343
(cherry picked from commit f1f3e4988e)

Conflicts:
	sql/updates/world/2015_03_23_01_world.sql
 2015-03-24 10:24:02 +00:00
Aokromes
0f076efe3f DB/Creature: Paladin Mounts - Holy visual 
By itslovelol, closes #14427
(cherry picked from commit 421c34a830)

Conflicts:
	sql/updates/world/2015_03_23_00_world.sql
 2015-03-24 10:18:58 +00:00
Rushor
b13064a45b DB/Quest: Blood Theory (Desolace) 2015-03-24 00:46:49 +01:00
Rushor
65b1710553 DB/Creature: Blackrock Worg Drops 
by @danlapps + @Gecko60
closes #14218
 2015-03-23 19:32:00 +01:00
Rushor
72bd107a15 DB/Creature: Complete Waypoint + Rdmmovement for Zone 'Desolace' 2015-03-23 19:27:15 +01:00
Rushor
d911961179 DB/Spawning: The Vortex Pinnacle 
Includes:
* All Queststarter
* All Gameobjects
* All Creaturespawns
* All Movement
Thx to @Mihapro
 2015-03-23 11:32:06 +01:00
Rushor
594a0a0a81 DB/Spawning: Desolace 
Inludes:
* WP-Movement (30% done)
* All SAIs
* All Creaturespawns
* All Vendors
* All Gameobjects
 2015-03-22 23:52:10 +01:00
Aokromes
98c19c372c DB/Creature: More Ulduar pathing 
By Malcrom
(cherry picked from commit 90bbe156aa)
 2015-03-22 22:03:17 +00:00
Aokromes
8529c1dbd8 DB/Creature: Pathing for Guardians of Life 
By Malcrom
(cherry picked from commit 975d33a461)
 2015-03-22 20:12:37 +00:00
Aokromes
d06e68b815 DB/Creature: Pathing for Freya 
By Malcrom
(cherry picked from commit 3be5c27920)
 2015-03-22 20:12:30 +00:00
Aokromes
01f3a2e67a DB/Creature: Pathing for Winter Revenant 
By Malcrom, closes #2070
(cherry picked from commit 98a9f53dd9)
 2015-03-22 20:12:18 +00:00