Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,350 Commits 4 Branches 146 Tags
96b5bfd98550da756f01f17d08b8aa626487c19a
Commit Graph

24350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shauren
96b5bfd985 Core/Commands: Fixed merge error 2015-10-23 18:12:42 +02:00
MitchesD
6f844f36c3 Merge pull request #15755 from ShinDarth/reset-stealth 
Fixed some rare stealth/prowl visual bugs after duel cd reset
 2015-10-23 12:09:41 +02:00
MitchesD
b2575a04ce Merge pull request #15753 from Rushor/blood 
Scripts/IcecrownCitadel: Quest 'Blood Quickening' - Add Killcredit in 25ManRaid
 2015-10-23 12:06:03 +02:00
ShinDarth
81980ae58c Core/Spells: fixed some rare stealth/prowl visual bugs after duel cd reset 2015-10-23 11:56:47 +02:00
Kittnz
6264f25a98 DB/Path: Pathing for few rats in Dalaran 2015-10-22 22:49:27 +02:00
Shauren
c92faf6277 Core/Commands: Refactored chat command script hook, fixes a crash when building with gcc 5 
Closes #15616
Closes #15740

(cherry picked from commit 2d942ddcc5)

# Conflicts:
#	src/server/scripts/Commands/cs_battlenet_account.cpp
#	src/server/scripts/Commands/cs_cast.cpp
#	src/server/scripts/Commands/cs_debug.cpp
#	src/server/scripts/Commands/cs_go.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/server/scripts/Commands/cs_mmaps.cpp
#	src/server/scripts/Commands/cs_modify.cpp
#	src/server/scripts/Commands/cs_npc.cpp
#	src/server/scripts/Commands/cs_reload.cpp
#	src/server/scripts/Commands/cs_ticket.cpp
 2015-10-22 22:34:16 +02:00
Rushor
c5641a9a58 Scripts/IcecrownCitadel: Quest 'Blood Quickening' - Add Killcredit in 25ManRaid 
closes #15733
 2015-10-22 12:24:26 +02:00
Rushor
db8aba662a DB/Gossip: Orbaz Bloodbane - Gossip option 
by @tkrokli + @Pitcrawler , closes #15737
 2015-10-22 11:21:10 +02:00
Rushor
82b727360c DB/Creature: Grethok the Controller - Add text on Death 2015-10-21 13:33:42 +02:00
Rushor
6a0ceb96fd DB/Pathing: Onyxia's Lair 2015-10-21 10:52:26 +02:00
Shauren
c04c409f41 Merge pull request #15746 from Rushor/Venom 
Core/Spells: Reduce Duration for EffectEnchantHeldItem-Spells
 2015-10-20 17:31:21 +02:00
Rushor
5dbe53279b Core/Spells: Reduce Duration for EffectEnchantHeldItem-Spells 2015-10-20 16:34:38 +02:00
Rushor
54341dc8ab DB/Creature: Thistle Boar - Skinning Loot 
* closes #15744
 2015-10-20 11:47:44 +02:00
Rushor
85616fcec3 DB/Creature: Small Crag Boar - Remove invalid skinning Loot 
* closes #15742
 2015-10-20 11:39:18 +02:00
Rushor
1bce1b99b9 DB/Creature: Young Thistle Boar - Skinning Loot 
* closes #15743
 2015-10-20 11:32:41 +02:00
Rushor
be0649fafb DB/Creature: Gryphoneer Leafbeard - Gossip 
* closes #15745
 2015-10-20 11:25:01 +02:00
Aokromes
183b89dcc3 Update UnixInstall.txt 2015-10-19 13:36:44 +02:00
blub
5c449b50aa Merge pull request #15731 from ShinDarth/toscri 
Convert the Duel Cooldown Reset feature to scripts
 2015-10-18 18:46:28 +02:00
ShinDarth
c6c3e72b55 Core/Scripts: convert the Duel Cooldown Reset feature to scripts 2015-10-18 18:41:58 +02:00
MitchesD
981e764004 Merge pull request #15727 from ShinDarth/duel-cd 
Core/SpellHistory: Improved Cooldown Duel Reset
 2015-10-18 15:55:39 +02:00
ShinDarth
9bd8522c0d Core/SpellHistory: Improved Cooldown Duel Reset 
- Do not send useless data to the client
- Fixed a rare visual bug
 2015-10-18 02:11:51 +02:00
Killyana
8ff619ddc4 DB/Creature: Add missing npcs in Dalaran 2015-10-18 01:23:35 +02:00
MitchesD
4204805d47 Merge pull request #15697 from ShinDarth/cd 
Core/Player rewritten duel CD reset system
 2015-10-17 18:38:31 +02:00
ShinDarth
1e52dd4797 Core/Player rewritten duel CD reset system 2015-10-17 18:37:34 +02:00
Killyana
ebf5b18fbc DB/Creature: Fix spawnMask for Spire Frostwyrm 2015-10-17 18:13:25 +02:00
Rushor
7c02709139 DB/SAI: Dalaran Mages - Add Emotescripts 2015-10-16 20:59:45 +02:00
Dr-J
def132d5ab DB/Misc: Updates for Argent Tournament Quests 
* add visual for The Light's Mercy
* On Agro text for Mistcaller Yngcar
* Correct Defend spell for Boneguard Lieutenant

Thanks to @killyana for updates to script for the Light's Mercy
 2015-10-16 19:05:23 +01:00
Aokromes
d4f2367c6b Update CONTRIBUTING.md 2015-10-16 11:16:30 +02:00
Aokromes
148b772fb6 Update README.md 2015-10-16 11:04:23 +02:00
Aokromes
5a3b1d32f7 DB/Misc: More AQ40 fixes 
By Malcrom.
 2015-10-16 00:42:16 +02:00
Carbenium
d97f8fc893 Merge pull request #15716 from ShinDarth/bg-exp 
Core/Misc split Rate.XP.Kill and Rate.XP.BattlegroundKill settings
 2015-10-16 00:14:54 +02:00
ShinDarth
2185165e84 Core/Misc split Rate.XP.Kill and Rate.XP.BattlegroundKill settings 2015-10-16 00:04:40 +02:00
Aokromes
69fb441a28 DB/Creature: AQ20 Full respawn and waypoints 
By Malcrom
 2015-10-15 21:57:59 +02:00
Killyana
f3344bcd7b DB/Quest: The Nightmare Manifests 
Fix some issues: InhabitType, Hover during the combat, and Eranikus will no longer be attackable before the phase 2
 2015-10-15 19:14:49 +02:00
Killyana
ec83d0fd8c DB/Item: Meteorite Crystal Trinket 
By @treak
Closes  #8669
 2015-10-15 04:35:49 +02:00
Killyana
141ba6bfda DB/Creature: Fix spawns/pathing in AQ40 
By malcrom
 2015-10-15 01:39:28 +02:00
pete318
c9258d436b Core/Auras: Fixed auras limited to a single target not being removed in all cases as expected 
* Fixes possible assertion failure in Aura::UnregisterSingleTarget
Closes #15696
Ref #15668

Cherry picked (manually) from b808910a89
 2015-10-14 18:38:13 +02:00
Killyana
bfa521491b DB: Fix up some errors in Vekniss Hive Crawler 
By Malcrom
 2015-10-14 16:52:50 +02:00
Aokromes
2478438117 DB/Misc: Fix 2 runtime errors 
By Malcrom
 2015-10-14 12:07:53 +02:00
Aokromes
3b2b679981 DB/Creature: Pathing for Lava Surger 
By Malcrom
 2015-10-14 09:38:11 +02:00
Aokromes
e3698ea109 Update 2015_10_14_00_world.sql 2015-10-14 09:34:12 +02:00
Carbenium
258a49a3fc DB/Creature: Fix spawns/pathing in AQ40 
By malcrom
 2015-10-14 02:32:47 +02:00
Aokromes
7605a1497c DB/Creature: Reguid for future commit 
By Malcrom.
 2015-10-13 23:43:19 +02:00
Naios
5a71eb7384 Merge pull request #15711 from ShinDarth/bg-leave 
Core/BG: Improved Battleground.InvitationType = 2
 2015-10-13 21:18:30 +02:00
ShinDarth
b76ea11685 Core/BG: Improved d7cb84f6cd 
- Handle case when some players leave or InvitationType changes while running
- Add some comments
 2015-10-13 17:41:08 +02:00
pete318
3f29ce9e8f Core/Pch - Fix non PCH build. 
Issue introduced in b1032ed620
 2015-10-13 09:28:44 +02:00
pete318
b1032ed620 Change many uint32 to ObjectGuid::LowType in line with 6.x changes. 2015-10-12 23:10:41 +02:00
Naios
f179c4180f Merge pull request #15676 from ShinDarth/bg2 
Core/Battlegrounds: implement even BG teams configuration
 2015-10-12 21:26:18 +02:00
pete318
69941864ef Merge pull request #15707 from ShinDarth/pvpstats 
Core/BG fix .character changefaction pvpstats victories amount
 2015-10-12 20:07:40 +02:00
ShinDarth
d7cb84f6cd Core/Battlegrounds: implment even BG teams configuration 2015-10-12 20:02:13 +02:00