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
Kiddie
9a962f86c9
Core\Characters: Consecutive letters validation for CheckPlayerName
...
Closes #7694
2012-09-08 17:29:27 +01:00
Nay
5ab5cbcd2c
Core/Loading: Fix a typo when loading creature_template
2012-08-31 17:48:05 +01: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
e3d9768a50
Core: Fix many "errors"/warnings and coding style (3)
...
Game
Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 22:44:33 +01:00
kaelima
bdfae83898
Core/Creature: Added DB support for UNIT_FIELD_FLAGS_2. Thanks cyberbrest
...
- Added more flags to UnitFlags2 enum (Thanks wpp)
2012-08-30 04:52:56 +02:00
Nay
6c14a51fe4
Core/Quests: Split Flags and SpecialFlags
2012-08-18 21:08:21 +01:00
Nay
4e46f7ced6
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Loot/LootMgr.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/worldserver/worldserver.conf.dist
2012-08-18 17:13:46 +01:00
Nay
aa5949ff1a
Core/Loading: Do not validate fields QuestGiverPortrait nor QuestTurnInPortrait
...
These fields do not have to exist server-side
2012-08-18 15:18:57 +01:00
Spp
8da0bbdbb3
Core: Fix compile (Thanks to Sovak for reporting). Remove many warnings and Fix possible out of bounds access to Void storage
2012-08-17 10:25:29 +02:00
Nay
69c74bb3c5
Core/Logging: Change a few more logging messages to LOG_FILTER_SERVER_LOADING
...
consistency!
2012-08-16 21:37:46 +01:00
Nay
21fb427ffc
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/worldserver/worldserver.conf.dist
2012-08-16 20:17:29 +01:00
Shauren
69469d5295
Core/Items: Fixed disenchanting
2012-08-16 16:36:23 +02:00
Spp
a566e3e58b
Core/Logging: Move more log messages to LOG_FILTER_SERVER_LOADING
2012-08-16 11:02:46 +02:00
Nay
b651b352ed
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
2012-08-16 00:36:50 +01:00
Spp
8a1e7dd070
Core/Loading: Re-enable Server loading log
2012-08-16 00:23:44 +02:00
Nay
ca879e96b0
Core/Loading: Fix a field type when loading reputation_spillover_template
...
Also whitespace cleanup
2012-08-15 21:22:29 +01:00
Nay
53a2b86228
Core&DB: Increase the size of MinLevel and MaxLevel to int16
2012-08-15 18:00:41 +01:00
Nay
c0adf370e5
Core/Vendors: Add currencies to vendors
...
npc_vendor table gets a new field, type (1 is item, 2 is currency)
for type 1 fields still mean the same, for type 2 maxcount is buycount (without any "precision")
changed structure of SMSG_UPDATE_CURRENCY(_WEEK_LIMIT) but not enabled, wrong values are being wrongly calculated
2012-08-14 18:11:06 +01:00
Shauren
e761458b24
Core/Taxi: Updated taxi mask building
2012-08-14 15:29:43 +02:00
kiper
0b157c9066
Core/Globals: Add 5th field in reputation_spillover_template for Bilgewater Cartel/Gilneas spillover reputation.
2012-08-14 01:49:18 +02:00
Nay
424d860454
DB&Core/Quests: Change MinLevel to signed since -1 is a valid value for deprecated quests
2012-08-13 23:59:14 +01:00
Nay
aa25336602
Core/Loading: Re-enable validation for quest_template currency loading
2012-08-13 23:31:21 +01: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
Nay
4d8b06d0bd
DB/Schema: Change basehp/mana/armor in creature_classlevelstatus to unsigned mediumint
...
There's no reason to be cheap...
2012-08-06 19:21:04 +01:00
Nay
b72373f1ee
Core/Creature: Add basehp3 to creature_classlevelstats
2012-08-06 19:11:30 +01:00
Subv
0e581b7991
Core/Items: Removed no longer needed code for item set names and item set names locales
2012-08-05 10:09:56 -05:00
Nay
da2db28cab
Core/PacketIO: Add some (possible) missing FlushBits
2012-08-04 19:11:13 +01:00
Subv
d9da2e8e50
Core/Player: Use DBC data to set the correct amount of hp and mana based on player level and class
2012-08-04 11:33:49 -05:00
cyberbrest
891a31ef5c
[Misc]: Fix loading quest locales.
2012-08-03 17:43:35 +03:00
Spp
634776e0bc
Fix compile under windows
2012-08-03 15:54:54 +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
Nay
8f07d0cc52
Core/Loading: Fix some wrong sql types in ObjectMgr loading code
2012-08-02 23:02:41 +01:00
Nay
c24de2c6d8
Core: Implement Void Storage
2012-07-30 16:39:46 +01:00
Nay
6dd20770af
Core/Misc: Few more missed chances related to money
...
Expect more commits like this :/
2012-07-24 15:47:47 +01:00
Shauren
1558b602f4
Core/Items: Renamed new currency related fields in item_template
2012-07-19 16:04:42 +02:00
Shauren
a9d3940738
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2012-07-14 19:03:03 +02:00
Shauren
32ba32c4eb
Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.3.4
2012-07-05 14:16:44 +02:00
Shauren
ed6f3e2def
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2012-07-04 22:20:21 +02:00
Shauren
a6a556ce09
Core: Minor startup error fixes (db structure)
2012-07-04 18:12:29 +02:00
Shauren
ee06bef31b
Core/DBC: 4.3.4 structure updates
2012-07-04 14:04:12 +02:00
Chaplain
716e2db0e1
Core/Misc: Code-style + some const methods.
2012-06-21 21:05:45 +03:00
Shauren
c7775c8d72
Core/Maps: Moved object respawn time storage from global to map level. This removes unneccessary locking since all objects run within its map's thread.
2012-06-07 23:20:57 +02:00
Shauren
5eee40249c
Core/Items: Added custom flags field to item_template, currently 2 flag values are available
...
* ITEM_FLAGS_CU_DURATION_REAL_TIME determines item duration counts even if offline (replaced ugly negative duration workaround, easy to lose data when importing fresh wdb)
* ITEM_FLAGS_CU_IGNORE_QUEST_STATUS quest status will not affect this item appearing in loot, currently needed for Arena Master trinket
2012-05-31 15:39:18 +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
kaelima
419d537bc8
Core/Global: Cleanup in MovementHandler and some assertions
2012-05-23 15:02:54 +02:00
click
d4cc9078e1
Core: Fix another type-error in the mail expiration handling (using data pulled from CHAR_SEL_EXPIRED_MAIL_ITEMS prepped statement)
2012-04-02 04:39:01 +02:00
Nay
b03f895cf5
Core/DBLayer: Yet more type fixes
2012-04-02 00:22:33 +01:00