Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
18,256 Commits 2 Branches 1 Tag
f01f695c7d31e0db9e4f36af406964598653aad7
Commit Graph
2206 Commits
Author SHA1 Message Date
Warpten f01f695c7d Core/Spells: Fixed Leap of Faith and renamed a spell script to match standards. 2012-11-25 21:07:08 +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
Subv ecf3f6c2c7 Merge pull request #8291 from Gacko/utgardekeep 
Core/DB: Utgarde Keep
 2012-11-16 05:33:16 -08:00
Gacko c95228fcf8 Core: Utgarde Keep - Fix warning/error 2012-11-16 14:21:48 +01:00
Spp 279b7f4c10 Core/Misc: Minor changes here and there 2012-11-16 09:51:44 +01:00
Spp 978fc4b7b9 Fix compile 2012-11-16 09:09:27 +01:00
Spp a0c8193ee7 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
 2012-11-16 08:51:15 +01:00
kaelima c9801e83c6 Script/Emerald Dragons: Fixed a couple of issues with emerald dragon world bosses and some cleanup. 
Renamed one sql from yesterday
 2012-11-14 09:02:17 +01:00
kaelima 3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
Gacko 4e95c64bad Core: Utgarde Keep - Codestyle 2012-11-12 19:16:26 +01:00
Spp f53a04add0 Core/Scripts: Added Worgen and Goblin races to .pinfo command. 2012-11-12 10:31:56 +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
Tuxity 516c6d31ec Merge branch 'master' into 4.3.4 2012-11-11 18:53:01 +01:00
Gacko 5126c0ad8b Core/DB: Utgarde Keep - Proto Drake 2012-11-11 18:43:04 +01:00
Shauren 63076ae58b Merge pull request #8260 from Warpten/cleanup 
Core/Scripts: Cleanup alterac_valley.cpp.
 2012-11-11 06:20:19 -08:00