Commit Graph
415 Commits
Author SHA1 Message Date
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 e3ea3b28bd Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.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/worldserver/worldserver.conf.dist
2012-08-21 23:40:38 +01:00
Vincent-Michael 6891fe6248 Core/Battlefield: Add missing stuff for wintergrasp 2012-08-21 23:03:30 +02:00
Shauren 9c3c3cd9ec Core/Items: Updated InventoryResult enum 2012-08-20 15:54:55 +02:00
teyrnon 6cea446f22 Core/Objects: Encapsulated Postion::m_orientation field to ensure it is always normalized to 0-2pi range
Closes #7400.
2012-08-20 10:44:14 +02:00
Subv bbe13bd126 Core/Misc: Use the proper EffectUnused handler for unused spell effects 2012-08-18 13:39:41 -05:00
Subv 19c67af6f5 Core/Spells: More spells cleanup 2012-08-17 12:24:21 -05:00
Subv 8a27cf327b Core/Spells: Removed more deprecated spells code 2012-08-17 09:48:53 -05:00
Subv a96f695245 Core/Spells: Removed some more deprecated spells code 2012-08-17 09:01:48 -05:00
Shauren f447403f6c Core/Spells: Implemented spell level scaling 2012-08-17 00:10:19 +02:00
Nay efdaf2a300 Core/Items:
- Update some ItemPrototype enums
- Merge armor and weapon vellum into a single subclass
- Fix tackler bags
2012-08-15 16:31:34 +01:00
Subv 24b1a27985 Core/Entities: Fixed block for Cataclysm 2012-08-12 15:46:02 -05:00
cyberbrest c6d4ae43c3 [Spell]: add new effects and auras.
privent crash with casting it.
2012-08-12 11:01:22 +03: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 f8cd39b2ed Core/Players: Improved alcohol handling, weeeeeeeeeeeeeeeee
Closes #7293
2012-08-07 17:45:10 +02:00
Nay 332baef4f2 Merge pull request #7255 from Vincent-Michael/summonVehicle
Core/Spells: Fix some summon vehicle spells with basepoint 1
2012-08-04 17:14:53 -07: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
Amit 8e35762b35 Add missing change in SpellEffects.cpp 2012-08-03 01:27:39 +03:00
Vincent-Michael bf6e334c5f Core/Spells: Fix some summon vehicle spells with basepoint 1
ty zwerg
2012-08-02 23:49:11 +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
Chipsi a7ca7db413 Fix a typo 2012-07-28 23:19:45 +02:00
Chipsi 41f0923f1b Core/Spells: Spells with SPELL_EFFECT_KNOCK_BACK(like Thunderstorm) can't knoback target if target has ROOT/STUN
Signed-off-by: Chipsi <chipsipower.anthoria@gmail.com>
2012-07-28 15:37:24 +02:00
Shauren fc453ab623 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-23 00:13:13 +02:00
Shauren 1fd37ac61b Core/Object: Use updatefield flags extracted from client to determine whether to send or not a field value instead of sending all data to client for non-player objects 2012-07-22 14:20:26 +02:00
Vincent-Michael 968a8e8ee8 Core/Spells: Fix Pain and Suffering reduces damage 2012-07-11 17:34:03 +02:00
Shauren ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
Shauren bf5002a4d1 Core/Items: Remove item from tradeable list when clearing the flag on enchanting/gemming 2012-06-23 12:31:46 +02:00
Vincent-Michael ef4d9dd4ae Core/Spells:
* Fix bloodthirst Heal
* Move bloodthirst damage calculation in Spell script
* Fix some codestyle
2012-06-20 18:06:29 +02:00
Faq d77a8568b7 Fixing Death Knight T8 Melee 4P Bonus (darkruned set). tibbi 2012-06-14 22:36:56 +03: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
Kandera b80621838a Core/Spells: Correctly fix basepoint calculation for adding extra attacks. 2012-06-11 13:26:30 -04:00
Kandera 042f825400 Core/Spells: use raw basepoint value for extra attacks. damage gets fuddled somewhere for this spell. fixes hardened steel berserker doing insane damages! 2012-06-11 12:22:32 -04:00
Kandera 22efc5e2bd Core/Spells: fix mocking blow doing damage to players and non tauntable creatures. 2012-06-07 13:10:27 -04:00
joschiwald 7e454b26ac more updates 2012-06-03 02:35:00 +02:00
Shauren 853f96217d Core/Players: 310% mounted speed is identified by riding skill 375, no need for a custom flag anymore. 2012-05-30 13:15:51 +02:00
kaelima 774f3cdc9b Fixed some merging errors, there could be more, but at least it compiles. 2012-05-30 09:22:56 +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 6b8d4ce123 Core/Spell: Fix spell effect SPELL_EFFECT_HEAL_MAX_HEALTH calculation 2012-05-21 00:11:58 +02:00
Kandera d1e0dc3fe0 Core/Spells: fix dispel aggro in a less hacky way! 2012-05-18 13:49:59 -04:00
Kandera e897bb59f7 Core/SpellEffects: successful dispel effects on hostile targets should put you in combat. Closes #656 Closes #678 2012-05-18 12:25:13 -04:00
Vincent-Michael e122f9fd30 Core/Spell:
* Fix Nourish heal calculation
* Fix some codestyle
2012-05-13 18:08:57 +02:00
Vincent-Michael 79a735fb01 Core/Spell:
* Fix Spells with DmgClass SPELL_DAMAGE_CLASS_NONE
* Fix SPELL_AURA_PERIODIC_HEAL calculation
* Fix Swiftmend heal calculation
* Fix some codestyle
2012-05-13 16:29:01 +02:00
joschiwald 4e354d6ca9 Core/Spells: fix damage mods from caster on target 2012-05-11 22:43:06 +02:00
Chaplain 469ba0b0e7 Clean up for 58f63509cd
*restore const methods in spellauraeffects
*fix typo in Unit::CalculateMeleeDamage thx bytewarrior
*minor speed up in SpellInfo::GetMaxTicks() thx Warpten
*deleted duble ';;' thx bytewarrior
*speed up in SpellInfo::GetMaxTicks() thx goes to Vincent-Michael
2012-05-10 20:42:07 +03:00
QAston 58f63509cd Merge pull request #6314 from Chaplain/spells
Core/Spells: Separation of caster/target part damage/heal bonus calculation.
2012-05-09 15:10:33 -07:00
Chaplain 879070bc80 Core/Spells: Separation caster/target part damage/heal bonus calculations.
*Implement HoT/DoT save caster side bonuses and apply target mods on each tick
2012-04-28 23:32:25 +03:00
Shauren 51656d7e60 Scripts/Icecrown Citadel: Fixed Scent of Blood on heroic mode of Deathbringer Saurfang encounter 2012-04-27 15:38:09 +02:00