Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,751 Commits 4 Branches 146 Tags
3dde44cf64c9eafd2acc67d07494ff2b52fa1a88
Commit Graph

27751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carbenium
3dde44cf64 DB: Add missing change to char base after 39d29edf93 2015-11-08 00:39:33 +01:00
Melvin1263
262e61aae1 Core/DataStores: Fixed reading uint64 fields from DB2 files 
Closes #15818
Closes #15752
 2015-11-07 18:50:13 +01:00
Shauren
78aa35ad5e Merge pull request #15791 from Golrag/FlyingCreatureGroupsPositionZ 
Core/CreatureGroups: Don't set positionZ to ground for flying creatures.
 2015-11-07 14:51:37 +01:00
MitchesD
0031a6e134 Merge pull request #14664 from tkrokli/Exorcism_of_Colonel_Jules 
[Core/DB] Quest: The Exorcism of Colonel Jules
(cherry picked from commit 5db0202a0a)
 2015-11-07 13:32:24 +01:00
Vincent-Michael
6d01960448 Updated url for tc wiki 2015-11-07 11:22:16 +01:00
Carbenium
752474e2ae Rename SQL files 2015-11-07 03:45:00 +01:00
Killyana
ff2db2758e DB/Creature: Ahn'Qiraj 434 & 6X Spawns 
Closes #15784
 2015-11-07 02:11:59 +01:00
Killyana
e9d910a87b DB/Creature: Apexis Flayer 2015-11-07 01:52:44 +01:00
Killyana
c9b7101d7f DB/Page text: Saga of the Sin'dorei 2015-11-07 01:27:11 +01:00
Shauren
88584a7398 Merge pull request #15495 from Treeston/3.3.5-gemperfection 
Core/Spell: Implement "Gem Perfection" (and framework for similar spells in the future)
(cherry picked from commit 15cafba8d5)
 2015-11-07 01:15:21 +01:00
Carbenium
74d7627778 Merge pull request #15720 from Tonghost/3.3.5 
Core/Items: Fix a trading spoof exploit.
(cherry picked from commit 12ae32a9b6)

Conflicts:
	src/server/game/Entities/Item/Item.cpp
 2015-11-07 01:02:11 +01:00
w1sht0l1v3
f605300c71 Core/Quests: Fix a CMSG injection abuse. 
closes #15709

(cherry picked from commit 11f0c85bd4)

Conflicts:
	src/server/game/Handlers/QuestHandler.cpp
 2015-11-07 00:47:58 +01:00
MitchesD
b236f5f50d Merge pull request #15755 from ShinDarth/reset-stealth 
Fixed some rare stealth/prowl visual bugs after duel cd reset
(cherry picked from commit 6f844f36c3)
 2015-11-07 00:43:18 +01:00
Shauren
949c0b58a9 Merge pull request #15746 from Rushor/Venom 
Core/Spells: Reduce Duration for EffectEnchantHeldItem-Spells
(cherry picked from commit c04c409f41)

Conflicts:
	src/server/game/Spells/SpellEffects.cpp
 2015-11-07 00:42:41 +01:00
blub
bf7175ee83 Merge pull request #15731 from ShinDarth/toscri 
Convert the Duel Cooldown Reset feature to scripts
(cherry picked from commit 5c449b50aa)
 2015-11-07 00:38:05 +01:00
MitchesD
42cf4e7713 Merge pull request #15727 from ShinDarth/duel-cd 
Core/SpellHistory: Improved Cooldown Duel Reset
(cherry picked from commit 981e764004)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
 2015-11-07 00:37:34 +01:00
MitchesD
63f253e95c Merge pull request #15697 from ShinDarth/cd 
Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
 2015-11-07 00:35:24 +01:00
Shauren
8ceffaef44 Merge pull request #15646 from ShinDarth/ticket 
Core/Player: implement ResetCoolDownAfterDuel configurable feature
(cherry picked from commit 5b8f1469ca)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
 2015-11-07 00:15:00 +01:00
Naios
ed20680f92 Merge pull request #15711 from ShinDarth/bg-leave 
Core/BG: Improved Battleground.InvitationType = 2
(cherry picked from commit 5a71eb7384)
 2015-11-06 23:51:10 +01:00
Naios
441be76050 Merge pull request #15676 from ShinDarth/bg2 
Core/Battlegrounds: implement even BG teams configuration
(cherry picked from commit f179c4180f)
 2015-11-06 23:46:53 +01:00
pete318
39d29edf93 Merge pull request #15707 from ShinDarth/pvpstats 
Core/BG fix .character changefaction pvpstats victories amount
(cherry picked from commit 69941864ef)

Conflicts:
	sql/base/characters_database.sql
	src/server/game/Battlegrounds/Battleground.cpp
 2015-11-06 23:46:03 +01:00
Shauren
ec1583df67 Core/Corpses: Fixed a possible crash adding bones to grid 
Closes #15808
 2015-11-06 21:30:08 +01:00
duhow
28bdb50d80 Scripts/Commands: Add taxinodes cheat status to 
* Some cleanup

Closes #15065

(cherry picked from commit 558ce7d877)

Conflicts:
	src/server/scripts/Commands/cs_cheat.cpp
 2015-11-06 20:17:38 +01:00
Killyana
c8b91dd511 DB/Quest: The Echo of Ymiron 2015-11-06 19:26:41 +01:00
Killyana
07792c4957 DB/Creature: Add missing spawn for Commander Hobb 2015-11-06 18:51:13 +01:00
Killyana
34d7d7b027 DB/Creature: Reguid one spawn 2015-11-06 18:32:01 +01:00
Killyana
8d73d432c3 DB/gossip: Add missing gossips to Garrosh Hellscream 
(cherry picked from commit 3b544a3577)
 2015-11-06 13:20:11 +01:00
Killyana
286f0ea6f3 Scripts/ICC: moved saurfang gossips to db 
Closes #14904

(cherry picked from commit 7225b7abf1)
 2015-11-06 13:17:54 +01:00
CreshandKesh
143d00a242 Core/Scripts: Salanar the Horseman, Into the Realm of Shadows 
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected

Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.

Closes #15603
Closes #15657

(cherry picked from commit 359df54b79)
 2015-11-06 13:14:05 +01:00
joschiwald
07f2b40443 DB/Conditions: corrected loot conditions after 8a9f1b871a 
(cherry picked from commit df92d2c8d2)
 2015-11-06 13:07:12 +01:00
Aokromes
ec9fa4bd74 DB/Misc: Fix startup errors 
Updates #14730
(cherry picked from commit b9b3955e32)
 2015-11-06 13:03:48 +01:00
Incorrect
b022724458 Core/Misc: Remove unneeded files 
These 3 BlackRock Mountain scripts can be removed from source:

- boss_anubshiah.cpp
- boss_gorosh_the_dervish.cpp
- boss_grizzle.cpp

They already removed from the creatures in DB, and are currently causing
DBErrors.

(cherry picked from commit d98037a75d)
 2015-11-06 13:00:21 +01:00
Shauren
710d9c0ecc Core/Players: Fixed saving players with incorrect gender 
(cherry picked from commit 6c53f820ae)
 2015-11-06 12:55:18 +01:00
Kittnz
24bad7fd20 Core/Player: Set correct Gender by Modelid 
An example: You are a blood elf female, you use [Iron Boot Flask], you turn into a male dwarf, you use  [Orb of the Sin'dorei] and it will turn you into a blood elf male. This is the correct behavior like retail.
(cherry picked from commit 3c82b498cc)
(cherry picked from commit 16f9d4ceeb)
 2015-11-06 12:52:41 +01:00
MitchesD
dd58e56f84 Core/Player: Fix not being able to do seasonal quests(if already done in the past) 
(cherry picked from commit 1ef1d42d14)
(cherry picked from commit 56b27711a4)
 2015-11-06 12:35:21 +01:00
ShinDarth
040b098aef Scripts/Commands: enhanced .instance get/setbossstate commands 
(cherry picked from commit 1ffec02d76)

# Conflicts:
#	src/server/game/Instances/InstanceScript.cpp
#	src/server/scripts/Commands/cs_instance.cpp
 2015-11-06 11:56:13 +01:00
jackpoz
ceed5e2d35 Core/Battleground: Fix "Call to Arms: Isle of Conquest!" not giving Holiday Weekend honor 
(cherry picked from commit 562e82928f)
 2015-11-06 11:51:28 +01:00
joschiwald
c4f64c6d9c Scripts/BWL: cleanup instancescript 
(cherry picked from commit 05429b3593)

# Conflicts:
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
 2015-11-06 11:48:53 +01:00
MitchesD
81ce5acb34 Core/Scripts: fix build after recent cherry picks 2015-11-06 11:28:35 +01:00
Killyana
bd91acf84c DB/SAI: Fix a DB error 
Origin: 91de0322bb
(cherry picked from commit 7bfbd9e3d8)
 2015-11-06 11:14:08 +01:00
Killyana
cfa7cdf6aa DB/Creature: Remove wrong spawns and add triggers npcs for future events on Icecrown Airships 
(cherry picked from commit e4520ec78b)
 2015-11-06 11:13:01 +01:00
sirikfoll
d4b3b1d1d2 DB/CORE Minor change in quest Kick, What Kick? and some codestyle 
Remove the line that despawns the 'Apple' npc, this despawn is non-blizzlike and breaks the quest.
Thx Killyana for sql and valuable information

Closes #15480

(cherry picked from commit 22f1d26986)
 2015-11-06 11:11:16 +01:00
Kittnz
33baefc49e DB/Instance: The Eye instance updates 
- Pathing for Phoenix-Hawk, Crystalcore Devastator, Astromancer Lord, Nether Scryer
- Delete & Correcting some npc's locations, formations..

(cherry picked from commit 700b5dcb49)
 2015-11-06 11:10:00 +01:00
treeston
6d14c4871f Scripts/Naxxramas: Anub'rekhan encounter cleanup. 
- Cleaned up events behavior to use phases instead of weird checks for auras.
- Cleaned up Crypt Guard despawn behavior, they should no longer despawn instantly upon death.
- Moved initial greeting from MoveInLineOfSight hack to proper areatrigger script.
- Fixed Crypt Guard respawn behaviour to prevent pulling them before Anub'rekhan has fully reset.
- Fixed Crypt Guard aggro behaviour to call for help on aggro. This prevents pulling the initial pair of Crypt Guards without engaging the boss.
- Added missing boss emotes.
- Code style cleanup.

(cherry picked from commit 91de0322bb)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
 2015-11-06 11:07:31 +01:00
Kittnz
d94e5d17e7 DB/Event: Day of the Dead spawn addon fixes 
Spirit's & Celebrant's should be invisible, only visible with  [Orange Marigold] and  [Bouquet of Orange Marigolds]

(cherry picked from commit eddc759cbe)
 2015-11-06 11:03:26 +01:00
treeston
b6ac8c577c Scripts/Naxxramas: Faerlina cleanup: 
- Move greeting to areatrigger instead of MoveInLineOfSight hack
- Clean up add spawn handling to prevent various glitching with combinations of evade state and add aggro
- Ensure all adds are always pulled alongside the boss and vice versa
- Add missing texts.
- Fix a bug in the core that prevents castable-while-dead spells (such as Widow's Embrace) from appearing on possess bars.

(cherry picked from commit 577fcf356e)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
 2015-11-06 10:59:34 +01:00
jackpoz
5f5ac9630c Scripts/Naxxramax: Fix clang warning 
(cherry picked from commit da0671f4fe)
 2015-11-06 10:56:27 +01:00
Dr-J
abb714a36e DB/Misc: Commoners (Hallow's End) 
Adds more texts and gossip for Hallows End
(cherry picked from commit 20ee754de9)
 2015-11-06 10:55:21 +01:00
Killyana
07dce1158f DB/Creature: Fix movement type for Thomas Yance 
(cherry picked from commit c911a2aaa9)
 2015-11-06 10:53:43 +01:00
Dr-J
d6e912a881 DB/Conditions: Dead Mage Hunter 
Dead Mage Hunters should not be interactable without the quest 'rifle the bodies'
(cherry picked from commit fc95812141)
 2015-11-06 10:53:03 +01:00