Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,386 Commits 4 Branches 146 Tags
7d1d55124c1e289748d2afefae896c97f710e57b
Commit Graph

561 Commits

Author SHA1 Message Date
Shauren
7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
 2014-09-16 21:50:01 +02:00
Nyeriah
92d514d0c9 Scripts/Misc: Some code style fixes for old code 2014-09-14 12:55:48 -03:00
Malcrom
14367ca8c0 Scripting/Stand spell: Remove UNIT_FIELD_FLAGS change from spell script. 2014-09-14 12:37:04 -02:30
Shauren
2a1a294383 Scripts/Commands: Fixed build with -DSCRIPTS=0 2014-09-14 16:54:21 +02:00
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
Malcrom
716c2918d2 Scripting/Spell Stand: Move this spell to spells generic. 2014-09-14 11:15:25 -02:30
joschiwald
59baaeec48 Core/Chat: cleanup MonsterText methods 2014-09-13 20:41:31 +02:00
Odyssey
54e201b8b9 Scripts/Commands: Allow to set a custom duration to the Freeze command applied Aura 
- Allow to set a default duration for the Freeze Aura in worldserver.conf
- Handle the .freeze and .unfreeze command custom effects through the Freeze AuraScript
- Make players able to eventually unfreeze by themselves since the aura will expire without someone having to use .unfreeze
- Make .freeze command usable with the following syntax:

      * .freeze (with a targeted player)
      * .freeze duration_in_seconds (with a targeted player)
      * .freeze playername duration (if duration is an invalid value it will be defaulted to the config one)
      * .freeze playername (in this case, duration will be defaulted to the config value)

- Make .listfreeze command able to show the remaining freeze duration on all affected players

Closes #12972
 2014-09-08 15:56:32 +01:00
joschiwald
ef9b4aea5e Core/InstanceScript: refactored load and save methods 2014-09-07 00:42:14 +02:00
joschiwald
5ad8dcc5d6 Core/Misc: 
- fixed an oracle/wolvar reputation change issue
- moved texts of read pronouncement to db

Closes #9105
 2014-09-04 19:42:37 +02:00
Vincent-Michael
eccb0ed3da Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High" 2014-08-28 20:17:43 +02:00
Vincent-Michael
a52135f276 Core: Remove whitespace 2014-08-27 23:22:16 +02:00
jackpoz
a3b14db015 Merge 'Numielle/master' into master 
This is a workaround required by the current spell system limitations.
Close pull request #11915 .
 2014-08-24 17:11:51 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
joschiwald
ccfa82e7d5 Core/Creature: update creature_template and some other small things 
http://www.trinitycore.org/f/topic/9572-creature-damage/
 2014-08-14 16:09:14 +02:00
DDuarte
df3b08d140 Core/Server: Use nullptr instead of 0 where pointers are expected 2014-08-09 21:32:26 +01:00
Vincent-Michael
479afc0ed0 Core/Spells: Fix Bloodworms summon count 2014-08-02 05:17:42 +02:00
Vincent-Michael
296956e06e Revert "Core/Spells: Death and Decay" 
This reverts commit 02d56e00bc.
 2014-07-24 16:14:25 +02:00
Trisjdc
f79e7d7640 Core/Spells: Unrelenting Assault shouldn't proc if the target isn't explicitly casting (turns out that UNIT_STATE_CASTING even a instant cast has a 'cast time') 2014-07-24 03:52:19 +01:00
karn
26496375f8 Script/IoC: Move some spell scripts from spell_generic to isle_of_conquest cpp 
Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:49:07 +01:00
jackpoz
3388587b7a Core/Misc: Replace rand() calls with SFMT 2014-07-22 21:43:19 +02:00
Vincent-Michael
9a2d86f6ae Core/Spells: Fix Quest "The Emissary" 2014-07-19 02:43:15 +02:00
Shauren
7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Trisjdc
0a641bace9 Core/Spells: Ensure Haunt's healing takes in consideration crit damage 2014-06-27 00:40:59 +01:00
jackpoz
26a7916faf Core/Misc: Fix gcc build 2014-06-11 21:40:50 +02:00
Unholychick
52c0fc96bb Move pestilence to spellscripts 
Fixes crash and warnings introduced in d4bbc26261
Fixes a bug that allowed dks to spread diseases using another dks diseases
Closes: https://github.com/TrinityCore/TrinityCore/issues/12245
 2014-06-11 20:03:30 +02:00
Unholychick
b651789cb0 Core/Spells: Implement Periodic mechanics 
Change behaviour of single target periodic aura ticks to be more blizzlike
Also add some missing handling of SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE
Fixes Deep wounds and Chimera Shot Serpent
Remove an ancient hack with Drain Soul, spell id 100001 can now be deleted from spell_dbc table
Allows Rolling dot mechanics and allows DK's to roll diseases with pestilence,
see link for info:

http://forums.elitistjerks.com/topic/82503-frost-dps-in-333this-will-be-a-day-long-remembered/page-88
 2014-06-09 23:10:56 +02:00
Trisjdc
3dce4fabae Core/Spells: Swift Retribution should be reapplied when needed to be able to gain spellmods 2014-06-09 23:10:42 +02:00
Trisjdc
e0d08f5afb Core/Spells: Corpse Explosion should not be able to pick the Ghoul out of implicit targets 2014-06-09 23:10:40 +02:00
Trisjdc
0e32789cd2 Core/Spells: Missing target conditions for Divine Hymn/Hymn of Hope's second effect 2014-05-26 20:42:53 +01:00
Trisjdc
ea1c4a355c Core/Spells: Sniper Training should refresh every 6 seconds if all conditions are met 2014-05-24 18:57:26 +01:00
Trisjdc
4793f20506 Core/Spells: Nitro Boost should not fail in dungeon maps 2014-05-22 14:40:21 +01:00
Shauren
f9c7bb4171 Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic." 
Visual studio does not support constexpr
Made semicolon after "Prepare*Script" mandatory - workaround for dumb IDEs inserting extra indentation level after newline
 2014-05-18 12:50:10 +02:00
Praetonus
f296095191 Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic. 
-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.

Two minor changes in addition :

-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.
 2014-05-15 21:32:47 +02:00
Dehravor
24ae6a6802 Core/Misc: Remove obsolete C++11 backward compatibility macros 
OVERRIDE, FINAL, DELETE_MEMBER
 2014-04-29 16:35:11 +02:00
jackpoz
2585e799f9 Core/Misc: Change how Position struct is retrieved 
Update Position::GetPosition() and similar methods signatures to reflect 2a4c9bcaf9 changes by return a Position object instead of accepting a Position parameter by reference.
 2014-04-25 21:19:30 +02:00
Numielle
91827e87d1 Core/Spells: Fixed double heal reduction on Eart Shield (issue #4032). 2014-04-20 23:48:57 +02:00
Unholychick
574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript 
Closes #11896
Closes #3464
 2014-04-18 20:21:05 +02:00
joschiwald
533cbf20bb Core/Spells: addition to b9a62115b1 2014-04-14 21:12:05 +02:00
untaught
b9a62115b1 Core/Spells: fixed Relic of the Earthen Ring 
Closes #11282
 2014-04-14 19:48:13 +02:00
trickerer
d123780b2b Fix Sweeping Strikes damage 2014-04-09 20:13:17 +07:00
joschiwald
29610b250d Core/Spells: fixed Throw Shield Visual and Clone Weapon 2014-04-05 00:37:07 +02:00
jackpoz
8c44259fae Core/Misc: Fix some static analysis issues 
Fix uninitialized values, most of which are false positives, always initialized before being accessed.
Add some asserts and additional NULL checks as sanity checks. Use SpellMgr::EnsureSpellInfo() if the spell id is valid and always supposed to return a valid not-NULL SpellInfo* .
 2014-03-27 21:43:59 +01:00
Shauren
a4d8a26dc7 Scripts/Icecrown Citadel: Icecrown Gunship Battle 2014-03-23 02:01:13 +01:00
MitchesD
e40d4e6f16 Scripts/Spells: fix logic fail in q9874 2014-03-22 10:04:43 +01:00
jackpoz
9e99db035f Core/Misc: Fix some static analysis issues 
Add some asserts and additional NULL checks as sanity checks.
 2014-03-21 22:47:58 +01:00
Discover-
a242662ae6 Core/Spells: Fix DK Ghoul's damage after ad8eb434c0. I misread 'SpellScript::m_damage' for 'SpellScript::damage'. 
By @joschiwald
 2014-01-31 10:37:55 +01:00
Discover-
ad8eb434c0 Core/Misc: Missing changes and get rid of useless method in acd46085d1 2014-01-30 10:28:05 +01:00
joschiwald
acd46085d1 Core/Spells: drop last leftovers of hardcoded spell target selection and move it into spellscripts 
Closes #1719
Closes #3186
 2014-01-30 02:40:12 +01:00