Vincent-Michael
97fc632b9d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Server/WorldSession.cpp
2013-09-01 23:48:40 +02:00
Shauren
6b60877e3e
Core/NetworkIO: Fixed memory leak
2013-09-01 17:48:47 +02:00
Vincent-Michael
224c5c5d3d
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/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/World/World.h
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/server/worldserver/worldserver.conf.dist
2013-08-30 21:43:02 +02:00
Vincent-Michael
87e105c818
Core: Fix warning
2013-08-30 20:56:41 +02:00
Nay
aa5bc37e9c
Core: Yet more warning fixes
2013-08-30 16:03:37 +01:00
Nay
1903d4ca7d
Core/Server: Fix a spammy warning in WorldSession and move code to .cpp
2013-08-30 15:44:17 +01:00
Machiavelli
9346695129
Core: Few fixes for previous commit.
2013-08-29 21:55:29 +01:00
Machiavelli
59b4c34924
Core/NetworkIO: Generic packet spam solution
...
Currently regulates the usage of CMSG_CHAR_ENUM only, but can be easily
extended to detect inappropriate network behaviour by using
AntiDOS.AllowOpcode in WorldSession's handlers.
2013-08-29 16:46:28 +01:00
Shauren
a9182245f9
Core/WorldSession: Removed a silly return that might have been leaking memory under rare conditions
2013-08-23 18:28:35 +02:00
Shauren
0e75857702
Core/PacketIO: Fixed object update failures
...
Closes #8105
2013-08-10 13:44:08 +02:00
Shauren
55fa58af19
Core/Movement: Prevent dynamic changes of movement flags for charmed creatures
...
Closes #10075
Closes #10079
2013-06-22 13:42:13 +02:00
Shauren
89ec907539
Core/Objects: Refactored MovementInfo structure
2013-06-18 18:15:33 +02:00
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
ec474a62e5
Core: More Function Renaming.
2013-06-11 21:25:12 -02:30
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
1b6fb2b695
Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)
...
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Movement/Spline/MovementTypedefs.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
src/server/scripts/Spells/spell_generic.cpp
2013-05-21 09:41:13 +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
d24ef896df
Core/PacketIO: Implemented possibility to ban client addons serverside
2013-04-05 15:06:35 +02:00
Vincent_Michael
e89d586032
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-03-15 23:03:06 +01:00
Nefarion
46ba2d945a
Allow reply to whispers if you are under CONFIG_CHAT_WHISPER_LEVEL_REQ, and implement feature for GMs to remove single players from their WhisperWhiteList.
2013-03-15 10:27:18 +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
Spp
03505a3a42
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/World/World.cpp
src/server/game/World/World.h
src/server/scripts/Commands/cs_reload.cpp
2013-02-27 04:08:19 +01:00
Spp
480c6cf4dd
Core/RBAC: Add .reload rbac command and prevent possible crash if rbac_permissions has wrong data
2013-02-27 03:30:53 +01:00
Spp
00c58f25d7
Core/RBAC: Force loadPermissions before checking session permissions if the storage is null (someone created a session but forgot to call to LoadPermissions)
2013-02-26 22:35: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
Spp
15343d9bb0
Core/RBAC: Remove unnecessary header includes from other header files
2013-02-25 15:48:17 +01:00
Vincent_Michael
c0c2e533a9
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
2013-02-21 00:45:02 +01:00
Shauren
59c3c6b8a6
Core/Players: Allow players to log out in combat when they are in resting area (logout in rest area is instant by default, but not when in combat)
2013-02-20 20:52:58 +01:00
Vincent_Michael
12c8cdc26c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
sql/base/characters_database.sql
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
src/server/scripts/Spells/spell_generic.cpp
2013-02-04 22:14:56 +01:00
Spp
b980aff83e
Core: Implement Role based Access Control
...
- This system will give more control of actions an account can perform.
System defines:
- Permissions to perform some action
- Roles: a set of permissions that have some relation
- Groups: a set of roles that have some relation
Operations:
- Grant: Assign and allow
- Deny: Assign and do not allow
- Revoke: Remove
Precedence to know if something can be done: Grant, Deny. That means, if you are granted some action by a role but you have denied the permission, the action can not be done.
Some Rules:
- Groups can only have roles
- Roles can only have permissions
- An account can be assigned granted and denied roles. Permissions inherited from roles are granted if roles is granted and denied if roles is denied
- An account can be assigned granted and denied permissions
- An account can have multiple groups, roles and permissions
- An account can not have same role granted and denied at same time
- An acconnt can not have same permission granted and denied at same time
- Id 0 can not be used to define a group, role or permission
Added some permissions as a sample of use (Instant Logout, Skip Queue, Join BGs, Join DF) and some permissions as a workaround to commands till command system is modified to use RBAC
2013-02-04 09:04:33 +01:00
Spp
709129f222
Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
...
Conflicts:
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/Formulas.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Waypoints/WaypointManager.cpp
src/server/game/Skills/SkillDiscovery.cpp
src/server/game/Skills/SkillExtraItems.cpp
src/server/game/Warden/WardenCheckMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
2013-01-30 11:57:02 +01:00
Spp
fa5dd4bd4e
Core/Misc: Remove some calls to const_cast
2013-01-30 08:39:06 +01:00
Spp
0e8011657d
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
Spp
927062f61f
Core/Misc: Some changes to reduce differences with 4.3.4 branch + some cosmetic changes
2013-01-16 11:17:14 +01:00
Spp
802657250c
Core/Misc: Apply codestyle to multiple files
2013-01-14 09:50:59 +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
cc65aba789
Update copyright note for 2013.
...
Happy new year.
2013-01-01 00:41:01 +01:00
Spp
2251d1bfae
Core/Misc: Set mode 0644 for files
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
Spp
0c4e8c8dc2
Core/Network: Enable trace loggers for packet send and receive (just account + opcodeName, opcodeId)
2012-11-23 12:36:18 +01:00
Spp
279b7f4c10
Core/Misc: Minor changes here and there
2012-11-16 09:51:44 +01:00
Spp
c97fc99e16
Merge branch 'master' into 4.3.4
...
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.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_titles.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
2012-10-30 10:30:05 +01:00
Spp
9fbc4c0ae2
Core/Misc: reduced amount of string memory allocations (Step II)
2012-10-24 15:34:48 +02:00
Spp
013fb1f4d9
Core/Misc: reduced amount of string memory allocations (Step I)
2012-10-24 15:34:48 +02:00
Spp
f570383fba
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.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/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
2012-10-04 13:33:04 +02:00
Spp
58c01c140d
Core/Battleground: Make Battleground queues and Free slot queue structures private.
2012-10-04 10:39:37 +02:00
Dimitro
c299e8340c
Core/Misc: Now attackers receiving all rewards, when the victim gone offline.
2012-10-03 14:13:14 +03:00
Shauren
3de6d44a00
Core: Free memory allocated for opcode handlers at shutdown.
2012-09-11 15:59:45 +02:00
Spp
bb559072ee
Core/Opcodes: Remove some opcodes that no longer exist on cata and fix a couple of log messages
2012-08-22 13:38:55 +02:00