Shocker
1293de90be
Core/Spells: Correct effect index check for Earth's Grasp
2012-12-17 01:53:52 +02:00
Vincent_Michael
d2cc278283
Core/Spells: Rename spell script scripts in correct script name
2012-12-14 23:19:03 +01:00
CeIa
b87cc31106
Scripts/Events/Achievement: fix 'Out With It'
...
Credits to @darkman1983
Closes #8211
Closes #8126
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-12-14 01:23:53 +00:00
Vincent_Michael
ebae4ab249
Core/Hunter: Fix Call of the Wild targets
...
Closes #8618
Closes #8610
2012-12-10 10:36:59 +01:00
Warpten
e6c763f433
Core/Spells: Fixed multiple spell effects where RadiusEntry is NULL but where MaxRadiusEntry is a valid radius entry.
...
Also fixed COD and money being swapped when sending mails, and another typo when sending battleground log data.
2012-12-07 17:29:31 +01:00
Spp
fb2e5c3c58
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/azshara.cpp
src/server/scripts/Kalimdor/azuremyst_isle.cpp
src/server/scripts/Kalimdor/darkshore.cpp
src/server/scripts/Kalimdor/durotar.cpp
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
src/server/scripts/Kalimdor/feralas.cpp
src/server/scripts/Kalimdor/moonglade.cpp
src/server/scripts/Kalimdor/silithus.cpp
src/server/scripts/Kalimdor/stonetalon_mountains.cpp
src/server/scripts/Kalimdor/tanaris.cpp
src/server/scripts/Kalimdor/the_barrens.cpp
src/server/scripts/Kalimdor/thousand_needles.cpp
src/server/scripts/Spells/spell_generic.cpp
2012-12-07 09:22:43 +01:00
Vincent-Michael
082c3f4267
Core/Hunter: Fix Furious Howl targets
2012-12-04 20:50:01 +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
Vincent-Michael
ddb6c95042
Core/Spells: Convert Replenishment in spell script
2012-11-30 18:27:34 +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
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
Spp
b5c9ab8802
Core/Misc: Reduction of header dependencies - Step II
2012-11-20 12:30:30 +01:00
Spp
bf8b642a47
Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4)
2012-11-19 12:02:33 +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
oMadMano
477d17b0fc
Core/Spells: Fixed Improved Cone of Cold.
2012-11-17 14:10:47 -05:00
Spp
b99c347747
Core: Remove Player.h dependency from all the possible headers
2012-11-17 05:18:37 +01:00
Spp
9659f0335f
Core/Guilds: Multiple changes
...
- Fix Delete Rank
- Fix Rank order after Rank is deleted
- Send correct event after Guild Tab purchase
- Better debug msgs
- Move news to Event Logs (internal struct is like Event Logs and Bank Event Logs). Max news configurable
2012-11-07 23:21:19 +01:00
Spp
c97fc99e16
Merge branch 'master' into 4.3.4
...
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
2012-10-30 10:30:05 +01:00
Spp
013fb1f4d9
Core/Misc: reduced amount of string memory allocations (Step I)
2012-10-24 15:34:48 +02:00
Subv
bcabdb08e4
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-10-21 17:26:37 -05:00
Subv
1fc3aad9d7
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCfmt.h
src/server/game/DungeonFinding/LFGMgr.h
src/server/scripts/Kalimdor/feralas.cpp
2012-10-21 17:18:35 -05:00
Shocker
66889f11b7
Core/Spells: Use previous defines in a druid spell script
2012-10-21 22:25:52 +03:00
Subv
77a8d6f127
Scripts/Spells: Corrected the spirit value used in the Mana Tide Totem script.
2012-10-19 16:16:30 -05:00
Spp
67a03027ae
Proper naming of LfgDungeon structures
2012-10-19 17:47:51 +02:00
Spp
2e55abcde4
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.h
2012-10-19 14:24:11 +02:00
Spp
d0334bf948
Core/Dungeon Finder: Some optimizations.
...
- Store teleport coordinates to avoid recalculations each time someone has to be teleported
- Correct teleport error msg when player is charming or using vehicle
- Internal changes in storage types
- Proper code for missing achievement lock type
- Better debug msgs
- Trying to get rid of "Player*" and "Group*" inside LFGMgr as much as possible (Step 1)
2012-10-18 09:15:10 +02:00
Subv
f8feb1ec0e
Core/Scripts: Fixed build
2012-10-17 17:35:50 -05:00
Subv
2356e936a4
Scripts/Spells: Updated some Shaman SpellScripts to 4.3.4
2012-10-17 15:04:51 -05:00
Subv
fc796fb879
Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift)
2012-10-15 18:01:16 -05:00
Subv
fe55f735c1
Scripts/Spells: Updated some more spells to 4.3.4
2012-10-15 14:27:56 -05:00
Subv
c757f811f2
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Commands/cs_modify.cpp
2012-10-15 11:15:25 -05:00
Subv
963aa5a159
Scripts/Spells: Updated some warlock spellscripts to 4.3.4
2012-10-14 19:18:18 -05:00
Nay
abe81119b4
Core/Script: Fix item unusual compass.
...
By Kaelima and Retriman
Closes #8039
2012-10-12 01:28:37 +02:00
Subv
a8fa67c53c
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
2012-10-10 10:29:18 -05:00
Nay
44c2edee51
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Spells/SpellMgr.cpp
2012-10-07 14:57:18 +01:00
Gigatotem
2b1a8004ba
Spells/Hunter: Readiness
...
Fixes Readiness resetting the cooldown of Gift of the Naaru. Needs testing
2012-10-07 13:44:05 +02:00
Kandera
2e247bd99a
Core/Spells: Master's Call should not remove stun effects.
2012-10-05 11:45:22 -04:00
Spp
f570383fba
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
2012-10-04 13:33:04 +02:00
Spp
02d68e4610
Core: Fix build without PCH
2012-10-03 15:40:01 +02:00
Spp
380db44583
Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct
2012-10-02 12:17:42 +02:00
Nay
94c8c7ec4e
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Battlefield/BattlefieldMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
2012-09-30 15:46:00 +01:00
Nay
8a18449a74
SQL: Rename file merged in PR; Core: cleanup whitespace and tabs
2012-09-30 15:33:56 +01:00
Nay
15c05ed771
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2012-09-25 09:26:48 +01:00
Vincent-Michael
118825601b
Core/Spells: fix misdirection removal on cancel. Closes #7776
2012-09-24 12:39:02 -04:00
Kandera
3cf359068e
Core/Spells: Fix things from commit da4067cb30 thx dracosvk
2012-09-24 12:16:37 -04:00
faq
58d3758f4c
Core/Spell: Correcting previos PR. splitamount is already calculated in core and removing not in. variable
2012-09-24 18:35:10 +03:00
faq
da4067cb30
Implementing split dmg cap to Divine Sacrifice. Author Tibbi
...
+correcting previos sql
Closes #6024
2012-09-24 18:18:30 +03:00
Faq
0e7ed5ec85
Core/Spells: Implementing some hooks for split damage taken, fixes the limitation of dmg such auras can split, for example at Hand of Sacrifice. Might have unexpected results, but they are called unexpected for a reason.. .Author Tibbi
...
closes #6025
Made new one as https://github.com/TrinityCore/TrinityCore/pull/7423/ was closed.
2012-09-18 23:28:46 +03:00
Spp
761060e1f1
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Spells/Spell.cpp
2012-09-18 14:38:44 +02:00