Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,720 Commits 4 Branches 146 Tags
ab2d26cb910ea9d24ae87d6342f0cbc264fc16cf
Commit Graph

21720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spp
ab2d26cb91 Merge branch 'master' into 4.3.4 
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-08 11:12:17 +01:00
Spp
94e2b9332a Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive) 2013-11-08 10:50:51 +01:00
Spp
990e4c7851 Merge branch 'master' into 4.3.4 
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-08 10:29:51 +01:00
Spp
16a51e328a Update LoggingHOWTO with latest changes 2013-11-08 09:13:07 +01:00
Spp
1b04bec290 Core/Logs: Create default set of loggers and Appender if the config is wrong. 
- Logger root (Error)
- Logger server (Info)
- Appender Console

Logger names are case-sensitive, Appender names are not.
 2013-11-08 08:55:10 +01:00
Malcrom
98a7a22368 DB/Misc: Remove some unneeded creature_ai_texts and EAI. 2013-11-07 23:52:30 -03:30
Malcrom
8370f70f26 DB/Creature_text: Creature text for Mennu the Betrayer 
Creature needs scripting moved from EAI to cpp.
 2013-11-07 23:50:44 -03:30
Malcrom
494ea7373a DB/creature_text: Creature text for Dalliah the Doomsayer & Wrath-Scryer Soccothrates 
Need someone to script these two bosses in cpp to remove them from EAI.
 2013-11-07 22:47:32 -03:30
Malcrom
78786d35cb DB/Creature_text: Creature text for Wrath-Scryer Soccothrates 2013-11-07 20:16:43 -03:30
Malcrom
88c46a6886 Core/CreatureGroups: Calculation change requested by Shauren. 2013-11-07 19:06:20 -03:30
Spp
8aa9745c4c Core/Logging: Extend logging system to allow inheritance of loggers 
- 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-07 16:34:44 +01:00
Gacko
d26bb8517c DB: Fix start up warnings 2013-11-07 11:57:40 +01:00
Gacko
be19ac95ed Core/SmartAI: Better wording for telling "There is a spell for summoning this" 2013-11-07 11:56:02 +01:00
Gacko
d00cb482c5 RBAC: Move initial log output in AccountMgr::LoadRBAC to debug 2013-11-07 11:54:07 +01:00
Malcrom
7a2a9a8d15 DB/Creature_formations: Update a few formations to not crossover at pathing endpoints. 2013-11-06 23:32:12 -03:30
Malcrom
b4a0533d81 Core/CreatureGroups: Add fields to creature_formations and code to prevent creature crossover in formations. 
Wiki update and db values too follow.
 2013-11-06 23:20:06 -03:30
Aokromes
a4b62d873f DB/Misc: Typo fix for Defiling Uther's Tomb 
by dr-j, closes #11180
 2013-11-05 15:35:58 +01:00
jackpoz
7e904b1dc0 Core/Threads: Include Helgrind suppressions file 
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 bcee801e4b .
 2013-11-04 20:24:28 +01:00
Aokromes
a34883b939 DB/Misc: Defiling Uther's Tomb 
by dr-j, closes #2410
 2013-11-04 16:37:28 +01:00
Filip
c4d9e58caf DB/Misc: Wooly Justice addition 
By @untaught
 2013-11-04 16:35:35 +01:00
Aokromes
b857567d85 DB/Misc: Get Stefan Vadu to reset quests for Drakuru's task when Sabotage, So Far So Bad, Hazardous Materials and Infilltrating Voltarus are taken 
by dr-j, closes #11170
 2013-11-04 16:29:09 +01:00
Aokromes
f771ff15e5 DB/Misc: Get Thorim to clear quests You Can't Miss Him and Battling the Elements on Quest accept of forging an alliance 
by dr-j, closes #11169
 2013-11-04 16:27:29 +01:00
Aokromes
f8a5b63dd4 DB/Misc: An Improper Burial 
By dr-j, closes #11173
 2013-11-04 16:23:38 +01:00
Kinzcool
e6c3a16aa9 DB/Creatures: Corrected the npc flags for difficulty 1 of some NPCs in IoC & added their respective "click spells". 2013-11-03 19:36:21 -05:00
Aokromes
58e9aff999 DB/Misc: Fix some startup errors 2013-11-04 01:05:49 +01:00
Aokromes
40d8f60293 Rename 2013_11_04_00_world_creature_template.sql to sql/updates/world/2013_11_04_00_world_creature_template.sql 2013-11-04 00:40:19 +01:00
Aokromes
2b812e790f Rename 2013_11_03_23_world_misc.sql to 2013_11_03_24_world_misc.sql 2013-11-04 00:39:33 +01:00
Aokromes
07dd4694ce Rename 2013_11_02_00_world_sai.sql to 2013_11_03_00_world_sai.sql 2013-11-04 00:38:30 +01:00
Aokromes
a0aff55d6e DB/Misc: Zeth'Gor Must Burn! 
by untaught, closes #11167
 2013-11-04 00:37:44 +01:00
Kinzcool
78c6123986 DB/Creatures: Corrected wrong speed values for Eye Stalk & Malmortis. 2013-11-03 18:25:35 -05:00
Sebastian Valle
184fe092c3 Scripts/Spells: Removed the duplicate script. 2013-11-03 12:48:59 -05:00
Sebastian Valle
428cf6b0ee Scripts/Spells: Fixed the warlocks' Fel Flame talent, now it adds to the duration of Immolate and Unstable Affliction. 
Closes #8455
 2013-11-03 12:39:21 -05:00
jackpoz
bcee801e4b Core/Network: Fix race condition in WorldSession timeout 
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-03 18:07:17 +01:00
Aokromes
bc6920a80b DB/Misc: Missing Scout 
by dr-j, closes #10380
 2013-11-03 17:51:09 +01:00
Aokromes
7082dc4e98 DB/Misc: Wooly Justice 
original work by Trista, updated by ZxBiohazardZx, final work by FireEmerald, closes #6587
 2013-11-03 16:51:47 +01:00
Aokromes
a20772929e DB/Spawn: Lordaeron Citizen 
by Hobbilis, closes #7914
 2013-11-03 16:43:13 +01:00
Aokromes
6613001ece DB/Misc: Argent Squire / Argent Gruntling items 
by BlackangelWow, updates #4710
 2013-11-03 16:02:56 +01:00
Aokromes
4ccbfe8eaa DB/Misc: Update to Vordrassil's Heart Credit 2013-11-03 15:33:00 +01:00
Aokromes
ba9b8da299 DB/Misc: Astor Hadren 
by dr-j, closes #10512
 2013-11-03 14:07:48 +01:00
Aokromes
00897518c9 DB/Misc: The Broken Front 
by dr-j, closes #7585
 2013-11-03 14:04:53 +01:00
Aokromes
6a19060632 DB/Misc: Blazerunner's Script from EAI to SAI 
by dr-j, closes #10547
 2013-11-03 13:52:45 +01:00
Aokromes
5f6061460e DB/Misc: Burn Skorn ,Burn / Towers of Certain Doom 
by dr-j, closes #10907
 2013-11-03 13:49:16 +01:00
Aokromes
56cce65db1 DB/Misc: Lupus Pupus 
by dr-j, closes #10436
 2013-11-03 13:38:45 +01:00
Aokromes
ce55c8b018 DB/Misc: Words for Delivery description/completion text 
by Crysicle, minor fix by xjose93, closes #10609
 2013-11-03 12:43:11 +01:00
Aokromes
7c7ed52a2b DB/Misc: A hero's Burden + Oracles / Frenzyheart Rep Swapping 
by dr-j, minor update by untaught, closes #8710 closes #6534
 2013-11-03 11:28:07 +01:00
Discover-
27fe7d1842 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2013-11-03 10:36:17 +01:00
Aokromes
1d2a070de4 Merge pull request #11165 from untaught/master 
Fix quest ... Or Maybe We Don't (12138) and remove the core script
 2013-11-03 01:36:08 -08:00
Discover-
b98cc11a49 Core/Misc: Fix compile after 316da388d5 2013-11-03 10:36:02 +01:00
untaught
45e0af089c Fix quest ... Or Maybe We Don't (12138) and remove the core script 2013-11-03 11:34:20 +02:00
Aokromes
741eed4740 DB/Misc: March of the Giants 
by Justiciar, closes #10246
 2013-11-03 10:23:33 +01:00