Vincent_Michael
6beda05e3d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.h
2013-02-15 14:23:21 +01:00
Machiavelli
203cf7cbf0
Core/RA: Addition to previous crashfix
...
To make sure it also works for sessions that use more than 1 command
before closing.
2013-02-14 13:30:51 +01:00
Machiavelli
b4be224004
Core/RA: Fix a possible crash
...
Caused when RASocket::handle_close (event-driven) would delete the underlying object before RASocket::commandFinished callback was executed for that object. Dereferencing freed pointers is bad.
2013-02-14 11:57:43 +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
Nay
42e660e2a2
Core/Sockets: Always try to send MSG_NOSIGNAL in peer().send()
...
Fixes RASocket::authenticate crash
"MSG_NOSIGNAL:
If you send() to a remote host which is no longer recv()ing, you'll typically get the signal SIGPIPE. Adding this flag prevents that signal from being raised."
Closes #5040
Thanks to @derex for the hint
2013-02-11 02:59:37 +00:00
Vincent_Michael
5b45a87da5
Core: More clean up whitespace
2013-02-07 00:24:00 +01:00
Vincent_Michael
943c866da9
Core: Whitespace cleanup
2013-02-07 00:02:22 +01:00
Vincent_Michael
1fbc25766f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-02-06 21:49:12 +01:00
click
ede65fb60c
Core/Remote: Adjust logentries to accomodate separation of info- vs debug-output, using Info-level as default unless it's REAL debugoutput
2013-02-05 15:45:18 +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
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
MrSmite
a45f7fd878
Adds CONF option to show quest levels in dialogs.
...
Example: [13] Westfall Stew
Default = 0 (off). Make sure to set UI.ShowQuestLevelsInDialogs to 1 to turn it on
NOTES:
* DO NOT supply the quest level when using commands such as .lookup quest, it
is not actually part of the title (even though it will be printed in the result)
* Also adds the level in the quest tracker and quest log
* If locale is used, the level is added after the proper title is looked up
* LUA Mods that offer this feature do not work properly with TC, most will not put the level in all dialogs. Users who have such mods should disable the mod's feature or they may see the quest level listed twice.
Example: [13][13] Westfall Stew
2013-01-25 21:47:07 -05:00
Machiavelli
39c2d892f3
Core/Log: Allow configuring a maximum file size for a log file. If the file size is about to be exceeded, the core will create a new file titled <oldname>_.log and start outputting there.
2013-01-23 17:48:17 +01:00
Tuxity
cb118cddc7
Core/Arenas:
...
- You earn 180 cp when you win a match
- Correctly display cp to the good currency meta
- Rename a currency meta to avoid errors
2013-01-23 09:19:49 +01:00
Nay
3cb80f206e
Core/Config: Set mmaps disabled by default
2013-01-21 20:45:09 +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
Shauren
a5e7936a0f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-01-19 18:36:39 +01:00
Shauren
a77bb44d1e
Core/RA: Warning fix
2013-01-19 13:35:01 +01:00
Vincent_Michael
224b4480a7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-16 23:43:07 +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
526bdc0764
Core/Logging: Add config option to enable/disable asyncronous logging (disabled by default)
2013-01-16 09:52:49 +01:00
Spp
be3826825e
Core/Logging: Use correct realmId when logging to DB
2013-01-16 08:59:56 +01:00
Vincent_Michael
11bd11badc
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-15 23:34:50 +01:00
Vincent_Michael
9391d087fd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.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/ZulGurub/zulgurub.h
2013-01-15 23:33:36 +01:00
kaelima
c7ce94ee3d
WorldServer/RA: Implement MSG_NOSIGNAL in RASocket send.
...
Used to prevent raising SIGPIPE when the host are no longer recv()ing
2013-01-15 16:10:59 +01:00
Tuxity
91c4f2c2fb
Core/Battleground: Fix asynch countdown timer for new players. close #8761
2013-01-10 15:38:39 +01:00
Tuxity
2f48fe7cf1
Core/Currency:
...
- Fix a typo in conquest points formulas
- Correctly fix max justice and honor points
- Remove a previous fix when refunding an item, my mistake
ref #8892
2013-01-10 14:18:14 +01:00
Tuxity
71b0b30712
Core/Battleground:
...
- Fix team logo after countdown timer expire. close #8887
- Add more options with justice and honor points in conf file, also fix a wrong cap value.
- Grant back currencies when refunding an item and fix price.
ref #8892
2013-01-09 20:37:02 +01:00
Vincent_Michael
b69dff28db
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
...
Conflicts:
src/server/game/World/World.cpp
src/server/worldserver/worldserver.conf.dist
2013-01-07 16:57:39 +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
ecedb798aa
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Conditions/ConditionMgr.h
2013-01-07 16:39:01 +01:00
Nay
d0e4e20265
Merge pull request #8825 from joschiwald/vmapspelligno
...
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
2013-01-07 07:36:40 -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
a509aea659
Core/Misc: Fix a couple of warnings, some of them performance related
...
Errors were found using Cppcheck, open-source static analysis tool
2013-01-04 23:14:14 +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
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
joschiwald
08f62d8313
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
2012-12-30 21:09:21 +01:00
joschiwald
22896bd7a4
Core/VMaps: drop "vmap.ignoreSpellIds" in config, this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
2012-12-30 18:52:32 +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
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
2251d1bfae
Core/Misc: Set mode 0644 for files
2012-11-27 13:03:12 +01:00
click
8ef48ecc99
Core/Buildsystem: Clean up compileflags when compiling with warnings fully enabled.
...
-Wwrite-strings is default enabled when -Wall is set in clang/gcc, hence removed.
-Woverloaded-virtual is now enabled for C++-code only, this removes the useless warnings when dabbling with C-only code.
2012-11-27 00:43:38 +01:00
Nay
24cd72c8e1
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
src/server/game/Maps/Map.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/HomeMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.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/Spells/SpellEffects.cpp
2012-11-23 23:39:03 +00:00
cyberbrest
f205bc9b4f
Core/Currency: Add support of Conquest points cap for arena and bg
...
Remove obselete code for arena points distribution
Thanks to @Zakamurite
2012-11-21 18:25:23 +01:00