Commit Graph
727 Commits
Author SHA1 Message Date
Shauren d0176f985d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-08-15 20:13:34 +02:00
joschiwald ccfa82e7d5 Core/Creature: update creature_template and some other small things
http://www.trinitycore.org/f/topic/9572-creature-damage/
2014-08-14 16:09:14 +02:00
Shauren 4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
2014-08-12 00:45:24 +02:00
MrSmite 5dcf111150 Fix pet spell cooldown being extended without successful cast
Closes #12560
2014-08-10 04:51:46 -04:00
DDuarte df3b08d140 Core/Server: Use nullptr instead of 0 where pointers are expected 2014-08-09 21:32:26 +01:00
Shauren e4d6d34f6e Core/Spells: Fixed LoS checks for spells like shadowfury 2014-08-04 18:56:17 +02:00
Duarte Duarte 02a3b3d949 Core/Spell: Correct the hit and miss counters in WriteSpellGoTargets
Fixes a client crash when spells hit (or miss) more than 255 targets (it was capped at 256 in 80b61fa584)
Thanks to @joschiwald for finding the mistake

Closes #12733
2014-08-03 17:55:13 +01:00
Vincent-Michael 5a8e79528f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-25 19:35:11 +02:00
DDuarte 8e385ca6d9 Core/Spells: Fix an issue with previous commit (a309ca9727) 2014-07-25 14:04:12 +01:00
Warpten a309ca9727 Core/Spells: Fixed issues with Death and Decay and similar spells not ticking if players stepping in the AoE are not in LoS with the caster.
Not exactly sure if that behavior should *exactly* be as such, but until more informations ...
2014-07-25 14:47:07 +02:00
Shauren 909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.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/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
2014-07-19 03:51:11 +02:00
Shauren 7532864264 Buildsystem/MSVC: Warning fixes
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
2014-07-17 15:42:57 +02:00
Subv dfdc19f3bc Merge branch master into boost
Conflicts:
               BattlegroundMgr.h
2014-07-13 16:52:38 -05: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 7008ac98aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-05 14:29:12 +02: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
Trisjdc 124398feef Core/Spells: Improve charge path logic, get a point to the target and then reduce it by the necessary distance 2014-07-04 22:22:28 +01:00
jackpoz 4302226a85 Core/Spells: Fix Charge pathing
Fallback to "straight path" pathing when raycast doesn't find a valid path.
Fixes #7931
2014-07-04 22:00:46 +02:00
joschiwald 7b74a725c8 Core/Spells: fixed Deep Freeze after 2a3546ca36
Closes #12424
2014-07-03 22:32:41 +02:00
Trisjdc 531de49fe7 Core/Spells: Spells which do not apply auras should not apply DR
- Solves issue where Intimidating Shout applied DR twice on the main target
2014-07-03 00:42:55 +01:00
Vincent-Michael f3de6f0284 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-27 19:39:23 +02:00
Trisjdc 78ffaf6ca6 Core/Spells: Implement CREATURE_TYPEFLAGS_PROJECTILE_COLLISION, and solve some targeting problems with TARGET_DEST_TRAJ 2014-06-27 16:58:46 +01: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 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 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
Trisjdc aca3795fa7 Core/Spells: Skip adding CAST_FLAG_RUNE_LIST to rune spells if it's a triggered cast. Solves some of the occasional Death Knight rune visual issues 2014-06-15 15:00:56 +01:00
Trisjdc 4615aa60a5 Core/Spells: Define and implement CAST_FLAG_NO_GCD 2014-06-15 14:49:03 +01:00
Trisjdc 4992c0290b Core/Spells: Change haste benefit to cast time formulas, may need further correction
- With these changes, Paladin/Death Knight mount summons will no longer benefit from haste
2014-06-12 20:03:52 +01: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
Sebastian Valle Herrera d0c9ac1d69 Merge pull request #12228 from Unholychick/patch_periodics
Core/Spells: Implement Periodic mechanics
2014-06-08 13:13:14 -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
Michael 83c2e79d52 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/Handlers/CharacterHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp
2014-06-05 19:42:48 +02:00
Trisjdc afb7c705c2 Core/Spells: *Properly* solve the Disarm vs Bladestorm issue 2014-06-05 11:48:43 +01: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 ef5bc9c70a 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/Guilds/Guild.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
2014-05-18 19:40:30 +02:00
jackpoz 32386be8e7 Merge pull request #12021 from Trisjdc/spell_target_dest
Core/Spells: Replace MovePosition by MovePositionToFirstCollision in spell dest target handling.
2014-05-13 21:02:07 +02:00
Vincent-Michael 4136f3c974 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/ArenaTeamHandler.cpp
2014-05-13 06:41:25 +02:00
Trisjdc 11f6eb91c0 Core/Spells: Fix fishing on areas with liquid data but no valid height 2014-05-11 14:43:12 +01:00
Vincent-Michael 09ff96914a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-08 02:47:29 +02:00
Trisjdc cb7668ab5a Core/Spells: Replace MovePosition by MovePositionToFirstCollision in spell dest target handling.
- Solves issues such as being able to summon creatures inside terrain/gameobjects, being able to fall through terrain by using Shadowstep/Feral Charge (Cat), and much more
2014-05-07 11:58:08 +01: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 5ca548602c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-05 16:13:40 +02:00
jackpoz 1c0c163485 Core/Misc: Fix warning 2014-05-04 14:03:42 +02:00
jackpoz 3aca9e64b3 Core/Misc: Fix exploit
Fix exploit that allowed to learn spells from recipes without consuming them.
2014-05-04 13:41:07 +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