Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,591 Commits 4 Branches 146 Tags
d4f936a4fa9f4b6202ee5a5d1565373c7ca5d5e8
Commit Graph

347 Commits

Author SHA1 Message Date
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
Spp
279b7f4c10 Core/Misc: Minor changes here and there 2012-11-16 09:51:44 +01:00
Spp
5fd7d01bde Core/Build: Remove some more unneeded code for OS X from cmake files 
Core: Minor changes here and there
 2012-11-12 10:29:52 +01:00
Spp
60d4343d8e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Spells/Spell.cpp
	src/server/shared/Logging/Appender.h
 2012-10-23 14:16:05 +02:00
Kaelima
1ff5b83657 Merge pull request #8074 from Warpten/halionUpdate 
Scripts/Ruby Sanctum: Misc fixes.
 2012-10-23 03:58:48 -07:00
Warpten
a664a356e2 Scripts/Ruby Sanctum: 
* Fixed a crash caused by the grid.
* Update spawnmasks.
* Misc updates and corrections.

Closes #8079.
Closes #8078.
Closes #8081.
Closes #8077.
 2012-10-22 21:18:21 +02:00
Subv
705873091b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
 2012-10-16 21:55:01 -05:00
Subv
27f091806a Core/SpellAreas: Changed the way quest_start and quest_end works. 
They now follow this rule:
The player's quest status of quest_start must have the mask defined in quest_start_status in order for the spell to be applied/kept.
The player's quest status of quest_end must _NOT_ have the mask defined in quest_end_status in order for the spell to be removed
To generate the mask:
Take the QuestStatus enum in QuestDef.h, use (1 << theValueYouWant) to obtain a mask and you can use | to combine masks.
This expands the usage of the spell_area table, making possible to give a player an aura while he has a quest, but remove it as soon as the quest is completed (not rewarded).
Feature request by @Svannon
 2012-10-16 21:44:28 -05:00
Subv
c757f811f2 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_modify.cpp
 2012-10-15 11:15:25 -05:00
Nay
6f0a8040d8 Core/SpellMgr: Replace magic number by constant 
Thanks 2010phenix
 2012-10-13 17:36:19 +02:00
Elron103
ae4f5f3dee Core/Spells: Fix power drain effect for heroic versions of spell 70759 (72015, 72016) - thanks to Shauren 2012-10-13 00:43:20 +02:00
Nay
44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
 2012-10-07 14:57:18 +01:00
kaelima
8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
Warpten
c971447855 Scripts/Ruby Sanctum: Halion, the Twilight Destroyer. 2012-10-06 22:47:52 +02:00
thesensei
91367bb39f Core/Oculus: Fixes here and there, implement phasing 
* Implement phasing (sniffed)
    * Add drakes proper support (events, texts, conditions for spells), remove npc_spellclick_spells
    * Add proper support for Gossip npcs
    * Removed the arcane shield Urom use first time we are about to meet him, because he only get it after he spawns a wave, added Evocation casts from sniff/retail that also break the teleportation visual bug
    * Some db updates based on Aokromes sniffs
    I intended to do it all, but there are core issues I have no knowledge to fix and I don't want to jump to other things before fixing them. :) So, I will submit boss updates, if I ever fix them. There are still stuff do do for drakes spells left from before.
    * Majour thanks to Shauren for helping me with summoning spells and w/e I ask him and all who answered my questions.
 2012-10-02 22:13:40 +03:00
Nay
1f79ac8c30 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-23 22:17:12 +01:00
Nay
a7386bd1b3 Scripts: Fix some code style issues in scripts 2012-09-23 22:16:28 +01:00
Nay
e4d08c1186 Merge pull request #7555 from Gacko/quest11648 
Core: Quest - The art of persuasion
 2012-09-23 07:48:40 -07:00
Nay
95d713ac6f Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-22 10:56:41 +01:00
Nay
435a240a9f Merge pull request #7551 from Gacko/utgarde 
Utgarde Keep
 2012-09-21 18:05:11 -07:00
Gacko
ee6ff0e5ed Core/DB: Utgarde Keep 2012-09-20 17:45:11 +02:00
Shauren
547895762d Compile fixes 2012-09-16 00:35:48 +02:00
Shauren
a51ab0abc4 Core/Spells 
* Removed unneeded ported helper functions and use our own
* Corrected filling pet spells
 2012-09-15 22:02:17 +02:00
Nay
68e0ef8039 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h
 2012-09-11 01:11:14 +01:00
Shauren
0390f9d708 Scripts/Icecrown Citadel 
* Despawn Mutated Abomination when second phase transition ends, not begins
* Prevent Unbound Plague jumping every 0.5 seconds to bypass the mechanic by raid members stacking in one place
* Fixed Volatile Ooze not picking targets when everyone stood close to the tank
* Fixed Ooze adds pickning new targets after old one gets lost

Closes #7610
Closes #7611
Closes #7665
 2012-09-10 20:32:13 +02:00
Nay
cc28161670 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2012-09-05 20:09:48 +01:00
kaelima
7c971be3c5 Core/Misc: Fix some warnings and logic mistakes found by static code analysis 2012-09-05 17:18:05 +02:00
Shocker
9c954a0cc4 Core/Spells: Crowd control spells PvP duration has been decreased to 8 seconds (down from 10) 2012-09-04 17:15:37 +03:00
Gacko
a303bda320 Core: Quest - The art of persuasion 2012-08-30 20:27:21 +02:00
Nay
fc16106823 Scripts/Spells: Fix a typo in spell_q12372_cast_from_gossip_trigger and cleanup whitespace 2012-08-27 14:40:12 +01:00
Nay
b26a7337f6 Core/Groups: Correction to comment of GROUP_UPDATE_FLAG_PHASE 2012-08-27 00:26:02 +01:00
Nay
3fd52c4736 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/GroupHandler.cpp
 2012-08-27 00:13:23 +01:00
Vincent-Michael
fcd48335e8 Core/Spells: Implement Battleground - Dampening for wintergrasp 2012-08-26 19:38:05 +02:00
Vincent-Michael
1ad861a95e Core/Battlefield: Fix Essence of Wintergrasp 2012-08-26 16:46:25 +02:00