Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,953 Commits 4 Branches 146 Tags
fc687effce3c877c8e4b02110973bf416a2ccdd5
Commit Graph

7320 Commits

Author SHA1 Message Date
Shauren
2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
 2014-07-27 20:59:22 +02:00
Dr-J
7c498a0cf9 DB/Misc: Fix some spell area issues 
Add spell area entries so some spells get removed when players leaves zone where its intended to be used: -

Closes #12669

Also fixes imbued scourge shroud http://www.wowhead.com/item=34782/imbued-scourge-shroud so the aura gets removed when player leaves the Temple City of En'kilah.
 2014-07-27 15:03:22 +01:00
Vincent-Michael
55eafa247d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
 2014-07-27 12:09:32 +02:00
Malcrom
6699d969f3 DB/Waypoints: Pathing for Murkblood Invaders in Nagrand 2014-07-27 01:12:16 -02:30
Malcrom
fe80415b50 DB/Misc: Fix some startup errors 2014-07-27 00:49:11 -02:30
Dr-J
1c345e59bc DB/SAI: Azuremyst Isle Scripts 
Script Turn in events for 

* Medicinal Purpose
* An Alternative Alternative
* Rune Covered Tablet

Script repeating event for "Cookie" McWeaksauce
 2014-07-27 02:11:04 +01:00
Malcrom
30e1342048 DB/Creature Formations: Fix formation error in last commit. 2014-07-26 13:07:45 -02:30
Malcrom
51b2756ab7 DB/Waypoints: Add Pathing for Garadar Wolf Riders in Nagrand 2014-07-26 12:45:55 -02:30
Subv
b5d025938e Core/Waypoints: Allow the table waypoint_data to use Takeoff and Land waypoints. 2014-07-25 19:05:25 -05:00
Vincent-Michael
5a8e79528f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-25 19:35:11 +02:00
Malcrom
c60bdec160 DB/Misc: Misc fixups in Dalaran 2014-07-25 14:54:47 -02:30
Malcrom
cbcebbe63d DB/Misc: Misc fixups in Shattrath 2014-07-25 13:08:12 -02:30
Dr-J
435baba1c9 DB/Creature: Add a lot of missing texts 
* Add a lot of missing texts (from sniff) and add sai to use them
* Add to some existing scripts to use texts which where missed from original scripts
 2014-07-25 14:44:33 +01:00
Malcrom
89f67fc0c3 DB/Waypoints: Pathing for Empoor and Formation for his bodyguard 2014-07-24 23:41:30 -02:30
Dr-J
9cdc9f84d6 DB/QUEST: Healing the lake 
Closes #12504
Closes #12526
 2014-07-25 00:39:17 +01:00
Dr-J
b63af06b62 I must not forget to add broadcasttext IDS... 2014-07-24 22:51:59 +01:00
Dr-J
d1f8dbd561 DB/QUEST: Quest a Carver and a Croaker 
Closes #3649
 2014-07-24 22:12:13 +01:00
WishToDie
fb484f9917 Fix typo in 2014_07_13_01_world_misc.sql 2014-07-24 23:39:05 +03:00
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