Commit Graph

7431 Commits

Author SHA1 Message Date
Shauren
666602e1aa Scripts: Fixed some unitialized variables 2012-08-12 13:56:43 +02:00
kaelima
a3adf6a2b9 Scripts/Grizzly Hills: Fix uninitialized variable in npc_venture_co_straggler. minor cleanup 2012-08-11 16:54:08 +02:00
Nay
274a54c152 Core: Cleanup whitespace, fix build and enable 1 opcode 2012-08-10 16:58:39 +01:00
Nay
ca5b4227a8 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-10 13:43:27 +01:00
Shauren
9538fb6d5a Core/Movement: Ensured object orientation is always within 0-2pi range, this fixes movement. 2012-08-10 14:10:57 +02: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
Nay
7249992e28 DB: Rename characters' void_storage to character_void_storage
Core: Fix build (/slap subv)
Also proper names for sql files
2012-08-08 03:42:48 +01:00
Nay
a781555f94 Core&DB/NPCs: Add an extra field for mana_mod in creature_template (for proper mana calculations)
This field is usually 2 for a small group of creatures with double mana
2012-08-08 03:11:10 +01: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
Shauren
7770c82097 Core/Items: Finished reforging (mostly by subv) 2012-08-06 23:00:57 +02:00
Nay
b72373f1ee Core/Creature: Add basehp3 to creature_classlevelstats 2012-08-06 19:11:30 +01:00
Kandera
9795498488 Core/Commands: missing change from previous commit 2012-08-06 13:55:35 -04:00
Kandera
81fc922b2e Core/Commands: change .modify money to only use int32 2012-08-06 12:20:00 -04:00
Shauren
b620686641 Compile fix for noob compilers 2012-08-06 18:06:48 +02:00
Spp
97c4b92eb0 Core/Logging: Try to simplify configuration of loggers and appenders
Changed multiple lines to a simple format:
- Logger.name=Type,LogLevel,Flags,AppenderList
- Appender.name=Type,LogLevel,Flags,optional1,optional2
  * Type = File: optional1 = File name, optiona2 = Mode
  * Type = Console: optional1 = Colors

Created a default set of loggers and appenders.
- Root logger defaults to Error, that means you will see nothing on console by default (not even loading)
- You need to add the loggers to Loggers options if you want to enable them, otherwise Root logger will be used for all types

Restored outSQLDriver (LOG_FILTER_SQL_DRIVER), outSQLDev (LOG_FILTER_SQL_DEV), outArena (LOG_FILTER_ARENA) and outChar (LOG_FILTER_CHARACTER) functionality by creating new types (LOG_FILTER_CHARACTER is a rename of LOG_FILTER_DELETE.

Note: You need to update your config file... again (yeah sorry... trying to make it simpler)
2012-08-06 12:10:33 +02:00
Subv
5b7b6e121c Core/Misc: Fixed a crash in .modify money command.
Fixed a mistake in the reforge handler
2012-08-05 17:33:29 -05:00
Nay
1bd8cb9a7c Script/Commands: Fix a copy paste type in .reload item_set_names command 2012-08-05 19:56:35 +01:00
Nay
c6c9f7b58f Scripts/Commands: remove reload item_set_names and locales_item_set_name 2012-08-05 19:49:59 +01:00
Vincent-Michael
cc0ff69ca4 Core/Commands:
* Add remove support for disable command
* Add quest disables support
* Add check for no existent entry
* Fix problems with flags 0
* Fix code style
2012-08-05 02:02:35 +02: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
Nay
3577afcfaf Core/WorldSession: Bypass assigned handler restriction if .debug send opcode command is used 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
f859088699 Core/Misc: Fix code style and a typo for recently merged in PRs 2012-08-03 00:20:44 +01:00
Alternative
dc7030ced6 Some codestyle changes. 2012-08-02 16:47:28 -04:00
Alternative
f303782de4 Added disable commands. 2012-08-02 16:33:35 -04: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
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
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
Vincent-Michael
4a3df36bd9 Core/Commands: Convert more misc commands in commandscript 2012-07-29 15:03:26 +02:00
Vincent-Michael
d02a3966ea Core/Command: Add missing part for pet command 2012-07-29 13:36:28 +02:00
Subv
7e00d312af Merge pull request #7145 from Vincent-Michael/miscCommand
Convert misc commands in commandscript
2012-07-28 18:25:52 -07:00
Vincent-Michael
6f69a3326d Convert misc commands in commandscript 2012-07-29 01:23:51 +02:00
kandera
bf22bc11d3 Merge pull request #7131 from Pesthuf/master
Haunt/Warlock
2012-07-27 10:56:20 -07:00
w1sht0l1v3
f5edf4034d Core/Scripts: Fix Forgemaster Garfrost phases and equipment change. 2012-07-25 18:49:06 +03: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
Nay
0f04b2fc36 Core/Misc: Update money to 64 bits (from 32), increasing the maximum gold possible
This got a bit messy and will be further fixed when all related packets are updated.
(Also fixed a typo in atoll msvc macro)
2012-07-24 15:27:42 +01:00
David Klepáček
d5dea1ca4e [Core\Quest] Fix Quest "The Aspirant's Challenge"
Credits goes to Valcorb
2012-07-24 03:28:36 +03:00
Shauren
fc453ab623 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-23 00:13:13 +02:00
Shauren
46035f2114 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-19 16:13:50 +02:00
Shauren
fa3a8363b1 Core/PacketIO: Zlib compression stream structure is kept per session - compress packets individually for each receiver 2012-07-18 20:14:51 +02:00
Shauren
e9e1fb1025 Core/PacketIO: Implemented packet compression for any opcode. 2012-07-18 14:43:55 +02:00
Shauren
953f093920 Core/PacketIO: Updated and enabled MSG_MOVE_TELEPORT, MSG_MOVE_TELEPORT_ACK, MSG_MOVE_WORLDPORT_ACK, SMSG_NEW_WORLD and SMSG_TRANSFER_PENDING 2012-07-17 19:29:18 +02:00
Vincent-Michael
7c6c488908 Core/Spell: Fix Idol of the Crying Wind calculation 2012-07-17 00:08:17 +02:00
Vincent-Michael
a9812a0860 Core/Commands: Convert ticket commands in commandscript 2012-07-15 22:20:22 +02:00