Spp
c4d4beff3b
Warning fixes and some minor changes here and there
...
- Added GetAchievementPoints to AchievementMgr
2012-09-18 11:35:18 +02:00
Nay
d6743c7c95
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
sql/updates/world/2012_09_09_02_world_spell_script_names.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
2012-09-10 00:52:35 +01:00
oMadMano
e377550280
Scripts/Karazhan: Fix Prince Malchezaar Infernal start timer
...
Closes #5700
2012-09-09 16:24:06 +02: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
Aokromes
6970a28f24
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
...
When Scarlet Commander Mograine dies and High Inquisitor Whitemane appears, if she is downed very quickly, then she will not perform the ressurection on Mograine and will not stun anyone, thus Mograine wont give the achievement nor loot. She should be invincible till she has ressurected Mograine.
2012-09-07 05:01:04 +03:00
Nay
874ddcb0ae
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
2012-09-03 16:11:46 +01:00
Elron103
1e361bc43a
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
2012-09-03 01:57:01 +02: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
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
gecko32
1a0a80bb77
Scripts/ZulGurub: Fix attacking Bloodlord Mandokir
...
Closes #1007
Closes #7499
2012-08-27 16:50:47 +01:00
neuro_999
b0256c30a4
Scripts/Uldaman: Archaedas now Awaken his minnions & spawn of npc lore keeper of norgannon
...
Closes #765
2012-08-27 16:26:45 +01:00
Nay
da9480557b
Core: Fix a typo and whitespace cleanup
2012-08-22 22:56:31 +01:00
Vincent-Michael
8ca6538f6d
Scripts/Zul Gurub: Fix map id in instance script for cata
2012-08-19 01:02:57 +02:00
Vincent-Michael
1be45d1a0a
Scripts/Zul Gurub: cleanup for cata
2012-08-18 22:16:41 +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
c29eb1f87a
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-08-15 16:33:00 +01:00
Vincent-Michael
a306d39bb4
Core/Scripts: Missing change from previous commit
2012-08-15 00:06:19 +02:00
Vincent-Michael
bddaf9b3a4
Core/Scripts: Fix uninitialized variable in boss_akilzon
2012-08-14 23:58:08 +02:00
Vincent-Michael
302051da3d
Core/Scripts: Fixed more uninitialized variables
2012-08-14 23:46:42 +02:00
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