aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-31Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
2013-01-31Core/Spells: Fix Gas Cloud Tracking stacking with other tracking spellsVincent_Michael
2013-01-31Scripts/Commands: Show correct guild Rank when using .pinfo commandSpp
(Corrections to 1b551cc1)
2013-01-31Script/ICC: Fix phase check in Saurfang script Gacko
... typos - typos everywhere. me->request(glasses);
2013-01-31Core: Fix some warningsVincent_Michael
2013-01-31Dang, one more typo.Warpten
2013-01-31Spells/Warlock: Fixed a small mistake in my previous commit's SQL.Warpten
2013-01-31Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate.Warpten
2013-01-31Core/Spells: Add missing break in f5fd7bad69c04352f5e367b8aca2035e0eff57d9Vincent_Michael
Thx Nayd
2013-01-31Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
Conflicts: sql/base/auth_database.sql src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
2013-01-30Core/Players: Improvements to currency handling.Shauren
2013-01-30Script/ICC: Fix phase check in Saurfang scriptGacko
Related to changes in dbecf05e39204ff46621ce46bf5dd181e6450eeb
2013-01-30Core: Fix warningsVincent_Michael
2013-01-30Merge pull request #7873 from Gacko/eventphasesGacko
Core: Logical fixes in EventMap
2013-01-30Core: Logical fixes and improvements in EventMapGacko
2013-01-30Core: Fix non pch buildVincent_Michael
2013-01-30Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanupVincent_Michael
2013-01-30Merge pull request #9103 from Norfik/authdbNay
DB/Auth: Fix typo in sql/base/auth_database.sql
2013-01-30DB/Auth: Fix typo in sql/base/auth_database.sqlEmo
ERROR 1136 (21S01) at line 216: Column count doesn't match value count at row 1
2013-01-30Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)Spp
Conflicts: src/server/game/Entities/Transport/Transport.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Events/GameEventMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Miscellaneous/Formulas.h src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/Waypoints/WaypointManager.cpp src/server/game/Skills/SkillDiscovery.cpp src/server/game/Skills/SkillExtraItems.cpp src/server/game/Warden/WardenCheckMgr.cpp src/server/game/Weather/WeatherMgr.cpp
2013-01-30Core/Misc: Some changes to minimize differences with 4.3.4 branchSpp
2013-01-30Core/Misc: Remove using directive from header files (It will eventually lead ↵Spp
to name collisions)
2013-01-30Core/Misc: Always state what columns are affected by MySQL statementsSpp
2013-01-30Core/Misc: Remove some calls to const_castSpp
2013-01-30Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless ↵Shocker
and Cataclysmic Gladiator). Also remove some unused outdated defines WARNING! Run the SQL query before you start your emulator because it will reset all titles on login otherwise
2013-01-30Merge remote-tracking branch 'origin/master' into 4.3.4Nay
2013-01-30Core/Object: Re-add a line that somehow got removed in a mergeNay
Thanks Warpten for noticing
2013-01-29DB/Loot: Fix 9 drop chance in gameobject_template (7 quests should be fixed ↵Nay
by this) If a GO with flags 4 drops a quest item, ChanceOrQuestChance for that items needs to be negative Query used to find the issue: ``` SELECT * FROM `gameobject_loot_template` WHERE (`item` IN (SELECT `questItem1` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem2` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem3` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem4` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem5` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem6` FROM `gameobject_template` WHERE (`flags` & 4) != 0)) AND `ChanceOrQuestChance` > 0; ```
2013-01-29Buildsystem/CMake: Revoke commit 7b49da48f9c3c21406fbe350de170757ea6e285f - ↵click
it creates unwanted results when used with PCh on *nix platforms.
2013-01-29Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new oneSouler
Closes #8433
2013-01-29DB/Achievements: Fix Portal JockeyFH3095
Current Status: Portal Jockey(10) is rewarded from 10nh and 25nh, Portal Jockey(25) is rewarded from 10hc and 25hc. Reason: Achievement-criteria 12971 is required for Portal Jockey(25), but checks for map-difficulty 2=10hc. On the other side achievment-criteria 12979 is required for Portal Jockey(10), but checks for map-difficulty 1=25nh. Closes #9081 Ref #6810
2013-01-29Buildsystem/CMake: Change policy CMP0005 to NEW and corect some ↵click
buildvariables accordingly ** Info from CMake: ** The OLD behavior for this policy is to place definition values given to add_definitions directly in the generated build rules without attempting to escape anything. ** The NEW behavior for this policy is to generate correct escapes for all native build tools automatically. If this breaks build, let us know on irc : irc.rizon.net/#trinity
2013-01-29Merge remote-tracking branch 'origin/master' into 4.3.4Nay
2013-01-29DB/Loot: Add Cache of the Ley-Guardian to heroic Oculus loot when RDF aura ↵w1sht0l1v3
is present. Closes #6927
2013-01-28DB/Gameobjects: Set proper state for ToCr doors and fixed looting of ↵Kinzcool
Venomhide Egg & Discarded Soul Crystal
2013-01-29Core&DB/Trainers: Remove `trainer_spell` from `creature_template` since it ↵Nay
is not longer necessary on Cata
2013-01-28Core/Quest: Bloody BreakoutGacko
Closes #641
2013-01-28Core/Misc: Fix a merge failure in SpellAuraEffects.cppNay
Thanks Tuxity and Vincent
2013-01-28Core/Misc: Fix compile errors introduced in previous mergeNay
There are probably other merge issues that got through, please report them
2013-01-28Merge remote-tracking branch 'origin/master' into 4.3.4Nay
Conflicts: dep/PackageList.txt src/server/game/Battlegrounds/Battleground.cpp src/server/game/Combat/ThreatManager.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/World/World.cpp src/server/game/World/World.h src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h src/server/scripts/Spells/spell_druid.cpp src/server/scripts/Spells/spell_mage.cpp src/server/scripts/Spells/spell_paladin.cpp src/server/scripts/Spells/spell_priest.cpp src/server/scripts/Spells/spell_rogue.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warlock.cpp src/server/scripts/Spells/spell_warrior.cpp src/tools/map_extractor/CMakeLists.txt src/tools/map_extractor/System.cpp src/tools/map_extractor/loadlib.cpp src/tools/map_extractor/mpq_libmpq.cpp src/tools/map_extractor/mpq_libmpq04.h src/tools/vmap4_assembler/CMakeLists.txt src/tools/vmap4_extractor/CMakeLists.txt src/tools/vmap4_extractor/mpq_libmpq.cpp src/tools/vmap4_extractor/mpq_libmpq04.h
2013-01-27DB/Gameobjects: Added an another missing GameobjectKinzcool
2013-01-27Typo: i will now go hang myself..... _ typoZxBiohazardZx
2013-01-27Fix/Commit: push final file, not the workingcopyZxBiohazardZx
2013-01-27DB/Creature: Add spawns for Unseen in Duskwood (thanks Expecto for that)Expecto
DB/SAI: Add SAI for the Unseen's Aura (thx ZxBiohazardZx)
2013-01-27Core/Authserver: Added possibility to allow realm connections both from ↵Shauren
"world" and local networks.
2013-01-27Core/Battlegrounds: Fixed arena scoreboards not showing all players.Shauren
2013-01-27Update sql/updates/world/2013_01_26_07_world_gameobject_template.sqlNay
2013-01-26DB/Gameobject: Added a missing gameobject templateKinzcool
2013-01-26DB/Creature: Fixed equipment of Elder Razormaw, he should no longer have a ↵Kinzcool
sword as arms
2013-01-27DB: Fix importGacko