Vincent-Michael
e4b14b943d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.h
src/server/scripts/Commands/cs_character.cpp
src/server/scripts/Commands/cs_lookup.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/tools/vmap4_extractor/mpq_libmpq04.h
2014-04-05 20:43:05 +02:00
Duarte Duarte
e4c57d839d
TDB 335.53 - 2014/03/29
2014-03-29 04:58:38 +00:00
Vincent_Michael
224da47952
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/scripts/Spells/spell_dk.cpp
2014-01-31 23:51:07 +01:00
Duarte Duarte
efeb54139e
SQL: Update old .sql files to keep consistency with auth_database.sql
...
Also update characters_database.sql (generated by mysqldump)
2014-01-31 04:34:32 +00:00
Vincent_Michael
3f99890b12
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
2014-01-21 21:58:30 +01:00
Vincent_Michael
d4479d9413
Missing changes in 313b294d6b
2014-01-19 21:10:41 +01:00
Vincent_Michael
7e527f9075
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Accounts/RBAC.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Server/Protocol/Opcodes.cpp
2014-01-19 20:52:16 +01:00
Vincent_Michael
313b294d6b
Core/RBAC: Fix difference problems with 4.3.4
2014-01-19 20:48:15 +01:00
Discover-
3102da5263
Misc/SQL: Rename SQL from fa2616fe4e
2014-01-19 17:05:36 +01:00
Vincent_Michael
e8be55aa8b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/TotemAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.h
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
2013-12-08 20:27:46 +01:00
Carbenium
fa2616fe4e
Add mailbox command
2013-12-06 21:37:55 +01:00
Aokromes
5a3b6edb59
Update 2013_12_01_00_auth_rbac_permissions.sql
2013-12-01 09:17:33 +01:00
Vincent_Michael
1bb4cf3ab6
Core/Misc: Removed more unused eventAI stuff
2013-12-01 02:06:37 +01:00
Vincent_Michael
6e13263c7a
Core/AI: Good bye, Good bye my beloved EventAI system :(
2013-12-01 01:27:08 +01:00
Spp
cd48662233
Core/Logging: Minor changes
...
- Select stderr when writing ERROR and FATAL messages
- Simplify function defines
- Fix `logs` table structure with latest logging changes
2013-11-11 14:35:16 +01:00
Shauren
75a790ca47
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-26 17:06:50 +02:00
Shauren
0f4fdb9bc4
Fixed sql files for ce55647c41
2013-10-16 19:39:03 +02:00
Shauren
ce55647c41
Core/Transports
...
* Rewritten path generation, now uses splines - timers are a lot more accurate now
* Implemented stopping transports
* Implemented spawning transports in instances
* Implemented spawning gameobjects as transport passengers
* Transport passengers are now stored in creature/gameobject table using gameobject_template.data6 from transport's template as map id
2013-10-16 18:37:29 +02:00
Shauren
fca4a5448a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-07 14:30:37 +02:00
Spp
ad29676c27
Fix compile under linux and update auth db with latest changes
2013-09-29 14:15:58 +02:00
Spp
ea2fe0217d
Core/RBAC: Simplify RBAC implementation
...
- Drop groups (roles than can have inherited roles) and roles (set of
permissions)
- Permissions can now have inherited permissions (those act as roles)
RBAC DB structure is now limited to four tables
- rbac_permissions: Contains permissions and roles
- rbac_linked_permissions: Contains the relation between permissions and
linked permissions (those permissions that have linked permissions are
called roles)
- rbac_default_permissions: Contains the list of permissions to be granted
to each security level [Added to maintain compatibility in an easy way]
- rbac_account_permissions: Contains the list of permissions granted or
denied for a particular account.
NOTE: IF YOU ARE USING CUSTOM PERMISSIONS, ROLES OR GROUPS CHECK THE SQL
BEFORE APPLYING...
2013-09-29 13:19:05 +02:00
Vincent-Michael
5583bcfeea
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
2013-09-10 19:53:43 +02:00
Aokromes
d617969d22
Core/RBAC: Fix typos in recent SQL files
...
I hope this is final one....
2013-09-10 18:21:32 +02:00
Spp
0ed83024e0
Core/RBAC: Fix typos in recent SQL files
2013-09-10 15:47:17 +02:00
Spp
953575abfa
Core/RBAC: Remove obsolete generic command permissions
...
Note: If you have any custom command, CHECK THE SQLS BEFORE APPLYING
2013-09-10 15:35:10 +02:00
Spp
78363e11b5
Core/RBAC: Move titles and wp commands to RBAC (using individual permissions)
2013-09-10 15:26:48 +02:00
Spp
b10241876e
Core/RBAC: Move ticket commands to RBAC (using individual permissions)
2013-09-10 15:13:08 +02:00
Spp
68ab10ccd4
Core/RBAC: Move tele commands to RBAC (using individual permissions)
2013-09-10 15:01:39 +02:00
Spp
abbc6b2760
Core/RBAC: Move server commands to RBAC (using individual permissions)
2013-09-10 14:57:01 +02:00
Spp
7183a355d2
Core/RBAC: Move reset commands to RBAC (using individual permissions)
2013-09-10 14:33:27 +02:00
Spp
1f95f0b0b8
Core/RBAC: Move reload command to RBAC (using individual permissions)
2013-09-10 14:25:07 +02:00
Spp
4f632ee3ff
Core/RBAC: Move quest commands to RBAC (using individual permissions)
2013-09-10 13:57:30 +02:00
Spp
efa194a7ce
Core/RBAC: Move npc commands to RBAC (using individual permissions)
2013-09-10 13:48:57 +02:00
Spp
04b313557e
Core/RBAC: Move modify commands to RBAC (using individual permissions)
2013-09-10 13:28:32 +02:00
Spp
4d36ce7405
Core/RBAC: Move mmap commands to RBAC (using individual permissions)
2013-09-10 13:08:39 +02:00
Spp
1038446278
Core/RBAC: Move misc commands to RBAC (using individual permissions)
2013-09-10 12:59:25 +02:00
Spp
ec1e88d888
Core/RBAC: Move send commands to RBAC (using individual permissions)
2013-09-10 12:24:40 +02:00
Spp
83cb44d79f
Core/RBAC: Move pet commands to RBAC (using individual permissions)
...
- Pet commands moved from cs_misc.cpp to own file
2013-09-10 12:07:03 +02:00
Spp
1eee42433b
Core/RBAC: Move group commands to RBAC (using individual permissions)
...
- group commands moved from cs_misc.cpp to own file
- renamed groupsummon to "group summon"
2013-09-10 11:45:59 +02:00
Spp
0004d2e9cf
Fix SQL typos after RBAC commits
2013-09-02 15:11:28 +02:00
Nay
28f9317698
Core/RBAC: Move cast and characters commands to RBAC (using individual permissions)
2013-09-02 13:25:07 +01:00
Spp
f3487aa0e1
Compile Fix (and edit of last 2 sqls to add the missing permissions)
2013-09-02 13:19:59 +02:00
Spp
f68471f142
Core/RBAC: Move message commands to RBAC (using individual permissions)
2013-09-02 13:01:50 +02:00
Spp
2d508387e5
Core/Commands: Move lookup commands to RBAC (using individual permissions)
2013-09-02 12:54:51 +02:00
Spp
eb73684952
Core/RBAC: Move list commands to RBAC (using individual permissions)
2013-09-02 12:25:32 +02:00
Spp
4219f45c85
Core/RBAC: Move lfg commands to RBAC (using individual permissions)
2013-09-02 12:17:46 +02:00
Spp
c0dfdeab1c
Core/RBAC: Move learn commands to RBAC (using individual permissions)
2013-09-02 12:12:20 +02:00
Spp
2625e78f80
Core/RBAC: Move instance commands to RBAC (using individual permissions)
2013-09-02 11:58:14 +02:00
Spp
08ef6bd9f8
Core/RBAC: Move honor commands to RBAC (using individual permissions)
2013-09-02 11:53:22 +02:00
Spp
11233dbd73
Core/RBAC: Move guild commands to RBAC (using individual permissions)
2013-09-02 11:45:36 +02:00