Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
22,362 Commits 2 Branches 1 Tag
a7c15e73685cf3d383647c25e719e46138374dda
Commit Graph
100 Commits
Author SHA1 Message Date
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
Vincent_Michael 20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01: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
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
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 d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +02:00
Vincent-Michael a08b52aa19 Core/Spells: Fix hunter talent "Improved Serpent Sting" 
Closes #10001
 2013-07-29 06:25:30 +02:00
Vincent-Michael e9acee868b Core/Spells: Fix more startup error with spells 2013-07-25 15:05:16 +02:00
Vincent-Michael 6035c40b2d Core/Spells: Fix hunter "Master's Call" for 4.3.4 2013-07-24 11:57:22 +02:00
Vincent-Michael 97608aeff7 Core/Spells: Fix hunter talent "Kindred Spirits" for 4.3.4 2013-07-23 14:54:21 +02:00
Vincent-Michael 193d71f158 Core/Spells: Fix hunter talent "Master Marksman" for 4.3.4 
Closes #9968
 2013-07-23 13:46:38 +02:00
Vincent-Michael 72c2ff0bf6 Core/Spells: Fix hunter wolf "Furious Howl" - is now for complete raid 2013-07-22 18:49:49 +02:00
Vincent-Michael 82d8023201 Spells: Remove mage "Burnout" - is no longer required 
"Patch 4.0.1 (12-Oct-2010): Removed."
 2013-07-22 18:41:00 +02:00
Vincent-Michael 7ec31a7a42 Core/Spells: Fix hunter "Serpent Sting" for 4.3.4 2013-07-22 18:27:03 +02:00
Vincent-Michael 41311da2de Core/Spells: Fix hunter "Steady Shot" focus regen 
Closes #9553
 2013-07-22 02:49:19 +02:00
Vincent-Michael afc242211c Core/Spells: Fix warlock talent "Aftermath" 2013-07-21 03:19:14 +02:00
Vincent-Michael 0d0de8bb7a Core/Spells: Update/Convert hunter "Improved Mend Pet" for 4.3.4 2013-07-21 01:52:15 +02:00
Vincent-Michael 2aef91d045 Core/Spells: Fix hunter "T.N.T." and "Lock and Load" for 4.3.4 2013-07-20 14:56:37 +02:00
Vincent-Michael 800f977415 Core: Fix warnings 2013-07-20 01:46:12 +02:00
Vincent-Michael 5252f1614f Core/Spells: Convert/Update death knight "Butchery" in spell script for 4.3.4 2013-07-20 01:18:53 +02:00
Vincent-Michael 557474f2ae Core/Spells: Convert/Update hunter "Rapid Recuperation" for 4.3.4 2013-07-19 21:54:21 +02:00
Vincent-Michael de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Nay b56b282eee Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.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/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.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_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.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_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.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/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
 2013-07-14 16:10:20 +01:00
Nay 3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts) 
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
 2013-07-06 20:21:45 +01:00
Vincent-Michael d547cc8e3b Core/Spells: Fix hunter talent "Thrill of the Hunt" 2013-06-28 16:55:12 +02:00
Malcrom ec474a62e5 Core: More Function Renaming. 2013-06-11 21:25:12 -02:30
Malcrom 66978cfc3b Core: Some function renaming. 2013-06-11 19:54:27 -02:30
Malcrom 047608e7de Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet(). 2013-06-11 18:39:51 -02:30
Nefarion 49fd11ab5a First step of comment style refactoring to doxygen-style. 2013-03-08 21:55:37 +01:00
Vincent_Michael 480c847156 Core: Some cosmetic changes 2013-01-26 19:49:53 +01:00
joschiwald af50ce6223 Core/Spell: convert more spells to SpellScripts 2013-01-22 23:36:51 +01:00
joschiwald 2f1bbb2c7a Misc: Reorder more scripts in some script files and some cosmetic stuff 2013-01-13 02:41:40 +01:00
Vincent_Michael ecbcca8794 Core: Whitespace cleanup 2013-01-11 14:49:38 +01:00
joschiwald 0c16b95905 Misc: Reorder scripts in some script files and some cosmetic stuff 2013-01-11 04:18:02 +01:00
Vincent_Michael cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Vincent_Michael ebae4ab249 Core/Hunter: Fix Call of the Wild targets 
Closes #8618
Closes #8610
 2012-12-10 10:36:59 +01:00
Vincent-Michael 082c3f4267 Core/Hunter: Fix Furious Howl targets 2012-12-04 20:50:01 +01:00
Spp b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Gigatotem 2b1a8004ba Spells/Hunter: Readiness 
Fixes Readiness resetting the cooldown of Gift of the Naaru. Needs testing
 2012-10-07 13:44:05 +02:00
Kandera 2e247bd99a Core/Spells: Master's Call should not remove stun effects. 2012-10-05 11:45:22 -04:00
Spp 380db44583 Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct 2012-10-02 12:17:42 +02:00
Vincent-Michael 118825601b Core/Spells: fix misdirection removal on cancel. Closes #7776 2012-09-24 12:39:02 -04:00
joschiwald 7e454b26ac more updates 2012-06-03 02:35:00 +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
joschiwald 4e354d6ca9 Core/Spells: fix damage mods from caster on target 2012-05-11 22:43:06 +02:00