Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,661 Commits 4 Branches 146 Tags
master
Commit Graph

7915 Commits

Author SHA1 Message Date
Shauren
c7fd67bdfd Merge pull request #8423 from joschiwald/conditions 
Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails
 2012-11-24 08:25:45 -08:00
joschiwald
e83c5d1a0f Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails 2012-11-24 02:45:48 +01:00
Nay
24cd72c8e1 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Spells/SpellEffects.cpp
 2012-11-23 23:39:03 +00:00
Vincent-Michael
ea60648c88 Core: Fix typo 2012-11-24 00:25:56 +01:00
Shocker
d2063d2fb3 Build fix 2012-11-24 00:48:21 +02:00
Shocker
8cbc904f02 Merge pull request #8407 from Gacko/creaturetext 
Core/Scripts: More creaturetext conversions
 2012-11-23 14:33:54 -08:00
kaelima
fc974d6fbe Core/Movement: Remove deprecated method Creature::AI_SendMoveToPacket. 2012-11-23 20:18:55 +01:00
kaelima
7fcdbdd3ae Core/Scripts: Fix typo in boss_lethon script 2012-11-23 20:17:19 +01:00
Gacko
4065176897 Core/DB: Convert 14 more scripts to creature text 2012-11-23 16:25:59 +01:00
Gacko
27619b2bd7 Core/DB: Chapter 5 in creature text 2012-11-23 15:59:11 +01:00
Gacko
a66adcf6e1 Core/DB: Chapter 2 in creature text 2012-11-23 15:59:10 +01:00
Gacko
14b728255c Core/DB: Converted 11 scripts to creature text 2012-11-23 15:59:10 +01:00
Spp
f09d8b3c71 Addition to last commit... "Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)" 2012-11-23 15:24:17 +01:00
Spp
86594d4b7a Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide) 
Closes #8418
 2012-11-23 15:13:00 +01:00
Kevin Darcel
b82db85e75 Merge pull request #8374 from Huri/4.3.4 
Core/Spells: Fixed Arcane Brilliance, Dalaran Brilliance, Power Word: Fo...
 2012-11-23 01:40:11 -08:00
Spp
3cf7eb23f9 Missing change from merge 2012-11-22 15:08:28 +01:00
Spp
b9b57c2d62 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp
 2012-11-22 15:04:59 +01:00
Tuxity
2f1000a9ed Core/Arenas: Drop old .modify arenapoint command, create a new command to add currency to players. 2012-11-22 01:39:54 +01:00
Tuxity
f5a54f8cbe Misc: Whitespace and tabs cleanup 2012-11-21 18:26:28 +01:00
cyberbrest
f205bc9b4f Core/Currency: Add support of Conquest points cap for arena and bg 
Remove obselete code for arena points distribution

Thanks to @Zakamurite
 2012-11-21 18:25:23 +01:00
Amit 86
b0b3c9ffbe Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE 2012-11-21 09:31:53 +02:00
Vincent-Michael
84d88cbcec Core: Fix warnings 2012-11-21 00:43:24 +01:00
Vincent-Michael
695836cb01 Core: Fix non pch build 2012-11-21 00:15:58 +01:00
ZxBiohazardZx
8bd462b6d1 Core/scritps: change enum to fix compile 2012-11-20 23:20:14 +01:00
ZxBiohazardZx
074b2e3936 Merge pull request #8371 from Gacko/creaturetext 
Core/DB: Some script to creature text conversions...
 2012-11-20 13:53:55 -08:00
Gacko
1e5e7056dc Core/DB: Converted 7 more scripts to creature text 2012-11-20 22:03:10 +01:00
Spp
08b7439f48 Typo Fix after 81606e5 (Thanks to vlad852 for noticing) 2012-11-20 19:02:58 +01:00
Gacko
9dc06f8bd9 Core/DB: Some script to creature text conversions... 2012-11-20 18:08:18 +01:00
huri
43d5af1ebd Core/Spells: Fixed Arcane Brilliance, Dalaran Brilliance, Power Word: Fortitude, Shadow Protection, Mark of the Wild, Blessing of Kings, Blessing of Might 2012-11-20 17:29:15 +01:00
Spp
1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.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/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
Spp
7bef4ce401 Core/Misc: Reduce header dependencies - Step III 2012-11-20 15:03:56 +01:00
Spp
b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp
81606e5d1e Core/Misc: Define some methods const 2012-11-20 09:29:52 +01:00
Vincent-Michael
7aa967e966 Scripts/AQ: Fix warnings (thx razhael) 2012-11-19 16:24:59 +01:00
Spp
fff684ec78 Remove duplicate code after some old merge 2012-11-19 12:03:45 +01:00
Spp
bf8b642a47 Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4) 2012-11-19 12:02:33 +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
Subv
a337abc436 Scripts/Instances: Added missing definition from previous commit. 2012-11-18 20:53:27 -05:00
Subv
bbe146d104 Scripts/Instances: Save Magister's Terrace door (and statue) state. 
Closes #6889
 2012-11-18 20:33:03 -05:00
Nay
27cf98dac1 Scripts/AQ: Fix non PCH build 2012-11-19 01:02:31 +00:00
Nay
4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00: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
krofna
aea5fec30d Scripts/AQ: Implement Ossirian the Unscarred 
Fix yell on kurinaxx death

Warning fix

Closes #8254

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 00:37:43 +00:00
Gacko
45b07f0931 Scripts&DB: Nexus - Ormorok 
Following improvements:
- Spellscript for crystal spikes
- Spawn crystal tanglers with spell
- Usage of event map
- Correct usage of frenzy
- Heroic spells
- Target selection for crystal tanglers

Details for the spell script:
There are 4 spells. Each of them spawns the same trigger but in another direction. The trigger gets an aura which triggers the spell which summoned him after 250ms. This time is too long, so it triggers on apply. Don't worry - test ingame first, it's working blizzlike (I watched some videos on YT to find out which is the best amount of time difference between spawn and next summon).

Some summon types don't store the spell id which summoned them. The trigger is one of them which are not doing so. So I had to move the line, which stores the spell id in the summon out of the if. This could be done more specific, but it works fine. This improvement is required to find out which spell the aura applied to the summoned trigger has to cast to keep the right direction.

Closes #8193

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-18 23:46:03 +00:00
Nay
bb8e31d1bd Merge pull request #8259 from Warpten/supLion 
Scripts/Ruby Sanctum: Tweaks and stuff.
 2012-11-18 13:51:58 -08:00
oMadMano
477d17b0fc Core/Spells: Fixed Improved Cone of Cold. 2012-11-17 14:10:47 -05:00
Spp
b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Spp
339d2b1257 Fix compile 2012-11-17 03:18:37 +01:00
Shocker
572788c3c0 Core/Commands: Fix .npc add item 2012-11-16 23:23:38 +02:00
Subv
d55771267a Core/EventAI: Removed table creature_ai_summons. 2012-11-16 12:30:48 -05:00