Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,460 Commits 4 Branches 146 Tags
12c8cdc26c9e307c4ae475d6021349f8a5603f14
Commit Graph

5228 Commits

Author SHA1 Message Date
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
Nay
8f6e9dc85c DB/Commands: Fix RBAC commands (remove an extra dot) 2013-02-04 20:25:18 +00:00
Nay
2a69143cec DB/Characters: Update sql/base/characters_database.sql 2013-02-04 16:22:43 +00:00
Nay
735419965c DB/Auth: Update sql/base/auth_database.sql 2013-02-04 16:08:45 +00:00
Spp
fb7a544d84 Correction to previous commit (Use proper way to delete from spell_script_names) 2013-02-04 17:04:40 +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
Gacko
30e1516387 Rename sql files of 760d62e934 2013-02-04 16:43:12 +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
Kinzcool
1537de5b39 Renamed game_graveyard_orientation to graveyard_orientation 2013-02-03 23:11:52 -05:00
Kinzcool
1a92b11ae3 Created table for a future (soon) use of graveyards orientations -- work based on WorldSafeLocs.dbc 2013-02-03 23:02:47 -05: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
Kinzcool
e0fca3454e DB/Creature Text: Corrected some texts & type fails -- more to come; Soon (TM) 2013-02-03 18:50:42 -05:00
w1sht0l1v3
0fbfe675ec DB/Misc: Add full script for Something Stinks (A:24655 H:24536) 
Rename an sql file.
 2013-02-04 01:26:45 +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
Nay
55fc0c58af DB/Schema: Change engine and collation of world.lfg_entrances 
latin1 -> utf8_general_ci
InnoDB -> MyISAM
(defaults for all `world` DB tables)
 2013-02-03 01:37:23 +00: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
Kinzcool
2976f94003 DB/WDB: Fixed some wrong WDBVerified; those templates IDs are way too high to have been took from retail 2013-02-01 21:35:37 -05: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
Zaphod
dc5e9c80fc DB/Loot: Fix Prismatic Black Diamond 2013-02-01 05:08:11 +00:00
Vincent_Michael
b539a9717b DB/Gameobject: Removed gameobject with bad wdb data 2013-02-01 00:46:32 +01:00
Warpten
454ee822ae Dang, one more typo. 2013-01-31 00:26:53 +01:00
Warpten
900f3e8d6a Spells/Warlock: Fixed a small mistake in my previous commit's SQL. 2013-01-31 00:24:52 +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
Bezo
83e3bf6d6d Remove \ No newline at end of file 2013-01-31 00:30:29 +02:00
Emo
2ffeaec443 DB/Auth: Fix typo in sql/base/auth_database.sql 
ERROR 1136 (21S01) at line 216: Column count doesn't match value count at row 1
 2013-01-30 14:51:40 +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
Shocker
b427068c39 Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless and Cataclysmic Gladiator). 
Also remove some unused outdated defines

WARNING! Run the SQL query before you start your emulator because it will reset all titles on login otherwise
 2013-01-30 07:05:19 +02:00
Nay
5151c57b18 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-30 01:33:46 +00:00
Nay
0281497573 DB/Loot: Fix 9 drop chance in gameobject_template (7 quests should be fixed by this) 
If a GO with flags 4 drops a quest item, ChanceOrQuestChance for that items needs to be negative

Query used to find the issue:
```
SELECT * FROM `gameobject_loot_template`
    WHERE (`item` IN (SELECT `questItem1` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem2` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem3` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem4` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem5` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem6` FROM `gameobject_template` WHERE (`flags` & 4) != 0)) AND
          `ChanceOrQuestChance` > 0;
```
 2013-01-29 23:48:39 +00:00
FH3095
76910472d8 DB/Achievements: Fix Portal Jockey 
Current Status: Portal Jockey(10) is rewarded from 10nh and 25nh, Portal Jockey(25) is rewarded from 10hc and 25hc.
Reason: Achievement-criteria 12971 is required for Portal Jockey(25), but checks for map-difficulty 2=10hc.
On the other side achievment-criteria 12979 is required for Portal Jockey(10), but checks for map-difficulty 1=25nh.

Closes #9081
Ref #6810
 2013-01-29 15:02:54 +00:00
Nay
4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
w1sht0l1v3
8183f70ae0 DB/Loot: Add Cache of the Ley-Guardian to heroic Oculus loot when RDF aura is present. 
Closes #6927
 2013-01-29 05:15:10 +02:00
Kinzcool
5040fd2558 DB/Gameobjects: Set proper state for ToCr doors and fixed looting of Venomhide Egg & Discarded Soul Crystal 2013-01-28 21:59:12 -05: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
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
Kinzcool
da080ac4e7 DB/Gameobjects: Added an another missing Gameobject 2013-01-27 13:10:14 -05:00
ZxBiohazardZx
2aa554db34 Typo: i will now go hang myself..... _ typo 2013-01-27 17:42:44 +01:00
ZxBiohazardZx
b9cb92cc88 Fix/Commit: push final file, not the workingcopy 2013-01-27 17:41:26 +01:00
Expecto
eba983c3a0 DB/Creature: Add spawns for Unseen in Duskwood (thanks Expecto for that) 
DB/SAI: Add SAI for the Unseen's Aura (thx ZxBiohazardZx)
 2013-01-27 17:37:20 +01:00
Shauren
6e80357f8e Core/Authserver: Added possibility to allow realm connections both from "world" and local networks. 2013-01-27 17:33:01 +01:00
Nay
3a6a02547c Update sql/updates/world/2013_01_26_07_world_gameobject_template.sql 2013-01-27 04:06:12 +00:00
Kinzcool
3de933bcb5 DB/Gameobject: Added a missing gameobject template 2013-01-26 22:09:09 -05:00
Kinzcool
10bd0adca1 DB/Creature: Fixed equipment of Elder Razormaw, he should no longer have a sword as arms 2013-01-26 21:41:28 -05:00
Gacko
3a07f4e17d DB: Fix import 2013-01-27 01:51:44 +01:00
Nay
1b551cc157 Scripts/Commands: Add guild info to .pinfo 
Original patch by @secharles, modified

Closes #8946
 2013-01-26 21:33:13 +00:00
ZxBiohazardZx
e591f886ff DB/Misc: 
Add Rare Bosses to Dire Maul Closes #5882
Add SAI for Quest: No Mercy for the Captured Closes #568
Add Spawn for Sand Shark Closes #5925 (thx Mogale)
Fix underground Centaurs Closes #8498 (thx baric)
 2013-01-26 22:12:04 +01:00