Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,988 Commits 4 Branches 146 Tags
6bdfbd12341897ae84db63b0dcd774d4e3023d88
Commit Graph

29988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Killyana
6bdfbd1234 DB/Creature: Add missing creatures before Lord Marrowgar on 25 difficulties 
(cherry picked from commit 11a1dc04a1)
 2017-02-05 16:47:06 +01:00
SnapperRy
a390604fb2 Core/Quest: implement usage of QUEST_FLAGS_RAID to allow a quest to be completed while in raid. (#17535) 
By @ForesterDev
(cherry picked from commit baf54cff3b)
 2017-02-05 16:38:18 +01:00
Meruemu
e575a6a03e Core/Entities: Fix flag CREATURE_FLAG_EXTRA_NO_PARRY_HASTEN implementation. (#17548) 
(cherry picked from commit 4a46fee03e)
 2017-02-05 16:37:49 +01:00
Warpten
3cd73a36e3 Scripts/RubySanctum: Fix missing break reported by Coverity. 
(cherry picked from commit 07ce570be8)
 2017-02-05 16:37:36 +01:00
SnapperRy
8c80ea4251 DB/Loot: increase drop chance for item "Tender Strider Meat" 
Source: Wowhead comments
(cherry picked from commit 49d857ce31)
 2017-02-05 16:36:58 +01:00
SnapperRy
401c6352b9 DB/Loot: fix drop conditions and chance for item "Cracked Silithid Carapace" 
(cherry picked from commit 844921a615)
 2017-02-05 16:36:01 +01:00
SnapperRy
fcbda4c83b DB/SAI: improvements for quest "Verog the Dervish" 
Change despawn type, prevent duplicates, and increase chance of spawn. Taken from Wowhead comments
(cherry picked from commit 439ec88354)
 2017-02-05 16:34:56 +01:00
SnapperRy
c016de4d14 DB/Texts: fix texts for two quests and one item 
(cherry picked from commit 0c15241a35)
 2017-02-05 16:33:04 +01:00
Keader
1a788ab226 Core/Movement Fixed minimum speed check (#17555) 
(cherry picked from commit 23b6991273)
 2017-02-05 16:29:27 +01:00
Snapper
81701280e8 DB/SAI: improve script for some ogres in Feralas: 
- Fix spam of Healing Wave for Gordunni Shaman
- Use CMC for Gordunni Warlock and Gordunni Ogre Mage

(cherry picked from commit ec919d7b0e)
 2017-02-05 16:28:57 +01:00
Snapper
a3096cc1c1 Core/Misc: use enum for UNIIT_NPC_FLAGS' zero values 
(cherry picked from commit ebb33bbfc1)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-05 16:27:55 +01:00
SnapperRy
030900d1f6 DB/Loot: Tailoring's bolts should not drop from any creature 
(cherry picked from commit 8e721e1965)
 2017-02-05 16:24:37 +01:00
SnapperRy
66f0e33dc0 DB/Quest: add prevquest to one of the "The Ashenvale Hunt" quests 
(cherry picked from commit 66c8bae7be)
 2017-02-05 16:23:22 +01:00
SnapperRy
9d0a8c940a DB/Loot: those items should only be dropped by gameobjects 
Items 'Silithid Egg', 'Lorgalis Manuscript', 'Broken Tears' AND 'Spotted Hippogryph Down' should not be dropped by creatures
(cherry picked from commit a1a7bca181)
 2017-02-05 16:21:15 +01:00
vincent-michael
7081201c91 DB/Quests: Updated quest_template data for 7.1.5 part 2 2017-02-05 11:57:28 +01:00
vincent-michael
5ef46cf628 DB/Creatures: Updated creature_template wdb data from 7.1.5 2017-02-05 11:21:59 +01:00
Shauren
e991a15dd7 Core/Groups: Fixed UI bugs related to leaving and rejoining the same group 
Closes #18789
 2017-02-05 01:57:15 +01:00
Aokromes
331fa3e03c Core/Player: Move few logs of loglevel and add few notes (#17554) 
(cherry picked from commit 8211266f9b)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-05 00:57:20 +01:00
Snapper
c639153567 Core/Misc: kill whitespace and use enum instead of hardcoded value. 
(cherry picked from commit 21797c6c4f)
 2017-02-05 00:57:20 +01:00
Snapper
3c23a5d075 DB/Conditions: spell "Wretched Tap" can only be cast by creature "Wretched Urchin". 
Closes #15586

(cherry picked from commit 4c78a416fe)
 2017-02-05 00:57:19 +01:00
SnapperRy
977cccab92 Core/Quest: don't save queststatus for autocomplete quests (#17487) 
(cherry picked from commit bf9b89dd2e)
 2017-02-05 00:57:19 +01:00
Shauren
64059516fe Core/Quests: Fixed crash during loading quest rewarded status added in 7905651b07 
Closes #17552

(cherry picked from commit cb786e8841)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-05 00:57:18 +01:00
Golrag
140d7828c8 Core/Unit: Add proc cooldown to all units (#17546) 
(cherry picked from commit 0b98544286)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
 2017-02-05 00:57:18 +01:00
treeston
9046483f3c Entities/Creature: Add some more std::chrono overloads 
(cherry picked from commit 0547926f17)
 2017-02-05 00:57:17 +01:00
Aokromes
14f1504991 Update FindBoost.cmake 
(cherry picked from commit 9790cb5762)
 2017-02-05 00:57:17 +01:00
SnapperRy
773b96d842 DB/Creature: fix InhabitType for Skadir Mistweaver and Winterskorn Raider 
(cherry picked from commit ee21295dcb)
 2017-02-05 00:57:17 +01:00
Aokromes
4f25a3ea39 DB/Misc: Add VerifiedBuild to gossip_menu/gossip_menu_option 
(cherry picked from commit 37b3240327)
 2017-02-05 00:57:16 +01:00
SnapperRy
caf744ad02 Core/Script: small improvement for quest "The Hunt is On". (#17537) 
Reset emotestate when the event starts.
(cherry picked from commit eb1cd4c907)
 2017-02-05 00:57:16 +01:00
SnapperRy
c9ef848b64 DB/Conditions: spell Cannon Ball can only hit Daggerspine Marauder 
Closes #17532.
(cherry picked from commit 2b0e307ee9)
 2017-02-05 00:57:15 +01:00
SnapperRy
8c0b56da62 DB/SAI: Webwood Spider and Githyiss the Vile 
(cherry picked from commit c797ffc0a8)
 2017-02-05 00:57:15 +01:00
Dr-J
69cabbf5bd DB/SAI: Murloc Pets 
Add dance animation to a few murloc pets - see https://youtu.be/iGazdEf03YM
(cherry picked from commit dab250acb1)
 2017-02-05 00:57:15 +01:00
Killyana
3256bcba4a DB/Creature: Add missing flags to triggers npcs related to the quest Uncovering the Tunnels 
Closes #17530
by Kodekc

(cherry picked from commit 105687228b)
 2017-02-05 00:57:14 +01:00
Killyana
a771185b67 DB/Creature: Update Hamat's aura with the correct one 
By Kodekc
Closes #17526

(cherry picked from commit 680a6f5f27)
 2017-02-05 00:57:14 +01:00
Killyana
aa62383f3c DB/Creature: Add missing Spirit Healer in Grizzly Hills 
(cherry picked from commit 1f014cd129)
 2017-02-05 00:57:14 +01:00
Krudor
3781b05263 Core/Criterias: Define 31 criteria types (#19042) 
Defined criteria types:
CRITERIA_TYPE_SURVEY_GAMEOBJECT
CRITERIA_TYPE_CLEAR_DIGSITE
CRITERIA_TYPE_MANUAL_COMPLETE_CRITERIA
CRITERIA_TYPE_COMPLETE_CHALLENGE_MODE_GUILD
CRITERIA_TYPE_DEFEAT_CREATURE_GROUP
CRITERIA_TYPE_COMPLETE_CHALLENGE_MODE
CRITERIA_TYPE_SEND_EVENT
CRITERIA_TYPE_COOK_RECIPES_GUILD
CRITERIA_TYPE_EARN_PET_BATTLE_ACHIEVEMENT_POINTS
CRITERIA_TYPE_SEND_EVENT_SCENARIO
CRITERIA_TYPE_RELEASE_SPIRIT
CRITERIA_TYPE_OWN_PET
CRITERIA_TYPE_GARRISON_COMPLETE_DUNGEON_ENCOUNTER
CRITERIA_TYPE_COMPLETE_LFG_DUNGEON
CRITERIA_TYPE_LFG_VOTE_KICKS_INITIATED_BY_PLAYER
CRITERIA_TYPE_LFG_VOTE_KICKS_NOT_INIT_BY_PLAYER
CRITERIA_TYPE_BE_KICKED_FROM_LFG
CRITERIA_TYPE_LFG_LEAVES
CRITERIA_TYPE_COUNT_OF_LFG_QUEUE_BOOSTS_BY_TANK
CRITERIA_TYPE_REACH_AREATRIGGER_WITH_ACTIONSET
CRITERIA_TYPE_START_ORDER_HALL_MISSION
CRITERIA_TYPE_RECRUIT_GARRISON_FOLLOWER (was defined for id 187)
CRITERIA_TYPE_OWN_HEIRLOOMS
CRITERIA_TYPE_ARTIFACT_POWER_EARNED
CRITERIA_TYPE_ARTIFACT_TRAITS_UNLOCKED
CRITERIA_TYPE_HONOR_LEVEL_REACHED

Redefined criteria types:
CRITERIA_TYPE_RECRUIT_GARRISON_FOLLOWER_WITH_QUALITY (was
CRITERIA_TYPE_RECRUIT_GARRISON_FOLLOWER)
 2017-02-05 00:17:43 +01:00
joschiwald
e774c29c21 Fixed build 2017-02-05 00:16:58 +01:00
Aokromes
de16ff14de Update options.cmake 
(cherry picked from commit e3de0ef531)
 2017-02-05 00:02:16 +01:00
Aokromes
4cdd8e048c Core/Misc: Coding standard 
(cherry picked from commit 3016783595)
 2017-02-05 00:00:50 +01:00
Aokromes
a5f21b4c62 Core/Misc: Coding standard (#17521) 
(cherry picked from commit a832865ce2)

# Conflicts:
#	src/server/game/Handlers/PetHandler.cpp
#	src/server/game/Spells/Spell.cpp
 2017-02-05 00:00:38 +01:00
Aokromes
6d9a0ade7b Core/Mmaps: Charge ignoring z position of target (#17516) 
* Core/Mmaps: Charge ignoring z position of target

By cemak closes #15011
(cherry picked from commit fda9f1a136)

Typo fix
(cherry picked from commit fcffdc38a7)

And another typo fix
(cherry picked from commit e0cc650ea9)
 2017-02-04 23:59:27 +01:00
ariel-
ad6e0b6d79 Core/Unit: remove duplicate resist roll in Unit::MeleeSpellHitResult (#17520) 
(cherry picked from commit cfbfa8158a)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
 2017-02-04 23:59:07 +01:00
SnapperRy
9f9692427a Core/Fishing: update fishing skill regardless of success or failure (junk items fished) (#17504) 
(cherry picked from commit bf30ec9c8e)
 2017-02-04 23:49:42 +01:00
SnapperRy
623215ce31 Event/Midsummer: improve pole ribbon functionality (#17464) 
Event/Midsummer: improve pole ribbon functionality:

- Bunny creature should hover, which puts it in the intended position.
- Use correct visual and internal spells to handle cosmetics and timers.
(cherry picked from commit 03b15d968b)

Rename 9999_99_99_99_world.sql to 2016_07_05_03_world.sql
(cherry picked from commit 8edc1caf32)
 2017-02-04 23:37:59 +01:00
Gustavo
e55420af86 Core/Scripts Corrections on Halion's Encounter (#16725) 
Core/Scripts: Updates to Halion

* Fixed Combustion and Consumption.
* Fixed Living Embers and Blazing Auras.
* Timer changes.
(cherry picked from commit dfe278459d)

# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
#	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp

Fix sql for merged PR
(cherry picked from commit 7f944695dd)

Derp.

github editor is bad.
(cherry picked from commit 1829049461)
 2017-02-04 23:33:26 +01:00
SnapperRy
752c789aaf Core/Quest: do not save/load Dungeon Finder/daily/repeatable quests as completed (#17458) 
* Core/Quest: do not save/load Dungeon Finder/daily/repeatable quests as completed
(cherry picked from commit 7905651b07)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-04 23:21:27 +01:00
SnapperRy
8ee0a14c27 Core/Spell: allow use of ground mounts while swimming (#17488) 
(cherry picked from commit b20912c8f6)
 2017-02-04 23:20:08 +01:00
Aokromes
29668f732d Code/Battleground Opening a game object(banner) under absorb effects … (#17459) 
* Code/Battleground Opening a game object(banner) under absorb effects in battlegrounds should result an interupt

By zwerg, closes #6222
(cherry picked from commit d34cce1edb)
 2017-02-04 23:16:52 +01:00
Andrew Letson
4c9301ca70 Core/Scripts: Migrate Shadowmoon Valley NPC's to SAI (#17373) 
* Migrate Flanis Swiftwing and Kagrosh to SAI and more.
(cherry picked from commit 32dd6bbca8)

Rename 2016_06_14_99_world.sql to 2016_07_04_12_world.sql
(cherry picked from commit d7b3285e78)
 2017-02-04 23:15:39 +01:00
Killyana
5d0d827745 DB/Quest: In service of the Lich King 
By Heaven31415
Closes #17462

(cherry picked from commit 5af360844d)
 2017-02-04 23:14:32 +01:00
Killyana
8b83670178 DB/Quest: Remove wrong repeatable flag from "The Legend of Stalvan" 
Closes #17491
By SnapperRy

(cherry picked from commit 05592e1dae)
 2017-02-04 23:13:12 +01:00