araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-21 15:27:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,205 Commits 17 Branches 140 Tags
54d28af46d09c0e2cbded1fd5fdfada2fd7b7441
Commit Graph

3911 Commits

Author SHA1 Message Date
Vincent_Michael 79a2a0c434 Core/Spell: Fix logic fail in 96ae4caf62 2014-01-26 16:42:02 +01:00
Vincent_Michael 96ae4caf62 Core/Spells: Fix typo in 955fb907c5 2014-01-26 03:56:41 +01:00
Vincent_Michael 955fb907c5 Core: Fix warnings 2014-01-26 03:48:33 +01:00
joschiwald fbddda52e7 Core/Spells: move more spells to spellscripts 2014-01-26 02:24:57 +01:00
joschiwald 96060bf007 Core/Spells: move some spells so spellscripts 2014-01-26 01:02:20 +01:00
Vincent_Michael c6650ecc71 Core/Spells: Move Pilgrims Bounty BuffFood in AuraScript (mimimi) 2014-01-25 16:28:29 +01:00
Vincent_Michael bdc150ebbd Core/Spells: Move Pilgrims Bounty BuffFood in AuraScript 2014-01-24 19:48:15 +01:00
Vincent_Michael a5ade26fa0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2014-01-24 19:36:32 +01:00
Vincent_Michael 9531073b77 Scripts: Gossip can crash with null instance 2014-01-24 17:08:17 +01:00
joschiwald b169d6bafb Fix build 2014-01-24 01:47:24 +01:00
joschiwald f0c4224603 Core/Spells: move killing spree to spellscript 
Closes #10597
Closes #11468
 2014-01-24 01:32:15 +01:00
Vincent_Michael 46e1b93c2b Scripts: A lots of changes here and there (maybe useless?!?) 2014-01-23 22:54:01 +01:00
joschiwald d6c5307a81 Scripts/Spells: use new hook in some spellscripts 2014-01-23 20:55:47 +01:00
Vincent_Michael b61bf8f01f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
 2014-01-23 19:23:17 +01:00
joschiwald f731116766 Scripts/AhnKahet: fix some issues on prince taldaram script 2014-01-23 18:21:17 +01:00
MitchesD 57e599fa02 Scripts/ZulGurub/Jeklik: fixed flying in first phase, reworked spawn and rewritten to EventMap 
Closes #11277
 2014-01-22 23:46:45 +01:00
Portgas D. Ace 4b3dc231a0 [MAGE/SPELLS]: Fixed Ice Barrier scale calculation 2014-01-22 17:00:31 +01:00
Vincent_Michael f1e1a5cad0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-01-22 14:28:40 +01:00
Vincent_Michael 516a6344fe Misc: Fix warnings 2014-01-22 07:31:37 +01:00
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 101ac7f511 Misc: Minor cosmetic changes here and there 2014-01-21 20:20:38 +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
Discover- f6264169d8 Merge pull request #11299 from Carbenium/MailboxCmd 
Core/Command: Add mailbox command
 2014-01-19 07:29:11 -08:00
Discover- c7b78a2b4e Core/Commands: Using the '.gm vis off' command now instantly makes the GM invisible to non-GM players, instead of waiting until Player::UpdateObjectVisibility was called from a different method. 
Ref. #11467
 2014-01-19 14:03:09 +01:00
w1sht0l1v3 c18fd0378d Core/Scripts: Fix the cleanup in 54dbf870b8. 2014-01-19 03:20:36 +02:00
w1sht0l1v3 8367944171 Core/Scripts: Fix kill credit for quest The Hunter and the Prince(13400). 2014-01-19 00:30:25 +02:00
Vincent_Michael e26dcbe2f5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
 2014-01-18 20:43:06 +01:00
Vincent_Michael ad8c046916 Core/Revert: ... 2014-01-18 01:36:12 +01:00
Discover- 735cebf7a3 Core/Commands: The .setskill command is now usable even if the player doesn't already have the skill learned. 2014-01-18 01:05:03 +01:00
Vincent_Michael 4027686b5b 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/Guilds/Guild.h
	src/server/game/Handlers/ItemHandler.cpp
 2014-01-18 01:01:11 +01:00
Zabustak 101cad1f28 Show Kick, Mute and Ban in world 2014-01-17 12:23:36 +01:00
joschiwald 5b6b26262f Misc: missing changes after merge 2014-01-14 12:38:19 +01:00
Vincent_Michael cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-01-13 20:34:21 +01:00
Vincent_Michael a73e8511f9 Fix non pch build 2014-01-12 02:02:02 +01:00
zengwf 23acf75d3b Core/Movement: Add LOS check for fleeingmovement target point. 
Prevents fleeing or feared units from going to upper floor ignoring walls/ceilings with mmaps on(and usually get stucked).

Current implementation just randomly selects a distance and angle against the frighting unit, when in narrow circumstance such as underground caves, such targeting point would be at another floor.

Closes #11300
Ref #9475 (needs fixed confirmation)
 2014-01-12 00:33:33 +00:00
Duarte Duarte 65c941b88d Merge pull request #11342 from Carbenium/Svala 
Scripting/Utgarde Pinnaccle: Fix visual during Svala's transformation
 2014-01-11 16:20:16 -08:00
Dr-J b83c252851 Scripts/NPCs: Remove core script for rogue trainers which was overriding db conditions 
SAI and conditions for rogue trainers to provide elegant leter to rogues provided that is level 24 or higher, does not have elegant letter and does not have taken, rewarded or complete the quest which elegant letter starts

Closes #11378

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-01-12 00:17:21 +00:00
DDuarte b204d71cb4 Core: Fix build due to merge resolution errors 2014-01-11 23:29:27 +00: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 352a2682b1 Core&Scripts: Compile fix 2014-01-10 17:23:14 +00:00
joschiwald 7378baee49 Scripts/PoS/Garfrost: cleanup saronit blocks after death 2014-01-10 17:37:03 +01: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
DDuarte 86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
joschiwald 6fff9d08b2 Fix build 2014-01-09 23:31:52 +01: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
joschiwald a60ba240b7 Core/Entities: add some log messages in CheckCreatureTemplate 
* Happy Error Spam
 2014-01-06 20:30:11 +01:00
Shauren 619edff196 Misc: 
* Tools: Fixed a compile warning
* Commands: Fixed npcflag format in .npc info
 2014-01-06 13:53:29 +01:00
joschiwald 95f14f921b Scripts/HoS: update Maiden of Grief 2014-01-05 16:47:07 +01:00
joschiwald cd76d32907 Core/Entities: correct creature damage, offhand damage should work too 
* todo: some creatures need dmg_multiplier update in creature_template
 2014-01-04 18:22:06 +01:00