Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,898 Commits 4 Branches 146 Tags
c0fc0f237f7e85ab3c5cc422fea7a1000fa72b23
Commit Graph

5189 Commits

Author SHA1 Message Date
Vincent-Michael
c0fc0f237f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/shared/DataStores/DBCFileLoader.h
 2013-08-07 11:59:51 +02:00
Vincent-Michael
d76d3def64 DB/Creature: Fix db startup error in c8bfb9cf4d 
by Kirkhammett
 2013-08-07 00:54:20 +02:00
Kirkhammett
c8bfb9cf4d DB&Scripts/Icecrown: Fix quest The Last Line Of Defense and script Argent Cannons 
Closes #998
Closes #10460
 2013-08-06 23:16:03 +01:00
Kirkhammett
3197d82f21 DB/SAI: Fix quest "Into the Wild Green Yonder" 
Closes #10456
 2013-08-06 23:10:11 +01:00
Kirkhammett
8d575bfcf3 DB/Misc: Misc for Naz'Anak: The Forgotten Depths 
Proper phasing for zone 4522; a few missing spawns, some missing scripts etc... etc..

Closes #10447
Closes #10438
 2013-08-06 23:07:38 +01:00
Nay
fee62f500c DB/Commands: Re-add help text for reload gameobject_questender 2013-08-06 21:17:06 +01:00
Vincent-Michael
01396ac8e9 SQL: Rename sql in correct date 2013-08-06 20:38:12 +02:00
Vincent-Michael
5af9056050 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-06 20:25:36 +02:00
snakeice
75b4b0594f Scripts/HoR: Major changes: 
- Fixed Intro timers
- Fixed mobs aggro
- Fixed General's shield trow
- Added Jaina / Sylvannas / Lich King escape event

Closes #10303
Closes #2505
Closes #9865
 2013-08-06 19:05:47 +01:00
Ukulutl
df9f34cde7 Scripts/Kezan: Fix quest "Good Help is Hard to Find" 
Added Maelstorm to scriptloader

Close #10337

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-08-06 13:18:58 +01:00
Vincent-Michael
820f002135 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/scripts/Commands/cs_reload.cpp
 2013-08-06 10:03:44 +02:00
Nay
dc8385f4c0 DB/Items: Remove unlimited charges from Jillian's Tonic of Stoneblood 
Closes #10444
 2013-08-06 00:16:55 +01:00
Nay
a71fcee27d DB/Schema: Rename _questrelation tables to _queststarter and _involvedrelation to _questender, for creature and gameobject 2013-08-06 00:04:29 +01:00
Vincent-Michael
2d3fd62aee Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_npc.cpp
 2013-08-05 21:15:35 +02:00
Vincent-Michael
f37d0495e1 Core/Commands: Add .npc info more infos for unit_flags 2013-08-05 20:13:04 +02:00
Vincent-Michael
38cddb42ae Core/Commands: Add .npc info mechanicImmuneMask infos 2013-08-05 20:13:04 +02:00
Kirkhammett
71233c366c DB/Misc: Fix db startup errors 2013-08-05 16:04:51 +01:00
Vincent-Michael
341dabb423 Core/Commands: Add .npc info more infos for unit_flags 2013-08-05 14:51:42 +02:00
Aokromes
0070b64b02 DB/SAI: Fix Redridge Mystic spam 
By Malcrom
 2013-08-05 12:26:45 +02:00
Vincent-Michael
c823436750 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-04 19:36:59 +02:00
Vincent-Michael
cfe4154376 Core/Commands: Add .npc info mechanicImmuneMask infos 2013-08-04 19:33:42 +02:00
Kirkhammett
79dd722206 DB/SAI: Free at last! 
Closes #10417
 2013-08-04 17:42:32 +01:00
Kirkhammett
9a377f169b DB/SAI: Meridith the Mermaiden 
Closes #10418
 2013-08-04 17:42:11 +01:00
Kirkhammett
3d4b8a212f DB/SAI: Script Witch Doctor Zum'rah 
Closes #10404
 2013-08-04 17:41:08 +01:00
Kirkhammett
96469e3e82 DB/Quests: Fix The Nightmare Manifests / Hope Within the Emerald Nightmare / The Boon of Remulos / The Keeper's Favor/Walking Legend 
Closes #10410
Closes #4902
Closes #10407
Closes #10406
 2013-08-04 17:39:46 +01:00
Vincent-Michael
fa90fabd10 Misc/Vendor: 
- Fix more vendors without maxcount
- Add log/skip for type currency with missing maxcount
 2013-08-03 14:53:16 +02:00
Vincent-Michael
edc86dbca5 DB/Vendor: Fix crash with buy Honor Points 2013-08-03 14:28:05 +02:00
Aokromes
5164caa9ff DB/Misc: Fix area 4522 spawns 
closes #1945
 2013-08-03 13:23:24 +02:00
Vincent-Michael
26d090fa9a Core/Spells: Fix druid talent "Nature's Grace" 2013-08-01 22:02:14 +02:00
Vincent-Michael
ec34ff9023 DB/Spells: Fix shaman "Item - Shaman T13 Restoration 2P Bonus (Mana Tide)" 2013-08-01 20:23:58 +02:00
Vincent-Michael
b8b21ce1f8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-01 17:22:42 +02:00
Vincent-Michael
a71341bbcf Core/Spells: Fix rogue talent "Overkill" (thx to @timh52280) 
Close #10411
 2013-08-01 17:22:03 +02:00
Vincent-Michael
bab04cc5f8 Core/Spells: Fix try for logic fail in 4ba3c2e51d 2013-07-30 23:59:30 +02:00
Vincent-Michael
d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +02:00
Vincent-Michael
597690ba17 DB/Spells: Fix some startup errors 2013-07-30 00:09:27 +02:00
Nay
b1d5ba3e69 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-07-29 16:15:33 +01:00
Nay
a91e42f20d SQLs: Rename files 
From now on, 3.3.5 (master branch)-only SQL files will be suffixed with _335 in the filename
 2013-07-29 16:14:29 +01:00
Vincent-Michael
cb8f159cea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
 2013-07-29 17:11:25 +02:00
MitchesD
3b78023100 Scripts/DrakTharonKeep: Update King Dred to use events 
Closes #10385

Signed-off-by: joschiwald <joschiwald@online.de>
 2013-07-29 13:11:07 +02:00
joschiwald
d868f9db4b Scripts/DrakTharonKeep: reworked InstanceScript 2013-07-29 12:49:27 +02:00
Vincent-Michael
a08b52aa19 Core/Spells: Fix hunter talent "Improved Serpent Sting" 
Closes #10001
 2013-07-29 06:25:30 +02:00
Vincent-Michael
eef0d67bb7 Core/Spells: Cleanup for paladin 4.3.4 2013-07-28 19:07:58 +02:00
Vincent-Michael
0710f480b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2013-07-28 18:41:57 +02:00
Vincent-Michael
9c5c43381b DB/Spells: Add missing in 1a8b2ce466 2013-07-28 17:59:15 +02:00
Vincent-Michael
1a8b2ce466 DB/Spells: Fix warrior talent "Deep Wounds" 2013-07-28 17:58:10 +02:00
Malcrom
62918e92d0 DB/SAI: Fix quest The Fate Of The Fallen 
Closes #9363

Thanks to @gaut for the initial script

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-07-28 16:57:09 +01:00
Vincent-Michael
3efda3a650 DB/Spells: Fix warrior talent "Incite" 2013-07-28 17:21:21 +02:00
Kirkhammett
a5a696fdda DB/GOs: Spawns of Discarded Soul Crystal for "The Fate Of The Fallen" 
Closes #

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-07-28 16:17:51 +01:00
Vincent-Michael
706c5a1975 Core/Spells: Update/Convert paladin "Beacon of Light" for 4.3.4 2013-07-28 16:02:59 +02:00
grsgs
036286cb48 Core/Spells: Fix absorbs effect from death knight "Necrotic Strike" 
Closes #10388

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-07-28 14:16:17 +02:00