treeston
df0d32be81
Merge remote-tracking branch 'Treeston/3.3.5-kelthuzad' into 3.3.5 (PR #16634 )
...
(cherry picked from commit 47a9cb1e56 )
...Huh. Wonder how this one didn't make travis complain on the PR.
(cherry picked from commit 93a68d5881 )
Was Travis completely napping on this one?
(cherry picked from commit 2d7dec0d39 )
2017-02-18 15:57:19 +01:00
SnapperRy
41ed592d05
Core/Achievements: implement ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY to check if the item with entry miscvalue1 is exactly of the quality specified in achievement_criteria_data's value1 field.
...
Also ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM --> ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPPED_ITEM
(cherry picked from commit 2b48082b9d )
2017-02-18 15:57:18 +01:00
treeston
bf5988733b
DB/Quest: Revert 376d281 and 63c77d2, move changes to reputation_reward_rate instead.
...
(cherry picked from commit 1ccdad6eb3 )
2017-02-18 15:49:07 +01:00
SnapperRy
75701f14c3
DB/Quest: fix reputation and offer reward text for quests "Mission Accomplished"
...
Closes #17379
(cherry picked from commit 3bc9214391 )
2017-02-18 15:49:06 +01:00
ariel-
c04384b691
Core/SmartAI: fix warning reported by VS2015
...
(cherry picked from commit 83c032c2a8 )
2017-02-18 15:49:06 +01:00
treeston
ab6f8f9fb7
Scripts/HallsOfLightning: Fix Volkhan healing.
...
(cherry picked from commit 5da3ae0489 )
2017-02-18 15:49:06 +01:00
tkrokli
16c6e0fb80
Core/Scripts: set correct unit_flags on Scarlet Mine Car ( #17844 )
...
Closes #17816
(cherry picked from commit f3dc97f263 )
Rename 2016_08_24_08_world.sql to 2016_08_24_03_world.sql
(cherry picked from commit cabf6bd98a )
2017-02-18 15:49:05 +01:00
treeston
5fd64171a9
DB/Creature: Remove random untargetable flag from a dragonkin in Crystalsong Forest. Sniff confirms flag is incorrect.
...
(cherry picked from commit eda05a636e )
2017-02-18 15:49:05 +01:00
SnapperRy
3a32b50002
DB/Quest: use the new SMART_TARGET_LOOT_RECIPIENTS for quest "Feeding Arngrim"
...
By Treeston, closes #16169
(cherry picked from commit c5904a5430 )
2017-02-18 15:49:05 +01:00
SnapperRy
2629009bde
DB/Quest: fix event for quest "Mimicking Nature's Call"
...
(cherry picked from commit 91cdbf8edd )
2017-02-18 15:49:04 +01:00
SnapperRy
8220496be1
Core/SmartAI: allow SMART_TARGET_OWNER_OR_SUMMONER to target a temporary summon's summoner, too ( #17851 )
...
Core/SmartAI: allow SMART_TARGET_OWNER_OR_SUMMONER to target a temporary summon's summoner, too
(cherry picked from commit 1fcd03b60a )
2017-02-18 14:47:01 +01:00
SnapperRy
6ea973adec
Core/SmartAI: add param2 to SMART_ACTION_UPDATE_TEMPLATE, allowing to specify if creature's level should remain the same between entry updates.
...
A value of 0 (default) forces the creature to keep its current level between entry updates.
Fixes #16371
(cherry picked from commit a6ef9d4539 )
2017-02-18 14:47:01 +01:00
SnapperRy
6a8ca9b0bf
Core/Event: prevent seasonal quests from resetting at server restart ( #17455 )
...
Closes #16015 .
Closes #16413 .
(cherry picked from commit fb6d4dd98f )
2017-02-18 14:47:00 +01:00
SnapperRy
a6209e6d6d
Event/Brewfest: implement relay race ( #17603 )
...
(cherry picked from commit 894378f867 )
Rename 9999_99_99_99_world.sql to 2016_08_23_05_world.sql
(cherry picked from commit 6036b07f25 )
2017-02-18 14:47:00 +01:00
tkrokli
d8befaf68b
Core/Scripts: npc_wormhole #define text moved to DB ( #17805 )
...
Another core script hardcoded text removal:
- removed #define text from script
- added the text to gossip_menu_option
- added and renamed enum to match DB entries
- minor additional adjustments and comments
Closes #6841
(cherry picked from commit 8a0990376d )
2017-02-18 14:42:03 +01:00
Gustavo
7e57e9a91b
Improve scripts for quests Breakfast Of Champions and A Bear of an Appetite ( #17780 )
...
Properly despawn the related GameObjects after use of the quest item, avoiding multiple use and summon
(cherry picked from commit 5661b4686b )
Rename 2016_08_99_99_world.sql to 2016_08_23_03_world.sql
(cherry picked from commit 831975fa34 )
2017-02-18 14:40:14 +01:00
SnapperRy
2574667854
Scripts/ArgentTournament: improve training dummy script
...
Now the ranged and charge target dummies will cast their spells and behave correctly for the related quests
(cherry picked from commit 433beb77e3 )
2017-02-18 14:38:42 +01:00
SnapperRy
3b32bfb650
DB/Conditions: allow spell Counterattack! to target Sunreaver Hawkstrider
...
Used by the Argent Tournament's Melee Targets. Was only working for Alliance players due to wrong entry set for the Horde vehicle
(cherry picked from commit 02df4f840a )
2017-02-18 14:38:01 +01:00
Killyana
39360e69fe
DB/Condition: Condition for Fumping spell used on The Big Bone Worm quest
...
Updates #11418
By sirikfoll
(cherry picked from commit f1feb5ac30 )
2017-02-18 14:36:40 +01:00
Killyana
c312fdd3cd
DB/Condition: Bael'Gar's Fiery Essence
...
By sirikfoll
Closes #12909
(cherry picked from commit 4a3967c8c2 )
2017-02-18 14:34:38 +01:00
SnapperRy
a45d43367c
DB/Conditions: cosmetic fix for quest "War is Hell"
...
Fires will appear on the corpses' positions instead of the caster's
(cherry picked from commit aec583ffe9 )
2017-02-18 14:31:44 +01:00
Shauren
9b63ee4333
Core/Creatures: Exclude despawned creatures from being found by "nearest entry" searchers
...
Updates #11418
Closes #17706
(cherry picked from commit 75c34bda67 )
2017-02-18 14:30:32 +01:00
jackpoz
143f0c0e4d
Core/Misc: Fix static analysis issues
...
(cherry picked from commit b7306f06f5 )
# Conflicts:
# src/server/game/Entities/Unit/StatSystem.cpp
2017-02-18 14:30:23 +01:00
ariel-
4910966f18
Core/Unit: removed ancient workaround changing spell caster based on triggering aura.
...
Keep an eye out for those broken scripts!
Closes #17739
(cherry picked from commit f183ed3c50 )
2017-02-18 14:29:24 +01:00
Killyana
9b7f57dfde
DB/Creature: Add immunity to Proto-Drake Egg
...
By DRJ
Closes #17610
(cherry picked from commit 44fe17b6a1 )
2017-02-18 13:58:49 +01:00
Killyana
3e7e6fa4ac
DB/Gossip: Fix wrong gossip option text for Byancie
...
Closes #17697
(cherry picked from commit 308602eebf )
2017-02-18 13:57:38 +01:00
Killyana
c690bd14fc
DB/SAI: Add missing SAI for Borean Tundra creatures
...
Closes #17744
By Kodekc
(cherry picked from commit a4e5c7545e )
2017-02-18 13:55:15 +01:00
Killyana
5ababe7c5f
DB/Object: Update respawn time for ruby lilac
...
By Tauriella
Closes #17761
(cherry picked from commit 29e9331e3f )
2017-02-18 13:54:18 +01:00
Killyana
01069e62d5
DB: Fix more DB errors
...
(cherry picked from commit 755add6fd2 )
2017-02-18 13:53:19 +01:00
joschiwald
c6632dc3ee
Fixed build and typo
2017-02-18 13:40:03 +01:00
joschiwald
bc3ffceae4
Core/Misc: Added missing include
2017-02-17 22:23:54 +01:00
joschiwald
80c36f3d9c
Scripts/Command: Fixed phases output in .pinfo command
...
Closes #19144
2017-02-17 21:54:49 +01:00
Shauren
06c1db0a0e
Core/Movement: Named all MonsterSplineSpellEffectExtraData fields
2017-02-16 00:43:09 +01:00
Shauren
662f113c1d
Core/Movement: Defined new spline flag
2017-02-15 23:59:13 +01:00
Keader
0ed67081bc
Core/Spells: Fixed Chilled effect on Frostbolt, Frozen Orb and Blizzard ( #19131 )
2017-02-15 12:17:45 -02:00
Aokromes
7aefa7e588
Update ObjectMgr.h
2017-02-15 10:10:17 +01:00
Aokromes
fac5ce67db
Game/Mapscripts: Implement SCRIPT_COMMAND_MOVEMENT
...
Cherry pick from 85357c75c4
2017-02-15 07:11:48 +01:00
Gacko
8821f59340
Update README.md.
2017-02-14 21:32:56 +01:00
Gennady
6e6bccce1c
Core/Unit: Some improved function RemoveAuraFromStack ( #19119 )
2017-02-13 21:19:34 +01:00
RoG_Hannibal
23aca839fe
Core/Spells: add slowing effect to Mage spell Frostbolt ( #19092 )
...
Closes #18932
2017-02-13 15:17:28 -02:00
RoG_Hannibal
d2dba9a5e0
Core/Spells: fix Priest spell Penance and Power Word: Shield ( #19033 )
...
- fix talent "The Penitent" for the spell Penance
- re-write Power Word: Shield
Closes #18520
2017-02-13 03:46:00 +01:00
joschiwald
b98132bded
Fixed warning in gcc 5
2017-02-12 17:56:51 +01:00
Shauren
796872c2a7
Dynamic linking build fix
...
(cherry picked from commit 4d5fee0489 )
2017-02-12 17:04:09 +01:00
Eilo
149a9854f7
Tools/mmaps_generator: Added estimated percentage progress to console output ( #17798 )
...
(cherry picked from commit 0a53d0b1fa )
# Conflicts:
# src/tools/mmaps_generator/MapBuilder.cpp
2017-02-12 17:04:08 +01:00
mik1893
0536c9d969
Core/Spells: Fixed spells like Shadowform, Tricks of the Trade, Misdirection getting stuck in unusable state clientside if they failed earlier because of GCD
...
Closes #657
Closes #12913
Closes #17376
(cherry picked from commit 6d07fbf07c )
Typo fix
(cherry picked from commit 39311e0ce8 )
2017-02-12 17:04:08 +01:00
Treeston
8b7934f718
Core/Spells: Fix orientation- and targeting-related issues if the creature isn't currently engaged in combat. ( #17120 )
...
Also disable spell focus system for vehicle control auras.
Closes #16572
Closes #17016
(cherry picked from commit 6f85422f0b )
2017-02-12 17:04:08 +01:00
Alan Deutscher
cd811271d9
Scripts: UNIT_FLAG_REMOVE_CLIENT_CONTROL no longer used as a method for preventing a unit from moving
...
UNIT_FLAG_REMOVE_CLIENT_CONTROL (formerly UNIT_FLAG_DISABLE_MOVE) is a client-only feature that should not be used for NPC scripting. All applications of this flag in scripts/ have been replaced with applications/removals of the UNIT_STATE_ROOT state.
Closes #17311
(cherry picked from commit 061b62a97d )
2017-02-12 16:52:18 +01:00
Aokromes
96fb2c9779
DB/Misc: Fix startup errors
...
(cherry picked from commit 2b3d72d1ba )
DB/Misc: Fix startup errors
(cherry picked from commit d76f077a7f )
DB/Misc: Fix startup errors
(cherry picked from commit 2151d5f420 )
2017-02-12 16:52:01 +01:00
ariel-
32bdbb00d0
Core/Entities: fix a crash that would happen whenever a player logged back in to an ended arena battle. Thanks Nawuko for the input
...
Closes #17825
(cherry picked from commit 6d4eead3a9 )
2017-02-12 16:50:26 +01:00
ariel-
0925c350e7
Core/Battlefield: Cleanup of Wintergrasp script and battlefield system:
...
- Standards: Moved all statics to cpps where they belong.
- Changed spawn position container from fixed size array to std::vector (not all positions were used in every case)
- Removed unused parameter teamId from Battlefield::SpawnCreature
- Removed workaround for GO rotation, added in a69cbeb9d5
- Added rotation parameter to Battlefield:SpawnGameObject
- Added sniffed rotation to existing script spawns.
- Implemented Archavon's Log (Closes #16880 )
(cherry picked from commit 1deb7d2df1 )
2017-02-12 16:50:06 +01:00