Commit Graph

5310 Commits

Author SHA1 Message Date
Vincent_Michael
cd24526aac Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-26 16:11:15 +01:00
Spp
2286de02f8 Core/RBAC: Correction to last sqls and update base/auth_database.sql 2013-02-26 15:25:46 +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
8d64a77bc0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-25 23:10:45 +01:00
Vincent_Michael
4bdc9e6f1c DB/Areatrigger: Update areatrigger_teleport cords for The Eye of Eternity entrance 2013-02-25 22:05:30 +01:00
Gacko
48c83afb04 DB/SAI: ... and remove the EAI. 2013-02-25 17:12:16 +01: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
Gacko
669b926b8b DB/SAI: Convert EAI for Stormforged Eradictor
Forgot to do so in cb99c1d16a
2013-02-25 17:04:49 +01:00
Spp
0c2402df95 Core/RBAC: Create new permissions 'See two side who list', 'Add friends of other faction', 'See all levels with who command' and 'Allows to add a gm to friend list' 2013-02-25 15:48:19 +01:00
Spp
019770dddb Core/RBAC: Create new permissions related to character creation
- 'Skips character creation team mask check'
- 'Skips character creation class mask check'
- 'Skips character creation race mask check'
- 'Skips character creation reserved name check'
- 'Skips character creation heroic min level check'
- 'Creation of two side faction characters in same account' (Affected by global config option)
2013-02-25 15:48:19 +01:00
Spp
f67330e2ad Core/RBAC: Create new permissions 'Allow channel chat between factions', 'Join channels without announce' (both need config option enabled and permission set) and 'Change channel settings without being channel moderator' 2013-02-25 15:48:18 +01:00
Spp
18562a43ba Core/RBAC: Create new permissions 'Skips needed requirements to use channel check', 'Filter whispers', 'Allow say chat between factions'. Last one needs config option to be enabled and both sender and receiver to have the permission 2013-02-25 15:48:18 +01:00
Spp
9bd697066b Core/RBAC: Add new permissions 'Skip disable map check', 'Skip reset talents when used more than allowed check', 'Skip spam chat check', 'Restore saved gm setting states', 'Use Config option START_GM_LEVEL to assign new character level' 2013-02-25 15:48:18 +01:00
Spp
fc78c48495 Core/RBAC: Create new permissions 'Notify if a command was not found' and 'Enables lower security than target check' 2013-02-25 15:48:18 +01:00
Spp
d14cb26e6e Core/RBAC: Create new permission 'Two side mail interaction'. In order to send/receive mails from other faction, config option should be enabled and both sender and receiver should have the permission 2013-02-25 15:48:18 +01:00
Spp
ea2e6052b2 Core/RBAC: Create new permissions 'Allow to use CMSG_WORLD_TELEPORT opcode' and 'Allow to use CMSG_WHOIS opcode' 2013-02-25 15:48:18 +01:00
Spp
e99dd15915 Core/RBAC: Create new permission 'Skip over-speed ping check' 2013-02-25 15:48:18 +01:00
Spp
54f7cc326f Core/RBAC: Create new permission 'Receive global GM messages/texts' 2013-02-25 15:48:18 +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
8e3944bd94 Corrections to recent sqls 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
1638092f18 Core/RBAC: Create 'Skip instance required bosses check' permission 2013-02-25 15:48:18 +01:00
Spp
8810fcb575 Core/RBAC: Add new Permission "Log gm trade". Config option still active, but will affect only to users with that permission granted 2013-02-25 15:48:18 +01:00
horn
c34f1aebe6 Script/Commands: Make creature_summon_groups table reloadable. 2013-02-24 23:50:08 +01:00
Gacko
cb99c1d16a Script/Quest: The Lonesome Watcher (12877)
Closes: #9185
See: http://www.youtube.com/watch?v=ylZRMu9CIMw
2013-02-24 19:42:21 +01:00
horn
ba549ddc30 Core/Summons: Implement summon groups system to be able to summon multiple NPCs at once without need of hardcoding the positions. Almost all hardcoded positions can now be moved to DB.
Thx to @Shauren for his help.
2013-02-24 17:10:02 +01:00
Vincent_Michael
1fba352a88 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-24 15:55:34 +01:00
Kinzcool
5f16aad092 DB/Trigger: Fixed instance exit of the Culling of Stratholme 2013-02-23 18:40:50 -05:00
Vincent_Michael
d5eeeb11d3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-23 23:53:23 +01:00
Vincent_Michael
56e32aac82 SQL: Fix "No newline at end of file" in 194cc54f08 2013-02-23 18:15:49 +01:00
Vincent_Michael
194cc54f08 DB/Gameobject: Removed transport gameobject 2013-02-23 18:13:17 +01:00
Vincent_Michael
c0c2e533a9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
2013-02-21 00:45:02 +01:00
Nay
65258666e0 Core/NPCs: Fix some equipment issues introduced with 028c72a9f2
Also changed equips defaults to 0 (no equipment) instead of 1.

It seems that some parts of the original commit were reverted locally, my bad.
2013-02-20 01:17:27 +00:00
Trista
2484e5760a DB/SAI: Add sai for quest Gather the Orbs (10859)
Closes #7636
2013-02-19 21:53:30 +01:00
ZxBiohazardZx
bd01370dff DB/Conditions: add conditions to Lokhtos Darkbargainer Thx badmoon for initial fix
Closes #9028
2013-02-19 21:50:55 +01:00
Vincent_Michael
1df992e918 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-19 21:50:40 +01:00
Exodius
e7a5c7e69b DB/Creature: Set Triggerflags & behaviour to triggerNPC
Closes #8950
2013-02-19 21:23:00 +01:00
Larya
5c4d2d3b63 DB/Creatures: Update damage done by ICC bosses to more blizzlike values
Closes #8580
2013-02-19 21:20:56 +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
Kinzcool
12e5541636 DB/Spell: Added an auto-kill spell if you go at No Man's Land in Isle of Conquest 2013-02-18 23:09:53 -05:00
Ascathor
8027c956fc SQL Fix after 933381f 2013-02-18 22:56:54 +01:00
Pitcrawler
933381f80d DB/Misc: Mostly gossip stuff for various creatures.
Some scripts still need to be implemented.
Fixes quest Blood Oath of the Horde.
2013-02-18 19:56:35 +01: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
Nay
fab33f0774 SQLs: Rename some old SQL files to match standards 2013-02-17 21:11:45 +00:00
Shocker
37292a3038 Remove BOM from 2 SQL files
Closes #9233
2013-02-17 06:03:15 +02:00
Shauren
e49aaab6f6 Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line 2013-02-17 02:10:08 +01:00
dr-j
b7b7f964a3 DB/Quests:
Update Quest Requirements for To Bor'gorok Outpost, Quickly! Closes #9113
 Fix Quest Grouping
 Add Quest Conditions for Hellscream's Champion  Closes #9092
 Fix SAI for Hugh Glass Closes #9097
2013-02-16 11:20:11 +01:00
Exodius
6141d38269 DB/Loot:
+ Remove Zulian Mudskunk from Zulian Crocolisk loot template  Closes #9169
+ Add Vicious Oil to Vicous Oil Closes #9147
2013-02-16 11:10:08 +01:00