aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
AgeCommit message (Collapse)Author
2013-02-05Merge branch 'master' into 4.3.4Spp
Conflicts: src/server/scripts/Kalimdor/zone_durotar.cpp
2013-02-04Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ↵m7nu3l
ScriptedAI::SetCombatMovement(false); to get the same functionality.
2013-02-04DB/Misc: Fix achievement Flirt With Disaster.w1sht0l1v3
2013-02-04Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
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-04Scripts/Player: Add OnMapChanged to PlayerScripts (after map changed)Spp
Core/Dungeon Finder: Use OnMapChanged script to cast/remove Luck of the draw - Also move code to force party update to LfgPlayerScript - Remove some obsolete Lfg code after recent commits
2013-02-04Merge pull request #9099 from Bezo/mutenewAokromes
Add Mute reason and mute by to the db so you can get this info from the ...
2013-02-04Core/RBAC: Add SQL to remove bad data from account_access, otherwise other ↵Spp
sqls will fail due to use of FOREIGN KEYS - Also add missing files from previous commit
2013-02-04Core: Implement Role based Access ControlSpp
- 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-04Core/Dungeon Finder: Declare some functions private as those are not used ↵Spp
outside LFGMgr. Also do not expose LFGDungeonData outside LFGMgr
2013-02-04Core/Dungeon Finder: Corrections to previous commitSpp
- player::inRandomLfgDungeon was supposed to return if current player map and difficulty are the ones player applied for
2013-02-04Core/Dungeon Finder: Use lfg namespace to encapsulate all LFG classes, ↵Spp
structs and enums
2013-02-04Core/Dungeon Finder: Simplify Spell Luck of the draw codeSpp
Core/Dungeon Finder: Partial recode of "group list" using existing Lfg functions
2013-02-04DB/Misc: Add full script for Pilfering Perfume (A:24656 H:24541)w1sht0l1v3
Closes #5205
2013-02-03Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
Conflicts: src/server/game/Entities/Object/Object.cpp src/server/game/Movement/Spline/MovementPacketBuilder.cpp
2013-02-03Fixed a few file names to improve searching.Krogonos
Signed-off-by: Krogonos <bryan.mayer26@yahoo.com>
2013-02-03Core: Warning fixesShauren
2013-02-03Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
Conflicts: 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/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
2013-02-03Script: Fix warning for craping script -.-Vincent_Michael
2013-02-03Core: Fix buildVincent_Michael
2013-02-03Scripts/Misc: Some code optimisationsVincent_Michael
2013-02-02Scripts/Icecrown CitadelShauren
* Fixed rare weird coldflame positioning * Fixed Bone Slice * Changed Bone Spike Graveyard timing (first has to happen after Lord Marrowgar starts using Bone Slice)
2013-02-02Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Spells/SpellMgr.cpp
2013-02-01Scripts/Icecrown Citadel:Shauren
* Fixed Coldflame dealing double damage * Targets hit by Bone Slice will now be immune to Bone Spike Graveyard * Fixed healing players on Bone Spike Closes #1091 Closes #4473 Closes #5854 Closes #7060
2013-02-01Core/Players: Prevent trading, taking gold from mail and withdrawing from ↵Shauren
guild bank if it would put the player over gold cap. Closes #4015
2013-01-31Script/ICC: Fix phase check and warningGacko
2013-01-31Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
2013-01-31Scripts/Commands: Show correct guild Rank when using .pinfo commandSpp
(Corrections to 1b551cc1)
2013-01-31Script/ICC: Fix phase check in Saurfang script Gacko
... typos - typos everywhere. me->request(glasses);
2013-01-31Core: Fix some warningsVincent_Michael
2013-01-31Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate.Warpten
2013-01-31Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
Conflicts: sql/base/auth_database.sql src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
2013-01-30Script/ICC: Fix phase check in Saurfang scriptGacko
Related to changes in dbecf05e39204ff46621ce46bf5dd181e6450eeb
2013-01-30Core: Logical fixes and improvements in EventMapGacko
2013-01-30Core: Fix non pch buildVincent_Michael
2013-01-30Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanupVincent_Michael
2013-01-30Add Mute reason and mute by to the db so you can get this info from the db ↵Bezo
with the pinfo command when player get muted. old LOGIN_UPD_MUTE_TIME change to LOGIN_UPD_MUTE_TIME_LOGIN due the use of it when character login to world.
2013-01-30Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)Spp
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-30Core/Misc: Some changes to minimize differences with 4.3.4 branchSpp
2013-01-30Core/Misc: Remove some calls to const_castSpp
2013-01-29Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new oneSouler
Closes #8433
2013-01-29Merge remote-tracking branch 'origin/master' into 4.3.4Nay
2013-01-29Core&DB/Trainers: Remove `trainer_spell` from `creature_template` since it ↵Nay
is not longer necessary on Cata
2013-01-28Core/Quest: Bloody BreakoutGacko
Closes #641
2013-01-28Core/Misc: Fix compile errors introduced in previous mergeNay
There are probably other merge issues that got through, please report them
2013-01-28Merge remote-tracking branch 'origin/master' into 4.3.4Nay
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-26Scripts/Commands: Add guild info to .pinfoNay
Original patch by @secharles, modified Closes #8946
2013-01-26Scripts/Icecrown Citadel: Fix warningVincent_Michael
2013-01-26Core: Some cosmetic changesVincent_Michael
2013-01-26Scripts/ShadowmoonValley: Fixup script for Lord Illidan Stormrage quest to ↵w1sht0l1v3
be doable. Notice: this whole script needs a proper rewrite(contains wrong Illidan npc id,bad dialogues,etc).
2013-01-26Core/Spells: Fixed Darkflight, Two Forms and Running Wild for worgens.Shauren
Closes #8905