Commit Graph

404 Commits

Author SHA1 Message Date
Subv
da5f8f58e2 Core/Scripts: Cleanup the warrior spell scripts 2012-09-09 11:48:29 -05:00
Nay
7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2012-09-09 02:18:58 +01:00
Geodar
2c441808f1 Core/Scripts: Fix Typo in 7121f015ed 2012-09-08 08:02:00 +02:00
Nay
242a2fdbc1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
2012-09-08 01:34:24 +01:00
Subv
7121f015ed Core/Scripts: Fixed a copy/paste mistake from previous commit 2012-09-07 18:31:19 -05:00
Subv
673ce30f38 Core/Spells: Fixed Improved Health Funnel damage reduction effect.
Author: Josh
closes #7275
2012-09-07 18:26:14 -05:00
Nay
19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
2012-09-07 03:36:47 +01:00
Vincent-Michael
6f38fb1011 Core: Fix some code style 2012-09-07 02:21:38 +02:00
Nay
15086e92f1 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-06 17:55:37 +01:00
Vincent-Michael
5954011a90 Core/Spells: clean up some code and move to spell script. Closes #7195 2012-09-06 11:00:37 -04:00
Nay
d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
2012-08-30 23:06:19 +01:00
Nay
abbb896cfb Core: Fix many "errors"/warnings and coding style (2)
Scripts; also reverted a change to AuthSocket

Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 22:44:03 +01:00
Souler
5ee99a9412 Scripts/Spells: Fix Weapon Copy related auras.
Closes #3731
2012-08-30 11:50:07 +02:00
Nay
aa9f2e9f18 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 14:01:38 +01:00
Nay
d533c950cb Scripts: Fix code style after PR 2012-08-28 19:31:15 +01:00
thesensei
66917624bb Core/Spells: Destabilize Azure Dragonshrine
*Spell script support for spell 49370
2012-08-28 20:58:03 +03:00
Nay
e4aacd3f86 Merge pull request #7543 from gigatotem/4.3.4
Spells/Shaman: Heroism and Bloodlust
2012-08-27 15:17:54 -07:00
Gigatotem
b7fa5cb566 Spells/Shaman: Heroism and Bloodlust
Heroism and Bloodlust will now check for Temporal Displacement from Time Warp and Insanity from Ancient Hysteria.
2012-08-28 00:03:37 +02:00
Nay
e09591b8a7 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
2012-08-27 22:43:07 +01:00
Vincent-Michael
7e2d007e0d Core/Spells: Fix 'Foam Sword Rack' mechanic 2012-08-27 19:57:26 +02:00
Nay
fc16106823 Scripts/Spells: Fix a typo in spell_q12372_cast_from_gossip_trigger and cleanup whitespace 2012-08-27 14:40:12 +01:00
Nay
f8c01739df Scripts/Spells: Remove a not needed cast in spell_q12372_cast_from_gossip_trigger 2012-08-27 14:29:00 +01:00
Nay
c157e2643a Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-27 14:11:57 +01:00
Vincent-Michael
50bed7eb4b Core/Spells: Cleanup in 71ca106814 /slap me 2012-08-26 05:05:05 +02:00
Vincent-Michael
71ca106814 Core/Spells: Implement visual spells for priest shadowform 2012-08-26 04:44:41 +02:00
thesensei
cc416592b9 Core/Scripts: Defending Wyrmrest Temple 2012-08-26 02:55:14 +03:00
Nay
11652278df Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/tools/vmap4_extractor/vmapexport.cpp
2012-08-20 16:08:27 +01:00
Faq
28c0874873 Core/Spells: Fixed Libram of Wracking. thnx Vincent-Michael
Closes #7094
2012-08-20 10:59:35 +02:00
Nay
c43bba98a3 Core: Fix build and cleanup whitespace and double semicolon 2012-08-18 17:56:09 +01:00
Greymane
759e73c78f Core/Spells:
* Implemented aura 328 SPELL_AURA_PROC_ON_POWER_AMOUNT.
* Added eclipse power energize handling.

Closes #7417
2012-08-16 19:55:01 +01:00
Nay
ca5b4227a8 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-10 13:43:27 +01:00
Nay
081acfde53 Merge pull request #6520 from Vincent-Michael/shadowstep
Core/Spell: Fix not using Shadowstep while rooted
2012-08-09 11:40:26 -07: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
Shauren
7770c82097 Core/Items: Finished reforging (mostly by subv) 2012-08-06 23:00:57 +02: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
Kaelima
6ae147aa80 Merge pull request #7065 from Vincent-Michael/PainAndSuffering
Core/Spells: Fix Pain and Suffering reduces damage
2012-08-01 22:56:51 -07:00
Kaelima
99d3918d34 Merge pull request #6800 from Vincent-Michael/cod
Core/Spells: Fix Curse of Doom (thx to Warpten / joschiwald for helping)
2012-08-01 22:56:30 -07:00
Spp
5a99dfad14 Warning fixes + compile fix after the merge 2012-07-30 10:07:26 +02:00
Jorge
b460c496e2 Merge pull request #7227 from Vincent-Michael/PCH
Core/Misc: Use proper headers to optimize compile
2012-07-30 00:02:03 -07:00
Vincent-Michael
634b3645d5 Core/Misc: Use proper headers to optimize compile 2012-07-30 05:38:40 +02:00
Nay
462b6ded19 Merge pull request #7113 from Vincent-Michael/IdolOfTheCryingWind
Core/Spell: Fix Idol of the Crying Wind calculation
2012-07-29 09:08:14 -07:00
Pesthuf
2f6583094d Core/Spells: Haunt should heal the Warlock when the target dies or the aura is reapplied. 2012-07-25 14:18:35 +02:00
Vincent-Michael
7c6c488908 Core/Spell: Fix Idol of the Crying Wind calculation 2012-07-17 00:08:17 +02:00
Shauren
a9d3940738 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-14 19:03:03 +02:00
Faq
1fa0177bb0 Core/Spells - Idol of the Crying Wind;
+ Fixing typo;
2012-07-13 18:42:28 +03:00
Vincent-Michael
968a8e8ee8 Core/Spells: Fix Pain and Suffering reduces damage 2012-07-11 17:34:03 +02:00
Kandera
6890b0a950 Core/Spells: codestyle cleanup. case statements are your friend :] 2012-07-05 09:07:06 -04:00
Shauren
ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
AliveShiro
07e47b89ee Fix Quest A Cleansing Song 2012-07-04 01:48:14 +02:00
Faq
3308809066 Correcting Black Ice bonus dmg for Scourge strike shadow part. Thnx Tibbi & Shauren 2012-06-30 21:27:09 +03:00