Commit Graph
14954 Commits
Author SHA1 Message Date
Subv ded43242eb Fixed build 2012-02-14 13:53:33 -05:00
Subv f8df838db9 Fixed build, thanks Amit86 for noticing 2012-02-14 13:47:35 -05:00
Subv d55126aacb Core/Spells: Revert erroneous interruption added in 5ea49613d2 - more research required 2012-02-14 13:14:51 -05:00
Subv 12d0e88346 Core/Battlegrounds: Fix Ring of vallor pillar at arena start
author: @p0ody
2012-02-14 13:00:08 -05:00
Subv 8a72aede16 Codestyle: Renamed some variables to fit codestyle, corrected order in structure/class fields to match alignment (they use slightly less memory now)
Signed-off-by: Subv <[email protected]>
2012-02-14 12:46:26 -05:00
Subv f1182f0884 SQL/Achievements: Added difficulty conditions for Once Bitten, Twice Shy achievement
closes #4120

Signed-off-by: Subv <[email protected]>
2012-02-14 10:31:31 -05:00
Subv 8550cb8333 Merge pull request #5234 from kandera/fix_seasonal_check
fix issue with seasonal quests
2012-02-14 06:06:00 -08:00
Kandera 3d9ff95177 fix issue with seasonal quests 2012-02-14 09:03:34 -05:00
Subv 0b02782037 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-02-13 19:40:09 -05:00
Subv d790adefe0 Codestyle: Renamed some variables to fit codestyle
Signed-off-by: Subv <[email protected]>
2012-02-12 20:10:09 -05:00
Malcrom 7965eed4e1 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 20:50:02 -03:30
Nay 84268be882 TDB 335.11.46 - 2012/02/13 2012-02-12 23:50:16 +00:00
Nay a827a6f8f1 DB/SAI: Fix a couple of issues in recent commits
By Dasio and tREAK
2012-02-12 23:33:30 +00:00
Subv 3e15eccd43 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-02-12 17:57:51 -05:00
Subv 06df126bd0 Core/Loading: Speedup on the creature loading code
Signed-off-by: Subv <[email protected]>
2012-02-12 17:34:41 -05:00
Malcrom 2b1cc3ded7 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 17:58:41 -03:30
zxbiohazardzx bc05042775 Codestyle: Cleanups (thx Svannon for spotting the issue here) 2012-02-12 22:22:35 +01:00
Malcrom aa5fbb363f Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 17:26:53 -03:30
zxbiohazardzx b51dc186ea Codestyle: corrected map, corrected tablenamequotes, thx WishToDie for the quick spotting 2012-02-12 21:56:05 +01:00
Malcrom ac52016f5c Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 17:25:15 -03:30
ZxBiohazardZx 81d4a8f084 DB/Creature: Add spawns and waypoints for npc 26841 from sniffs 2012-02-12 21:49:09 +01:00
Malcrom 76ed571a25 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 17:16:54 -03:30
Subv 11d9f8e161 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-02-12 15:42:10 -05:00
Subv 5ea49613d2 Core/Spells: Spell casts should be interrupted if the target goes out of LoS.
Signed-off-by: Subv <[email protected]>
2012-02-12 15:30:16 -05:00
Malcrom 1329ec3686 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 16:32:18 -03:30
zxbiohazardzx bafd04de48 DB/Creature: Add some more Sunscale Lashtails in the area from sniffs
Closes #5107
2012-02-12 20:22:06 +01:00
Subv ca2324b5ee Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-02-12 12:47:34 -05:00
Subv 836459ef0e Extractors: Do not show a warning in the vmap extractor when a model fails to load to avoid confusion 2012-02-12 12:45:45 -05:00
w1sht0l1v3 f7cb47a72e DB/Quests: Fix quest Hot On The Trail
Closes #5199
Ref #5194
2012-02-12 15:29:38 +00:00
Pitcrawler 42e0f6c619 DB/Misc: Missing Zul'Drak gossips (+ conditions)
Closes #5206
Enables f76f091fc3 and c80ab4d19e
2012-02-12 15:03:38 +00:00
Subv a7f6c4f558 Fixed the logic on my last commit 2012-02-12 08:41:59 -05:00
Malcrom 6ed5dcbc5a Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-02-12 08:11:22 -03:30
Subv b0bcf1f67c Core/Collision: Fixed LoS for doors with data0 = 0 and state = 0
closes #5197

Signed-off-by: Subv <[email protected]>
2012-02-11 21:47:00 -05:00
Subv d3a510957e Codestyle: Renamed some battleground variables and changed some other things to fit codestyle 2012-02-11 19:44:10 -05:00
Subv d0110dae9d Merge pull request #5193 from Souler/master
Dalaran Sewers Arena waterfall issue
2012-02-11 16:28:38 -08:00
Subv 0d77ae8fc1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-02-11 19:23:40 -05:00
Subv ff9830c18d Core/Spells: Blink wont be able to trespass solid objects anymore (walls/doors)
Refactored some code

Signed-off-by: Subv <[email protected]>
2012-02-11 19:23:18 -05:00
Matthew Goff b0145e3b39 Core/Quests: Correct use of parenthesis in IsAutoComplete and IsAutoAccept
Closes #5195
2012-02-11 22:26:53 +00:00
neurorulez cf9e183e25 DB/SAI: Send data to instance on Ward Keeper death
Closes #4819
2012-02-11 20:46:08 +00:00
Souler 491c25ddc5 Core/Arenas/Dalaran Sewers: Add warning before fully activating the waterfall 2012-02-11 21:08:26 +01:00
Pitcrawler 6bb7f15092 DB/NPCs: Remaining Grizzly Hills gossips
Scripts|SAI: Convert npc_kingdom_of_dalaran_quests to SAI
Closes #4845
2012-02-11 20:01:06 +00:00
Nay 605d3ffa52 Copy paste is bad, mkay? 2012-02-11 19:51:03 +00:00
Nay 5c62fd1d6a Core/Db/Conditions: Add conditions for world state and phasemask
CONDITION_WORLD_STATE - 11 - index - value - 0
CONDITION_PHASEMASK - 26 - value - 0 - 0
Idea by @LiMCrosS
2012-02-11 19:46:41 +00:00
Subv 1fc3470233 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-02-11 14:29:13 -05:00
Subv f3802488ff Core/Collision: Missing a negation operator in Ring of Valor 2012-02-11 14:28:25 -05:00
Nay 987860c09c DB/SAI: Fix a typo in a recent SAI script
(Startup DB errors)
2012-02-11 19:00:57 +00:00
malcrom 001a2bc5e7 DB/Quests: Fix quest Sorlof's Booty
Closes #5071
Closes #1785
2012-02-11 18:59:07 +00:00
Subv 7eab228818 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2012-02-11 13:49:41 -05:00
Subv 0e57de54fb Battleground/Collision: Fixed the DS waterfall and RV pillar glitches 2012-02-11 13:47:43 -05:00
gecko32 c5cabd3295 DB/Quests: Script A Daughter's Love quest ending
Closes #5102
2012-02-11 18:47:19 +00:00