Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,690 Commits 4 Branches 146 Tags
dd61ba2844fc96b3344183fe0b05ce65985fa8be
Commit Graph

7431 Commits

Author SHA1 Message Date
Nay
984e1feadf Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
 2013-02-09 20:33:30 +00:00
Gacko
a7eef6a598 Script/Quest: Kodo Roundup 
Closes #943
 2013-02-09 16:24:31 +01:00
thomas33
82c31e50bb typo 2013-02-07 16:10:10 +01:00
Vincent_Michael
5b45a87da5 Core: More clean up whitespace 2013-02-07 00:24:00 +01:00
click
75994b3dd3 Core: Clean up whitespace, and remove a silly warning in boss_lurker_below.cpp 2013-02-07 00:19:19 +01:00
Vincent_Michael
943c866da9 Core: Whitespace cleanup 2013-02-07 00:02:22 +01:00
Spp
f7c7f0f0f6 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/zone_durotar.cpp
 2013-02-05 09:57:14 +01:00
m7nu3l
f9654d52e0 Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality. 2013-02-04 19:18:48 -03:00
w1sht0l1v3
1e8bf1aad1 DB/Misc: Fix achievement Flirt With Disaster. 2013-02-04 23:39:04 +02: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
61979f8591 Scripts/Player: Add OnMapChanged to PlayerScripts (after map changed) 
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-04 16:52:43 +01:00
Aokromes
6d8a69d640 Merge pull request #9099 from Bezo/mutenew 
Add Mute reason and mute by to the db so you can get this info from the ...
 2013-02-04 06:55:26 -08:00
Spp
683de1d624 Core/RBAC: Add SQL to remove bad data from account_access, otherwise other sqls will fail due to use of FOREIGN KEYS 
- Also add missing files from previous commit
 2013-02-04 09:39:01 +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
ec5d16db8a Core/Dungeon Finder: Declare some functions private as those are not used outside LFGMgr. Also do not expose LFGDungeonData outside LFGMgr 2013-02-04 06:43:03 +01:00
Spp
f743424f63 Core/Dungeon Finder: Corrections to previous commit 
- player::inRandomLfgDungeon was supposed to return if current player map and difficulty are the ones player applied for
 2013-02-04 05:50:52 +01:00
Spp
9bdfc87774 Core/Dungeon Finder: Use lfg namespace to encapsulate all LFG classes, structs and enums 2013-02-04 04:43:50 +01:00
Spp
f753c989f2 Core/Dungeon Finder: Simplify Spell Luck of the draw code 
Core/Dungeon Finder: Partial recode of "group list" using existing Lfg functions
 2013-02-04 04:43:49 +01:00
w1sht0l1v3
ffb4c63fe3 DB/Misc: Add full script for Pilfering Perfume (A:24656 H:24541) 
Closes #5205
 2013-02-04 05:22:09 +02: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
Krogonos
cfaabe50cf Fixed a few file names to improve searching. 
Signed-off-by: Krogonos <bryan.mayer26@yahoo.com>
 2013-02-03 09:12:03 -06:00
Shauren
b346459ca8 Core: Warning fixes 2013-02-03 14:11:59 +01:00
Vincent_Michael
06041bc423 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-03 01:50:51 +01:00
Vincent_Michael
1cdfc65959 Script: Fix warning for craping script -.- 2013-02-03 01:32:14 +01:00
Vincent_Michael
0f53f69e52 Core: Fix build 2013-02-03 01:12:07 +01:00
Vincent_Michael
847cafc121 Scripts/Misc: Some code optimisations 2013-02-03 00:38:34 +01:00
Shauren
73d2f315af Scripts/Icecrown Citadel 
* 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-02 16:48:09 +01:00
Vincent_Michael
6161f69b7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-02 00:16:11 +01:00
Shauren
817f5b3648 Scripts/Icecrown Citadel: 
* 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-01 18:06:51 +01:00
Shauren
0bf29d45d1 Core/Players: Prevent trading, taking gold from mail and withdrawing from guild bank if it would put the player over gold cap. 
Closes #4015
 2013-02-01 11:38:55 +01:00
Gacko
f5264e3fbb Script/ICC: Fix phase check and warning 2013-01-31 22:00:32 +01:00
Vincent_Michael
8350c088c7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-31 21:53:29 +01:00
Spp
67d46ae1ae Scripts/Commands: Show correct guild Rank when using .pinfo command 
(Corrections to 1b551cc1)
 2013-01-31 09:18:42 +01:00
Gacko
0a9fbc6588 Script/ICC: Fix phase check in Saurfang script 
... typos - typos everywhere. me->request(glasses);
 2013-01-31 08:45:47 +01:00
Vincent_Michael
9a0525757a Core: Fix some warnings 2013-01-31 00:35:33 +01:00
Warpten
a4b1f1c45f Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate. 2013-01-31 00:21:28 +01:00
Vincent_Michael
f5fd7bad69 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-31 00:10:17 +01:00
Gacko
754418a8de Script/ICC: Fix phase check in Saurfang script 
Related to changes in dbecf05e39
 2013-01-30 19:34:59 +01:00
Gacko
dbecf05e39 Core: Logical fixes and improvements in EventMap 2013-01-30 18:39:34 +01:00
Vincent_Michael
5a74336c5e Core: Fix non pch build 2013-01-30 18:24:29 +01:00
Vincent_Michael
8814d8c136 Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup 2013-01-30 18:06:19 +01:00
Bezo
760d62e934 Add Mute reason and mute by to the db so you can get this info from the db 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-30 13:09:41 +02: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
8cd408ae6c Core/Misc: Some changes to minimize differences with 4.3.4 branch 2013-01-30 10:34:18 +01:00
Spp
fa5dd4bd4e Core/Misc: Remove some calls to const_cast 2013-01-30 08:39:06 +01:00
Souler
d92347bc22 Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new one 
Closes #8433
 2013-01-29 15:10:47 +00:00
Nay
4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
Nay
1b180e683e Core&DB/Trainers: Remove trainer_spell from creature_template since it is not longer necessary on Cata 2013-01-29 02:25:24 +00:00
Gacko
29cd1dbec1 Core/Quest: Bloody Breakout 
Closes #641
 2013-01-28 19:50:01 +01:00
Nay
98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge 
There are probably other merge issues that got through, please report them
 2013-01-28 02:54:27 +00:00