Vincent-Michael
0c96062687
Scripted/Kezan: Fix warnings
2013-08-06 20:32:15 +02:00
Vincent-Michael
5af9056050
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-06 20:25:36 +02:00
Vincent-Michael
a090c82fb7
Core/Chat: Fix typo
2013-08-06 20:09:13 +02:00
snakeice
75b4b0594f
Scripts/HoR: Major changes:
...
- Fixed Intro timers
- Fixed mobs aggro
- Fixed General's shield trow
- Added Jaina / Sylvannas / Lich King escape event
Closes #10303
Closes #2505
Closes #9865
2013-08-06 19:05:47 +01:00
Nay
ebaee135c9
Server/Player: Fix a logical mistake in ApplyEquipCooldown
...
Thanks Joschiwald
2013-08-06 18:19:18 +01:00
Nay
e139c1e9af
Scripts/Kezan: Fix a typo (build)
2013-08-06 17:32:30 +01:00
Nay
8dfaf27d25
Merge pull request #10245 from Mihapro/master
...
Core/SmartScripts
2013-08-06 08:55:41 -07:00
Tanner Carter
0253a7618a
Battlegrounds/IC: Fix achiev Back Door Job
...
giggity
Closes #10043
Closes #3776
Closes #3194
2013-08-06 16:53:45 +01:00
Nay
8dccf61005
Merge pull request #10445 from Discover-/Cooldown-Exploit
...
Core/Items: Fix an exploit where players would be able to reset the cool...
2013-08-06 08:35:57 -07:00
Nay
1bf1f95a8e
Merge pull request #10455 from Discover-/Battleground-Reinterpret-Casts
...
Core/Misc: Implement reinterpret casts for all battleground classes and ...
2013-08-06 08:31:59 -07:00
Discover-
233a154e77
Core/Misc: Update const casts of ToBattlegroundX to use reinterpret_cast as well.
2013-08-06 17:30:23 +02:00
Ukulutl
df9f34cde7
Scripts/Kezan: Fix quest "Good Help is Hard to Find"
...
Added Maelstorm to scriptloader
Close #10337
Signed-off-by: Nay <dnpd.dd@gmail.com >
2013-08-06 13:18:58 +01:00
Nay
3995a55b2d
Merge pull request #10282 from NorthStrider/4.3.4
...
Scripts/ICC: fixed the frozen throne model display
2013-08-06 04:53:34 -07:00
Discover-
7f744de746
Core/Misc: Implement reinterpret casts for all battleground classes and use them.
2013-08-06 13:26:52 +02:00
Vincent-Michael
820f002135
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Miscellaneous/SharedDefines.h
src/server/scripts/Commands/cs_reload.cpp
2013-08-06 10:03:44 +02:00
Nay
ce33967136
Core/ObjectMgr: Fix a TC_LOG_ERROR call
2013-08-06 00:46:26 +01:00
Nay
a71fcee27d
DB/Schema: Rename _questrelation tables to _queststarter and _involvedrelation to _questender, for creature and gameobject
2013-08-06 00:04:29 +01:00
Vincent-Michael
2f3388828b
Scripts/Commands: Fix compile (v3)
2013-08-06 00:40:14 +02:00
Nay
2bd4049890
Scripts/Commands: Fix compile (v2)
2013-08-05 22:55:06 +01:00
Nay
df6e66555b
Scripts/Commands: Fix compile
2013-08-05 22:41:37 +01:00
Vincent-Michael
7ca5474663
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Commands/cs_npc.cpp
2013-08-05 21:18:21 +02:00
Vincent-Michael
d24bb958da
Core: Random changes
2013-08-05 21:13:20 +02:00
Nay
8af6e6ca79
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2013-08-05 20:00:08 +01:00
Nay
ccdba0859d
Core/Items: Correct randomProperlyId type when reading to/from DB
...
Ref #10446
2013-08-05 19:59:54 +01:00
Vincent-Michael
f37d0495e1
Core/Commands: Add .npc info more infos for unit_flags
2013-08-05 20:13:04 +02:00
Vincent-Michael
38cddb42ae
Core/Commands: Add .npc info mechanicImmuneMask infos
2013-08-05 20:13:04 +02:00
Vincent-Michael
341dabb423
Core/Commands: Add .npc info more infos for unit_flags
2013-08-05 14:51:42 +02:00
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
Discover-
4bb49378fc
Core/Items: Fix an exploit where players would be able to reset the cooldown of items to the equip cooldown (30 seconds) when unequipping, equipping and then relogging.
2013-08-04 23:10:21 +02: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