Commit Graph

21346 Commits

Author SHA1 Message Date
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
Vincent-Michael
a5bcab16a9 DB/Creature: Removed hack in 356ba1e0ce 2013-09-10 18:55:03 +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
Aokromes
4d6adbbb1b Core/RBAC: Fix typos in recent SQL files 2013-09-10 18:20:36 +02:00
Aokromes
f65be0d30d Core/RBAC: Fix typos in recent SQL files 2013-09-10 16:38:04 +02:00
Aokromes
6ec94e4177 Core/RBAC: Fix typos in recent SQL files 2013-09-10 16:20:10 +02:00
Aokromes
c70eda3234 Core/RBAC: Fix typos in recent SQL files 2013-09-10 16:17:47 +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
Filip
62a4d53fe7 Because I hate tabs 2013-09-10 12:14:01 +02:00
Filip
356ba1e0ce DB/SAI: The Zephyrium Capacitorium(part 1), The Singing Ridge(part 2), Razaan's Landing, Ruuan Weald
Fixes #6322 Fixes #6323 Fixes #6324
2013-09-10 12:10:26 +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
Filip
f2121b12c0 DB/Cond: Conditions for Hodir's Horn 2013-09-10 09:04:26 +02:00
Filip
ddca805378 DB/SAI: Blowing Hodir's Horn (12977)
Fixes #10749
2013-09-09 18:53:12 +02:00
Vincent-Michael
ce742dc7a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
2013-09-09 18:26:31 +02:00
Shauren
be5cf42ec3 Core/SmartAI: Fixed creatures using SAI not attacking its charmer after it breaks
Closes #7601
2013-09-09 17:44:07 +02:00
Filip
79307bc884 DB/Update: Needs null spawndist 2013-09-08 18:10:08 +02:00
Filip
688a35e25d DB/SAI: Trapping the Light Fantastic (10674) & Gather the Orbs (10859)
Fixes #7202
Adds support for the Alliance quest also, and makes the orbs go in tandem with the horde version script.
2013-09-08 17:57:12 +02:00
Shauren
fcf9552934 Core/SmartScripts: Fixed heap corruption in SMART_ACTION_EQUIP
Closes #10739
2013-09-08 12:15:13 +02:00
NaydSucks
7eddda9905 DB/Sai: Teron Gorefiend, I am...
Added horde version for the script also.
2013-09-07 21:22:22 +02:00
Filip
00f3e423a5 DB/Updates: AI fixups
By @Aokromes, fixes #10733 #10728
2013-09-07 19:03:12 +02:00
Machiavelli
e8675dd4ed Scripts/Blood Furnace: Fix possible compile errors on old VS versions 2013-09-07 15:17:56 +01:00
Aokromes
80516db48c Core/Battlegrounds: Allow random BG winner/loser rewards to be configurable
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
2013-09-07 13:32:04 +01:00
Machiavelli
287dc307bc Merge pull request #10724 from jackpoz/guild_disband_leak
Core/Guild: Fix memory leak on Guild disband
2013-09-07 05:07:28 -07:00
Aokromes
c3c5327fbd Merge pull request #10716 from Discover-/SAI_Owner_Or_Summoner
Core/SAI: Make SMART_TARGET_OWNER_OR_SUMMONER also work for creatures su...
2013-09-06 17:29:15 -07:00
joschiwald
f66120060a Scripts/Spells: drop obsolete code 2013-09-07 01:21:36 +02:00
Vincent-Michael
fab0f461c0 Core/Condition: Added CONDITION_SOURCE_TYPE_PHASE_DEFINITION define for only 4.3.4 branch 2013-09-07 00:16:10 +02:00
Vincent-Michael
be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
2013-09-06 21:55:19 +02:00
Subv
8c70f8cb08 Merge pull request #10730 from jackpoz/scoreboard_fix
Core/Battleground: Fix scoreboard
2013-09-06 12:51:00 -07:00
jackpoz
3816fb440f Core/Battleground: Fix scoreboard
Fix scoreboard broken in 07d793b94b . A local variable in a loop stored data of the iterator before incrementing it.
2013-09-06 21:49:30 +02:00
Vincent-Michael
bc1a079b6c Core/SAI: Fix typo (i blame germans laziness) 2013-09-06 21:40:04 +02:00
joschiwald
e5af3e25f9 -.- 2013-09-06 21:18:07 +02:00
joschiwald
49e2ad73d2 Fixed build 2013-09-06 21:16:09 +02:00
joschiwald
9429251e2e Scripts/YoggSaron: fixed rewarding loot 2013-09-06 21:02:02 +02:00
joschiwald
adef15cd0f Core/Spells: add an other condition to SpellInfo::NeedsToBeTriggeredByCaster to correct spells with are wrongly triggered by target instead of caster
- convert archavons rock shards to spellscript (now it works properly)
- add a spellscript for one spell that can't be corrected by this (and delete the sai hack, now i uses the correct spell)
2013-09-06 20:57:38 +02:00
Shauren
46ffea86e3 Merge pull request #10729 from xjose93/DebugSendOpcodeFreeze
Core/Commands: Fix .debug send opcode freeze if file dont exists.
2013-09-06 06:49:00 -07:00
xjose93
35ef163703 Core/Commands: Fix .debug send opcode freeze if file dont exists. 2013-09-06 15:31:22 +02:00