Shauren
|
8e288dd673
|
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlefield/Battlefield.h
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Battlegrounds/ArenaTeam.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Battlegrounds/BattlegroundQueue.h
src/server/game/Battlegrounds/BattlegroundScore.h
src/server/game/Battlegrounds/Zones/BattlegroundAB.h
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
src/server/game/Battlegrounds/Zones/BattlegroundEY.h
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
src/server/game/Battlegrounds/Zones/BattlegroundWS.h
src/server/game/DungeonFinding/LFG.h
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/DungeonFinding/LFGQueue.cpp
src/server/game/DungeonFinding/LFGQueue.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Creature/GossipDef.h
src/server/game/Entities/Creature/TemporarySummon.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Object/Updates/UpdateData.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Globals/ObjectAccessor.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.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/PetHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Handlers/VehicleHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reset.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_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_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.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_durotar.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/shared/Packets/ByteBuffer.h
|
2014-09-20 11:05:30 +02:00 |
|
DDuarte
|
256ad379dd
|
Oops.
|
2014-09-19 03:39:57 +01:00 |
|
DDuarte
|
cefcde9ba9
|
Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code)
|
2014-09-19 03:30:02 +01:00 |
|
Shauren
|
7d1d55124c
|
Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Scripting/MapScripts.cpp
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
|
2014-09-16 21:50:01 +02:00 |
|
Shauren
|
878073d516
|
Core/Logging: Fixed incorrect usage of guid in logs
|
2014-09-16 20:47:08 +02:00 |
|
Shauren
|
a0e50ea35f
|
Core/Entities: Use ObjectGuid class in game project
|
2014-09-14 16:14:12 +02:00 |
|
Vincent-Michael
|
ca3961f987
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
|
2014-09-13 22:38:25 +02:00 |
|
joschiwald
|
59baaeec48
|
Core/Chat: cleanup MonsterText methods
|
2014-09-13 20:41:31 +02:00 |
|
Shauren
|
ce67a097bf
|
Core/Entities: Use new PackedGuid class
|
2014-09-13 01:12:16 +02:00 |
|
Shauren
|
7f2cdfd166
|
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/scripts/World/npcs_special.cpp
|
2014-09-12 20:26:46 +02:00 |
|
DDuarte
|
dcba0106d6
|
Core/Skills: Fix rogue's lock picking
Fixes #12677
Closes #13111
|
2014-09-12 18:11:19 +01:00 |
|
DDuarte
|
2bba219106
|
Core/Loot: Fix some issues with master loot
Thanks to @PortgasDAce for the initial patch
Closes #12732
|
2014-09-09 23:11:37 +01:00 |
|
DDuarte
|
6885eb4f2c
|
Merge remote-tracking branch 'origin/master' into 4.3.4
|
2014-09-07 19:36:33 +01:00 |
|
Vincent-Michael
|
c7e1eae2ce
|
Core: Remove again whitespace (meh :/)
|
2014-09-07 04:06:50 +02:00 |
|
DDuarte
|
1f6066c6e3
|
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
|
2014-09-06 22:03:20 +01:00 |
|
Vincent-Michael
|
80fe88337e
|
Core: Fix git fail -.-
|
2014-09-06 03:12:51 +02:00 |
|
Vincent-Michael
|
76f1d5f221
|
SQL: Rename SQL after recent PR merge
|
2014-09-06 03:09:33 +02:00 |
|
DDuarte
|
9a4f062b26
|
Core/Players: Restore haste related code
Fixes haste rating
Thanks to @roc13x (#13018) for the fix
Closes #13018
Fixes #12395
|
2014-09-05 23:10:17 +01:00 |
|
DDuarte
|
4dbe318194
|
Core/Player: Fix a typo in the struct of SMSG_REQUEST_PVP_REWARDS_RESPONSE
Ref #11552
|
2014-09-02 03:40:40 +01:00 |
|
Vincent-Michael
|
f89739dab5
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2014-08-30 05:03:47 +02:00 |
|
Duarte Duarte
|
bcb2b2f6bf
|
Merge pull request #12958 from Nyeriah/patch-ir
Core/Player: Implement a method to send out the Postmaster's item retrie...
|
2014-08-29 23:49:53 +01:00 |
|
Vincent-Michael
|
06daf22e1e
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/scripts/Commands/cs_guild.cpp
|
2014-08-29 21:18:23 +02:00 |
|
Duarte Duarte
|
743088d683
|
Merge pull request #12959 from Nyeriah/patch-qf
Core/Player: Already complete quests shouldn't turn failed
|
2014-08-29 14:09:13 +01:00 |
|
Nyeriah
|
c0697c7726
|
Core/Player: Already complete quests shouldn't turn failed
Core/Player: Already complete quests shouldn't turn failed
Core/Player: Already complete quests shouldn't turn failed
|
2014-08-29 05:13:16 -03:00 |
|
Nyeriah
|
9f606f74a3
|
Core/Player: Implement a method to send out the Postmaster's item retrieval mails as it seems to be used in multiple places and also send disenchant roll result as a mail if the player's inventory is full
|
2014-08-29 02:53:30 -03:00 |
|
Vincent-Michael
|
9cb92f93aa
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
sql/base/auth_database.sql
src/server/game/Entities/Player/Player.cpp
|
2014-08-29 06:24:08 +02:00 |
|
Nyeriah
|
cbad3b1cb8
|
Core/Player: Dungeon Finder quests don't follow the same rule as repeatable quests, they should award experience every time they're rewarded
|
2014-08-28 21:40:27 -03:00 |
|
Nyeriah
|
01f9acda10
|
Core/Players: Dungeon Finder quest rewards should be sent as a mail if the player's inventory happens to be full
Thanks @dr-j for the sniffed texts
|
2014-08-28 21:02:04 -03:00 |
|
Vincent-Michael
|
c0c708cf02
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Scripting/ScriptMgr.h
|
2014-08-27 23:06:40 +02:00 |
|
chadryx
|
983755a21d
|
Added a new hook Called when a player's money is at limit
|
2014-08-27 19:01:41 +03:00 |
|
Vincent-Michael
|
98e27a4f15
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/System.cpp
|
2014-08-24 16:33:29 +02:00 |
|
jackpoz
|
c20f92c08c
|
Merge branch 'Rochet2/questreward'
Close pull request #12657
|
2014-08-24 14:38:55 +02:00 |
|
Rochet2
|
9beae1dc97
|
Removed OnQuestComplete hook, use QuestReward instead. Implemented OnQuestStatusChange hook
Also fixed some comments and added overrides
The OnQuestComplete hook was unused and didnt work properly
|
2014-08-24 14:31:38 +03:00 |
|
Vincent-Michael
|
560048cf33
|
Core: meh, fix build and warnings
|
2014-08-24 02:22:14 +02:00 |
|
Vincent-Michael
|
547115476f
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_warrior.cpp
|
2014-08-24 02:11:33 +02:00 |
|
jackpoz
|
7fe7f30521
|
Core/Misc: Fix some -Wconversion warnings
|
2014-08-23 19:56:41 +02:00 |
|
DDuarte
|
f5f9df0483
|
Core/Auctionhouse: Better fix for 809fb9894e
|
2014-08-23 16:30:45 +01:00 |
|
Shauren
|
42cac6796a
|
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/authserver/Server/AuthSession.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
|
2014-08-21 23:59:00 +02:00 |
|
Brian Swango
|
87cbe5a2fc
|
Core/Loot: Fixes lootable items being able to be moved in inventory, and
also loot generated that uses conditions from being saved to the DB.
|
2014-08-18 20:03:13 -04:00 |
|
Shauren
|
4a741258f1
|
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/Zones/BattlegroundAB.h
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
src/server/game/Battlegrounds/Zones/BattlegroundEY.h
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
src/server/game/Battlegrounds/Zones/BattlegroundWS.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Item/Item.h
src/server/game/Entities/Object/Updates/UpdateData.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Guilds/Guild.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Server/WorldPacket.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/shared/Packets/ByteBuffer.h
|
2014-08-12 00:45:24 +02:00 |
|
DDuarte
|
df3b08d140
|
Core/Server: Use nullptr instead of 0 where pointers are expected
|
2014-08-09 21:32:26 +01:00 |
|
DDuarte
|
a394205eca
|
Core/Server: Add missing overrides
|
2014-08-09 20:17:40 +01:00 |
|
Duarte Duarte
|
a5d2d3ac85
|
Merge pull request #12810 from Carbenium/questreward
Core/Player: Fix an issue with Player::RemoveRewardedQuest not deleting ...
|
2014-08-09 01:14:23 +01:00 |
|
Carbenium
|
dbaf0557e8
|
Core/Player: Fix an issue with Player::RemoveRewardedQuest not deleting the queststatus_rewarded form database
Needed for SPELL_EFFECT_CLEAR_QUEST
|
2014-08-09 01:54:22 +02:00 |
|
jackpoz
|
78af80230d
|
Core/Misc: Fix static analysis issues
|
2014-08-08 21:14:12 +02:00 |
|
Shauren
|
58ecb73674
|
Core/Trade: Replaced SendNotification hacks with proper trade packets
|
2014-08-01 22:06:33 +02:00 |
|
Shauren
|
45e9ef3d93
|
Core/Loot: Fixed pickpocket refill timer and use send proper loot error packets to master looter
|
2014-07-31 21:41:41 +02:00 |
|
Vincent-Michael
|
a917b6599f
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Server/WorldSocket.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
|
2014-07-30 22:26:59 +02:00 |
|
joschiwald
|
04bb78f6c3
|
Scripts/OutdoorPvP: replaced some chat texts with proper defense messages
|
2014-07-29 23:45:34 +02:00 |
|
DDuarte
|
5193eaac87
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
|
2014-07-24 03:35:19 +01:00 |
|