Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,738 Commits 4 Branches 146 Tags
170ba68e63c46323f8624ecff24e6de1d38bd97b
Commit Graph

3616 Commits

Author SHA1 Message Date
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 b0c4268a6b)

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 0cf0209741)

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
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 f85605b5f7)
 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 6d12297ffa)
 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 48ee1f0033)

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
Nyeriah
da74aa526a Scripts/Ulduar: Fix a comple of issues with Flame Leviathan's towers 
* Fix tower count being set to 0 once the first tower is destroyed due to bad logic
* Prevent towers from reducing counter twice (caused by event being sent twice by the gameobject when destroyed)
 2015-05-12 14:16:51 -03:00
ariel-
36cdc47e8f Fixed some issues with PR #14157, kudos to @Nyeriah @Warpten: 
* Moved scripts to other source file instead of having them on the instance cpp
* Removed magic number, use of DoAction instead of SetData to do the yelling
* Added spellscript for Remove Kargath's Executioner
* Saved victim GUIDs in instance script instead of checking nearby area
* Returning position as const-reference (by Naios)
 2015-05-08 22:58:33 -03:00
tkrokli
95c07b6270 [Core/DB] Quest: The Exorcism of Colonel Jules 
by @danlapps; closes #1524

Thanks to WoW-Studio@0aa81ca for doing most of the work
Thank to @Killyana for SQL walkthrough
Thanks to @Rushor for doing most of the converting work,
Thanks to @Nyeriah for pointers to solutions for all the errors
Thanks to @MitchesD for pointing out missing codestyle and errors
Thanks to @ccrs for supplying the ObjectAccessor lines
Thanks to @DDuarte for making me understand the changes
 2015-05-09 01:32:04 +02:00
Nyeriah
2d349da2ac Scripts/Eye of Eternity: Provide players with drakes when entering instance after Malygos' demise 2015-05-05 02:04:04 -03:00
jackpoz
09aed25659 Scripts/VioletHold: Fix crash 
Fix crash in Violet Hold happening when crystals were activated without killing trash mobs.
Crash added in cba6515acb and f4531c5a58 .
Closes #14629
 2015-05-03 11:57:04 +02:00
Vincent-Michael
5745c880fd Core/Misc: Fix issues reported by static analysis 
Coverity defect IDs: 1296295, 1296294
 2015-05-01 18:09:07 +02:00
Kittnz
6e1113a810 Core/Script: Make 2 remaining bridge parts active in Serpent Shrine 2015-04-27 19:25:26 +02:00
Kittnz
3e588acfe9 Scripts: trying to fix non-pch 2015-04-25 09:15:27 +02:00
Kittnz
cf286ea9cd Scripts/Uldaman: Fix build & fix some movement suggested by josch 2015-04-25 08:44:16 +02:00
Kittnz
9cb4cb52d8 Scripts/Uldaman: Instance update 
- Fixup Boss Ironaya
- Add the freeze animation for minions and archaedas
- Fix attack target for minions who wake up
 2015-04-24 23:11:02 +02:00
MitchesD
e0a23a66d4 Scripts: finally (I hope) fixed nonpch build, damn you @ariel- 2015-04-24 22:26:18 +02:00
MitchesD
563966fd91 Scripts: non-pch fix again 2015-04-24 21:53:34 +02:00
MitchesD
20c001fd00 Scripts: fixed non-pch build 2015-04-24 21:26:18 +02:00
MitchesD
5e06ff20e8 Merge pull request #14157 from ariel-/shathalls 
Shattered Halls: Revamped instance script
 2015-04-24 20:59:12 +02:00
Nyeriah
335cceb26e Scripts/HallsOfStone: Set the Tribunal of Ages encounter state to IN_PROGRESS once it starts, instead of when Brann's escort starts 2015-04-23 23:51:40 -03:00
Nyeriah
6645af4b3c Scripts/HallsOfStone: Brann Spankin' New achievement should only fail if damage is taken during event 2015-04-23 23:13:25 -03:00
w1sht0l1v3
b394446554 Fix build. 2015-04-23 23:11:59 +03:00
w1sht0l1v3
4e0dec7fd2 Core/LFG: Fix crash in ".lfg group <playername>" in case of offline player and 
extend the output to display the offline members of the group also.Atm if members are offline no info is displayed.

Note: all the new code is mostly copy/paste from ".group list <playername>" command.
 2015-04-23 22:07:10 +03:00
MitchesD
4d8ddac555 Scripts/CoS: Chrono Lord Epoch converted to BossAI 
(cherry picked from commit d74e0d823d)
 2015-04-18 18:30:57 +02:00
arks
e1ae2fa8ba Scripts: Shattered Halls: Revamped instance script, support for quests 10884, 9524, 9525 2015-04-14 02:08:31 -03:00
ariel-
e707905764 Port commit 56186319bd (6.x branch) 
Core/Spells: Cooldown updates

Updates #14418
 2015-04-13 12:13:46 -03:00
tkrokli
8126faccda Fix $n bug in NPC text for quest 11664 Escaping the Mist 
Make quest NPC target player character to say the actual name instead of $n

Idea by @DDuarte
Final solution found in similar escort quests.
(Example script: npc_kayra_longmane in zone_zangarmarsh.cpp)
 2015-04-12 10:27:38 +02:00
MitchesD
f9eb3d245f Merge pull request #14497 from tkrokli/Kodo_Roundup 
[Quest] Kodo Roundup
 2015-04-11 23:52:50 +02:00
Nick
a6836e6a91 Core/Scripts: Remove Bloodmaul Brutes script 
As explained by @dr-j in 6b846a4e29
 2015-04-11 02:33:33 +02:00
click
a09eafa104 Core: Whitespace/tab2spaces cleanup 2015-04-10 04:12:06 +02:00
click
79696e0871 Core/Command: Sanitize input for .account set gmlevel <username> handling 2015-04-07 06:12:37 +02:00
Nick
77eb89157b Core/Scripts: Remove The Thunderspike script 
As explained by @Killyana in https://github.com/TrinityCore/TrinityCore/issues/4458#issuecomment-90061073
 2015-04-06 21:08:15 +02:00
Aokromes
16481d17aa Scripts/Kalimdor: Ashenvale - add missing enum 2015-04-05 12:57:14 +02:00
Rushor
f49a1b0f1f Scripts/Kalimdor: Ashenvale - Remove Torek C++ Script 2015-04-05 12:43:15 +02:00
Carbenium
c0b77fc216 Switch abs to std::abs 
(cherry picked from commit 8476c2ac5a)
 2015-04-05 00:41:39 +02:00
Carbenium
aa1971964b Add missing override keyword in scripts 
(cherry picked from commit b948a4275e)

Conflicts:
	src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2015-04-05 00:41:21 +02:00