Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,001 Commits 4 Branches 146 Tags
c8eeb1f9e6d804c2b87843436fb132f9ebd75c8d
Commit Graph

293 Commits

Author SHA1 Message Date
Subv
61fcae113b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/moonglade.cpp
 2012-08-12 13:18:19 -05:00
Subv
75af5ac353 Scripts/Quests: Removed more deprecated quest scripts in Eastern Kingdoms 2012-08-12 13:14:54 -05:00
kaelima
f92946e128 Core/Misc: Fix some mem-leaks and uninitialized variables. 2012-08-12 20:06:12 +02:00
Subv
7d75c2818d Scripts/Quests: Removed some deprecated scripts and fixed quest 26050 2012-08-12 12:20:51 -05:00
Shauren
7d29e585df Scripts/Karazhan: Fixed some uninitialized variables 2012-08-12 14:16:11 +02:00
Subv
d82266bc0e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level2.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	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/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/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Kalimdor/azuremyst_isle.cpp
	src/server/shared/Logging/Log.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
 2012-08-07 13:44:22 -05:00
Nay
d1b10082a2 Whitespace is the root of all evil (version 2) 2012-08-03 22:55:18 +01:00
Nay
12307c7d06 Whitespace is the root of all evil 2012-08-03 22:39:34 +01:00
Spp
55ce180f28 Core/Logging: Add Asyncronous logging with Loggers ("What to log") and Appenders ("Where to log") system. Will allow to select to full log some parts of core while others are not even logged. 
- Logging System is asyncronous to improve performance.
- Each msg and Logger has a Log Type and Log Level assigned. Each msg is assigned the Logger of same Log Type or "root" Logger is selected if there is no Logger configured for the given Log Type
- Loggers have a list of Appenders to send the msg to. The Msg in the Logger is not sent to Appenders if the msg LogLevel is lower than Logger LogLevel.
- There are three (at the moment) types of Appenders: Console, File or DB (this is WIP, not working ATM). Msg is not written to the resource if msg LogLevel is lower than Appender LogLevel.
- Appender and Console Log levels can be changed while server is active with command '.set loglevel (a/l) name level'

Explanation of use with Sample config:

Appender.Console.Type=1       (1 = Console)
Appender.Console.Level=2      (2 = Debug)

Appender.Server.Type=2        (2 = File)
Appender.Server.Level=3       (3 = Info)
Appender.Server.File=Server.log

Appender.SQL.Type=2           (2 = File)
Appender.SQL.Level=1          (1 = Trace)
Appender.SQL.File=sql.log

Appenders=Console Server      (NOTE: SQL has not been included here... that will make core ignore the config for "SQL" as it's not in this list)

Logger.root.Type=0            (0 = Default - if it's not created by config, server will create it with LogLevel = DISABLED)
Logger.root.Level=5           (5 = Error)
Logger.root.Appenders=Console

Logger.SQL.Type=26            (26 = SQL)
Logger.SQL.Level=3            (2 = Debug)
Logger.SQL.Appenders=Console Server SQL

Logger.SomeRandomName.Type=24 (24 = Guild)
Logger.SomeRandomName.Level=5 (5 = Error)
Loggers=root SQL SomeRandomName

* At loading Appender SQL will be ignored, as it's not present on "Appenders"

* sLog->outDebug(LOG_FILTER_GUILD, "Some log msg related to Guilds")
  - Msg is sent to Logger of Type LOG_FILTER_GUILD (24). Logger with name SomeRandomName is found but it's LogLevel = 5 and Msg LogLevel=2... Msg is not logged

* sLog->outError(LOG_FILTER_GUILD, "Some error log msg related to Guilds")
  - Msg is sent to Logger of Type LOG_FILTER_GUILD (24). Logger with name SomeRandomeName is found with proper LogLevel but Logger does not have any Appenders assigned to that logger... Msg is not logged

* sLog->outDebug(LOG_FILTER_SQL, "Some msg related to SQLs")
  - Msg is sent to Logger SQL (matches type), as it matches LogLevel the msg is sent to Appenders Console, Server and SQL
    - Appender Console has lower Log Level: Msg is logged to Console
    - Appender Server has higher Log Level: Msg is not logged to file
    - Appender SQL has lower Log Level: Msg is logged to file sql.log

* sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Some msg related to Battelgrounds")
  - Msg is sent to Logger root (Type 0) as no Logger was found with Type LOG_FILTER_BATTLEGROUND (13). As Logger has higher LogLevel msg is not sent to any appender

* sLog->outError(LOG_FILTER_BATTLEGROUND, "Some error msg related to Battelgrounds")
  - Msg is sent to Logger root (Type 0) as no Logger was found with Type LOG_FILTER_BATTLEGROUND (13). Msg has lower LogLevel and is sent to Appender Console
    - Appender Console has lower LogLevel: Msg is logged to Console
 2012-08-03 14:20:18 +02:00
Nay
f5231929e0 Scripts/Build: Fix non PCH build 2012-08-01 23:57:36 +02:00
Spp
5a99dfad14 Warning fixes + compile fix after the merge 2012-07-30 10:07:26 +02:00
Vincent-Michael
634b3645d5 Core/Misc: Use proper headers to optimize compile 2012-07-30 05:38:40 +02:00
Shauren
27ea130b55 Core/Movement 
* Updated movement flags
* Cleaned up MovementStatusElements enum
* Updated and enabled MSG_MOVE_START_FORWARD
 2012-07-14 23:39:12 +02:00
Shauren
a9d3940738 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-14 19:03:03 +02:00
Kandera
2c6c74f21c Core/Instance: fix attumen/midnight encounter (thx zwerg) closes #6188 2012-07-13 12:36:44 -04:00
Shauren
ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
Shauren
c8d20004a5 Core: Minor code style corrections 2012-06-30 16:07:09 +02:00
QAston
e53b44b6ba Merge pull request #6491 
Core/Spells: convert some spell effects to SpellScripts
Closes #6491
 2012-06-14 19:12:03 +02:00
kaelima
3d14384c32 Merge git://github.com/TrinityCore/TrinityCore into 4.x 
Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt
 2012-05-30 08:01:02 +02:00
joschiwald
cd7ab6f3a5 Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2012-05-28 04:27:51 +02:00
joschiwald
ca07f30d03 Core/Spells: convert some spell effects to SpellScripts 2012-05-28 04:07:51 +02:00
Vincent-Michael
ab77e597b1 Add function for SetObjectScale 
Author: NoFantasy
Source: Mangos
 2012-05-26 23:14:57 +02:00
Malcrom
74da8dc410 Core: another update cause case matters! 2012-05-26 00:38:53 -02:30
Malcrom
83f74263a2 core: fix ubrs script 2012-05-26 00:27:10 -02:30
Malcrom
39a609ce5c Core/DB: Some updates for UBRS from sniff 2012-05-25 23:53:33 -02:30
4m1g0
524e30e57b Scripts/kalimdor: Use proper headers to optimize compile, code style and general cleanup. 
Closes #6419 (pr)
 2012-05-19 15:11:09 +01:00
Malcrom
ac844f9953 Core/Scripts: Scripting of Dragonspire Hall Runes "UBRS" 
Additional work to do.
 2012-05-16 12:30:37 -02:30
Malcrom
fa7e9d3c0d Core/Scripts: And some Gameobject enums for future scripting of Blackrock Spire. 2012-05-13 15:14:32 -02:30
Shauren
1851a2e9e3 Scripts: Replaced calls to ForcedDespawn with DespawnOrUnsummon (calls appropriate AI hooks in case of temporary summons) and made ForcedDespawn private 2012-04-24 16:53:37 +02:00
faramir118
b1c4e8202e Scripts/Karazhan/Midnight: Fix timer logic 
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2012-04-11 20:00:51 +02:00
kaelima
4c961ff393 Core/Scripts: Remove some unnecessary creature/player casts in scripts and do some safer casting in a silithus script 2012-04-09 14:28:46 +02:00
Machiavelli
bc96df1aae Core/Shared: Move container functions to shared project under Trinity::Container namespace. Also implement RandomResizeList which takes a predicate function as parameter. 
Core/ScriptedAI: Extend SummonList::DoAction to take a predicate function as parameter and allow specifying a maximum number of units to be selected.
 2012-04-08 17:40:05 +02:00
Nay
945566e84e Scripts/SM: Fix dead anymation of Fairbanks 
Patch by DennisRassmann (25/10/2010)
Closes #4998
 2012-04-07 22:29:19 +01:00
Nay
5fb2ffa625 Script/UC: Add some combat spells to Lady Sylvannas 
Original patch by pxlcreations (11/04/2010)
 2012-04-07 21:09:57 +01:00
Gyx
a1c4786ba0 Core/Script: Code style and some rewriting. 
MoveInLineOfSight(Unit* unit) -> MoveInLineOfSight(Unit* who)

Signed-off-by: Gyx <2359980687@qq.com>
 2012-04-01 19:56:41 +08:00
Gyx
d9088c083c Core/Script: Code style and some rewriting. 
JustDied(Unit* Killer) -> JustDied(Unit* killer)
JustDied(Unit* /*Killer*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*unit*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*slayer*/)) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*victim*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* victim) -> JustDied(Unit* killer)
JustDied(Unit* /*who*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* who) -> JustDied(Unit* killer)
JustDied(Unit*) -> JustDied(Unit* /*killer*/)

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-31 18:56:37 +08:00
Gyx
ba2ee48fc6 Core/Script: Code style(Missing?). 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-30 10:39:33 +08:00
Gyx
391d68be20 Core/Script: Code style. 
WaypointReached(uint32 i) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 /*waypointId*/)
WaypointReached(uint32 uiI) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*i*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiWPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*wp*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 waypointId)

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-29 15:44:24 +08:00
Gyx
a20fa23ea6 Core/Script: Code style and remove unused core. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-28 15:15:48 +08:00
Gyx
e050945c91 Core/Script: Code style and remove unused core. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-28 11:13:37 +08:00
kaelima
c38bf4498a Fix compile and fix a possible crash for mob_kiljaeden_controller 2012-03-26 03:12:56 +02:00
Gyx
5cb16b65fc Core/Script: Code style and remove unused core. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-17 17:54:48 +08:00
Gyx
7877eae6ba Core/Script: Code style and remove unused core. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-17 12:17:15 +08:00
Gyx
d8b4bc590a Core/Script: Code style and remove unused core. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 21:41:15 +08:00
Gyx
cd38e7df2b Core/Script: Code style. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 20:31:23 +08:00
Gyx
bef1b0c402 Core/Script: Code style. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 19:40:57 +08:00
Gyx
ddc0f5d7d6 Core/Script: Clean-Up in Scripts. 
InstanceScript* m_instance -> InstanceScript* instance

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 19:35:13 +08:00
Gyx
76c18e00c7 Core/Script: Clean-Up in Scripts. 
GameObject* pGO -> GameObject* go

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 19:28:10 +08:00
Gyx
fcbb222aca Core/Script: Clean-Up in Scripts. 
Creature* c -> Creature* creature
Creature* _Creature -> Creature* creature
Creature* Creature -> Creature* creature

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 19:21:47 +08:00
Martin Weinelt
419e6a4a9e Scripts/Magister's Terrace: Fix Translocation Orb Activation and correct some codestyle 2012-03-14 23:30:55 +01:00