Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
19,833 Commits 2 Branches 1 Tag
e89d586032edcb42e13d7fc5187f17d6db0655b4
Commit Graph
426 Commits
Author SHA1 Message Date
Vincent_Michael e89d586032 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-15 23:03:06 +01:00
Vincent_Michael 3b9ab08029 Core: Fix non pch build 2013-03-15 23:02:11 +01:00
Nefarion 46ba2d945a Allow reply to whispers if you are under CONFIG_CHAT_WHISPER_LEVEL_REQ, and implement feature for GMs to remove single players from their WhisperWhiteList. 2013-03-15 10:27:18 +01:00
Vincent_Michael a9b740ab74 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/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.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/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-03-10 01:08:55 +01:00
Vincent_Michael 4ee0a4a446 Revert "Core/Commands: Optimize for command .npc near" 
This reverts commit 4e789d4c5c.
 2013-03-09 23:28:32 +01:00
Vincent_Michael 4e789d4c5c Core/Commands: Optimize for command .npc near 2013-03-09 23:05:27 +01:00
Vincent_Michael 65b16a97be Core/Commands: Add unit flags 2 for .npc info 2013-03-09 22:34:46 +01:00
Vincent_Michael ce0add2121 Core/Commands: Add mmaps check for command .gps 2013-03-09 22:19:14 +01:00
Vincent_Michael 20eeeaf597 Core: Fix warnings 2013-03-09 20:15:11 +01:00
Nay ab088cf5ba SQL: Rename a SQL from PR 2013-03-09 18:48:17 +00:00
Nay bf17b7b3c0 Scripts/Commads: Fix non PCH build 2013-03-09 17:55:59 +00:00
Nay 6ab7de2dd8 Merge pull request #9388 from thomas007788/DeserterCmd 
Implement .deserter commands
 2013-03-09 09:45:43 -08:00
Nefarion 1b45bcd7b9 Add the following commands: 
.deserter instance add $time (Adds the instance deserter debuff with $time duration to your target)
.deserter bg add $time (Adds the BG deserter debuff with $time duration to your target)
.deserter instance remove (Removes the instance deserter debuff)
.deserter instance remove (Removes the bg deserter debuff)
 2013-03-09 18:43:09 +01:00
SgT-Fatality 8e8617cfe6 Scripts/Commands: Fix .mod rep faction not updating client side reputation 
Closes #7939
Closes #9354
 2013-03-09 15:58:25 +00:00
Vincent_Michael 83a5043741 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2013-03-09 00:32:33 +01:00
Nefarion 49fd11ab5a First step of comment style refactoring to doxygen-style. 2013-03-08 21:55:37 +01:00
Spp 377cfdb560 Core/RBAC: Fix multiple permissions and remove multiple config options that are currently implementes by RBAC 
- Remove config options: CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT, CONFIG_ALLOW_TWO_SIDE_INTERACTION_MAIL, CONFIG_GM_LOG_TRADE, CONFIG_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_ALLOW_TWO_SIDE_WHO_LIST, CONFIG_ALLOW_GM_FRIEND, CONFIG_ALLOW_TWO_SIDE_ADD_FRIEND, CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL
- Fix RBAC_PERM_SKIP_CHECK_CHAT_SPAM (Was checking spam for those that had the permission)
- Only check RBAC_PERM_TWO_SIDE_INTERACTION_CHAT for sender of whispers (Restores GM being able to whisper players)
- Only check RBAC_PERM_TWO_SIDE_INTERACTION_MAIL for sender
- Fix .ticket assign <Player>, with last RBAC change it was changed by mistake from Player to Account
 2013-03-08 13:15:25 +01:00
Nay 37101c82d3 Fix typo introduced in previous commit 2013-03-02 16:54:19 +00:00
Nay 943610cbca Core/Loading: Fix CreatureLoadTemplates and add missing fields to WORLD_SEL_CREATURE_TEMPLATE 2013-03-02 16:41:04 +00:00
Spp 03505a3a42 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_reload.cpp
 2013-02-27 04:08:19 +01:00
Spp 480c6cf4dd Core/RBAC: Add .reload rbac command and prevent possible crash if rbac_permissions has wrong data 2013-02-27 03:30:53 +01:00
Shauren af4ac778d7 Core/Quests: Implemented quest flag forcing the player to be flagged for PvP as long as the quest is in his log. 2013-02-26 17:14:13 +01:00
Vincent_Michael cd24526aac Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-26 16:11:15 +01:00
Nay b00f6a981e Merge pull request #9295 from horn/summons 
Script/Commands: Make creature_summon_groups table reloadable.
 2013-02-25 17:17:53 -08:00
Vincent_Michael 529c4b7592 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MailHandler.cpp
 2013-02-25 17:11:36 +01:00
Spp 367d3ccc4f Core/RBAC: Create new permissions 'Use staff badge in chat' and 'Check if should appear in .gm ingame command' 2013-02-25 15:48:18 +01:00
Spp cb0456fedc Core/RBAC: Create new permissions 'Instant .save', 'Allow params with .unstuck', 'Full HP after resurrect' 2013-02-25 15:48:18 +01:00
Spp e6087b5563 Core/RBAC: Create new permission 'Be assigned ticket' 2013-02-25 15:48:18 +01:00
Spp 15343d9bb0 Core/RBAC: Remove unnecessary header includes from other header files 2013-02-25 15:48:17 +01:00
horn c34f1aebe6 Script/Commands: Make creature_summon_groups table reloadable. 2013-02-24 23:50:08 +01:00
Vincent_Michael 0c16890774 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/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_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2013-02-19 18:57:36 +01:00
Nay 03f97f75ec Core/Startup: Write current and expected maps version when there's a version mismatch 2013-02-19 01:16:24 +00:00
Vincent_Michael 71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Nay 028c72a9f2 Core/NPCs: Refactor equipments 
- creature_template.equipment_id deleted
- creature_equip_template.entry == creature_template.entry
- id field added to creature_equip_template -> PK(entry, id)
- id field in creature_equip_template starts at 1
- creature.equipment_id references id of creature_equip_template
- creature.equipment_id = 0 means no equipment at all (default 1)
- creature.equipment_id = -1 means pick a random equipment from creature_equip_template
- add equipment info to .npc info command

While table creature_equip_template got bigger in size, this system is easier to mantain and allows creatures to have a random template from a group of equipments
 2013-02-18 12:24:18 +00:00
Vincent_Michael 3c5bf554ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-13 21:48:09 +01:00
Shauren d926ad63c0 Core/Spells: Fixed charge effects with non-explicit targets 2013-02-13 20:21:26 +01: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 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
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 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
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 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
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
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
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