Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
29,917 Commits 2 Branches 1 Tag
b2ae2653f73fed2b1015d615cd6acb13064da170
Commit Graph
29917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 2d3fd62aee Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_npc.cpp
 2013-08-05 21:15:35 +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
Nay e16caac852 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-08-05 16:07:15 +01:00
Kirkhammett 71233c366c DB/Misc: Fix db startup errors 2013-08-05 16:04:51 +01:00
Vincent-Michael 341dabb423 Core/Commands: Add .npc info more infos for unit_flags 2013-08-05 14:51:42 +02:00
Aokromes 0070b64b02 DB/SAI: Fix Redridge Mystic spam 
By Malcrom
 2013-08-05 12:26:45 +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 c823436750 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-04 19:36:59 +02:00
Vincent-Michael cfe4154376 Core/Commands: Add .npc info mechanicImmuneMask infos 2013-08-04 19:33:42 +02:00
Kirkhammett 79dd722206 DB/SAI: Free at last! 
Closes #10417
 2013-08-04 17:42:32 +01:00
Kirkhammett 9a377f169b DB/SAI: Meridith the Mermaiden 
Closes #10418
 2013-08-04 17:42:11 +01:00
Kirkhammett 3d4b8a212f DB/SAI: Script Witch Doctor Zum'rah 
Closes #10404
 2013-08-04 17:41:08 +01:00
Kirkhammett 96469e3e82 DB/Quests: Fix The Nightmare Manifests / Hope Within the Emerald Nightmare / The Boon of Remulos / The Keeper's Favor/Walking Legend 
Closes #10410
Closes #4902
Closes #10407
Closes #10406
 2013-08-04 17:39:46 +01: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 edc86dbca5 DB/Vendor: Fix crash with buy Honor Points 2013-08-03 14:28:05 +02:00
Aokromes 5164caa9ff DB/Misc: Fix area 4522 spawns 
closes #1945
 2013-08-03 13:23:24 +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
Vincent-Michael ec34ff9023 DB/Spells: Fix shaman "Item - Shaman T13 Restoration 2P Bonus (Mana Tide)" 2013-08-01 20:23:58 +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 1b0c604848 Revert "CMake/MSVC: Fix VS 2013 compile -- Zm500 hack is no longer required" 
This reverts commit ca7377369f.
 2013-07-30 13:50:29 +01:00
Vincent-Michael 597690ba17 DB/Spells: Fix some startup errors 2013-07-30 00:09:27 +02: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
Nay b1d5ba3e69 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-07-29 16:15:33 +01:00