Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,779 Commits 4 Branches 146 Tags
c4e2f0e5adfff21da647fef0dde2b9d9be95a171
Commit Graph

6187 Commits

Author SHA1 Message Date
ariel-
afb8c16989 DB/Spells: Added spell proc entry for Meat Cleaver 2016-01-20 02:03:01 -03:00
ariel-
44261652ec Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 2016-01-19 22:27:29 -03:00
ariel-
67bb4c0c3c Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/updates/world/2015_11_09_02_world335.sql
	sql/updates/world/2015_11_09_02_world_335.sql
	sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql
	sql/updates/world/2015_12_16_02_world335.sql
	sql/updates/world/2015_12_16_02_world_335.sql
	sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql
	sql/updates/world/2016_01_02_00_world335.sql
	sql/updates/world/2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_10_05_world335.sql
	sql/updates/world/2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_12_01_world335.sql
	sql/updates/world/2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_12_02_world335.sql
	sql/updates/world/2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_15_00_world.sql
	sql/updates/world/2016_01_17_10_world.sql
	sql/updates/world/2016_01_17_11_world.sql
	sql/updates/world/2016_01_17_12_world.sql
	sql/updates/world/2016_01_17_13_world.sql
	sql/updates/world/2016_01_17_14_world.sql
	sql/updates/world/2016_01_17_15_world.sql
	sql/updates/world/2016_01_18_00_world.sql
	sql/updates/world/2016_01_19_00_world.sql
	sql/updates/world/2016_01_19_01_world.sql
	sql/updates/world/2016_01_19_02_world.sql
	sql/updates/world/2016_01_19_03_world.sql
	src/server/scripts/Spells/spell_paladin.cpp
 2016-01-19 22:24:14 -03:00
Killyana
c606ac53d6 DB: Typo 2016-01-20 01:38:30 +01:00
Killyana
cc0a4e68f7 DB/Gossip: Add missing npc text to Lorrin Foxfire 2016-01-20 01:36:28 +01:00
Killyana
ccad6eca9e Fix Some typos and mechanic_immune_mask in a previous commit 2016-01-20 00:49:00 +01:00
joschiwald
ea38a7d95b Scripts/ICC/Teleporter: moved gossips to db 2016-01-20 00:32:30 +01:00
Aokromes
8838540556 DB/Misc: Declare heroic modes for ShadowFang Keep creatures 
By dragosgirip
 2016-01-19 23:41:22 +01:00
Killyana
a534ca337a DB/Creature: Add gossip menu for Magistrate Bluntnose 
Closes #13031
 2016-01-19 21:42:11 +01:00
treeston
e8a79737a5 Merge branch '3.3.5-horsemen' into 3.3.5-base (PR #16194) 2016-01-19 21:39:23 +01:00
treeston
d23ef5d6d0 Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142) 2016-01-19 21:38:24 +01:00
Saben65
ccf3ed40e2 Scripts/Zangarmarsh: Removes empty gossip_text that resulted in NPCs saying blank text to players after buffing them 
Closes #12697
Closes #16300
 2016-01-19 21:17:10 +01:00
Killyana
cb6fa7556d DB/Creature: Restore Thaumaturge Zajir spawn and update Vaultkeeper Jazra position 2016-01-19 17:58:38 +01:00
Aokromes
6455c450fb DB/Misc: Fix import 2016-01-19 08:33:24 +01:00
Aokromes
180550a87d DB/Misc: 3.3.5a fixes 2016-01-19 07:47:25 +01:00
Aokromes
7d454c66f7 DB/Misc: Few cosmetic fixes for Black Wing Lair 
(c++ script needs to be updated to handle proper door id 176965 instead door 175946)
 2016-01-19 07:22:41 +01:00
Aokromes
c9f009c432 DB/spawn: fix coords for one mob as for wow 4.3.4 2016-01-19 07:03:53 +01:00
ariel-
a43297604f DB/Misc: some more trigger bunnies (weren't visible due to phase, doh) 
Ref #22
 2016-01-19 02:55:20 -03:00
ariel-
7cac086a16 DB/Misc: set some creatures as trigger 
Ref #22
 2016-01-19 02:43:29 -03:00
ariel-
2961a6baaf Core/DB: Fix spellscript validation startup errors 
Closes #44
 2016-01-19 01:42:42 -03:00
Killyana
0279f958fe DB/Creature: High Priestess Jeklik 
Fixed movement stood on the site.
By @DevRival
Closes #16252
 2016-01-19 03:41:48 +01:00
Killyana
89e316ca6c DB/Creature: Battleguard Sartura 
Fix the BaseAttackTime
By @DevRival
 2016-01-19 03:31:04 +01:00
Killyana
9aad349b87 DB/Creature: Landen Stilwell 
Gossip and script
Closes #16238
 2016-01-19 03:19:14 +01:00
Killyana
8f71950c91 DB/Achievement: Terokkar Turkey Time 
By @sirikfoll
Closes #16235
 2016-01-19 01:33:37 +01:00
Killyana
caf160bfaf DB: Update amount of enchanting materials from Wrath greens 
By @Treeston
Closes #16206
 2016-01-19 01:29:31 +01:00
Killyana
e9ed9f80db DB: Fix some DB errors 
By @tkrokli
Closes #16323
 2016-01-19 01:16:24 +01:00
Killyana
cdf7ac6096 DB/Creature: Fordragon Battle Steed 
Closes #16295
 2016-01-18 19:31:35 +01:00
Aokromes
705cf5cb7f Update 2015_12_20_00_world.sql 2016-01-18 19:25:13 +01:00
Killyana
ac64e8fbb0 DB/Creature_text: Kaya Flathoof 
By @tkrokli
Closes #16315
 2016-01-18 16:57:51 +01:00
Dr-J
11a330e691 DB/SAI: Neltharion's Flame 
rewrite  Rothin the Decaying script and add some missing visuals and other stuff
 2016-01-18 14:04:12 +00:00
Kittnz
82c0a074b4 DB: Fix startup errors 2016-01-18 09:27:35 +01:00
ariel-
be57c96863 DB/Achievements: fixed arena season achievements rewarded on login. 
Closes #20
 2016-01-18 00:29:30 -03:00
Killyana
7f5805f308 DB/SAI: Fix Coilfang Scale-Healer spamming 'Heal' 
By @Treeston
Closes #16176
 2016-01-18 00:52:16 +01:00
ariel-
e74775ad64 DB/Core: Add missing realm first achievement criteria conditions. 2016-01-17 20:49:23 -03:00
Killyana
8b30ee0e39 DB/Crearure text: Upate AlgalonText Range 
By @Treeston
Closes  #16170
 2016-01-18 00:43:09 +01:00
Aokromes
6898311caa DB/Misc Remove ammo from vendors/drops 
By msoky
 2016-01-17 21:03:03 +01:00
Kittnz
e4fef200ec DB/Creature: Risen Wintergarde Miner & Risen Wintergarde Defender 
- Delete all existing spawns & respawn both npc's
- Pathing added to Risen Wintergarde Defender
- Miner still needs SAI!

Updates #16306
 2016-01-17 20:20:20 +01:00
Killyana
10b7490a33 DB/Object: Add missing object 2016-01-17 19:58:46 +01:00
Aokromes
448c988e89 DB/Misc: Fix some startup errors 2016-01-17 19:27:23 +01:00
Aokromes
1d76c8f9db DB/Loot: Fix some startup errors 2016-01-17 19:18:39 +01:00
Killyana
3d9f997478 DB/Creature: Remove duplicate spawn for Dreadfang Widow 
By @Saben65
Closes #16140
 2016-01-17 18:17:38 +01:00
Killyana
4682ba0f55 DB: Rename file 2016-01-17 18:14:53 +01:00
Dr-J
bea174e998 DB/Misc: Fix errors 
Fix startup errors introduced with 83efabefe8
 2016-01-17 16:23:20 +00:00
Killyana
8a2a129d35 DB/Creature: Add pooling for Ethereum Jailor 
Only 5 spawns can be active in the world
 2016-01-17 17:22:08 +01:00
Aokromes
0896f91691 DB/Misc: Fix some phases 
By Kilyana
 2016-01-17 17:08:02 +01:00
Kittnz
cb064601a8 DB/Creature: Update MovementType of Shadow of Thel'zan the Duskbringer 
Closes #16304
 2016-01-17 17:00:22 +01:00
Kittnz
97f06d07cb DB/Event: Add missing Feast of Winter Veil spawns in Eastern Kingdoms 2016-01-17 16:25:24 +01:00
Kittnz
670c0466d6 DB/Zone: The Exodar 
- Add missing waypoint & spawns for Exodar Peace Keepers & Worker (could use some SAI scripting)
 2016-01-17 15:37:11 +01:00
Kittnz
7162d94d3c DB/Instance: The Temple of Atal'Hakkar 
- Add waypoints for Hazzas & make Morphaz follow him
 2016-01-17 15:32:51 +01:00
Dr-J
6d10b92071 DB/Quest: Nether Gas In a Fel Fire Engine 
Update 01beba21b5 to more reliabily complete quest to actually allow quest to be returned rather than just been marked as complete in quest log and on map but quest giver still showing grey ? ad grey continue button.
 2016-01-17 12:16:39 +00:00