Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,692 Commits 4 Branches 146 Tags
761060e1f161e103adc378b3fb5992e1900ea131
Commit Graph

4534 Commits

Author SHA1 Message Date
Nay
6568b0624d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_druid.cpp
 2012-09-17 23:49:13 +01:00
Kandera
64115461fa DB/Quests: fix The Scarlet Oracle, Demetria (Closes #7773) and The Call to Command quest chain (Closes #7673) 
DB/Creature: fixes sound for Twilight Lord Kelris (Closes #7309)
 2012-09-17 13:11:23 -04:00
kandera
198c0346e2 Merge pull request #7797 from Warpten/kingOfTehWorld 
Core/Spells: Fixed King of the Jungle. (alphabetical order!)
 2012-09-17 09:44:56 -07:00
Kandera
80b3531890 DB/Spells: fix a typo from the previous commit. im back! 2012-09-17 12:34:11 -04:00
Kandera
b7de25d170 DB/Spells: fix DoT bonus for Righteous Vengance 2012-09-17 12:23:54 -04:00
Warpten
2b9232dddc Core/Spells: Fixed King of the Jungle. 
Closes #7098
 2012-09-17 18:17:23 +02:00
Kandera
d3dd3a2b83 DB/Spells: fix druid final lifebloom tick closes #6707 (thx diton) 2012-09-17 10:17:52 -04:00
Nay
e3add09fb7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-17 00:03:12 +01:00
Warpten
bb03cfb0a2 DB/Spells: Fix druid's Savage Roar 
SpellScript was bound to the wrong spell

Closes #2669
 2012-09-16 14:48:39 +01:00
Vincent-Michael
72f26fe357 SQL: Rename SQL 2012-09-16 14:12:35 +02:00
Vincent-Michael
5bc913d1da SQL: Add newlines to end of file 2012-09-16 14:08:40 +02:00
Vincent-Michael
59e86f8df9 DB/Creatures: Fix "Frostbrood Vanquisher" flying 
CLoses #5927
 2012-09-15 23:20:58 +02:00
Nay
d6b60ce51c Merge pull request #7782 from Trista/master 
DB/Skettis: Remove uneeded additions from previous commit and add con…
 2012-09-15 14:16:13 -07:00
thesensei
1a992bea9f DB/Skettis: Remove uneeded additions from previous commit and add conditions 
* The GO spawn is uneeded and so all connected with it, sorry I failed, the spell is enough
* Conditions thanks to Vincent-Michael and Shauren /noticing my retardness/
 2012-09-15 23:44:18 +03:00
Vincent-Michael
d079a834c4 DB/Loot: Fix typo in Ionar loot (thx DarkJaxyChan) 
Closes #7765
 2012-09-15 22:38:19 +02:00
Vincent-Michael
883db2af3e Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling 2012-09-15 22:32:10 +02:00
Nay
a95511f35e (TDB 335.49) Also move 4.x-only SQLs to the old directory 2012-09-15 21:18:23 +01:00
Nay
06f96f47e7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql
 2012-09-15 21:13:35 +01:00
Nay
0d3554d4bf TDB 335.49 - 2012/09/15 2012-09-15 21:03:40 +01:00
Nay
966283168c Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2012-09-15 19:50:11 +01:00
Vincent-Michael
80006a275f SQL: Rename SQL 2012-09-15 20:45:51 +02:00
Vincent-Michael
572b644060 DB/Loot: Fix Sister Svalna loot 2012-09-15 20:32:30 +02:00
Nay
7b3ea36c8c Merge pull request #7777 from Trista/master 
Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
 2012-09-15 07:44:49 -07:00
ZxBiohazardZx
0b2fb4a5a8 DB/Loot: fix startuperrors caused by previous lootidfix, porting the wrong way :) 2012-09-15 16:37:45 +02:00
thesensei
548a487721 Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void 
* Add instance achievement criteria scripts and remove from disables. Based on retail data.
* A lot more compact style and specify only for heroic, thanks to Vincent-Michael. Tested.
This involves everything needed by the achievement, however the dungeon still needs majour fixes/rewrite.
 2012-09-15 17:31:57 +03:00
Nay
b9b344eb88 Merge pull request #7766 from Faq/Misc0 
DB/SAI: correct Fix npc Scrapped Fel Reaver. thnx Expecto
 2012-09-14 09:05:51 -07:00
kandera
6dd32f56a8 DB/Loot: i am full of fail 2012-09-14 11:45:14 -03:00
kandera
5bd486712b DB/Loot: fix error from previous commit 2012-09-14 11:41:27 -03:00
Kandera
2773adbb38 DB/Loot: Sister svalna is supposed to also drop one emblem of frost 2012-09-14 09:58:42 -04:00
Faq
4a802a376f DB/SAI: correcting npc Scrapped Fel Reavers SAI after 8558a21211 2012-09-14 14:24:16 +03:00
zxbiohazardzx
6e134d4761 DB/Loot: Fixlooting for HC dungeons trash 
Closes #7515
 2012-09-14 12:42:49 +02:00
Nay
528b9d4f7d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/shared/Packets/ByteBuffer.h
 2012-09-13 17:24:37 +01:00
Myran2
13e140cfac Core/Commands: Added a command that shows what cheat commands you have active 
Closes #7721

(Modified)
 2012-09-13 15:32:33 +01:00
Nay
b9434b6377 Merge pull request #7753 from Faq/ScrollOfRecall 
Core/Spells: Scroll of Recall
 2012-09-13 07:03:57 -07:00
Nay
b34d6f5784 DB&Scripts: Corrections to pull request #7750 
Closes ##7750
 2012-09-13 15:01:19 +01:00
thesensei
f106273cfa Scripts/Skettis: Fires Over Skettis quest support 
* Include SAI/Spawn and spell support, also achievement support for "Bombs Away"
Credits: Based on Warpten script and Nelegalno/shlomi1515 updates

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-09-13 14:31:11 +01:00
thesensei
422b78f029 Scripts/Ogri'La: Change credit target type from invoker to invoker party 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-09-13 14:31:10 +01:00
thesensei
54fe4489a3 Scripts/Ogri'La: Add support for quest "Bomb Them Again" and all related 
* Sniffed spell support for Knockdown Fel Cannon: Choose Loc, Knockdown Fel Cannon: The Aggro Check, Knockdown Fel Cannon: The Aggro Burst, Knockdown Fel Cannon: The Aggro Check Aura, Trhow Bomb and Fel Flak Fire
* Sniffed spawns support, but only for quest related creatures and gos, no area patrols/spawns involved
* Achievement support for Blade's Edge Bomberman and Fa-la-la-la-Ogri'la
* Full DB support based on sniffs, all that can be done in SAI and not in *cpp is converted
Credits: The SAI script is based on Warpen work, thanks to Subv for proposing fix for Fel Flak Fire /and helping/ and DDuarte for helping with conditions

Closes:

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-09-13 14:31:10 +01:00
Faq
9b76acbd3a Core/Spells Scroll of Recall 2012-09-13 15:19:52 +03:00
kaelima
f746c2d975 Core/ItemTemplate: 
Rename unk0 column.
Weapons have special sounds on impact. This column is used to override these sounds by specifying another subclass. For example an item with misc subclass can sound like a stave on impact by overriding the subclass here.
 2012-09-13 11:38:50 +02:00
w1sht0l1v3
b62ad5a955 Core/ToCr: Several fixes. 
Fix floor animation when destroyed.
Add spawns for Highlord Tirion Fordring,Argent Mage and Portal to Dalaran.
Remove Db spawn of Highlord Tirion Fordring.
Correct tribute chest spawn location.

Fix sql names for last commits.
 2012-09-12 06:15:50 +03:00
w1sht0l1v3
f6c799a26b DB/Gameobject: Update Trial of Grand Crusader door info. 2012-09-12 00:49:16 +03:00
Nay
b015ed0a99 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-11 22:38:59 +01:00
w1sht0l1v3
02096f1c23 Core/Scripts: Anub'Arak encounter changes and fixes. 2012-09-11 22:52:47 +03:00
Nay
68e0ef8039 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h
 2012-09-11 01:11:14 +01:00
Kretol
8d049545de DB/Creature: creature_model_info fix - Horde Guard 
Closes #3352
 2012-09-11 01:01:57 +01:00
Bizzy
8558a21211 DB/SAI: Fix npc Scrapped Fel Reaver 
Closes #3074
 2012-09-11 00:59:47 +01:00
nelegalno
f151ff7342 DB/Scripts: Fix quest Finding the Keymaster 
Ref #4661
Closes #2604
 2012-09-11 00:52:14 +01:00
Kinzcool
866bc4156d DB/NPC: Various fix for gossip 
Closes #7156
 2012-09-11 00:42:12 +01:00
armano2
73cdd187e2 DB/Quests: Creature involvedrelation for quest Words for Delivery 
Closes #1911
 2012-09-11 00:40:00 +01:00