Commit Graph
29966 Commits
Author SHA1 Message Date
Golrag 140d7828c8 Core/Unit: Add proc cooldown to all units (#17546)
(cherry picked from commit 0b9854428657bd5c988e7aeda5b6e4df9a72131a)

# 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 0547926f179f2e21af4921c43ca2cded5ba7c6a5)
2017-02-05 00:57:17 +01:00
Aokromes 14f1504991 Update FindBoost.cmake
(cherry picked from commit 9790cb5762ce46929f8a098976c8dd028d1488f3)
2017-02-05 00:57:17 +01:00
SnapperRy 773b96d842 DB/Creature: fix InhabitType for Skadir Mistweaver and Winterskorn Raider
(cherry picked from commit ee21295dcb7a1c26df8be03560e4c0a0266915f8)
2017-02-05 00:57:17 +01:00
Aokromes 4f25a3ea39 DB/Misc: Add VerifiedBuild to gossip_menu/gossip_menu_option
(cherry picked from commit 37b32403270e0f1156807b0ebad64f6101f68205)
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 eb1cd4c90708309a2e3c0e6e7c3e91645f725810)
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 2b0e307ee937674c99e6b32079ef4f1888a17b36)
2017-02-05 00:57:15 +01:00
SnapperRy 8c0b56da62 DB/SAI: Webwood Spider and Githyiss the Vile
(cherry picked from commit c797ffc0a8838e0bd934c24e8e22bc81db99d690)
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 dab250acb176bd62c05590d319ebd5d2f8c0e9ce)
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 105687228b8741b7a6c55cdef1af70fc9e837425)
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 680a6f5f27e36b8a525182695924c46d55fe86f5)
2017-02-05 00:57:14 +01:00
Killyana aa62383f3c DB/Creature: Add missing Spirit Healer in Grizzly Hills
(cherry picked from commit 1f014cd129025e5711777a5a5b307c5e76132351)
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 e3de0ef531bf89a2f4193cf1beecf4bce05971af)
2017-02-05 00:02:16 +01:00
Aokromes 4cdd8e048c Core/Misc: Coding standard
(cherry picked from commit 3016783595c53d696c3355f4887da2bf83de3522)
2017-02-05 00:00:50 +01:00
Aokromes a5f21b4c62 Core/Misc: Coding standard (#17521)
(cherry picked from commit a832865ce2656404b126af399b50abd74d952832)

# 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 fda9f1a1367dfe5f7829b8223afa2057429a8020)

Typo fix
(cherry picked from commit fcffdc38a7366042d472c93a9bec864992b0f195)

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

# 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 bf30ec9c8efb40e78cc8c123780edf12e7a2a162)
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 03b15d968b56b7855693e47e79a320cf9990d73c)

Rename 9999_99_99_99_world.sql to 2016_07_05_03_world.sql
(cherry picked from commit 8edc1caf32635f417aee290811a9ef2860f145b6)
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 dfe278459d79ade500a66356a98b4065c0722572)

# 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 7f944695ddad14cec021ff5a0527a5a92fb4cf81)

Derp.

github editor is bad.
(cherry picked from commit 182904946174cd635b7478bd38507235d0d45aa2)
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 7905651b0793d47b4ba040ad6ac47231ad3ec9d2)

# 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 b20912c8f6972360596c8b52360f6dd1d584c93e)
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 d34cce1edb818425935662582fd18cc79bb77b19)
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 32dd6bbca810c652e49befb9c7d6bddc8cd534a2)

Rename 2016_06_14_99_world.sql to 2016_07_04_12_world.sql
(cherry picked from commit d7b3285e78d72c741a2751b644bd553e83a761ce)
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 5af360844dfcb254b396961d47355c05193d9b8d)
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 05592e1dae32812b3532f2f083ea05f3b058183c)
2017-02-04 23:13:12 +01:00
Killyana 8167e9e9a8 DB/Quest: Add vendor conditions for quest items related to "The Party Never Ends" and "Dry Times"
By SnapperRy
Closes #17490

(cherry picked from commit 0566bba3356470d0564e39ee971b1a53c50351a4)
2017-02-04 23:12:07 +01:00
Killyana 02db52b393 DB/Quest: Fix availability for quest "Gaining the Advantage"
By SnapperRy
Closes #17494

(cherry picked from commit 1b1348fca637c26ba209789ed5b9d06ab232288c)
2017-02-04 23:11:01 +01:00
Killyana 3ef6d93347 DB/Quest: Remove outdated quests in Isle of Quel'Danas, and add a missing one
By SnapperRy
Closes #17495

(cherry picked from commit e5fefebfc3848e11f171b3720385708115b4c222)
2017-02-04 23:09:35 +01:00
Killyana 81c1de263f DB/Quest: Fix availability for quests "Sunfury Attack Plans" and "The Missing Magistrix"
By SnapperRy
Closes #17496

(cherry picked from commit 80a98456565bc7e8e6e9a0104b1e1fff76d373c6)
2017-02-04 23:08:31 +01:00
Killyana c8cd337234 DB/Quest: Replace quest "Trial of the Naaru: Magtheridon" with the newer version from WotLK
By SnapperRy
Closes #17497

(cherry picked from commit f6aa2ca08602c9acd838a96792175955abeba6fd)
2017-02-04 23:05:33 +01:00
Killyana 8c17f555b4 DB/Item: Instant Statue Pedestal
By SnapperRy
Closes #17500 #10599

(cherry picked from commit 0aa2f74eece59789368174bb6277354c8de9d1da)
2017-02-04 23:01:59 +01:00
joschiwald ddf3ce3bc3 DB/Fishing: Corrected minimum required fishing skill level for Wintergrasp 2017-02-04 21:16:33 +01:00
vincent-michael d87f6a246e DB/Hotfixes: Updated broadcast_text data from 7.1.5 2017-02-04 20:27:26 +01:00
Killyana c40c4a1b26 DB/Fishing: Set minimum required fishing skill level for Wintergrasp
By SnapperRy
Closes #17502

(cherry picked from commit 4d6eed380fb924295c5ff9293d70f605bc868604)
2017-02-04 20:17:46 +01:00
Killyana 86b6d7f2a3 DB/Quest: Treats for Great-father Winter (Horde version) shouldn't be repeatable
By SnapperRy
Closes #17505

(cherry picked from commit 9df55542a54525319b535e618719379afd3a261e)
2017-02-04 20:17:46 +01:00
Killyana 530177b32e DB/Object: Add a missing spawn for Pure Saronite Deposit and fix spawnmask and respawn time
(cherry picked from commit f191471a8af92169e15d3429d1db52faef774e93)
2017-02-04 20:17:45 +01:00
vincent-michael d205c88059 SQL: Fixed import 2017-02-04 20:07:56 +01:00
Aokromes 92b746eb88 Core/Misc: Even better description for logs
(cherry picked from commit fad58ad099c967a17d68954b240b4f6620263366)

# Conflicts:
#	src/server/game/Maps/Map.cpp
2017-02-04 18:38:56 +01:00
Aokromes f74f32d242 Core/Misc: Better description for few logs
(cherry picked from commit 9a25c0e7e02c6640b41bf1c2170f41e9635a9c65)
2017-02-04 18:37:21 +01:00
Aokromes 2bb0f565c4 Core/Misc: Clarify the use of world_database.sql
(cherry picked from commit 4cef7fe72bceac0f7bc44681b6f7952f435f2cb5)
2017-02-04 18:37:12 +01:00
Aokromes 54dfd00bf7 Core/Misc: Better description for a log
(cherry picked from commit 35042de723bb17557fe343ec16c0a3de7a3c717a)
2017-02-04 18:36:50 +01:00
Kittnz 36d211c0f9 DB/Event: Add missing objects for Midsummer Fire Festival world event
- In following zones Exodar, Stormwind, Moonglade, whole Outlands & Northrend.
- Removed some objects that were dubble spawned.
(2692 objects in total are added)

(cherry picked from commit 3b66e7504642c59edf8aacee60eba0776e230d02)
2017-02-04 18:27:03 +01:00
Aokromes bed341867c DB/Misc: Fix startup errors
(cherry picked from commit c27e9e0b0918c87972fb7e986c6f667e4e5efe27)
2017-02-04 18:07:34 +01:00
SnapperRy 101d5ed953 Core/Loading: output error when specified emote id for some quest-related tables is invalid (#17469)
* Core/Loading: output error when specified emote id for some quest-related tables is invalid
* Apply suggested changes (and kill whitespace)

(cherry picked from commit c853a83dd050092a42c0ebbc4cbc0454fd9e8fbb)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
2017-02-04 18:06:26 +01:00
Killyana 1f6be58ca3 DB: Restore Incense for the Festival Schorlings scripts
(cherry picked from commit aa59ec4ee786343a5369e465cc704c6be79a790d)
2017-02-04 18:04:03 +01:00
Killyana fe364ce8b3 DB/SAI: Fix model for Earthen ring Guide
(cherry picked from commit 577893b0f845d3d76fed43bd6bfd3cda7112c7fc)
2017-02-04 18:02:45 +01:00
Killyana 6aa4804dac DB/Object: Remove double spawns related to Midsummer Fire Festival
(cherry picked from commit 832ed3bcfcf30cfb8ccd0cc0bd915329dddb9753)
2017-02-04 18:01:31 +01:00