Commit Graph

22674 Commits

Author SHA1 Message Date
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
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
Aokromes
92b746eb88 Core/Misc: Even better description for logs
(cherry picked from commit fad58ad099)

# 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 9a25c0e7e0)
2017-02-04 18:37:21 +01:00
Aokromes
54dfd00bf7 Core/Misc: Better description for a log
(cherry picked from commit 35042de723)
2017-02-04 18:36:50 +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 c853a83dd0)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
2017-02-04 18:06:26 +01:00
Aokromes
5c3651379b Scripts/Midsummer: Burning hot pole dance (#17445)
* Scripts/Midsummer: Burning hot pole dance
By  zwerg, closes #6876
(cherry picked from commit b0e5f6de47)

Rename 2016_99_99_99_world_.sql to 2016_06_26_01_world_.sql
(cherry picked from commit 184e64fa33)

Rename 2016_06_26_01_world_.sql to 2016_06_26_01_world.sql
(cherry picked from commit 4cc88b5f09)
2017-02-04 17:58:01 +01:00
Gustavo
e336272ec2 Core/Scripts Boss Ahune Clean-up (#17320)
Remove use of flags UNIT_FLAG_NON_ATTACKABLE and UNIT_FLAG_REMOVE_CLIENT_CONTROL
Replace with correct one, UNIT_FLAG_UNK_31, imunity part now is fully handled by auras
Fix a problem with bugged orientation while casting SPELL_SYNCH_HEALTH
Use std::crono notations
Remove unneeded code

Move one spell_linked_spell to SpellScript
Fix Loot issue
Fix Possible Crash
(cherry picked from commit f1639a30ba)

Rename 2016_99_99_99_world.sql to 2016_06_26_00_world.sql
(cherry picked from commit fdf0092ac2)
2017-02-04 17:56:05 +01:00
DoctorKraft
3ee48d5f3a Core/Player: Implemented multiple skillups from professions (#19023) 2017-02-03 21:05:32 +01:00
DoctorKraft
4075bd16e4 Core/Spells: Fixed Divine Storm (#19031) 2017-02-03 20:49:30 +01:00
Keader
d9eb79c3c5 Core/Spells: Missing override 2017-02-03 07:11:15 -03:00
DoctorKraft
8aa07daff3 Core/Spells: Divine Steed (#19027) 2017-02-02 18:19:08 +01:00
DoctorKraft
9850e1eef6 Core/Player: Shapeshift Part 2 (#19025) 2017-02-02 18:08:45 +01:00
psayafan
d1e9bb6f26 Core/Player: Add option to prevent rename during character customization
Closes #17420

(cherry picked from commit fe2aed6047)
2017-02-01 22:53:24 +01:00
Aokromes
84fded2e42 Core/Misc: Even better description for a log
(cherry picked from commit bd7dc87b02)

# Conflicts:
#	src/server/game/Maps/Map.cpp
2017-02-01 22:53:24 +01:00
Aokromes
10bb5fa86e Core/Misc: Better description for a log
(cherry picked from commit 54d4769d4b)

# Conflicts:
#	src/server/game/Maps/Map.cpp
2017-02-01 22:53:23 +01:00
Meruemu
9733e084e6 Core/Scripts: Fix array out of bounds in boss_mother_shahraz.cpp. (#17434)
Fix an error in Prismatic Shield auras and Fatal Attraction teleport points selection (was introduced in fb63c8e915)
(cherry picked from commit 325ccab595)
2017-02-01 22:53:21 +01:00
jackpoz
2355facafe Core/Creature: Fix assertion triggered
Fix assertion triggered when a Creature was summoned at an invalid position with Auras loaded as Creature addons.
Fix #17415

(cherry picked from commit 75319e4a68)
2017-02-01 22:53:21 +01:00
Shauren
40054ba475 Core/Maps: Add broken isles to continent list
by @zamalaev

Closes #18941
2017-02-01 22:33:14 +01:00
Shauren
787adc24b2 Fixed clang segmentation fault in nopch mode 2017-01-30 17:10:01 +01:00
Krudor
7a9515b388 Core/Criterias: Declared a criteria type (#18914) 2017-01-30 11:08:29 +01:00
joschiwald
18d9f53a61 Fixed Build 2017-01-29 22:24:43 +01:00
elecyb
792a4fd580 Core/Entities: Moved PITCH movement flags into TURNING mask (they do not cause movement in any direction alone, only combined with forward/backward/strafe)
Closes #16256

(cherry picked from commit d7460887c8)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
2017-01-29 21:51:07 +01:00
elecyb
58c660f4e4 Core/Player: Fix ghost players water walking visual bug
Fix bug of ghost players appearing as swimming to other players instead of water walking.
Ref #16256

(cherry picked from commit f8e87a445a)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
2017-01-29 21:51:06 +01:00
Aokromes
91aaf95f51 Core/Pet: Fix pet at rest distance (#17206)
* Core/Pet: Fix pet at rest distance

By MrSmite, closes #10865

* Update TargetedMovementGenerator.cpp

(cherry picked from commit b2effe4460)
2017-01-29 21:51:06 +01:00
SnapperRy
416bcdd852 Script/Quest: Improvements for quest Corrosion Prevention (27347): (#17385)
- Energized! spell should target only the caster and any player around.
- Prevent trigger from gaining threat from beneficial spell casts, getting stuck in a "gaining threat but cannot attack, reset" situation.
- The Power Core Fragment near the zeppelin crash should always be active.
(cherry picked from commit 764daeb9cc)

Rename 9999_99_99_99_world.sql to 2016_06_18_01_world.sql
(cherry picked from commit ce236d37c8)
2017-01-29 21:51:06 +01:00
Aokromes
db7d279cde Core/DungeonFinder: Add new log to allow to debug some issues
By Spp- on #14331
Enable lfg.allqueued DEBUG log. It will give more detailed info.
(cherry picked from commit e2e872d657)
2017-01-29 21:51:05 +01:00
tkrokli
604b8bfab1 Core/Scripts: Tom Hegger must target player in Say text (#17395)
File: zone_borean_tundra.cpp
Script: npc_hidden_cultist
Quest: The Hunt is On, 11794
NPC:  Tom Hegger, 25827

Before this change, Tom Hegger does not target player when saying his
aggro text "You don't know who you're messing with, $c!   Death beckons!"
and hence the text $c will be shown instead of the player class.
(cherry picked from commit 736843fbb5)
2017-01-29 21:51:04 +01:00
Treeston
d8911a9dd6 Creature/Loot: Do not display "lootable" sparkles for player even if others in the group still have quest items to be looted from creature. (#16265)
(cherry picked from commit a49544cc18)

# Conflicts:
#	src/server/game/Handlers/LootHandler.cpp
2017-01-29 21:51:04 +01:00
treeston
5baf6ea4d9 Merge branch '3.3.5-frogger' into 3.3.5 (PR #17261)
(cherry picked from commit 90ff3ce8c8)
2017-01-29 21:51:03 +01:00
Keader
5d8172f2d7 Core/Pet: Fixed pets dont lose auras on join arena (#17185)
(cherry picked from commit 994eab6bae)
2017-01-29 21:51:03 +01:00
Aokromes
927561c4cf DB/Quest: fix availability for some quests
Closes #17371 by SnapperRy
(cherry picked from commit a307157dac)
2017-01-29 20:45:47 +01:00
mik1893
7f903afea2 Core/Spells: Implement SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER (#17160)
* Core/Spells: Implement SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER
Closes #14972
(cherry picked from commit fd88a67182)
2017-01-29 18:13:21 +01:00
ariel-
d40c151cc8 Core/Scripts: Extended SMART_ACTION_SET_INST_DATA to also set BossStates. (#16739)
Scripts/Dire Maul: Initialize boss states array so it may be called from SmartAI. (Ref #6429)
(cherry picked from commit d1d0c64ad1)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
2017-01-29 18:04:10 +01:00
Andrew Letson
fd480d14f0 Core/Scripts: Migrate Professor Dabiri to SAI (#17367)
- removes Professor Dabiri from zone script and adds him to smart_scripts.
- also removes one more line of hardcoded text in core scripts
(cherry picked from commit 8e84603090)
2017-01-29 17:57:19 +01:00
Alan Deutscher
15817ba85f Adjustment to Player::SetViewpoint to allow for Mind Vision "hops". (#17041)
* Adjustment to Player::SetViewpoint to allow for Mind Vision "hops".

* Dynamic objects should not be a valid viewpoint for spells like Mind Vision.

* Dynamic objects should not be a valid viewpoint for spells like Mind Vision.

* Removed redundant TYPEMASK_PLAYER check.

* Moved SetSeer outside of if statement.

(cherry picked from commit 2df6a9126a)
2017-01-29 17:45:05 +01:00
joschiwald
acac606b21 Core/World: Fixed compile warning 2017-01-29 16:36:54 +01:00
joschiwald
a6d238b833 Core/Player: Moved character_template from character to world db 2017-01-29 16:09:46 +01:00
Shauren
c8af5de0d3 Core/Spells: Fixed Crash Lightning 2017-01-29 12:41:54 +01:00