Commit Graph

5396 Commits

Author SHA1 Message Date
Vincent_Michael
15a249e28c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Pet/Pet.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
2013-03-21 22:00:01 +01:00
Nay
64cffa1271 SQLS: Rename sql file after PR merge 2013-03-20 21:02:45 +00:00
Nay
94dd2cd850 Merge pull request #8734 from blipi/guardians_altar
Quest 4901 "Guardians of the Altar"
2013-03-20 14:01:34 -07:00
Vincent_Michael
455da45d9c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-18 23:39:21 +01:00
Bezo
228d9803f3 Scripts/Commands: Add .list mail $char/$guid command
Prints a list of mails received by the characters

Closs #9421
2013-03-17 17:32:24 +00:00
Vincent_Michael
2e4d6f9e26 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore into 4.3.4 2013-03-17 16:05:27 +01:00
Pitcrawler
f598bf81ad DB/Quests: Fix Send Them Packing, closes #6851 2013-03-17 15:07:36 +01:00
Pitcrawler
def742ab5a DB/Creature: Fix a creature state (visual only) 2013-03-17 14:12:15 +01:00
Pitcrawler
7aa2380913 DB/Quests: Fix Valkyrion Must Burn, closes #2595
Replace core script with SAI
2013-03-17 13:59:01 +01:00
Pitcrawler
222b30f2e8 DB/Conditions: Fix some spell implicit targets
Fix an SAI issue (visual only)
2013-03-16 14:35:48 +01:00
Nay
efdbc68cae Scripts/Commands: Fix "cannot pass objects of non-trivially-copyable type ‘std::string’ through ‘...’" 2013-03-15 23:39:51 +00:00
Kinzcool
7458f38764 Revert "Core/Objects: Updated playercreateinfo_spell's content for Cataclysm with the new database structure."
This reverts commit 8bd4e3aff8.
2013-03-15 18:35:13 -04:00
Vincent_Michael
e89d586032 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-15 23:03:06 +01:00
Nay
6b78efdcd6 SQL: Rename SQL file after PR merge 2013-03-15 20:44:07 +00:00
Nay
3a3f087b07 Merge pull request #9396 from thomas007788/Whispers
Allow reply to whispers if you are under CONFIG_CHAT_WHISPER_LEVEL_REQ
2013-03-15 13:42:43 -07:00
Shauren
db0a0e73e4 SQL: Corrected file name and replaced tabs with spaces 2013-03-15 21:25:24 +01:00
Shauren
dcdd9447fd Core/PacketIO: Allow playing all ingame movies
Closes #9434
2013-03-15 21:19:15 +01:00
Shauren
e58e05d9d5 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-15 20:09:48 +01:00
Gacko
b136f01edf Script/Quest: Into the wild green Yonder
Still todo:
* Fix spell focus requirement for the drop spell casted by the vehicle

Closes: #8752
2013-03-15 19:37:45 +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
Warpten
51b9e6d2c9 DB/Spells: Corrected playercreateinfo_spell records *for good*.
Also corrected load count and temporarily removed an error log. It needs better troubleshooting to avoid error'ing false positives.
2013-03-15 01:24:54 +01:00
Vincent_Michael
11846f5990 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-14 22:40:53 +01:00
Warpten
1bab3073d2 DB/Spells: Fixed startup errors related to playercreateinfo_spell, and prevent logging spam when race mask or class mask 0 is used. 2013-03-13 23:23:45 +01:00
Vincent_Michael
556694b40b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-13 23:20:04 +01:00
Kirkhammett
c83b2b69b6 DB/SAI fix some event_flags and other conversion issues
Closes #9144
2013-03-13 19:57:11 +01:00
dr-j
2f895f91ee DB/Loot: Correct Lootmode for some questitems (thx redsonja as well)
Closes #9382
Closes #9381
2013-03-13 19:52:31 +01:00
Pitcrawler
3bc7e5a7c8 DB/Quests: Fix The Best of Intentions, closes #5716
Remove a bunch of incorrectly spawned NPCs and add some missing NPCs and GOs for quest Defiling the Defilers.
2013-03-13 11:58:51 +01:00
Vincent_Michael
0b445a9906 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-12 23:09:14 +01:00
Warpten
8bd4e3aff8 Core/Objects: Updated playercreateinfo_spell's content for Cataclysm with the new database structure.
Also fixed some characters not being able to clear glyphs (missing spell) and removed a hack.
2013-03-12 18:56:44 +01:00
Gacko
a0f4937fbc Rename sql files 2013-03-12 18:51:08 +01:00
Warpten
41c3c42731 Fixed a duplicate ALTER query, it was already in the previous SQL file. 2013-03-12 17:18:34 +01:00
Warpten
eb3f2349ba Core/Objects: Added missing data convertion for playercreateinfo_spell_custom. 2013-03-12 17:16:14 +01:00
Vincent_Michael
e13fdd9829 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-11 22:08:29 +01:00
Warpten
a3e4f05e1a Core/Objects: Changed playercreateinfo_spell and playercreateinfo_spell_custom to use race and class masks.
Specifying a race mask of zero will provide the spell to every race.
Specifying a class mask of zero will provide the spell to every class that the race can be.

Note: As the SQL truncates `playercreateinfo_spell`, all your "custom" additions will be gone.
2013-03-11 20:57:52 +01:00
Nay
9ae9277817 DB/Auth/Schema: Change secId from int(10)u to tinyint(3)u in rbac_security_level_groups
Closes #9403
2013-03-11 14:46:38 +00:00
Pitcrawler
cdb77f3ea1 DB/Quests: Fixes Scare the Guano Out of Them! Closes #6854
Thanks @w1sht0l1v3 for initial work
2013-03-11 15:02:02 +01:00
Vincent_Michael
866d82a2ce Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-10 22:20:33 +01:00
Pitcrawler
0f5f560aad DB/Quests: Fixes Memories of Stormhoof, closes #1065 2013-03-10 15:42:47 +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
Pitcrawler
f3617abdba DB/Quests: Fixes Dun-da-Dun-tah! Closes #4182 2013-03-09 23:50:44 +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
Nay
ab088cf5ba SQL: Rename a SQL from PR 2013-03-09 18:48:17 +00:00
Nay
3c10d4117a SQL: Update sql/base/auth_database.sql 2013-03-09 17:57:48 +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
Trista
8e44b2d4a6 Scripts/Eye of Eternity: Remove some uneeded check and last to do that is uneeded after last GO changes
* also repair some broken GO data for 3.3.5a.
2013-03-09 05:32:02 +02:00
Vincent_Michael
deabbb0e76 DB/Misc: Fix some db startup errors 2013-03-09 01:56:47 +01: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
Spp
524a10d628 Typo fix... ¬¬ 2013-03-08 14:05:51 +01:00