Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,338 Commits 4 Branches 146 Tags
8d7a400564c71d79979aa8d4698029886e7ec4fa
Commit Graph

4745 Commits

Author SHA1 Message Date
Warpten
8d7a400564 Core/Spells: 
* Fixed Inner Fire and Inner Will stacking.
* Added a missing spell_proc_event to Fingers of Frost.
* Enable Sinister Strike's ability to grant combo points when Eviscerate is learnt.
 2012-12-02 15:13:50 +01:00
Warpten
4d111c10f0 Scripts/Spells: Fixed Rogue's Recuperate, Mage's Conjure Refreshment and Paladin's Sacred Shield. 
Also fixed SQL file naming.
 2012-12-01 14:58:56 +01:00
Spp
404129963c Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ArenaTeamHandler.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSpline.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_disable.cpp
	src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/ungoro_crater.cpp
	src/server/shared/Packets/ByteBuffer.h
	src/tools/map_extractor/dbcfile.h
 2012-11-27 14:15:12 +01:00
Shauren
25f1d61923 Merge pull request #8473 from Gacko/creaturetext 
Core/DB: Convert 25 more scripts to creature text
 2012-11-27 03:12:09 -08:00
Vincent-Michael
371fbf5d31 SQL: Fix sql import problem 2012-11-26 23:46:13 +01:00
Gacko
3bfce15019 Core/DB: Corrections for creature text conversion 2012-11-26 23:13:56 +01:00
WishToDie
9129b440ea Fix No newline at end of file. 2012-11-27 00:06:05 +02:00
w1sht0l1v3
b67afe1fa0 Core/Scripts/Quests: Implement The Battle for Crusaders' Pinnacle. 2012-11-26 23:56:48 +02:00
Gacko
7accb42cc4 Core/DB: Convert 25 more scripts to creature text 2012-11-26 22:55:12 +01:00
Spp
8ae0f2332c Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/Zones/BattlefieldWG.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/azshara.cpp
 2012-11-26 08:43:29 +01:00
Warpten
f01f695c7d Core/Spells: Fixed Leap of Faith and renamed a spell script to match standards. 2012-11-25 21:07:08 +01:00
Vincent-Michael
941be9cdc4 DB/Conditions: 
- Fix startup db error
- Fix spawn for Plant Chieftain's Totem
 2012-11-25 19:10:06 +01:00
ZxBiohazardZx
c44c6248ec DB/Misc: Various fixes from issuetracker: 
correct SAI parameters, should fix quest "Not On My Watch" Closes #4149
Add SAI for quest "Eliminate the Competition" Closes #4206
add SAI for quest "Bringing Down the Iron Thane" Closes #4252
add SAI for event after quest "The Dragonforged Hilt" Closes #4888
 2012-11-25 12:49:31 +01:00
ZxBiohazardZx
f9b2fac9eb DB/Misc: Various fixes from the issuetracker, Various Authors, see issues for details 
Fix issue for warlock quest "The Binding" Closes #373
add SAI and gossip for quest "Glyph Chasing" Closes #1682
add spells for quest "On Ruby Wings" Closes #3068
add spawns for quest "Vengeful Souls" Closes #3232
add conditions and spells for quest "Seal of Ascension" Closes #3608
add SAI for quest "Hungry Nether Rays" Closes #3656
add SAI for quest "The Restless Dead" Closes #3853
 2012-11-25 12:27:50 +01:00
Vincent-Michael
bc01f34ce5 SQL: Rename SQL merged in PR 2012-11-25 01:17:26 +01:00
Vincent-Michael
dd4d9f44f4 SQL: Add newlines to end of file 2012-11-25 01:11:00 +01:00
ZxBiohazardZx
cabfcb1a3d Readd support for quest 11198 (SAI) 
Closes #1421 : Morridune is hostile for Alliance.
Closes #1426 : Attack on Camp Narache
Closes #1518 : Eramas Brightblaze's attack type
Closes #1520 : Banish the Demons
Closes #1843 : Old Crystalbark
Closes #1881 : The Honored Dead
Closes #2075 : Bring Down Those Shields
Closes #2077 : Eyes of the Eagle
Closes #2324 : Battered Hilt
Closes #4363 : Crashin' Thrashin' Racer
Closes #5320 : Fields of Grief
Closes #8408 : ICC Trash Mobs Damage
Closes #8401 : Anatoly will talk
Closes #8405 : A Sister's Pledge and Hour Of The Worg
Closes #8404 : An Experienced Guide
Closes #8382 : Agmar's Hammer missing gossips
Closes #8032 : Destroying the Altars
Closes #7996 : Set Required races for some Argent Tournament quests
Closes #7969 : Pyroblast Cinnamon Ball (37582), G.N.E.R.D.S. (37583), Soothing Spearmint Candy (37584) & Chewy Fel Taffy (37585) duration fix
Closes #7964 : Hyperspeed Acceleration
Closes #7824 : Missing Brewfest Vendors
Closes #7823 : This One Time, When I Was Drunk... Alliance quest giver fix
Closes #7416 : Twilight of the Dawn Runner
Closes #7301 : Ashenvale's spirit healer
Closes #7219 : The Ashenvale Hunt
Closes #7079 : Corporal Thund Splithoof
Closes #7155 : Aleric Hawkins
Closes #7011 : Inactive Fel Reaver
Closes #6959 : There Is No Hope
Closes #6212 : Merciful Freedom
 2012-11-25 01:06:55 +01:00
Kinzcool
2e04c1280b DB/Gossips: Added proper gossips Ids for Darnassus Sentinel 2012-11-24 16:15:30 -05:00
Shauren
c7fd67bdfd Merge pull request #8423 from joschiwald/conditions 
Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails
 2012-11-24 08:25:45 -08:00
ZxBiohazardZx
e29be15432 DB/Quests: Convert/remove quest_start_script entries 
THIS (TEMP) REMOVES SUPPORT FOR QUESTS 434,10985,11108,11198!
 2012-11-24 14:42:35 +01:00
joschiwald
e83c5d1a0f Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails 2012-11-24 02:45:48 +01:00
Shocker
7243b988b7 SQL: Rename recent SQL 2012-11-24 00:35:05 +02:00
Gacko
4065176897 Core/DB: Convert 14 more scripts to creature text 2012-11-23 16:25:59 +01:00
Gacko
27619b2bd7 Core/DB: Chapter 5 in creature text 2012-11-23 15:59:11 +01:00
Gacko
a66adcf6e1 Core/DB: Chapter 2 in creature text 2012-11-23 15:59:10 +01:00
Gacko
14b728255c Core/DB: Converted 11 scripts to creature text 2012-11-23 15:59:10 +01:00
Kevin Darcel
b82db85e75 Merge pull request #8374 from Huri/4.3.4 
Core/Spells: Fixed Arcane Brilliance, Dalaran Brilliance, Power Word: Fo...
 2012-11-23 01:40:11 -08:00
Spp
b9b57c2d62 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp
 2012-11-22 15:04:59 +01:00
Tuxity
7416ada4f7 DB/Misc: Fix typo in previous SQL file 2012-11-22 10:05:14 +01:00
Tuxity
2f1000a9ed Core/Arenas: Drop old .modify arenapoint command, create a new command to add currency to players. 2012-11-22 01:39:54 +01:00
cyberbrest
f205bc9b4f Core/Currency: Add support of Conquest points cap for arena and bg 
Remove obselete code for arena points distribution

Thanks to @Zakamurite
 2012-11-21 18:25:23 +01:00
Pitcrawler
94997a508d DB/SAI: Cleansing Drak'Tharon 
Closes #8317
 2012-11-21 12:41:28 +01:00
ZxBiohazardZx
78c873c1d3 Commit/Naming: update filename from automerge 2012-11-20 22:56:07 +01:00
Gacko
9f360cc81c DB: Correct mistake in horseman conversion 2012-11-20 22:04:31 +01:00
Gacko
1e5e7056dc Core/DB: Converted 7 more scripts to creature text 2012-11-20 22:03:10 +01:00
Gacko
9dc06f8bd9 Core/DB: Some script to creature text conversions... 2012-11-20 18:08:18 +01:00
huri
43d5af1ebd Core/Spells: Fixed Arcane Brilliance, Dalaran Brilliance, Power Word: Fortitude, Shadow Protection, Mark of the Wild, Blessing of Kings, Blessing of Might 2012-11-20 17:29:15 +01:00
Spp
1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.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/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
ZxBiohazardZx
7c6c24fce8 DB/commit: darn incremental number fail 2nd time today 2012-11-19 22:11:39 +01:00
Krogonos
1954486855 DB/Misc: Ysera@Emerald Dragonshrine should lay down and ground work on Bloodmoon Isle 
Closes #8305
 2012-11-19 21:51:25 +01:00
ZxBiohazardZx
e5c047c90d DB/Misc: some cleanups 2012-11-19 21:40:45 +01:00
ZxBiohazardZx
731d30664f Commit: change SQL name to match indexing 2012-11-19 21:20:56 +01:00
Vincent_Michael
37f2060f4c DB/Event: Pilgrims Bounty support, thanks to Vincent Michael 2012-11-19 21:11:39 +01:00
ZxBiohazardZx
dc5fac23dd db/commit: NULL is a bad param, fixed 2012-11-19 21:06:50 +01:00
ZxBiohazardZx
7a30ffe68e commitfix: add newline to prevent possible issues with next file 2012-11-19 20:46:51 +01:00
ZxBiohazardZx
cdec49fc85 DB/misc: 
NPC Jezelle Pruitt Closes #856
Standards and Practices Closes #1539
An Improper Burial Closes #1977
Postponing the Inevitable Closes #2350
Rune of Dawn Closes #2782
No Rest For The Wicked Closes #4013
Gregory Tabor Closes #4350
Anatoly Will Talk Closes #4551
Pilgrim's Bounty Closes #5025
The Fallen Sisters Bugged again Closes #5419
The Lost Spirits Closes #5647
Feedin' Da Goolz Closes #5679
The One That Got Away Closes #5764
Find the Ancient Hero Closes #5785
Shattrath Daily Quests missing ExclusiveGroup Closes #5821
Nether Drake Egg Closes #6284
Quest - 28056 Closes #6627
Before the Gate of Horror Closes #5760
Quest Audio - 12593 Closes #6632
Souls of the Decursed Closes #6724
Norgannon's Shell (12872,12928) Closes #7837
Windcaller Yessendra (15498),Warden Haro (15499),Keyl Swiftclaw (15500),Mokvar (16012) & Deliana (16013) quests  Closes #7907
Attunement to the Core (7487,7848) Closes #7908
spawn location in OG near Rogg (37072) Closes #8021
Missing Fires for Hallow End Q  Closes #8086
Wickerman Festival NPC & GO's Closes #8133
Hallow's End Pumpkin Treat & Tricky Treat time fix Closes #8244
Exhausted Vrykul - not responding after using discipline stick on him Closes #8288
 2012-11-19 20:35:20 +01:00
Spp
7f061fc57f Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2012-11-19 10:09:58 +01:00
Nay
4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00:00
tibbi
1f9db80b69 Scripts/ToC: Trial of the Crusader rewrite 
Closes #8272
Closes #7013
Closes #7552
Closes #5561
Closes #4221
Closes #2701
Closes #2079
Closes #5082
Closes #6503
Closes #6784

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 00:42:25 +00:00
krofna
aea5fec30d Scripts/AQ: Implement Ossirian the Unscarred 
Fix yell on kurinaxx death

Warning fix

Closes #8254

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 00:37:43 +00:00