Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,905 Commits 4 Branches 146 Tags
cdb33ab174a43fb3cc19dcd672bbfd3191fd84aa
Commit Graph

7302 Commits

Author SHA1 Message Date
DDuarte
cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2014-07-24 17:10:21 +01:00
DDuarte
3de1714350 Scripts&DB/Feralas Convert npc_screecher_spirit to SAI 
SAI by @Rushor and gossip by @malcrom

Closes #12630
 2014-07-24 16:38:18 +01:00
Aokromes
03146835e5 DB/Creature: Mana surge 
By untaught, closes #11661
 2014-07-24 17:08:01 +02:00
Shauren
02cbe978aa Rename 2014_07_24_00_world_misc.sql to 2014_07_24_00_world_misc.sql 2014-07-24 16:59:58 +02:00
Dr-J
88ac8d4c68 DB/Gameobject: Spawn some missing mailboxes 
Spawn Missing Mailboxes in Undercity and Stormwind

* 6 In Undercity (previously only 1 mailbox was spawned in whole of undercity) - 7 in total including the 1 already spawned
* 2 In Stormwind (12 where spawned) - 14 in total including the 12 already spawned
 2014-07-24 15:54:35 +01:00
Malcrom
532d8fb2b0 Create 2014_07_24_10_world_sai.sql 
DB/SAI: Fallen Ranger SAI fix
closes #12206
 2014-07-24 12:18:48 -02:30
Malcrom
1c3e465a9b Create 2014_07_24_09_world_sai.sql 
DB/SAI: Argus Shadow Mage SAI fix
closes #12001
 2014-07-24 12:14:20 -02:30
Vincent-Michael
296956e06e Revert "Core/Spells: Death and Decay" 
This reverts commit 02d56e00bc.
 2014-07-24 16:14:25 +02:00
Malcrom
d7cf0a935a Create 2014_07_24_07_world_conditions.sql 
Db/Conditions: Update conditions for Gart Mistrunner gossip
closes #12496
 2014-07-24 11:23:34 -02:30
Aokromes
062755df94 DB/Creature: Fix Innkeeper Belm 
By Rushor, closes #12618
 2014-07-24 11:34:57 +02:00
Vincent-Michael
38381f9ab2 DB/Creature: Fix model problem with "Enraged Air Spirit" 
ServerToClient: SMSG_DB_REPLY (0x1F01) Length: 101 ConnectionIndex: 1 Time: 03/30/2014 19:37:07.876 Number: 47320
Entry: 21060
DB2 File: Creature (3386291891)
Hotfix date: 03/30/2014 19:37:04
Size: 85
Creature Entry: 21060
Item Entry 1: 0
Item Entry 2: 0
Item Entry 3: 0
Mount: 0
[0] Display Id: 14515
[1] Display Id: 15294
[2] Display Id: 0
[3] Display Id: 0
[0] Display Id Probability: 1
[1] Display Id Probability: 0
[2] Display Id Probability: 0
[3] Display Id Probability: 0
Name: Enraged Air Spirit
Rank: 0
Inhabit Type: 0
 2014-07-24 07:22:46 +02:00
DDuarte
73df8f8381 Scripts/IoC: Rename spell_gen_* spells to spell_ioc_* 
(Additions to 6bb63ab7db679d9c)

Closes #12414 (PR)
 2014-07-24 03:49:30 +01:00
msoky
1ab65432a6 DB/Pets: Add missing pet stats data 
Closes #11639
 2014-07-24 03:37:32 +01:00
DDuarte
5193eaac87 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
 2014-07-24 03:35:19 +01:00
Aokromes
a2c35e33af DB/Gameobject: Spawn Maraudon portal 
Closes #10131
 2014-07-24 04:12:26 +02:00
Aokromes
9a80eb5a85 DB/Creature: Fix of Doc Mixilpixil gossips 
By Malcrom, closes #12617
 2014-07-24 02:57:47 +02:00
Aokromes
24a46a3574 DB/Creature: Update SAI of more creatures 
By Malcrom.
 2014-07-24 02:31:08 +02:00
malcrom
6b4dafc1aa DB/NPCs: Add missing gossip for Strahad Farsan 
Closes #12613
 2014-07-24 01:25:08 +01:00
Aokromes
1116e8544d DB/Creature: Update SAI of even more creatures 
By Malcrom.
 2014-07-23 23:12:25 +02:00
Aokromes
98a1ba59c2 DB/Creature: Update SAI of more creatures 
By Malcrom
 2014-07-23 22:15:44 +02:00
Aokromes
a8026fd23f DB/Creature: Update SAI of multiple creatures 
By Malcrom, King of fixes.
 2014-07-23 20:33:11 +02:00
Shauren
f6fc81fed7 SQL: Moved file to proper location 2014-07-23 19:28:21 +02:00
Dr-J
a7476a7898 DB/SAI: Eye of the Lich King 
Properly fix Eye of the Lich King in Pit of Saron so it randomly whispers players
 2014-07-23 17:49:18 +01:00
Aokromes
6d33078731 DB/SAI: Script multiple mobs with SAI 
By Malcrom, king of fixes.
 2014-07-23 17:03:17 +02:00
Dr-J
51614d2319 Fix my screw up cec1ae4c5b 
Fix my screwup with cec1ae4c5b
 2014-07-23 12:08:34 +01:00
Dr-J
cec1ae4c5b DB/Misc: Vault of Lights 
Scripts for Audrid, Tobin, Torian, Omony and Kurzon for the repeating event at the vault of Lights Exodar
 2014-07-23 11:41:56 +01:00
Aokromes
b7251e1c9e DB/Misc: More aditions to 569bfc3 
By dr-j, closes #12601
 2014-07-23 07:51:47 +02:00
Vincent-Michael
8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2014-07-23 06:32:44 +02:00
Aokromes
1bebe15698 DB/Quest: Fix quest credit for the first trial 
By dr-j, closes #12600
 2014-07-23 00:19:24 +02:00
DDuarte
2117810aa4 DB/Schema: Change playercreateinfo_skills engine to MyISAM 2014-07-22 22:36:00 +01:00
DDuarte
a08f931d42 DB/Quests: Add conditions to quest The Symbol of Live 
Closes #11444
 2014-07-22 18:14:06 +01:00
DDuarte
01d9681a4d Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/authserver/Realms/RealmList.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
 2014-07-22 13:15:36 +01:00
Aokromes
f4d065dee0 DB/Creature: Update to c1006c5 
It's bad to do things at late night.
 2014-07-21 16:49:43 +02:00
Aokromes
210fb15265 DB/Creature: Remove no longer needed Summon Imp quests 
Closes #12557
 2014-07-21 15:54:17 +02:00
Aokromes
569bfc3aba DB/Misc: additions to a02ef421b1 
By dr-j, closes #12590
 2014-07-21 13:22:46 +02:00
Aokromes
bdd4b44320 DB/Creature: Oglethorpe Obnoticus 
By dr-j, closes #12315
 2014-07-21 13:20:39 +02:00
Aokromes
0540983f3f DB/Creature: Lyria Skystrider 
By dr-j, closes #12587
 2014-07-21 08:56:44 +02:00
Golrag
1a391e9fbd Scripts/ICC: Added Orange/Green Blight Residue 
Closes #5920
Closes #12464 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-21 03:11:55 +01:00
Aokromes
b82c66f57e DB/Creature: Fix Highvale Outrunner spawn 
Closes #12325
 2014-07-21 04:06:44 +02:00
Aokromes
c661873ca7 DB/Creature: Remove 2 crazy arcane resistance from 2 mobs 
Closes #11237
Someone on UDB must had used resistance6 for error to fill PetSpellDataId.
 2014-07-21 02:59:43 +02:00
Aokromes
675f50f64c DB/Quest: Rezlak quests are not available for Alliance 
Closes #10390
Ref:
http://www.wowhead.com/quest=834#comments:id=52704
http://www.wowhead.com/quest=835#comments:id=52705
 2014-07-21 02:17:16 +02:00
Aokromes
c1006c5a53 DB/Creature: Remove some incorrect bytes from Coilskar mobs 
Closes #6891
 2014-07-21 02:11:50 +02:00
Aokromes
8934eb0084 DB/Creature: Make heroic version Exploding Orb trigger like normal mode 
Closes #12542
 2014-07-20 22:06:37 +02:00
Aokromes
0dac38f8fb DB/Creature: Technician Zhanaa 
By Rushor, closes #12527
 2014-07-20 18:04:01 +02:00
Aokromes
dfbe867e45 DB/Creature: Skorn Whitecloud text 
By Rushor, closes #12258
 2014-07-20 18:00:46 +02:00
Vincent-Michael
3b32053c59 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/shared/Utilities/Util.h
 2014-07-20 16:35:35 +02:00
Aokromes
0c99667887 DB/Quest: Master of the Storm part 3 of 5 
By dr-j, closes #10705
 2014-07-20 14:06:55 +02:00
Vincent-Michael
e68d3b0937 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
 2014-07-20 03:06:03 +02:00
Aokromes
d2c120f2c2 DB/Creature: Diktynna 
By Rushor, closes #12540
 2014-07-20 00:34:04 +02:00
Duarte Duarte
a8773daf6e SQL: Update and rename 2014_07_19_09_world_misc.sql to 2014_07_19_11_world_misc.sql 
Fix a typo in the number of columns of the creature insert query
 2014-07-19 23:25:30 +01:00