Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,652 Commits 4 Branches 146 Tags
06f96f47e7caa0023a95cd48a7e0c4c57e8803ed
Commit Graph

4517 Commits

Author SHA1 Message Date
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
Tomas
f2067f98f9 DB/Spells: Armistice aura is missing when player is in front Sunreaver Pavillion or Silver Covenant Pavillion 
Closes #1938
 2012-09-11 00:35:36 +01:00
nelegalno
9f87270d80 DB/Loot: Bump drop chance of Vic's Keys from 15% to 100% 
Closes #1954
 2012-09-11 00:33:33 +01:00
Aristoo
292cca744a DB/NPCs: Little Ooze (Rotface in ICC) can not be taunted 
Closes #1993
 2012-09-11 00:31:43 +01:00
Trista
282767450c DB/Quests: Fix quest relations for Disharmony of Flame 
Closes #2653
 2012-09-11 00:30:09 +01:00
Trista
820a14ef31 DB/Quests: Fix quest relations for Grark Lorkrub 
Closes #2659
 2012-09-11 00:28:40 +01:00
Shauren
0390f9d708 Scripts/Icecrown Citadel 
* Despawn Mutated Abomination when second phase transition ends, not begins
* Prevent Unbound Plague jumping every 0.5 seconds to bypass the mechanic by raid members stacking in one place
* Fixed Volatile Ooze not picking targets when everyone stood close to the tank
* Fixed Ooze adds pickning new targets after old one gets lost

Closes #7610
Closes #7611
Closes #7665
 2012-09-10 20:32:13 +02:00
Nay
21a4f8e088 Rename SQL and update characters_database.sql 2012-09-10 11:56:37 +01:00
Warpten
917ffc030e Core/Guilds: Implemented GuildFinder. 2012-09-10 12:41:42 +02:00
nelegalno
7790a2d631 DB/Quests: Fix "Homeward Bound" completion text 
Closes #7454
 2012-09-10 03:19:28 +02:00
Nay
1458a006b8 Siigh 2012-09-10 02:11:21 +01:00
Nay
0a81824772 DB/Guilds: Add missing reward table 2012-09-10 02:10:28 +01:00
Nay
d97d125618 Move a SQL file 2012-09-10 02:04:21 +01:00
Vincent-Michael
75eb6fc608 DB/Game Event: Update Darkmoon Faire start times 2012-09-10 02:54:28 +02:00
Nay
d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
 2012-09-10 00:52:35 +01:00
Nay
5963d02750 SQL: Update characters_database.sql 2012-09-10 00:41:35 +01:00
Nay
5226f53b8a Core/Guilds: Corrections to guild news & rewards commit, fixed build and added missing sql 
Closes #7708
 2012-09-10 00:06:47 +01:00
Subv
6fc3d3a77c Core/Scripts: Some cleanup in warlock spellscripts 2012-09-09 12:28:31 -05:00