Commit Graph

5251 Commits

Author SHA1 Message Date
Vincent_Michael
d292b05ac1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-12 21:21:06 +01:00
Nay
12359b993d DB/NPCs: Set trigger flags_extra to a bunch of quest credit markers
God damn Aokromes, always making me do work and stuff...
2013-02-11 03:10:02 +00:00
Kinzcool
1b4a610976 DB/Triggers: Added anti-exploration in Hellfire Ramparts 2013-02-10 13:05:53 -05:00
Vincent_Michael
92573c4fb5 DB/Factionchange: Add a missing spell (Teleport: Darnassus / Teleport: Thunder Bluff) at player_factionchange_spells 2013-02-10 04:53:48 +01:00
Kinzcool
8e58779d91 DB/Triggers: Fixed access to Duskwither Spire 2013-02-09 19:36:29 -05:00
Vincent_Michael
caf70ee40d DB/Creature: Fix Onyxian Lair Guard equipment 2013-02-10 00:00:53 +01:00
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
Nay
e33f70c002 DB/Quests: Fix quest The Collapse and Deploy the Shake-n-Quake
Ref #1005
Ref #2034
Ref ae30704847
Closes #3595
2013-02-09 15:13:49 +00:00
Kinzcool
8066e43dd8 DB/Triggers: Added areatriggers in Shadowfang - when you'll try to jump out of the dungeon walls, you will be teleported 2013-02-08 17:51:55 -05:00
Shauren
b6e56e42ea Core/Auth: Reverted part of fb43a92cc2 - session key is still needed after logging in to be able to switch realms 2013-02-08 01:03:56 +01:00
Shauren
fb43a92cc2 Core/Accounts: sessionkey field in account table is only a temporary storage to pass data from authserver to worldserver and should only be used as such. Clearing sessionkey from database after a successful login to prevent possible exploits. 2013-02-07 16:15:23 +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
w1sht0l1v3
f27a83e98f Fix up previous commit. 2013-02-06 18:39:09 +02:00
w1sht0l1v3
d42dac4cee DB/Misc: Fixup quest Hot On The Trail (A:24849 H:24851) 2013-02-06 18:32:28 +02:00
Gacko
32546a64c9 Add comment to f205613eb5 2013-02-06 09:08:56 +01:00
Kinzcool
2fa8d06b25 DB/Items: Added Heart-Shaped Box, missing for Love in the Air event
Closes: #9130
2013-02-05 22:30:34 -05:00
Warpten
6a0b7950a7 Core/Spells: Fixed Molten Core's proc. 2013-02-06 00:30:40 +01:00
click
00d299f12f Core/SQL: Explicitly set the auth.account-table to use the INNODB-engine (to allow foreign keys and transactions)
If you have an OLD database (auth), and RBAC SQL-alterations, make SURE that it's InnoDB, otherwise run this (it can be run multiple times anyway)
(The only change added is to alter the table to explicitly be an InnoDB-table)
2013-02-05 22:20:55 +01:00
Gacko
f205613eb5 DB/Disable: Ignore LOS for Krakles Thermometer
Closes #5560
2013-02-05 19:40:20 +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
Kinzcool
630ad4b0b5 DB/Creature: Updated Unseen template 2013-02-04 20:03:04 -05:00
w1sht0l1v3
1e8bf1aad1 DB/Misc: Fix achievement Flirt With Disaster. 2013-02-04 23:39:04 +02:00
Vincent_Michael
7f2a1ece62 Fix merge fail (fucking saving button -.-) 2013-02-04 22:17:23 +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
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