Commit Graph
3647 Commits
Author SHA1 Message Date
Vincent-Michael 5c5533c355 Core: Remove whitespaces
(cherry picked from commit 5705555f1f9a259f2d4d52980ccb68d1b909b7a2)

Conflicts:
	src/server/game/Server/Packets/TicketPackets.h
2015-07-24 11:35:34 +01:00
DDuarte 3c4484d782 Scripts/ScarletEnclave: Add weapons to Unworthy Initiate
Closes #14954
Closes #14955

(cherry picked from commit 673648ee6507597837bd2c8a7a78f425d139baea)
2015-07-20 01:16:47 +01:00
jackpoz a22fd7dca5 Scripts/VioletHold: Fix build warnings 2015-07-19 14:57:10 +02:00
mik1893 2295dc75e5 Merge pull request #14986 from robinsch/chimeraShot
Scripts/Spells: Hunter's Chimera Shot - Serpent damage
2015-07-14 16:47:24 +02:00
duhow cec97f168c Scripts/Commands: Allow .maxskill to be used with self or selected player
Closes #15064
2015-07-14 02:27:56 +01:00
joschiwald 7b1fee6c78 Scripts/FoS/Bronjahm: fixed corrupted soul fragment
Closes #5215
2015-07-12 14:37:46 +02:00
sirikfoll 5bbd7cff4c Spell Script for quests Among the Champions and The Grand Melee
Solves issues with the credit spells hitting the mount instead of the player itself.
2015-07-11 00:30:08 +02:00
DDuarte 57091cc5f1 CRLF to LF
Seriously....
2015-07-10 20:16:55 +01:00
jackpoz b574c99549 Scripts/Ulduar: Fix Flame Leviathan instance lock
Fix Flame Leviathan instance lock not being granted to players because they were ejected from the vehicles as soon as boss died.
Players are now ejected some seconds later.
Close https://github.com/TrinityCore/TrinityCore/issues/15005
2015-07-05 17:16:35 +02:00
jackpoz 37b157746e Scripts/Commands: ".mmap path line" now uses raycast pathfinding
Add "line" optional parameter to ".mmap path" command to use raycast implementation of recast, useful to simulate charge paths.
2015-07-03 23:21:09 +02:00
joschiwald 6680a7c331 Scripts/EoE: fixed crash
- removed some useless code (and some other random changes)
2015-07-03 21:01:29 +02:00
jackpoz 275bb93034 Scripts/EyeOfEternity: Fix crash added in d1853f693b
Close https://github.com/TrinityCore/TrinityCore/issues/14984#issuecomment-118044904
2015-07-02 22:08:19 +02:00
jackpoz 55681666b3 Core/Misc: Fix build warnings 2015-07-01 20:57:20 +02:00
robinsch b57539d2f2 Scripts/Spells: Hunter's Chimera Shot - Serpent (ID: 53353) damage should be increase by Improved Stings talent. 2015-07-01 15:58:12 +02:00
Nyeriah 0b1355b280 Scripts/RubySanctum: Fix build warnings 2015-06-30 10:22:28 -03:00
mik1893 7c01638d45 Scripts/VioletHold: fix a crash during Ichoron encounter
Closes #14962
2015-06-27 22:07:57 +02:00
Mik1893 409c8e406d Scripts/Oculus: Implemented Drake GPS system 2015-06-26 16:24:12 +02:00
DDuarte 5a7adbba3a Fix build after recent cherry picks (v2.0) 2015-06-26 04:08:40 +01:00
DDuarte 079ebe4d5d Fix build after recent cherry picks 2015-06-26 04:01:26 +01:00
DDuarte 02df39f791 Fix build and SQL import after recent cherry picks 2015-06-26 02:42:24 +01:00
Warpten aade16a2f4 Scripts/RubySanctum: Updates to Halion.
* Fixed Living Embers not spawning.
* Meteor Strike is now randomized.

(cherry picked from 1447875cac0fefd58ae3ad27e6b3fa2134a714c0)

Scripts/RubySanctum: Fix a mathematical mistake.
SQL: Do not use MAX(Id), hardcode it.

(cherry picked from 7a5bc9e1fe457f0c77cdfecefa5bd42525105c3e)

Scripts/RubySanctum: Correctly spawn Living Embers.

(cherry picked from 7c4b8b0e826fd1cdab8a635225123aebd1b950c6)

Scripts/RubySanctum: Remove duplicate code.

(cherry picked from 1d29328769d505caf4541b0d712972195dda8b70)

Core/Misc: Warning fixes

(cherry picked from dc53dad8a44292bcb555db9fdc07eb255a838cac)
2015-06-26 01:52:17 +01:00
DDuarte 24b5dfcb4d Core/BattlegroundIC: Removed 1 hack:
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."

(cherry picked from commit 8a4afad63ac97b39f6746d466f3166eeef62e711)

Conflicts:
	sql/updates/world/2015_05_01_00_world.sql
	src/server/game/Miscellaneous/Language.h

Rename 2015_05_01_00_world.sql to 2015_06_13_00_world.sql

(cherry picked from commit 74eeefa5be163a55489f91c05d7dfd1cb624c78d)
2015-06-26 01:24:21 +01:00
mik1893 49809bd404 Scripts/VioletHold: Fix codestyle and unwanted crash in Violet/Hold
closes #14952 and #14953
2015-06-26 00:30:04 +02:00
MitchesD e34f74dace Scripts/VioletHold: fixed non-pch build and codestyle 2015-06-25 15:26:02 +02:00
MitchesD 83954fb999 Merge pull request #14860 from mik1893/violethold
Core/Scripts: Violet Hold, full rework
2015-06-25 14:45:13 +02:00
MitchesD 0cba5558cf Scripts/Spells: fix codestyle
thanks @whoami
2015-06-24 11:05:36 +02:00
mik1893 0bb7f89e82 Core/Scripts: Rework Violet Hold bosses adding missing spells/mechanics:
- Cyanigosa, Arcane Vacuum
- Ichoron, globules mechanic
- Moragg, optic link visuals
- Lavanthor, minor changes
- Zuramat, correctly implement void sentries
- Erekem, implement Windfury and correct management of Erekem Guards
- Script for the pre-event
Thx @ManuFe
2015-06-23 16:32:50 +02:00
MitchesD 8197467c87 Merge pull request #14776 from sirikfoll/SpellMidsummer
Core/Spells Add support for quest Torch Tossing/More Torch Tossing
2015-06-23 11:34:35 +02:00
Shauren d04c9d55ac Scripts/Zul'farrak: Fixed summoning Gahz'rilla
Fixes #5782 regression

(cherry picked from commit cec05ff07d1751649b6eecff07f23f52ca5443cd)
2015-06-19 17:29:09 +02:00
jackpoz 0b9cd22a6b Core/ChatCommands: Allow to use "tele" command inside of a battleground
Allow GameMasters with ".gm on" tag to use ".tele" command inside of a battleground to tele around.
2015-06-15 21:35:05 +02:00
joschiwald 34a721ba84 Scripts/VioletHold: picked some things from pull request #11399 (thx MitchedD for initial work) 2015-06-14 16:03:17 +02:00
Nyeriah d86ff08145 Scripts/TheEye: Clean up instance script 2015-06-10 01:07:24 -03:00
jackpoz a7847728a5 Scripts/Auchindoun: Fix distance check in boss Shirrak
Issue added in 88137c07b9
2015-06-03 20:40:08 +02:00
DDuarte 1e54097084 Core/Scripts: Corrected argument types in GetCreatureEntry/GetGameObjectEntry ZoneScript hooks
(cherry picked from commit b0c4268a6b0ed1fffeb51c7542c7991399b18284)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp
2015-06-01 00:44:11 +01:00
MitchesD db8fdd94ed Merge pull request #14782 from doctaweeks/fixes-for-6.x
Minor fixes for 6.x
(cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93)

Conflicts:
	src/server/bnetserver/Main.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
	src/server/game/Battlegrounds/Zones/BattlegroundTP.h
	src/server/game/Chat/Channels/Channel.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.h
	src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
	src/server/shared/Cryptography/SHA256.h
2015-06-01 00:39:56 +01:00
jackpoz 391c81d86c Core/Misc: Fix issues reported by static analysis
Coverity defect IDs: 1023115
2015-05-31 00:01:31 +02:00
jackpoz 25881ca95f Core/Misc: Fix issues reported by static analysis
Coverity defect IDs: 1022861, 1022862, 1022863, 1302435, 1302439, 1302440
2015-05-30 23:09:34 +02:00
sirikfoll 309de9e71b Core/Spell Add Spell Script Needed for quest Torch Tossing/More Torch Tossing
Updated
2015-05-29 19:01:05 -03:00
Sarah Alexander b3c8c4f34d Merge pull request #14753 from Rushor/Ihaveadream
DB/Quest: No Mere Dream
2015-05-29 13:27:49 -03:00
Rushor 3625d83cd9 DB/Quest: No Mere Dream
closes #11252
2015-05-29 17:40:28 +02:00
tkrokli 9325f18528 [3.3.5a][ICC/Professor Putricide] Volatile Ooze Eruption fix
by @ManuFe and @Rushor; closes #12336

In the existing source, the rooting aura is removed after the explosion,
therefore the knockback effect does not work because the player is still rooted.
By swapping these 2 lines, the aura is removed, then the explosion happens.

Result: rooting is removed before the knockback effect is cast on the player.
2015-05-27 06:42:14 +02:00
MitchesD 82a6cbcad4 Merge pull request #14613 from ariel-/shathalls
Fixed some issues with PR #14157
2015-05-26 11:52:30 +02:00
Rushor a961177d20 Scripts/Spells: Curing the Sick - Add Questcredit
closes #14688
2015-05-24 14:16:47 +02:00
Shauren 1f076a395f Scripts/Icecrown Citadel: Fixed Ice Tomb during phase 3 of Sindragosa encounter
(cherry picked from commit f85605b5f78f73c53a56874161155416b64ec078)
2015-05-21 00:03:11 +02:00
Carbenium be6c53e949 Scripts/Commands: Fix LANG_PINFO_MUTED in HandlePInfoCommand
Closes #14560
Thanks @Mack36

(cherry picked from commit 6d12297ffa4ce33db5513937852d151917085d23)
2015-05-20 17:52:29 +02:00
Carbenium 64bed16a57 Scripts/Icecrown: Move Squire David to SmartAI 2015-05-19 23:20:26 +02:00
Shauren 8a013ba0fb Core/Misc: Moved Position to its own file
(cherry picked from commit 48ee1f003347910a48183f768501c1080fc40269)

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Spells/Spell.cpp
2015-05-19 21:44:39 +01:00
Duarte Duarte f4c1a8fb2d Merge pull request #14454 from ariel-/cd
Port Core/Spells: Cooldown updates (6.x branch)
2015-05-19 18:52:05 +01:00
jackpoz d1efb90ae8 Scripts/Commands: Change few commands to target current Player by default 2015-05-17 16:16:32 +02:00
jackpoz b5cc8c5b17 Scripts/ToC: Fix doors opening/closing during Dreadscale fight
Fix doors opening/closing during Dreadscale fight by sending a CloseDoor command instead of toggling the door state when Dreadscale resets its movement.
Note that bounding the door state to boss movement makes poor sense and should be changed. Other bosses in ToC have this logic and should be updated if they show the same bug.
2015-05-17 14:50:30 +02:00