aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-08Merge branch 'master' into 4.3.4Spp
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/DataStores/DBCStores.cpp src/server/game/DungeonFinding/LFGMgr.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Guilds/Guild.cpp src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/BattlefieldHandler.cpp src/server/game/Handlers/CalendarHandler.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/ChatHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/LFGHandler.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/NPCHandler.cpp src/server/game/Handlers/PetitionsHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Instances/InstanceScript.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellMgr.cpp src/server/game/Tools/PlayerDump.cpp src/server/game/World/World.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/Commands/cs_reload.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/Spells/spell_warlock.cpp src/server/worldserver/worldserver.conf.dist
2013-11-08Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger ↵Spp
names are case-sensitive)
2013-11-08Merge branch 'master' into 4.3.4Spp
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/AI/EventAI/CreatureEventAIMgr.h src/server/game/Achievements/AchievementMgr.cpp src/server/game/DungeonFinding/LFGMgr.h src/server/game/Entities/Creature/Creature.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/Grids/Notifiers/GridNotifiers.h src/server/game/Grids/ObjectGridLoader.h src/server/game/Spells/SpellInfo.h 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/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_darkshore.cpp src/server/scripts/Kalimdor/zone_desolace.cpp src/server/scripts/Kalimdor/zone_mulgore.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp src/server/scripts/Kalimdor/zone_tanaris.cpp src/server/scripts/Kalimdor/zone_thousand_needles.cpp src/tools/map_extractor/System.cpp src/tools/map_extractor/mpq_libmpq.cpp src/tools/map_extractor/mpq_libmpq04.h src/tools/vmap4_extractor/loadlib/loadlib.h src/tools/vmap4_extractor/mpq_libmpq.cpp src/tools/vmap4_extractor/mpq_libmpq04.h
2013-11-08Update LoggingHOWTO with latest changesSpp
2013-11-08Core/Logs: Create default set of loggers and Appender if the config is wrong.Spp
- Logger root (Error) - Logger server (Info) - Appender Console Logger names are case-sensitive, Appender names are not.
2013-11-07DB/Misc: Remove some unneeded creature_ai_texts and EAI.Malcrom
2013-11-07DB/Creature_text: Creature text for Mennu the BetrayerMalcrom
Creature needs scripting moved from EAI to cpp.
2013-11-07DB/creature_text: Creature text for Dalliah the Doomsayer & Wrath-Scryer ↵Malcrom
Soccothrates Need someone to script these two bosses in cpp to remove them from EAI.
2013-11-07DB/Creature_text: Creature text for Wrath-Scryer SoccothratesMalcrom
2013-11-07Core/CreatureGroups: Calculation change requested by Shauren.Malcrom
2013-11-07Core/Logging: Extend logging system to allow inheritance of loggersSpp
- Changed default loggers and appenders - '.' determines the relation between loggers ("type.subtype" inherits "type" logger setting if logger "type.subtype" is not defined) - When core logs a message it search for the correct logger (root is the default one) ie: a message logged with "type.subtype" * Core will try to find a logger with name "type.subtype", if its not found then will search for "type", again if its not found it will return the default one "root"
2013-11-07DB: Fix start up warningsGacko
2013-11-07Core/SmartAI: Better wording for telling "There is a spell for summoning this"Gacko
2013-11-07RBAC: Move initial log output in AccountMgr::LoadRBAC to debugGacko
2013-11-06DB/Creature_formations: Update a few formations to not crossover at pathing ↵Malcrom
endpoints.
2013-11-06Core/CreatureGroups: Add fields to creature_formations and code to prevent ↵Malcrom
creature crossover in formations. Wiki update and db values too follow.
2013-11-05DB/Misc: Typo fix for Defiling Uther's TombAokromes
by dr-j, closes #11180
2013-11-04Core/Threads: Include Helgrind suppressions filejackpoz
Include a Helgrind suppressions file under source control. Each suppressed race is either a false positive, a read race followed by a lock acquire anyway, a bool race. Suppressions related to the same issue in the same function are grouped with a counter in brackets [ ] . Fix tabs added in bcee801e4bdbf7d53f15cd0499e9d3aaedd3c3e2 .
2013-11-04DB/Misc: Defiling Uther's TombAokromes
by dr-j, closes #2410
2013-11-04DB/Misc: Wooly Justice additionFilip
By @untaught
2013-11-04DB/Misc: Get Stefan Vadu to reset quests for Drakuru's task when Sabotage, ↵Aokromes
So Far So Bad, Hazardous Materials and Infilltrating Voltarus are taken by dr-j, closes #11170
2013-11-04DB/Misc: Get Thorim to clear quests You Can't Miss Him and Battling the ↵Aokromes
Elements on Quest accept of forging an alliance by dr-j, closes #11169
2013-11-04DB/Misc: An Improper BurialAokromes
By dr-j, closes #11173
2013-11-03DB/Creatures: Corrected the npc flags for difficulty 1 of some NPCs in IoC & ↵Kinzcool
added their respective "click spells".
2013-11-04DB/Misc: Fix some startup errorsAokromes
2013-11-04Rename 2013_11_04_00_world_creature_template.sql to ↵Aokromes
sql/updates/world/2013_11_04_00_world_creature_template.sql
2013-11-04Rename 2013_11_03_23_world_misc.sql to 2013_11_03_24_world_misc.sqlAokromes
2013-11-04Rename 2013_11_02_00_world_sai.sql to 2013_11_03_00_world_sai.sqlAokromes
2013-11-04DB/Misc: Zeth'Gor Must Burn!Aokromes
by untaught, closes #11167
2013-11-03DB/Creatures: Corrected wrong speed values for Eye Stalk & Malmortis.Kinzcool
2013-11-03Scripts/Spells: Removed the duplicate script.Sebastian Valle
2013-11-03Scripts/Spells: Fixed the warlocks' Fel Flame talent, now it adds to the ↵Sebastian Valle
duration of Immolate and Unstable Affliction. Closes #8455
2013-11-03Core/Network: Fix race condition in WorldSession timeoutjackpoz
Helgrind log: Lock at 0x2BD582E0 was first observed at : pthread_mutex_init (hg_intercepts.c:443) by : ACE_OS::mutex_init(pthread_mutex_t*, int, char const*, pthread_mutexattr_t*, int, int) (in /usr/lib/libACE-6.0.3.so) by : ACE_Thread_Mutex::ACE_Thread_Mutex(char const*, pthread_mutexattr_t*) (in /usr/lib/libACE-6.0.3.so) by : WorldSocket::WorldSocket() (WorldSocket.cpp:106) by : ACE_Acceptor<WorldSocket, ACE_SOCK_Acceptor>::make_svc_handler(WorldSocket*&) (Acceptor.cpp:261) by : ACE_Acceptor<WorldSocket, ACE_SOCK_Acceptor>::handle_input(int) (Acceptor.cpp:396) by : ACE_Dev_Poll_Reactor::dispatch_io_event(ACE_Dev_Poll_Reactor::Token_Guard&) (in /usr/lib/libACE-6.0.3.so) by : ACE_Dev_Poll_Reactor::handle_events(ACE_Time_Value*) (in /usr/lib/libACE-6.0.3.so) by : ACE_Reactor::run_reactor_event_loop(ACE_Time_Value&, int (*)(ACE_Reactor*)) (in /usr/lib/libACE-6.0.3.so) by : ReactorRunnable::svc() (WorldSocketMgr.cpp:170) by : ACE_Task_Base::svc_run(void*) (in /usr/lib/libACE-6.0.3.so) by : ACE_Thread_Adapter::invoke_i() (in /usr/lib/libACE-6.0.3.so) Possible data race during write of size 8 at 0x2BD6F6F8 by thread #12 Locks held: 1, at address 0x2BD582E0 at : WorldSession::ResetTimeOutTime() (WorldSession.h:372) by : WorldSocket::ProcessIncoming(WorldPacket*) (WorldSocket.cpp:709) by : WorldSocket::handle_input_payload() (WorldSocket.cpp:517) by : WorldSocket::handle_input_missing_data() (WorldSocket.cpp:610) by : WorldSocket::handle_input(int) (WorldSocket.cpp:282) by : ACE_Dev_Poll_Reactor::dispatch_io_event(ACE_Dev_Poll_Reactor::Token_Guard&) (in /usr/lib/libACE-6.0.3.so) by : ACE_Dev_Poll_Reactor::handle_events(ACE_Time_Value*) (in /usr/lib/libACE-6.0.3.so) by : ACE_Reactor::run_reactor_event_loop(ACE_Time_Value&, int (*)(ACE_Reactor*)) (in /usr/lib/libACE-6.0.3.so) by : ReactorRunnable::svc() (WorldSocketMgr.cpp:170) by : ACE_Task_Base::svc_run(void*) (in /usr/lib/libACE-6.0.3.so) by : ACE_Thread_Adapter::invoke_i() (in /usr/lib/libACE-6.0.3.so) by : ACE_Thread_Adapter::invoke() (in /usr/lib/libACE-6.0.3.so) This conflicts with a previous write of size 8 by thread #7 Locks held: none at : WorldSession::UpdateTimeOutTime(unsigned int) (WorldSession.h:368) by : WorldSession::Update(unsigned int, PacketFilter&) (WorldSession.cpp:256) by : World::UpdateSessions(unsigned int) (World.cpp:2646) by : World::Update(unsigned int) (World.cpp:2003) by : WorldRunnable::run() (WorldRunnable.cpp:60) by : ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186) by : ACE_OS_Thread_Adapter::invoke() (in /usr/lib/libACE-6.0.3.so) by : mythread_wrapper (hg_intercepts.c:233)
2013-11-03DB/Misc: Missing ScoutAokromes
by dr-j, closes #10380
2013-11-03DB/Misc: Wooly JusticeAokromes
original work by Trista, updated by ZxBiohazardZx, final work by FireEmerald, closes #6587
2013-11-03DB/Spawn: Lordaeron CitizenAokromes
by Hobbilis, closes #7914
2013-11-03DB/Misc: Argent Squire / Argent Gruntling itemsAokromes
by BlackangelWow, updates #4710
2013-11-03DB/Misc: Update to Vordrassil's Heart CreditAokromes
2013-11-03DB/Misc: Astor HadrenAokromes
by dr-j, closes #10512
2013-11-03DB/Misc: The Broken FrontAokromes
by dr-j, closes #7585
2013-11-03DB/Misc: Blazerunner's Script from EAI to SAIAokromes
by dr-j, closes #10547
2013-11-03DB/Misc: Burn Skorn ,Burn / Towers of Certain DoomAokromes
by dr-j, closes #10907
2013-11-03DB/Misc: Lupus PupusAokromes
by dr-j, closes #10436
2013-11-03DB/Misc: Words for Delivery description/completion textAokromes
by Crysicle, minor fix by xjose93, closes #10609
2013-11-03DB/Misc: A hero's Burden + Oracles / Frenzyheart Rep SwappingAokromes
by dr-j, minor update by untaught, closes #8710 closes #6534
2013-11-03Merge branch 'master' of https://github.com/TrinityCore/TrinityCoreDiscover-
2013-11-03Merge pull request #11165 from untaught/masterAokromes
Fix quest ... Or Maybe We Don't (12138) and remove the core script
2013-11-03Core/Misc: Fix compile after 316da388d586eee5625d9b0a01d21b3befb2cc69Discover-
2013-11-03Fix quest ... Or Maybe We Don't (12138) and remove the core scriptuntaught
2013-11-03DB/Misc: March of the GiantsAokromes
by Justiciar, closes #10246