Shauren
64f0e99958
Core/StatSystem: Implemented mastery.
2013-05-12 17:56:37 +02:00
Vincent_Michael
a9b740ab74
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/shared/Packets/ByteBuffer.h
2013-03-10 01:08:55 +01:00
Nefarion
49fd11ab5a
First step of comment style refactoring to doxygen-style.
2013-03-08 21:55:37 +01:00
Vincent_Michael
c376757241
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-03-03 21:17:41 +01:00
Trista
a108a9026a
Scripts/Eye of Eternity: Rewrite Arcane Barrage mechanic
...
* Note that even after last changes happens I'm not sure exactly how the timers are controlled. The wipe chance should be a lot smaller now.. Any further change I can think of is beyond what I see. The main problem is currently. In theory there is chance, If timers get to be same with delay lesser than 2 seconds and if target randomisations select same target for shit out of luck reason. And if starting different timers were matching you can be hit atleast 2-3 times and on 25 mode maybe more. The timers are not with fixed difference for sure is all I know.
2013-03-03 03:16:17 +02:00
Vincent_Michael
5fd8add7bf
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-03-01 21:45:00 +01:00
Trista
d1853f693b
Scripts/Eye of Eternity: Remove some flags, fix some timers and some misc
...
* Starting timers were a bit slower
* Destroy platform proper timing for drake casting mount spell to player (trigger)
* Remove IMMUNITY_PC flag after Iris is triggered (thx to Expecto) and readd it on evade
* Remove NOT_SELECTABLE flag since shouldn't be present at starting event
* Fix misc of id of Static Field added to LOS attributes
2013-03-01 16:25:58 +02:00
Vincent_Michael
b2d05c9cdd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
2013-02-28 22:14:48 +01:00
Trista
6801314881
Scripts/Eye of Eternity: Rewrite most of it.
...
Closes : #1133 , #8212 , #1150 , #5003 , #6794
* More stuff will be done, a lot to clean maybe, as of raiding it's good to go now pretty much*.
* Big thx to Shauren, Horn, manuel, Machiavelli, Nay, Krofna and rest who helped.
2013-02-28 18:44:07 +02:00
Vincent_Michael
cd24526aac
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-02-26 16:11:15 +01:00
QAston
6403e3fbfe
Core/SpellsMgr: remove unneeded functions from spellmgr, add some const modifiers for methods
2013-02-26 11:05:10 +01:00
Vincent_Michael
71eaceae5d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Weather/Weather.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/tools/CMakeLists.txt
2013-02-18 18:51:52 +01:00
Shauren
e49aaab6f6
Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line
2013-02-17 02:10:08 +01:00
Vincent_Michael
49e196e6b0
Misc/Spells:
...
- Add some ulduar teleport pos for spells
- Add target hack for ulduar teleport spells
2013-02-16 03:26:26 +01:00
Vincent_Michael
6161f69b7e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Spells/SpellMgr.cpp
2013-02-02 00:16:11 +01:00
Shauren
817f5b3648
Scripts/Icecrown Citadel:
...
* Fixed Coldflame dealing double damage
* Targets hit by Bone Slice will now be immune to Bone Spike Graveyard
* Fixed healing players on Bone Spike
Closes #1091
Closes #4473
Closes #5854
Closes #7060
2013-02-01 18:06:51 +01:00
Tuxity
5b7c01e48c
Core/Spells: Add missing break in previous commit
2013-01-22 17:43:18 +01:00
Tuxity
c72afa9ecf
Core/Spells: Fix Tree of Life (Passive). Closes #8544
...
I learn something today, thx Shauren
2013-01-22 15:44:47 +01:00
Spp
0e8011657d
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
Malcrom
ace7bbeddf
Core/Zul'Grub: Fix up Mandokir Boss
2013-01-16 00:41:03 -03:30
Subv
bb1c955c8b
Scripts/HallsOfOrigination: Added script for Anraphet and the Vault of Lights.
...
Some bugs might still remain.
Crumbling Ruin spell has a problem with radius handling.
2013-01-04 18:07:56 -05:00
Vincent_Michael
eba9abd2ee
Core/Spells: Update no fly zone for wintergrasp
2013-01-03 17:37:39 +01:00
Vincent_Michael
aa43ecd18d
Core/Spells: Removed no fly zone for dalaran
2013-01-03 16:58:38 +01:00
Spp
aed36a8375
Merge branch 'master' into 4.3.4
...
Conflicts:
dep/libmpq/CMakeLists.txt
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Item/ItemPrototype.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.h
src/server/game/World/World.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
2013-01-02 13:30:51 +01:00
Spp
d36c4a91ba
Core/Misc: Use equal_range instead of lower_bound/upper_bound calls where possible.
2013-01-02 09:53:43 +01:00
Vincent_Michael
cc65aba789
Update copyright note for 2013.
...
Happy new year.
2013-01-01 00:41:01 +01:00
Vincent_Michael
abbbf55931
Core/Spell: Removed a obsolete spell fix for cata
2012-12-28 19:38:01 +01:00
Nay
3375f56bf8
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/scripts/Kalimdor/thousand_needles.cpp
2012-12-28 17:31:39 +00:00
Faq
e04275984e
Core/Spells: fix self-damage caused by Glyph of Chains of Ice. oMadMano
...
Closes #7270
Closes #644
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-12-28 02:24:01 +00:00
Shauren
a2bb50c462
Core/Spells: Removed a few obsolete spell fixes
2012-12-27 20:22:22 +01:00
Nay
91136ea55f
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/DataStores/DBCEnums.h
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/Commands/cs_reload.cpp
2012-12-27 17:52:11 +00:00
joschiwald
3288d7024a
Core/Spells: fix possible crash when loading spell_proc table
2012-12-27 06:04:45 +01:00
Subv
587710feb5
Scripts/HallsOfOrigination: Added script for Earthrager Ptah.
...
ToDo: Fix spell Sand Vortex on Heroic difficulty.
Note: Feedback needed.
2012-12-25 19:36:01 -05:00
Subv
d4f936a4fa
Scripts/HallsOfOrigination: Fixed Temple Guardian Anhuur's Reverberating Hymn spell damage.
2012-12-24 19:02:10 -05:00
Subv
f9e592e9c7
Scripts/HallsOfOrigination: Some work on Halls of Origination.
...
Temple Guardian Anhuur's script added.
ToDo: Make the triggers invisible.
Merry Christmas folks!
2012-12-24 18:25:57 -05:00
Subv
77b85b2ea0
Core/Spells: Fixed loading of spell data corrections.
2012-12-24 12:34:46 -05:00
Subv
eff2a994b1
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-23 08:34:10 -05:00
Subv
3869bb7b3a
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
2012-12-23 08:33:13 -05:00
QT
92374d203d
Core/Leveling: Prevent blue text spam 'Your skill in Axes increased to 30'
...
closes #8484
2012-12-22 22:22:18 +01:00
Gacko
2302b04a06
Core/Spell: Last work on Shadows Fate
...
- Shadows Fate can now be applied by more than just one player at the same
time. So on everyone who hits the unit the credit spell with the visual
will be casted on death.
- The AOE credit spells for the three infusion quests will be casted by
the boss once. If this would be done on proc, these AOE spells could be
casted up to 25 times.
-> 25 AOE credit spells plus 25 Soul Feast credit spells equals Sh**
2012-12-22 17:49:51 +01:00
Subv
1750391fca
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-07 19:12:00 -05:00
Vincent_Michael
3199c9d563
SQL:
...
- Fix startup errors
- Rename SQLs in correct name
2012-12-07 18:11:28 +01:00
PitCrawler
5c3431337a
DB/Various Fixes:
...
Add SAI support for Quests 11984, 12255, 12259 Closes #4787
Fix quest Seeking the Windserpent Godess, Setting the Stage Closes #8577
Fix quest Quest I Sense a Disturbance Closes #8515
2012-12-07 16:08:29 +01:00
Spp
fb2e5c3c58
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/azshara.cpp
src/server/scripts/Kalimdor/azuremyst_isle.cpp
src/server/scripts/Kalimdor/darkshore.cpp
src/server/scripts/Kalimdor/durotar.cpp
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
src/server/scripts/Kalimdor/feralas.cpp
src/server/scripts/Kalimdor/moonglade.cpp
src/server/scripts/Kalimdor/silithus.cpp
src/server/scripts/Kalimdor/stonetalon_mountains.cpp
src/server/scripts/Kalimdor/tanaris.cpp
src/server/scripts/Kalimdor/the_barrens.cpp
src/server/scripts/Kalimdor/thousand_needles.cpp
src/server/scripts/Spells/spell_generic.cpp
2012-12-07 09:22:43 +01:00
Vincent-Michael
0a3972db7c
Core/Quest: Removed table quest_start_scripts
2012-12-04 11:23:10 +01:00
Warpten
ff1ca5522e
Core/Spells:
...
* Bryntroll's Drain Life should not crit.
* Bestial Wrath can be used while under CC since patch 3.3.2
Patch 3.2.2 (2009-09-22): "Bestial Wrath and The Beast Within Changed to function like PvP Trinkets, removing any movement impairing effects, and giving immunity to these effects for 10 seconds.", also the tooltip doesn't say this, but it now breaks all forms of CC that a PvP trinket would break (including Cyclone,Sap, etc.).
2012-12-01 14:21:44 +01:00
Spp
2251d1bfae
Core/Misc: Set mode 0644 for files
2012-11-27 13:03:12 +01:00
Spp
7f061fc57f
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Chat/Chat.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
2012-11-19 10:09:58 +01:00
tibbi
1f9db80b69
Scripts/ToC: Trial of the Crusader rewrite
...
Closes #8272
Closes #7013
Closes #7552
Closes #5561
Closes #4221
Closes #2701
Closes #2079
Closes #5082
Closes #6503
Closes #6784
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-11-19 00:42:25 +00:00
Spp
b99c347747
Core: Remove Player.h dependency from all the possible headers
2012-11-17 05:18:37 +01:00