Commit Graph
836 Commits
Author SHA1 Message Date
Nay 972b418103 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-10-07 14:51:21 +01:00
kandera c4c093ac80 Merge pull request #7971 from Retriman/SpellTi
Core/Spell: Remove LOS in spell tremor, grounding Totem.
2012-10-05 05:52:39 -07:00
Retriman 5f90eb831a Core/Spell: Remove LOS in spell tremor, grounding Totem. 2012-10-04 23:32:50 -04:00
Subv f7d3600e7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-10-04 19:39:09 -05:00
Kandera 94b2f90a5a Core/Spells: fix typo from 0f85a1d4f3 2012-10-02 11:58:27 -04:00
Kandera 0f85a1d4f3 Core/Spells: Fix seal procs from tiny abom in a jar. Closes #3463 2012-10-02 10:58:11 -04:00
Kandera c85c0c549a Core/Spells: when charges are removed by a proc they should be handled with AURA_REMOVE_BY_DEFAULT. Closes #7910 2012-10-02 10:23:36 -04:00
Spp 7831ecdb18 Core: "Initial support for C++11 compilers" 2012-10-02 15:06:19 +02:00
Spp 380db44583 Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct 2012-10-02 12:17:42 +02:00
Spp f8846cdeaf Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer 2012-10-02 11:54:41 +02:00
Nay 746252fe4e Merge remote-tracking branch 'origin/master' into mmaps 2012-09-30 15:43:20 +01:00
Nay 8a18449a74 SQL: Rename file merged in PR; Core: cleanup whitespace and tabs 2012-09-30 15:33:56 +01:00
Subv a706b8027a Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-09-28 17:56:08 -05:00
tibbi 3fae05f6f3 correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT 2012-09-27 00:31:00 +01:00
Kandera c5ada4b487 Core/Spells: fix typo from previous commit that caused a crash. 2012-09-26 09:11:30 -04:00
Nay 6dae8a5a49 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-25 09:27:08 +01:00
kandera c0c64da286 Merge pull request #6788 from Vincent-Michael/charmer
Core/Spells: Fix no combo points after Mind Control
2012-09-24 07:55:32 -07:00
Kandera dc935ef8b1 Core/Spells: fix beacon of light being on a non player. 2012-09-24 10:37:58 -04:00
kandera a4e3709dd3 Merge pull request #7811 from Faq/SplitDamage2
Core/Spells: Implementing some hooks for split damage taken, fixes the l...
2012-09-24 05:24:01 -07:00
Nay df0519607c Merge remote-tracking branch 'origin/master' into mmaps 2012-09-23 22:17:52 +01:00
MrSmite ce6785d9db Core/Combat: Fix Evade Mechanics
- Can now kite mobs beyond ThreatRadius (CONF) if continuing to damage them. World bosses still use ThreatRadius to prevent pulling them to cities
- A mob that is beyond the ThreatRadius, it will return home (evade) after 10 seconds of no damage if there are no valid targets within attack distance of it, otherwise it will still attack
- Mobs now properly report "Evade" if attacked while returning home.

(modified - Nayd)

Closes #830
Closes #7748
2012-09-22 02:11:31 +01:00
Nay 863229afbe Merge remote-tracking branch 'origin/master' into mmaps 2012-09-19 00:02:25 +01:00
Faq 0e7ed5ec85 Core/Spells: Implementing some hooks for split damage taken, fixes the limitation of dmg such auras can split, for example at Hand of Sacrifice. Might have unexpected results, but they are called unexpected for a reason.. .Author Tibbi
closes #6025

Made new one as https://github.com/TrinityCore/TrinityCore/pull/7423/ was closed.
2012-09-18 23:28:46 +03:00
Spp 8c5f011e79 Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr)
Note: No real use in 3.3.5 but will be used in 4.3.4
2012-09-18 14:29:53 +02:00
Nay 23961d0dce Merge remote-tracking branch 'origin/master' into mmaps 2012-09-17 23:50:08 +01:00
kandera 198c0346e2 Merge pull request #7797 from Warpten/kingOfTehWorld
Core/Spells: Fixed King of the Jungle. (alphabetical order!)
2012-09-17 09:44:56 -07:00
Warpten 2b9232dddc Core/Spells: Fixed King of the Jungle.
Closes #7098
2012-09-17 18:17:23 +02:00
Kandera 3f64286132 Core/Spells: fix beacon of light proc thx (oMadMono) 2012-09-17 12:08:26 -04:00
kandera 6516139290 Merge pull request #7280 from Faq/PrayerOfMending
Core/Spells: Only auras that has triggered spell should proc from fully absorbed damage.
2012-09-17 06:04:55 -07:00
Nay 2431895a54 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
2012-09-17 00:04:07 +01:00
Shauren bc912af806 Core/Spells: Defined and implemented SPELL_ATTR5_DONT_TURN_DURING_CAST.
This attribute controls whether unit can turn during casting spells (fixes Ingvar's Dark Smash)
2012-09-16 23:34:30 +02:00
Nay b1c4118a33 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 01:13:41 +01:00
Subv 5d57bd646b Core/Spells: Add parenthesis to some bitwise AND comparisons 2012-09-10 15:54:28 -05:00
Vincent-Michael 06eff1644d Core/Vehicles: Fix warnings 2012-09-10 15:44:12 +02:00
Spp 358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
Nay 4896a1775e Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-10 00:54:29 +01:00
Shauren 83817afd99 Core/Vehicles: Improved vehicle passenger position calculation (still not complete) 2012-09-09 19:56:00 +02:00
Vincent-Michael 2317af8dd3 Core/Spells: Convert Gift of the Naaru in spell script
Closes #6545
2012-09-09 04:02:47 +02:00
Nay 50327363ca Merge remote-tracking branch 'origin/master' into mmaps 2012-09-09 02:26:31 +01:00
Nay d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Subv f9fdf03ec2 Core/Spells: Corrected Glyph of Blessing of Might and Glyph of Blessing of Wisdom.
They should not affect Greater Blessing of Might and Greater Blessing of Wisdom.
2012-09-08 07:59:21 -05:00
Nay 6c1bdb3d3c Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-08 01:32:47 +01:00
Vincent-Michael 9fc30476ed Core/Spells: Fix Flash of Light proc only for Infusion of Light
Closes: #6274
2012-09-08 02:01:34 +02:00
Subv 20ca59fbc7 Core/Spells: Allow more aura types to use spell_group_stack_rules data. 2012-09-07 17:04:13 -05:00
Nay 407286fe81 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-07 03:34:23 +01:00
kaelima f685e9fb2a Core/Vehicle: Correction to 5eb22e5b64. Thanks joschiwald (and slap some others) for noticing 2012-09-07 03:31:46 +02:00
kaelima 5eb22e5b64 Core/Vehicles:
- Send proper triggering flag when casting spellclick spells on vehicles (should not be fully triggered)
- Only compute non-transport positions when not finalized. (Fixes changing seat on vehicles, or changing vehicle from vehicle)
2012-09-07 03:17:04 +02:00
Vincent-Michael 6f38fb1011 Core: Fix some code style 2012-09-07 02:21:38 +02:00
cyberbrest aed0ecd2e4 Core/Conditions: Allow multiple condition for spellclick source type
Currently unused in 335 but required for some 434 spellclicks
2012-09-06 20:03:21 +01:00
Nay 0522e50c86 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Spells/Spell.cpp
2012-09-06 18:01:51 +01:00