Vincent-Michael
|
87d9d1d705
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.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/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ghostlands.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_tirisfal_glades.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_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.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/Spells/spell_pet.cpp
src/server/scripts/Spells/spell_shaman.cpp
|
2013-06-13 19:35:01 +02:00 |
|
Malcrom
|
4096c54efa
|
Core: More Function name updates
|
2013-06-11 22:02:00 -02:30 |
|
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 |
|
Vincent-Michael
|
0bebf40fe7
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Creature/Creature.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/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/NPCHandler.cpp
|
2013-06-11 22:07:11 +02:00 |
|
Shauren
|
b77d6f50dc
|
Core/PacketIO: Fixed structure of SMSG_UPDATE_OBJECT CreateObject block for objects on transports/vehicles
|
2013-06-07 16:17:24 +02:00 |
|
Malcrom
|
c238cae7d0
|
Core: Remove some no longer needed gossip code.
|
2013-06-03 22:33:26 -02:30 |
|
Shauren
|
7d64b56db1
|
Core/PacketIO: Fixed SMSG_PLAY_SOUND structure
|
2013-06-01 17:49:33 +02:00 |
|
Shocker
|
1ef3dd29b8
|
Core/Misc: Implement AreaTrigger entity
(might need some cleanup)
|
2013-05-26 04:28:19 +03:00 |
|
Spp
|
86afccc8ff
|
Merge branch 'master' into 4.3.4 (Only the Logging System One)
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/DataStores/DBCStores.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/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/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/zone_silverpine_forest.cpp
|
2013-05-21 09:55:09 +02:00 |
|
Spp
|
d1677b2db0
|
Core/Logging: Performance-related tweaks to logging system
All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
Memleak fix
|
2013-05-13 15:07:36 +02:00 |
|
Shauren
|
5de7bf1f17
|
Core/Objects
* Vehicles can now be sent with UPDATETYPE_CREATE_OBJECT2
* Corrected HIGHGUID type for guilds
|
2013-04-09 17:26:02 +02:00 |
|
Shauren
|
1ba6d0ce6f
|
Core/Units: Started work on updating movement (main goal: remove SendMovementFlagUpdate())
|
2013-04-03 20:13:33 +02:00 |
|
Shauren
|
b431a499a7
|
Core/Units: Removed deprecated BuildMovementPacket method and updated MovementFlags2 enum
|
2013-04-01 14:45:47 +02:00 |
|
Spp
|
c97c381ea0
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Events/GameEventMgr.cpp
src/server/game/Loot/LootMgr.cpp
src/server/shared/Packets/ByteBuffer.h
|
2013-03-25 14:34:22 +01:00 |
|
Spp
|
1a6a23ec96
|
Core/Misc: Minor optimizations (+code changes to reduce differences with 4.3.4 branch)
Core/Logging: Create new logger type "Cheat". Will be used to log all cheat attempts
|
2013-03-25 13:26:48 +01:00 |
|
Spp
|
7c36e3a298
|
Core/Misc: Minor optimizations (+ code changes to reduce differences with 4.3.4 branch)
|
2013-03-25 10:36:30 +01:00 |
|
Vincent_Michael
|
a9b740ab74
|
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/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.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/Entities/Unit/Unit.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.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_orgrimmar.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/shared/Packets/ByteBuffer.h
|
2013-03-10 01:08:55 +01:00 |
|
Nefarion
|
49fd11ab5a
|
First step of comment style refactoring to doxygen-style.
|
2013-03-08 21:55:37 +01:00 |
|
Vincent_Michael
|
4b4199d75b
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
|
2013-03-04 23:44:25 +01:00 |
|
Vincent_Michael
|
5d4e657e91
|
Core: Whitespace cleanup
|
2013-03-04 19:14:58 +01:00 |
|
Vincent_Michael
|
7ce02e7900
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Creature/Creature.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/Entities/Unit/Unit.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
|
2013-03-04 19:09:57 +01:00 |
|
QAston
|
26cbf5f6ba
|
Core/Entities: nullify m_uint32Values after object deletion for better detection of access to deleted objects.
|
2013-03-04 16:31:24 +01:00 |
|
QAston
|
4eec72c986
|
Core/Entities: Move complex function implementations from Player.h to Player.cpp
|
2013-03-04 15:56:00 +01:00 |
|
QAston
|
8012feee16
|
Fix build.
|
2013-03-04 13:00:02 +01:00 |
|
QAston
|
9fd6b7ee01
|
Core/Entities: Move complex function implementations from Creature.h to Creature.cpp
|
2013-03-04 12:41:17 +01:00 |
|
QAston
|
3439084082
|
Move complex functions from Object.h to Object.cpp
|
2013-03-04 11:45:57 +01:00 |
|
Vincent_Michael
|
cd24526aac
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-02-26 16:11:15 +01:00 |
|
horn
|
badcce45d8
|
Core/Summons: Pack the TempSummonGroupKey structure so it is being compared correctly and make the second parameter of SummonCreatureGroup() optional
|
2013-02-26 02:51:55 +01:00 |
|
Vincent_Michael
|
529c4b7592
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/MailHandler.cpp
|
2013-02-25 17:11:36 +01:00 |
|
horn
|
ba549ddc30
|
Core/Summons: Implement summon groups system to be able to summon multiple NPCs at once without need of hardcoding the positions. Almost all hardcoded positions can now be moved to DB.
Thx to @Shauren for his help.
|
2013-02-24 17:10:02 +01:00 |
|
Vincent_Michael
|
d292b05ac1
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-02-12 21:21:06 +01:00 |
|
Shauren
|
38eb090e9a
|
Core/Objects: Rewritten UpdateMask class to perform bit operations faster at the cost of higher memory use and moved building the mask for packet to a separate method.
Closes #9127
|
2013-02-09 23:59:09 +01:00 |
|
Vincent_Michael
|
66dfcd2b43
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
|
2013-02-03 23:11:48 +01:00 |
|
Shauren
|
07442f932c
|
Core/Object: Fixed a mistake in update mask building - fields marked with UF_FLAG_PARTY_MEMBER should be sent to the entire raid, not only one subgroup
|
2013-02-03 12:23:28 +01:00 |
|
Shauren
|
653557d335
|
Core/Objects: Some optimizations to object updatemask building
|
2013-02-03 12:16:10 +01:00 |
|
Nay
|
92d92df809
|
Core/Object: Re-add a line that somehow got removed in a merge
Thanks Warpten for noticing
|
2013-01-30 01:33:12 +00:00 |
|
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 |
|
Shauren
|
10d4d2e5b7
|
Core/Objects: Changed how update fields marked for sending are stored serverside to use our UpdateMask class
|
2013-01-22 18:45:09 +01:00 |
|
Souler
|
456d9a6cea
|
Spells/Mage: Mages should be able to see everything while on Invisibility
|
2013-01-19 15:31:42 +01: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
|
cc65aba789
|
Update copyright note for 2013.
Happy new year.
|
2013-01-01 00:41:01 +01:00 |
|
Shauren
|
f1170ba0fb
|
Core: Fixed some level 4 warnings (msvc)
|
2012-12-31 20:43:14 +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 |
|
MidnaAT
|
30936fd1c4
|
Core/Totem: Have Lightwell use Totem logic
ref www.trinitycore.org/f/topic/7599-propper-lightwell-handling/
|
2012-12-26 04:34:40 +01:00 |
|
kaelima
|
a8cd34c4a4
|
Core/Battleground: Rename and correct usage of opcode 1223 and increase the timer before arena/bg invitation window is removed to its proper value. Closes #6725
|
2012-12-26 04:02:42 +01:00 |
|
Subv
|
181b8fca51
|
Core/Chat: CHAT_MSG_RAID_BOSS_WHISPER also sends extra data
Note: SMSG_MESSAGECHAT is bloated all around the core, a complete mess.
|
2012-12-23 18:31:30 -05:00 |
|
Subv
|
497dcc5974
|
Core/Chat: Fixed raid boss emotes.
|
2012-12-23 18:15:15 -05:00 |
|