Commit Graph
9266 Commits
Author SHA1 Message Date
Vincent-Michael c00c59c0f5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.h
2013-08-05 11:54:21 +02:00
Aokromes 1dcd027426 Merge pull request #9761 from xjose93/ImproveLog11
Core/Logs: Added functions GetMapAreaAndZoneString() and GetCoordsMapAreaAndZoneString()
2013-08-05 01:13:52 -07:00
Vincent-Michael cfe4154376 Core/Commands: Add .npc info mechanicImmuneMask infos 2013-08-04 19:33:42 +02:00
Vincent-Michael fa90fabd10 Misc/Vendor:
- Fix more vendors without maxcount
- Add log/skip for type currency with missing maxcount
2013-08-03 14:53:16 +02:00
Vincent-Michael 7227a8547b Core/Spells: Add druid Moonkin Aura with Moonkin Form (thx to kraven5) 2013-08-03 02:15:34 +02:00
Vincent-Michael 846b67e1ab Core/Spells: Random cleanup 2013-08-03 00:13:19 +02:00
Vincent-Michael 8b85fa2454 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-02 20:07:43 +02:00
Shauren 20a61b6400 Core/Creatures: DoTs and self damage will no longer reset time since last damage taken for stopping creature from evading 2013-08-02 19:56:48 +02:00
Vincent-Michael 39cce3344c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-08-02 14:41:33 +02:00
Vincent-Michael 5b0cd04810 Core/Spells: Remove invalid spell entry for mondkingestalt 2013-08-02 14:40:49 +02:00
Shauren 5ae86ee2a8 Fixed compile 2013-08-01 22:22:39 +02:00
Vincent-Michael 26d090fa9a Core/Spells: Fix druid talent "Nature's Grace" 2013-08-01 22:02:14 +02:00
Shauren ac10589eda Core/Misc: Fixed some issues found by Coverity Scan 2013-08-01 21:31:11 +02:00
Shauren 3814bbdd46 Core/Misc: Fixed compile warnings 2013-08-01 18:03:48 +02:00
Shauren ab6be8c603 Core/Battlegrounds: Fixed error with counting AB owned nodes (and warning fixes) 2013-08-01 18:02:08 +02:00
Vincent-Michael b8b21ce1f8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-01 17:22:42 +02:00
Vincent-Michael a71341bbcf Core/Spells: Fix rogue talent "Overkill" (thx to @timh52280)
Close #10411
2013-08-01 17:22:03 +02:00
joschiwald f04217300c Core/Battleground: fix type mismatch
Ref #10320
2013-07-31 11:07:58 +02:00
Vincent-Michael bab04cc5f8 Core/Spells: Fix try for logic fail in 4ba3c2e51d 2013-07-30 23:59:30 +02:00
Vincent-Michael d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +02:00
Nay a7d876e8b5 Config: Change ProcessPriority default to 0 (Normal)
On Linux, superuser (root) is required to set a process high priority and we shouldn't force that.
(It's already set to 0 (Normal) in worldserver\Master.cpp and authserver\Main.cpp)
2013-07-30 15:34:38 +01:00
Nay 7cb1b21f5e Core/Spells: Fix a merge error 2013-07-30 15:27:24 +01:00
joschiwald 0d0baf004d Scripts/DrakTharonKeep: fix copy paste fail
Closes #10402
2013-07-30 15:46:56 +02:00
Nay 7165fd769e Merge pull request #9862 from Ric101/condition_creature_type
Core/Conditions: Implement CONDITION_CREATURE_TYPE - 24
2013-07-30 06:25:04 -07:00
Nay b21fe684c1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellMgr.cpp
2013-07-30 14:14:22 +01:00
Nay 394b2c6845 Scripts/OnyxiasLair: Fix a crash in boss_onyxia
Closes #10393

Note: this just fixes the crash, not the issues the script has (a.k.a rewrite this)
2013-07-29 21:46:49 +01:00
Shauren d26afd7703 Core/Spells: Fixed crashes happening with spells that had their dbc targets overriden
Closes #10395
2013-07-29 19:00:34 +02:00
Vincent-Michael cb8f159cea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
2013-07-29 17:11:25 +02:00
Nay 1bb3c4a2b4 Misc: Fix warnings and build
Closes #10396
2013-07-29 14:24:53 +01:00
MitchesD 3b78023100 Scripts/DrakTharonKeep: Update King Dred to use events
Closes #10385

Signed-off-by: joschiwald <joschiwald@online.de>
2013-07-29 13:11:07 +02:00
joschiwald d868f9db4b Scripts/DrakTharonKeep: reworked InstanceScript 2013-07-29 12:49:27 +02:00
Vincent-Michael a08b52aa19 Core/Spells: Fix hunter talent "Improved Serpent Sting"
Closes #10001
2013-07-29 06:25:30 +02:00
Nay 3330239a02 Servers: Fix typo 2013-07-28 20:12:06 +01:00
Nay e3f7be12ef Servers: Enable UseProcessors and ProcessPriority settings to be used on Linux 2013-07-28 18:58:12 +01:00
Vincent-Michael eef0d67bb7 Core/Spells: Cleanup for paladin 4.3.4 2013-07-28 19:07:58 +02:00
Vincent-Michael 0710f480b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
2013-07-28 18:41:57 +02:00
Nay f71d894a21 Servers: Fix some code style issues in world and authserver 2013-07-28 16:59:07 +01:00
Vincent-Michael 1a8b2ce466 DB/Spells: Fix warrior talent "Deep Wounds" 2013-07-28 17:58:10 +02:00
Vincent-Michael 706c5a1975 Core/Spells: Update/Convert paladin "Beacon of Light" for 4.3.4 2013-07-28 16:02:59 +02:00
grsgs 036286cb48 Core/Spells: Fix absorbs effect from death knight "Necrotic Strike"
Closes #10388

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
2013-07-28 14:16:17 +02:00
Vincent-Michael 67bd19706e Core/Spells: Fix paladin talent "Daybreak" 2013-07-27 21:35:43 +02:00
joschiwald cf7e783274 Scripts/Spells: Fixed typo in 7678800a93 2013-07-27 21:25:56 +02:00
Vincent-Michael 4d315bee3d Core/Spells: Convert "Maim Interrupt" and "Deadly Throw Interrupt" in generic script 2013-07-27 19:41:32 +02:00
Vincent-Michael 24b0a6f6c3 Core/Spells: Convert/Update rogue talent "Deadly Brew" for 4.3.4 2013-07-27 18:04:17 +02:00
joschiwald 7678800a93 Scripts/Spells: simplified "spell_dk_presence" 2013-07-27 17:53:00 +02:00
Vincent-Michael 100f9cc371 Core/Spells: Smallfix for warrior talent "Impending Victory"
Note: Healamount need fix
2013-07-27 17:32:57 +02:00
joschiwald 844671c5c7 Scripts/Spells: Update Death Knights Presences 2013-07-27 17:29:19 +02:00
Shauren 61b069e849 Compile fix 2013-07-27 15:20:10 +02:00
Vincent-Michael c87e557771 Core/Spells: Fix mage talent "Improved Polymorph" 2013-07-27 14:48:04 +02:00
Shauren 1be55d5311 Core/PacketIO: Implemented phase notifications for group update packets 2013-07-27 11:47:35 +02:00