araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 22:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
29,988 Commits 17 Branches 140 Tags
6bdfbd12341897ae84db63b0dcd774d4e3023d88
Commit Graph

22687 Commits

Author SHA1 Message Date
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
Keader 1a788ab226 Core/Movement Fixed minimum speed check (#17555) 
(cherry picked from commit 23b6991273)
 2017-02-05 16:29:27 +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
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
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
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
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 https://github.com/TrinityCore/TrinityCore/commit/fb63c8e915986650f787de62859e1f818d1d96c7)
(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