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
DDuarte
a394205eca
Core/Server: Add missing overrides
2014-08-09 20:17:40 +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
479afc0ed0
Core/Spells: Fix Bloodworms summon count
2014-08-02 05:17:42 +02: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
DDuarte
cdb33ab174
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_generic.cpp
2014-07-24 17:10:21 +01:00
Vincent-Michael
296956e06e
Revert "Core/Spells: Death and Decay"
...
This reverts commit 02d56e00bc .
2014-07-24 16:14:25 +02:00
Trisjdc
0e91a0e54c
Core/Spells: Solving the double dips in Hammer of the Righteous
2014-07-24 03:40:05 +01:00
DDuarte
5193eaac87
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
2014-07-24 03:35:19 +01:00
Exodius
02d56e00bc
Core/Spells: Death and Decay
...
Solves problems with Death and Decay doing LoS check using the caster instead of the center of AOE.
Fix by @PKX
Closes #6345
2014-07-24 03:08:49 +02:00
joschiwald
b5975c2817
Scripts/ICC: fixed Festergut Malleable Goo (thx @ManuFe)
...
Closes #12023
2014-07-23 17:24:50 +02:00
Vincent-Michael
8bc519a308
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2014-07-23 06:32:44 +02:00
jackpoz
3388587b7a
Core/Misc: Replace rand() calls with SFMT
2014-07-22 21:43:19 +02:00
Vincent-Michael
e68d3b0937
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
2014-07-20 03:06:03 +02:00
leak
dce92611f3
Refactored singletons to enable proper deconstruction during shutdown
2014-07-20 00:40:08 +02:00
karn
26aaf2384c
Core/Creature: Minigob Manabonk
...
Closes #11097
Signed-off-by: DDuarte <dnpd.dd@gmail.com >
2014-07-19 22:50:32 +01:00
Shauren
2452cfb98e
Part 2: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2014-07-19 15:26:06 +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
Vincent-Michael
fbccc58f4a
Core/Spells: "Black Magic" can no longer remove after dead
2014-07-19 03:18:05 +02:00
Warpten
dd64f77dcc
Core/Spells: Since patch 4.0.1, an hunter can track multiple creature types at once.
2014-07-18 06:42:21 -04: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
ec263868af
Core/Aura: Update InvisibilityType for 4.3.4
2014-07-13 00:08:15 +02:00
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
leak
013e3f4c0c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
2014-07-06 20:07:52 +02: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
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
Subv
151785b9ce
Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
...
Conflicts:
src/server/game/World/World.cpp
2014-07-03 15:57:47 -05: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
Shauren
2a3546ca36
Core/Skills: Use SkillLineAbility.dbc to determine player initial spells - skill assignment done in a new table playercreateinfo_skills
...
* Removed DK start skill hacks
* Resolved missing skills in character skill tab
Closes #12311
2014-07-01 17:20:48 +02:00
leak
029bad6698
Replaced all remaining ACE based Singletons
...
Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
2014-07-01 00:54:09 +02:00
jackpoz
1bd4ff6cb9
Revert "Scripts/Ulduar: Implement Mimiron"
2014-06-28 13:49:34 +02:00
Trisjdc
0ac6f16896
Merge pull request #12268 from Unholychick/patch_mimironnew
...
Scripts/Ulduar: Implement Mimiron
2014-06-28 12:17:32 +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