Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,022 Commits 4 Branches 146 Tags
11ad71e2fc322c8e109ffe8cd8c52332a26048bf
Commit Graph

28022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shauren
11ad71e2fc Core/Misc: Fixed array out of bounds access when loading locales_achievement_reward, locales_creature_text, locales_gossip_menu_option and skip LOCALE_none when iterating over locales 2016-01-24 15:08:49 +01:00
Shauren
d5b0ffbe9b Core/Misc: Added safeguard against generating invalid selection weight data in Trinity::Containers::SelectRandomWeightedContainerElement 2016-01-23 11:34:47 +01:00
Aokromes
55bfd2d738 DB/Misc: Fix startup errors 2016-01-23 06:58:12 +01:00
Aokromes
5275d31f10 Update 2016_01_22_00_world.sql 2016-01-23 04:38:26 +01:00
Shauren
044edced9a Core/Spells: Ignore category cooldowns for triggered spells. 
* This fixes weird issues where triggered spell fails because it has the same category as the spell triggering it

Closes #15794
Closes #15048
 2016-01-22 22:11:11 +01:00
myran2
2652d700e1 Core/Spells: Updated combo point handing 
Closes #15996
 2016-01-22 20:27:48 +01:00
Carbenium
d3be63d0c8 Fix some linebreaks in 2016_01_22_00_world.sql 2016-01-22 19:37:22 +01:00
Killyana
657b7ccbb9 DB/SAI: Update SMART_ACTION_SET_INGAME_PHASE_MASK 2016-01-22 19:18:13 +01:00
Aokromes
812e3ad568 Update 2016_01_22_00_world.sql 2016-01-22 16:57:23 +01:00
Aokromes
773a94041b DB/Misc: Spawn Blackwing Descent 
I suppose by Malcrom
 2016-01-22 13:46:43 +01:00
Aokromes
52604405c1 DB/Misc: Sync 6.x gameobject spawns with 3.3.5a 2016-01-22 13:26:31 +01:00
Aokromes
fa73a782c7 DB/Misc: Sync 6.x gameobject spawns with 3.3.5a 
Yes. i known phaseIds are incorrect, if you don't have better to blame, fix it yourself. They will be fixed when i finish this.
 2016-01-22 12:31:03 +01:00
Shauren
f4ebab2a73 Buildsystem: Try picking up zmq lib for VS 2013 if using VS 2015 2016-01-21 17:50:37 +01:00
Carbenium
575d5f5ff8 Core/PacketIO: CMSG_BATTLEMASTER_JOIN_ARENA 2016-01-20 23:01:12 +01:00
[Dev]Rival
38116dd905 Core/BattlegroundIC: Duplicate Keep Cannons. 
(cherry picked from commit fb6a7407e2)
 2016-01-20 22:08:26 +01:00
jackpoz
8f13fe9c3b Scripts/ICC: Fix static analysis issue 
Fix an issue reported by static analysis

(cherry picked from commit 4191bb868a)
 2016-01-20 22:01:17 +01:00
jackpoz
8f91df0465 Scripts/Commands: Modify ".setskill" command to target current Player by default 
(cherry picked from commit e138e094a9)
 2016-01-20 21:59:49 +01:00
jackpoz
0f157f1eac Merge pull request #16186 from ariel-/spellmodcharges 
Core/Spells: Fix redundant mod charge drop and spell crit calc
(cherry picked from commit b39216eed3)
 2016-01-20 21:58:38 +01:00
Francesco Borzì
6c3f2b9d9b Merge pull request #16208 from ShinDarth/putricide-fix 
[3.3.5] Scripts/ICC: Fixed Professor Putricide
(cherry picked from commit 3e42d83e9c)
 2016-01-20 21:56:55 +01:00
jackpoz
06fdcb9e18 Merge pull request #16193 from Goatform/3.3.5 
Core/GameObjects: Fixed an issue where traps were not redirected to Grounding Totem
(cherry picked from commit 2a50ea5cf1)
 2016-01-20 21:55:50 +01:00
jackpoz
ea2c2c9763 Merge pull request #16188 from Asterc/3.3.5 
Core/Player: Fix profession specialization being re-learnt on login after unlearning it
(cherry picked from commit 1c89b4dcdf)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2016-01-20 21:53:51 +01:00
Aokromes
524c3b2e26 Build/Misc: Clarify the meaning of one setting 
(cherry picked from commit 6861deaae2)
 2016-01-20 21:31:10 +01:00
jackpoz
36ed04bc6b Scripts/Commands: Fix ".help" command to show commands in alphabetical order 
(cherry picked from commit 841ce54a0d)
 2016-01-20 21:29:21 +01:00
jackpoz
e7f7ffa73f Scripts/Commands: Modify ".learn" command to target current Player by default 
(cherry picked from commit f22b1938db)
 2016-01-20 21:28:17 +01:00
Vincent-Michael
834ce504ae Core/Objects: Fix typo in 19cab2c508 
(cherry picked from commit dbe854cd31)

Conflicts:
	src/server/game/Globals/ObjectMgr.h
 2016-01-20 21:10:36 +01:00
Shauren
038138592d Merge pull request #15995 from ShinDarth/mmr 
Core/Arena: more arena configs
(cherry picked from commit 776103cfea)

Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2016-01-20 20:59:40 +01:00
Shauren
a6dd6d7841 Core/Logging: Include more info in bad realm log 2016-01-20 17:19:42 +01:00
Shauren
a36d8d54c5 Warning fix 2016-01-19 20:43:35 +01:00
Shauren
3cd3184394 Core/Quests: Implemented new quest objective types 2016-01-19 20:12:09 +01:00
Shauren
a50b1d0924 Core/Items: Updated item socketing opcodes 2016-01-18 19:52:49 +01:00
MitchesD
34a07db263 DB/Creature: fixed invalid spawnMasks for all creatures 
* fixed +- 1500 startup errors
 2016-01-17 20:52:49 +01:00
Killyana
5fd33ef16c DB/Quest: Master and Servant 
Remove unneeded condition to allow quest item usage in all areas as the item can be used only in few npcs
Closes #16136

(cherry picked from commit f4e2fb8f79)
 2016-01-17 14:17:59 +01:00
Killyana
1552fc93bc DB/Creature: Fix Wretched Captive Orientation 
For all branchs

(cherry picked from commit c812b0dbf5)
 2016-01-17 14:16:02 +01:00
Killyana
3294071c79 DB/Creature: Add missing spawns 
(cherry picked from commit 082eeda7fe)
 2016-01-17 14:06:08 +01:00
Killyana
a56f92e889 Script/Creature: Imprisoned Beryl Sorcerer 
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one

(cherry picked from commit 13e509a622)
 2016-01-17 14:04:51 +01:00
Killyana
e16f695453 DB/Creature: Franclorn Forgewright 
Make the npc visible only for dead players
Remove the SAI and move the aura to Creature addon

(cherry picked from commit 1c877ecbd2)
 2016-01-17 14:04:01 +01:00
Killyana
d7bfacbd65 DB/Quest: An Undead's Best Friend 
Add a sleep effect on Hungering Plaguehound once they are fed to avoid spamming the credit
Fix the Ethereal aura being removed and not set after evade for Eidolon Watcher
Fix Assassinate Restless Lookout, it will only be used on Restless lookout
Closes #16054

(cherry picked from commit bc6c380e7d)
 2016-01-17 14:03:27 +01:00
Killyana
4f2e6d7fd7 DB/Quest: The Stories Dead Men Tell 
By @Rushor
Closes #16055

(cherry picked from commit 91c1de2f43)
 2016-01-17 14:02:53 +01:00
Killyana
7d2cfa2f21 DB/Creature: Remove wrong spawns for Commoners and link some other to Winter Veil 
Closes #16068

(cherry picked from commit 394e0db657)
 2016-01-17 14:02:22 +01:00
Killyana
4da0a6f8e3 DB/Quest: Add missing text for Horns of Nez'ra 
By @tkrokli
Closes #16078

(cherry picked from commit 99f31a2202)
 2016-01-17 14:00:59 +01:00
Killyana
6aa8ab86a8 DB/SAI: Ethereal Spellfilcher and Ethereal Thief 
Closes #16094

(cherry picked from commit 571578dce5)
 2016-01-17 14:00:15 +01:00
Killyana
4aa1982295 DB/Creature: Fix Crystal Spike react state on Ormorok the Tree-Shaper encounter 
Closes #16097

(cherry picked from commit 70308e3c33)
 2016-01-17 13:59:37 +01:00
Killyana
6e4948a498 Creature/script: William Kielar 
Fix Gossips used for taxi
Closes #16112

(cherry picked from commit 79c9af11b9)
 2016-01-17 13:58:15 +01:00
Killyana
d0047283b8 DB/Creature: Fix InhabitType for Ash'ari Crystals 
By @Saben65
Closes #16121

(cherry picked from commit 4292ff0b54)
 2016-01-17 13:58:07 +01:00
Killyana
44e2a7fbc6 DB/Creature: Remove unneeded SAI for Water Terror and move the aura to creature addon 
Closes #16107

(cherry picked from commit 335ec729bd)
 2016-01-17 13:57:37 +01:00
Killyana
5d7cc696b8 DB: Fix spawn position and equipment for Coilfang Engineers 
By @Saben65
Closes #16104

(cherry picked from commit 17b57453c1)
 2016-01-17 13:57:13 +01:00
Killyana
c9f6bea60d DB/Condition: Add condition to sunwell-blade spell to target only Dar'Khan Drathir 
Closes #16122

(cherry picked from commit cb6a7b7fa6)
 2016-01-17 13:56:48 +01:00
Killyana
178a1dd703 DB/Quest: Fix spell target for Leave Our Mark quest item 
Closes #16081

(cherry picked from commit b269c1f1cb)
 2016-01-17 13:56:21 +01:00
Killyana
19c69a273d DB/Creature: Fix Tournament Druid Spell Target visibility 
Closes #16119

(cherry picked from commit bf8a3b1dfe)
 2016-01-17 13:55:55 +01:00
Killyana
ad28b1e10c DB/Object: Add missing Dirt mound spawn 
(cherry picked from commit 812809a977)
 2016-01-17 13:55:30 +01:00