Vincent-Michael
0f5c481cd4
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/SkillHandler.cpp
2014-07-12 18:08:30 +02:00
Shauren
6d8dbb5c4a
Core/Misc: Renamed a few spell and skill line related methods to follow tc coding standards
2014-07-12 17:28:35 +02:00
Shauren
d91964912e
Core/Skills: Fixed spells automatically learned from skill lines adding more skill lines
2014-07-12 17:27:26 +02:00
Vincent-Michael
6a6403a54e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/scripts/EasternKingdoms/CMakeLists.txt
2014-07-09 10:23:14 +02:00
Sebastian Valle Herrera
4a4da95aa0
Merge pull request #10887 from zorix/PR3
...
Core/Spell: Triggered spells now will be cast on the primal target instead of on caster
Closes #10853
Closes #10860
2014-07-08 09:57:37 -05:00
Vincent-Michael
722a5ba7ee
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/BattlegroundScore.h
2014-07-05 20:14:14 +02:00
Trisjdc
dad9b01b26
Core/Spells: Fix Blink/_DEST spell effects when cast inside/near water
2014-07-05 15:35:21 +01:00
Vincent-Michael
a508ce1976
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
2014-07-05 14:28:58 +02:00
joschiwald
7b74a725c8
Core/Spells: fixed Deep Freeze after 2a3546ca36
...
Closes #12424
2014-07-03 22:32:41 +02:00
Vincent-Michael
f3de6f0284
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-27 19:39:23 +02:00
Shauren
74850abcfc
Core/Loot: Skinning improvements
...
* Set skinnable flag only after all loot was taken
* Creatures are skinnable only once - after skinning, the player only has to loot the creature again if he did not take all skinning loot
2014-06-26 22:01:55 +02:00
Vincent-Michael
e97b6e6403
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-26 19:48:16 +02:00
Shauren
224b5c08df
Core/Spells: Fixed professions resetting back to 1 when learning new level (expert/artisan)
2014-06-26 17:39:09 +02:00
Vincent-Michael
3a63187b47
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
2014-06-26 00:13:34 +02:00
Shauren
afd931550b
Core/Skills: Check if a skill can be unlearned with SkillRaceClassInfo.dbc data and use max skill level from SkillTiers.dbc
2014-06-25 20:34:10 +02:00
Vincent-Michael
50cf908d78
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/World/World.h
2014-06-25 19:51:27 +02:00
Subv
a0fedd1d78
Core/Skinning: Fixed the creatures becoming non-skinnable even before looting them completely.
...
Closes #5318
2014-06-24 20:04:26 -05:00
Vincent-Michael
d8234bed42
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Accounts/AccountMgr.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
2014-06-23 23:47:48 +02:00
Trisjdc
85176f1488
Typo fix
2014-06-23 19:23:46 +01:00
Trisjdc
7a78d60d34
Core/Spells: Cloak of Shadows should not remove physical debuffs
...
Closes htps://github.com/TrinityCore/TrinityCore/issues/7581, probably others
2014-06-23 19:18:20 +01:00
Kinzcool
34572492dd
Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2014-06-18 23:25:57 -04:00
Vincent-Michael
fe8e904dea
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2014-06-17 21:22:45 +02:00
yesitsme
77d70fbc0c
Core/Spells fix 0442ff5c99
...
Let it apply only to players
2014-06-17 16:44:24 +02:00
Vincent-Michael
97ccfdb625
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Spells/Auras/SpellAuraEffects.cpp
2014-06-16 22:17:27 +02:00
Unholychick
6b430db910
Core/Spells: Implement SPELL_ATTR7_CAN_RESTORE_SECONDARY_POWER
...
spells without this attribute will no longer energize secondary power.
Druids in cat form will no longer be able to replenish mana from every kind of spell
2014-06-16 01:38:46 +02:00
Vincent-Michael
26dd770b8e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/shared/Utilities/Util.cpp
2014-06-15 19:36:30 +02:00
Unholychick
52c0fc96bb
Move pestilence to spellscripts
...
Fixes crash and warnings introduced in d4bbc26261
Fixes a bug that allowed dks to spread diseases using another dks diseases
Closes: https://github.com/TrinityCore/TrinityCore/issues/12245
2014-06-11 20:03:30 +02:00
Unholychick
b651789cb0
Core/Spells: Implement Periodic mechanics
...
Change behaviour of single target periodic aura ticks to be more blizzlike
Also add some missing handling of SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE
Fixes Deep wounds and Chimera Shot Serpent
Remove an ancient hack with Drain Soul, spell id 100001 can now be deleted from spell_dbc table
Allows Rolling dot mechanics and allows DK's to roll diseases with pestilence,
see link for info:
http://forums.elitistjerks.com/topic/82503-frost-dps-in-333this-will-be-a-day-long-remembered/page-88
2014-06-09 23:10:56 +02:00
Golrag
8769207854
Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
2014-06-09 23:10:31 +02:00
Vincent-Michael
18b6a6450b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_warlock.cpp
2014-06-09 03:27:53 +02:00
Trisjdc
0b3e391ac4
Merge pull request #11739 from Golrag/master
...
Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
2014-06-09 00:53:28 +01:00
Subv
bbe51bbd13
Core/Phases: Removed more of the old phasemasks
2014-06-07 20:26:25 -05:00
Unholychick
d4bbc26261
Core/Spells: Implement Periodic mechanics
...
Change behaviour of single target periodic aura ticks to be more blizzlike
Also add some missing handling of SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE
Fixes Deep wounds and Chimera Shot Serpent
Remove an ancient hack with Drain Soul, spell id 100001 can now be deleted from spell_dbc table
Allows Rolling dot mechanics and allows DK's to roll diseases with pestilence,
see link for info:
http://forums.elitistjerks.com/topic/82503-frost-dps-in-333this-will-be-a-day-long-remembered/page-88
2014-06-07 19:13:57 +02:00
Subv
48ec2df81f
Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4
...
Put here for peer review.
2014-06-01 22:27:29 -05:00
Michael
15efe08a60
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Item/Item.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/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
2014-05-25 21:52:27 +02:00
jackpoz
f091713086
Core/Misc: Fix typo
...
Fix typos about the word "Resurrect"
2014-05-24 18:25:53 +02:00
Vincent-Michael
09ff96914a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-08 02:47:29 +02:00
jackpoz
2878b0d105
Core/Misc: Fix enchants broken in 3aca9e64b3
...
Compare cast item entry instead of checking cast item spells to fix the exploit mentioned in 3aca9e64b3 without breaking any functionality.
2014-05-05 20:05:33 +02:00
Vincent-Michael
5e3e431b06
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-04 04:24:59 +02:00
jackpoz
720c3cbbd0
Core/Misc: Fix exploit
...
Fix exploit that allowed to duplicate stackable splitable items. If the item that cast the spell can't be found anymore, the spell is cancelled.
Fixes https://github.com/TrinityCore/TrinityCore/issues/11977
2014-05-03 21:22:12 +02:00
Vincent-Michael
1390621f4d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
src/server/scripts/Commands/cs_reload.cpp
2014-04-25 23:42:40 +02:00
jackpoz
2585e799f9
Core/Misc: Change how Position struct is retrieved
...
Update Position::GetPosition() and similar methods signatures to reflect 2a4c9bcaf9 changes by return a Position object instead of accepting a Position parameter by reference.
2014-04-25 21:19:30 +02:00
Vincent-Michael
f5b02d1278
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-21 16:57:46 +02:00
joschiwald
6b52cef5bc
Core/Spells: corrected implementation of SPELL_EFFECT_QUEST_START
2014-04-21 16:48:05 +02:00
Vincent-Michael
e4b14b943d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.h
src/server/scripts/Commands/cs_character.cpp
src/server/scripts/Commands/cs_lookup.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/tools/vmap4_extractor/mpq_libmpq04.h
2014-04-05 20:43:05 +02:00
joschiwald
29610b250d
Core/Spells: fixed Throw Shield Visual and Clone Weapon
2014-04-05 00:37:07 +02:00
jackpoz
8c44259fae
Core/Misc: Fix some static analysis issues
...
Fix uninitialized values, most of which are false positives, always initialized before being accessed.
Add some asserts and additional NULL checks as sanity checks. Use SpellMgr::EnsureSpellInfo() if the spell id is valid and always supposed to return a valid not-NULL SpellInfo* .
2014-03-27 21:43:59 +01:00
Golrag
53a03fc730
Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
2014-03-18 08:07:08 +01:00
joschiwald
b000fdca70
Core/Entities: allow interaction with gameobject questgivers if player can take or return quests
...
Closes #11269
Closes #8898
Closes #10204
Closes #11410
Closes #7053
Closes #6189
Closes #9474
2014-02-06 21:23:18 +01:00
Vincent_Michael
224da47952
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/scripts/Spells/spell_dk.cpp
2014-01-31 23:51:07 +01:00