Commit Graph
426 Commits
Author SHA1 Message Date
Nay b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.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_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2013-01-28 01:04:37 +00:00
Nay 1b551cc157 Scripts/Commands: Add guild info to .pinfo
Original patch by @secharles, modified

Closes #8946
2013-01-26 21:33:13 +00:00
WishToDie 1348e4e44d Fix Typo. 2013-01-26 00:57:10 +02:00
w1sht0l1v3 6acfa49065 Script/Commands: Implement command to list the members of a group/party. 2013-01-26 00:41:46 +02:00
w1sht0l1v3 70490c8238 Script/Commands: Add command to join an existing group/party. 2013-01-23 20:58:01 +02:00
Vincent_Michael 98e01fdb3f Core: Fix build 2013-01-22 21:00:08 +01:00
Nay 6fc17c6b1e Core: Fix compile warnings 2013-01-22 19:34:27 +00:00
Vincent_Michael 94944e3072 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
2013-01-20 00:34:20 +01:00
Gacko e524539d90 Core/CS: More npcflag info in .npc info 2013-01-19 20:59:48 +01:00
Vincent_Michael 65cd79dc77 Core/Misc: Update headers to 2013 2013-01-14 17:42:06 +01:00
Nay e6a07076c3 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-14 13:58:34 +00:00
Spp 0d5cb6af75 Core/Misc: Apply codestyle to multiple files (II) 2013-01-14 11:12:58 +01:00
Spp d75222feca Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
2013-01-14 11:04:03 +01:00
Spp 802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Vincent_Michael b08ea19aff Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-13 01:25:56 +01:00
Nay 9d1e5a013e Core/Ticket: Fix unassigned message not showing who was assigned to ticket
Thanks to @Bezo
Closes #8923
2013-01-12 18:16:02 +00:00
Vincent_Michael 84cdd538bb Core/Commands: Fix sql warnings with pinfo at ban players 2013-01-12 18:52:51 +01:00
Vincent_Michael 7210ffe34d Core: Fix warnings 2013-01-09 21:14:12 +01:00
blub 9ad1857e59 Merge pull request #8826 from joschiwald/mmaps_disable
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
2013-01-07 07:52:35 -08:00
Vincent_Michael d5163d846f 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/Achievements/AchievementMgr.cpp
2013-01-05 17:01:46 +01:00
Vincent_Michael 24e0eb1812 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-05 16:55:17 +01:00
Nay 8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +00:00
Vincent_Michael 8db66bfefd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-04 01:27:51 +01:00
Vincent_Michael 0f71fd8e23 Core: Fix build 2013-01-03 23:48:50 +01:00
Vincent_Michael 00ca57e2cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Commands/cs_reload.cpp
2013-01-03 23:41:36 +01:00
Nay 9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Spp aed36a8375 Merge branch 'master' into 4.3.4
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ReferAFriendHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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_wushoolay.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/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
2013-01-02 13:30:51 +01:00
Vincent_Michael 62adbdab99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
2013-01-01 23:12:21 +01:00
Vincent_Michael 7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Vincent_Michael eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael cc65aba789 Update copyright note for 2013.
Happy new year.
2013-01-01 00:41:01 +01:00
joschiwald 08f62d8313 Core/MMaps: use DisableMgr to disable pathfinding on a specific map 2012-12-30 21:09:21 +01:00
Vincent_Michael ee9b7dfef8 Core/Command: Add command for near creature finding 2012-12-30 17:10:54 +01:00
Vincent_Michael 9281eb42da Core: Fix build 2012-12-28 19:11:55 +01:00
Nay 3375f56bf8 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/scripts/Kalimdor/thousand_needles.cpp
2012-12-28 17:31:39 +00:00
Subv ff5b0a14a4 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-12-28 11:45:46 -05:00
secharles 8272affe92 Script/Commands: New command: lookup spell id #spellid
Command to allow to know spell names based on id

Example:
 lookup spell id 686:
 686 - [Shadow Bolt rank 1 esES] [know]

Closes #8800

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-28 01:05:56 +00:00
Vincent_Michael c93559c02d Core: Fix build 2012-12-27 19:50:16 +01:00
Nay 7e196e8e58 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-27 17:53:34 +00:00
Nay 91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp
2012-12-27 17:52:11 +00:00
Vincent_Michael 7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00
kaelima 0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h
2012-12-21 00:00:16 +01:00
Spp 80b1b6c494 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp
2012-12-19 08:23:34 +01:00
Aokromes Name 5d77b10c35 Core/Account: Add logs for password change and fail change password 2012-12-18 01:58:12 +01:00
Spp fb2e5c3c58 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/azshara.cpp
	src/server/scripts/Kalimdor/azuremyst_isle.cpp
	src/server/scripts/Kalimdor/darkshore.cpp
	src/server/scripts/Kalimdor/durotar.cpp
	src/server/scripts/Kalimdor/dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/feralas.cpp
	src/server/scripts/Kalimdor/moonglade.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/scripts/Kalimdor/stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/tanaris.cpp
	src/server/scripts/Kalimdor/the_barrens.cpp
	src/server/scripts/Kalimdor/thousand_needles.cpp
	src/server/scripts/Spells/spell_generic.cpp
2012-12-07 09:22:43 +01:00
Vincent-Michael 0a3972db7c Core/Quest: Removed table quest_start_scripts 2012-12-04 11:23:10 +01:00
Spp 404129963c Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ArenaTeamHandler.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSpline.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_disable.cpp
	src/server/scripts/EasternKingdoms/Karazhan/karazhan.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_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/ungoro_crater.cpp
	src/server/shared/Packets/ByteBuffer.h
	src/tools/map_extractor/dbcfile.h
2012-11-27 14:15:12 +01:00
Spp e954498560 Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch 2012-11-27 13:03:12 +01:00
Spp 8ae0f2332c Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlefield/Zones/BattlefieldWG.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/azshara.cpp
2012-11-26 08:43:29 +01:00
joschiwald e83c5d1a0f Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails 2012-11-24 02:45:48 +01:00