Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
22,259 Commits 2 Branches 1 Tag
3f99890b129c836cd364169ec4d69620bff0ca82
Commit Graph
741 Commits
Author SHA1 Message Date
Vincent_Michael 3f99890b12 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
 2014-01-21 21:58:30 +01:00
Vincent_Michael 7e527f9075 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp
 2014-01-19 20:52:16 +01:00
w1sht0l1v3 8367944171 Core/Scripts: Fix kill credit for quest The Hunter and the Prince(13400). 2014-01-19 00:30:25 +02:00
DDuarte 08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
DDuarte 33c2bd5ce1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	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/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
 2014-01-10 18:32:05 +00:00
DDuarte 25d1be5a75 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/Battlefield.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Texts/CreatureTextMgr.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-01-10 06:13:26 +00:00
joschiwald e80d1f3465 Scripts/BloodFurnace: 
* cleanup InstanceScript
* fix broggok poison cloud

Scripts/Naxxramas/Grobbulus:
* fix poison cloud
* fix mutating injection
 2014-01-09 23:17:02 +01:00
Vincent_Michael 20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Malcrom fe95371d9a Core/Scripting: Replace casted with cast as casted is not a word. 2013-12-25 14:16:55 -03:30
Shauren 107af52853 Core/Chat: Refactored building chat packets 
* Moved everything into one specialized method instead of being scattered all over the place
* Allow localizing creature names in chat messages (when using $N)
* Send SMSG_GM_MESSAGECHAT for gm messages
 2013-12-23 14:23:49 +01:00
Portgas D. Ace dc959d6f32 Core/Spells: Power Word: Shield SP Coeff 
The Spell Power coefficient has to be 87% not 80.68%
 2013-11-19 21:54:10 +01:00
Spp ab2d26cb91 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	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/Entities/Unit/Unit.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/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Tools/PlayerDump.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-11-08 11:12:17 +01:00
Spp 94e2b9332a Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive) 2013-11-08 10:50:51 +01:00
Sebastian Valle 184fe092c3 Scripts/Spells: Removed the duplicate script. 2013-11-03 12:48:59 -05:00
Sebastian Valle 428cf6b0ee Scripts/Spells: Fixed the warlocks' Fel Flame talent, now it adds to the duration of Immolate and Unstable Affliction. 
Closes #8455
 2013-11-03 12:39:21 -05:00
Shauren 75a790ca47 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-26 17:06:50 +02:00
Vincent_Michael 9802c7b891 Scripts/Misc: Coding Style unification? (by Aokromes) 2013-10-22 20:24:05 +02:00
Shauren fca4a5448a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-07 14:30:37 +02:00
Kirkhammett 89085f7d57 DB/Core: The Storm King's Vengeance 2013-09-27 12:50:34 +02:00
zorix ff274cda0b Core/Script: 
Added missing NULL pointer check
 2013-09-18 23:31:41 +02:00
Vincent-Michael ce742dc7a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
 2013-09-09 18:26:31 +02:00
joschiwald f66120060a Scripts/Spells: drop obsolete code 2013-09-07 01:21:36 +02:00
Vincent-Michael be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
 2013-09-06 21:55:19 +02:00
joschiwald e5af3e25f9 -.- 2013-09-06 21:18:07 +02:00
joschiwald 49e2ad73d2 Fixed build 2013-09-06 21:16:09 +02:00
joschiwald adef15cd0f Core/Spells: add an other condition to SpellInfo::NeedsToBeTriggeredByCaster to correct spells with are wrongly triggered by target instead of caster 
- convert archavons rock shards to spellscript (now it works properly)
- add a spellscript for one spell that can't be corrected by this (and delete the sai hack, now i uses the correct spell)
 2013-09-06 20:57:38 +02:00
Vincent-Michael d25c2e7f5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp
 2013-09-05 16:46:14 +02:00
joschiwald 7ef1f0738b Core/Battlegrounds/IoC: fix fortress teleport pads 
(and replace a hack with an other hack)

Closes #5846
Closes #7993
Ref #8984
 2013-09-05 00:59:22 +02:00
Vincent-Michael 611d51af98 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_debug.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-09-02 22:53:44 +02:00
Aokromes 59667ee606 Core/Spells: move debug log into debug mode 2013-09-02 09:41:46 +02:00
Vincent-Michael 6c8d0e5405 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-31 21:52:15 +02:00
Vincent-Michael b1721a65ee Core/Spells: Fix quest credit for quest "Death Comes From On High" 2013-08-31 17:42:04 +02:00
Vincent-Michael 224c5c5d3d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-08-30 21:43:02 +02:00
Nay 1903d4ca7d Core/Server: Fix a spammy warning in WorldSession and move code to .cpp 2013-08-30 15:44:17 +01:00
Vincent-Michael 738a781468 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
 2013-08-29 20:55:20 +02:00
Kirkhammett e23b6436c5 Core/Quests: Escape from Silverbrook 12308 2013-08-29 14:37:29 +02:00
joschiwald 76171984f1 Scripts/Spells: fix codestyle in 48783b8606 2013-08-29 03:08:08 +02:00
Kirkhammett 48783b8606 Core/Quests: Fuel for the Fire (12690) 2013-08-29 00:50:14 +02:00
Vincent-Michael 3166638078 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
 2013-08-28 19:24:01 +02:00
Nay a7527b3b48 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h
 2013-08-25 14:12:32 +01:00
Nay 12973de799 Core&Tools: Fix multiple issues found by a static code coverage tool 2013-08-24 22:57:22 +01:00
Vincent-Michael 9eb01d63bd Core: Fix warnings 2013-08-18 13:54:20 +02:00
Vincent-Michael 7dbf68cbfc Scripted/Misc: Remove some whitespace 2013-08-18 02:07:13 +02:00
joschiwald 2b19ba1879 Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes 2013-08-18 01:41:10 +02:00
Vincent-Michael c32dbd1432 Core/Spells: Fix hunter T7 4P Bonus 
Closes #8320
 2013-08-18 00:55:44 +02:00
Xanvial 01178f5958 Core/Spells: Fix paladin talent "Grand Crusader" 
Closes #9072

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-08-16 00:04:52 +02:00
Vincent-Michael 21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren 4d260a54ae Core/Spells: Fixed warrior T10 4p dps bonus 
Closes #493
 2013-08-15 16:39:31 +02:00
Vincent-Michael 4c64e407b7 Core/Spells: Convert hunter "Improved Mend Pet" in spell script 
Closes #5597
Closes #9006
Closes #10346
 2013-08-11 19:23:21 +02:00
Vincent-Michael fa0aaa5fa4 Core/Spells: Some cleanup and missing stuff in a6eee516bd 2013-08-11 01:46:29 +02:00