Commit Graph
2786 Commits
Author SHA1 Message Date
kaelima b6ff06a796 Script/Misc: Fix two script crashes when spawned outside instance
also remove redundant null check in boss_lich_king_toc and an unused variable in npc_announcer_toc10
Closes #7785
2012-09-16 17:56:18 +02:00
Nay 8e5578e664 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-15 19:51:09 +01:00
Nay 966283168c Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
2012-09-15 19:50:11 +01:00
thesensei 548a487721 Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
* Add instance achievement criteria scripts and remove from disables. Based on retail data.
* A lot more compact style and specify only for heroic, thanks to Vincent-Michael. Tested.
This involves everything needed by the achievement, however the dungeon still needs majour fixes/rewrite.
2012-09-15 17:31:57 +03:00
Shauren 130cc423d2 Scripts/Commands: Fixed crashes in unstuck command
Closes #7754
2012-09-13 23:58:45 +02:00
Nay 9b108fad85 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-13 17:25:13 +01:00
Nay 528b9d4f7d Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/shared/Packets/ByteBuffer.h
2012-09-13 17:24:37 +01:00
Myran2 13e140cfac Core/Commands: Added a command that shows what cheat commands you have active
Closes #7721

(Modified)
2012-09-13 15:32:33 +01:00
Nay b34d6f5784 DB&Scripts: Corrections to pull request #7750
Closes ##7750
2012-09-13 15:01:19 +01:00
thesensei f106273cfa Scripts/Skettis: Fires Over Skettis quest support
* Include SAI/Spawn and spell support, also achievement support for "Bombs Away"
Credits: Based on Warpten script and Nelegalno/shlomi1515 updates

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-09-13 14:31:11 +01:00
thesensei 54fe4489a3 Scripts/Ogri'La: Add support for quest "Bomb Them Again" and all related
* Sniffed spell support for Knockdown Fel Cannon: Choose Loc, Knockdown Fel Cannon: The Aggro Check, Knockdown Fel Cannon: The Aggro Burst, Knockdown Fel Cannon: The Aggro Check Aura, Trhow Bomb and Fel Flak Fire
* Sniffed spawns support, but only for quest related creatures and gos, no area patrols/spawns involved
* Achievement support for Blade's Edge Bomberman and Fa-la-la-la-Ogri'la
* Full DB support based on sniffs, all that can be done in SAI and not in *cpp is converted
Credits: The SAI script is based on Warpen work, thanks to Subv for proposing fix for Fel Flak Fire /and helping/ and DDuarte for helping with conditions

Closes:

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-09-13 14:31:10 +01:00
w1sht0l1v3 2ff0910d67 Core/Scripts: Reliquary of Souls: fix encounter start and essence phases. 2012-09-13 03:40:17 +03:00
w1sht0l1v3 b62ad5a955 Core/ToCr: Several fixes.
Fix floor animation when destroyed.
Add spawns for Highlord Tirion Fordring,Argent Mage and Portal to Dalaran.
Remove Db spawn of Highlord Tirion Fordring.
Correct tribute chest spawn location.

Fix sql names for last commits.
2012-09-12 06:15:50 +03:00
Nay 7dcbb7d9bf Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 22:39:36 +01:00
Nay b015ed0a99 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-11 22:38:59 +01:00
Tuxity 045682006a Core/Stats:
- Defense skill doesn't exist since 4.0.X
- Weapon skill doesn't increase during player's level anymore, it's set to the max value for level on each levelup.
2012-09-11 23:14:41 +02:00
w1sht0l1v3 02096f1c23 Core/Scripts: Anub'Arak encounter changes and fixes. 2012-09-11 22:52:47 +03:00
Nay b1c4118a33 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 01:13:41 +01: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 a301cf5bec Build fix. 2012-09-10 20:48:38 +02: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
Spp 358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
Warpten 917ffc030e Core/Guilds: Implemented GuildFinder. 2012-09-10 12:41:42 +02:00
Nay 4896a1775e Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-10 00:54:29 +01:00
Nay d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
2012-09-10 00:52:35 +01:00
Nay 5226f53b8a Core/Guilds: Corrections to guild news & rewards commit, fixed build and added missing sql
Closes #7708
2012-09-10 00:06:47 +01:00
Subv 6fc3d3a77c Core/Scripts: Some cleanup in warlock spellscripts 2012-09-09 12:28:31 -05:00
Subv da5f8f58e2 Core/Scripts: Cleanup the warrior spell scripts 2012-09-09 11:48:29 -05:00
oMadMano e377550280 Scripts/Karazhan: Fix Prince Malchezaar Infernal start timer
Closes #5700
2012-09-09 16:24:06 +02:00
Vincent-Michael 637894da1a Core/Spells: Fix typo (I need sleep) 2012-09-09 04:19:17 +02:00
Vincent-Michael 2317af8dd3 Core/Spells: Convert Gift of the Naaru in spell script
Closes #6545
2012-09-09 04:02:47 +02:00
Nay 50327363ca Merge remote-tracking branch 'origin/master' into mmaps 2012-09-09 02:26:31 +01:00
Nay 7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2012-09-09 02:18:58 +01:00
Nay d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Myran2 c243185a3a Removed a line of debug code 2012-09-08 19:01:33 -04:00
Myran2 5cd9910463 Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game 2012-09-08 18:59:06 -04:00
Subv b8343391c2 Core/Scripts: Muglash should walk instead of running. 2012-09-08 07:51:54 -05:00
blub 16989dea6a Merge pull request #7690 from Geodar/master
Core/Scripts: Fix typo
2012-09-08 04:29:08 -07:00
Vincent-Michael 9c54cf3312 Core: Fix warnings 2012-09-08 13:24:42 +02:00
Geodar 2c441808f1 Core/Scripts: Fix Typo in 7121f015ed 2012-09-08 08:02:00 +02:00
Nay 242a2fdbc1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
2012-09-08 01:34:24 +01:00
Nay 6c1bdb3d3c Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-08 01:32:47 +01:00
Subv 7121f015ed Core/Scripts: Fixed a copy/paste mistake from previous commit 2012-09-07 18:31:19 -05:00
Subv 673ce30f38 Core/Spells: Fixed Improved Health Funnel damage reduction effect.
Author: Josh
closes #7275
2012-09-07 18:26:14 -05:00
tibbi 286feb6940 Scripts/ToTC: Correcting Jaraxxus Volcano and Nether Portal behaviour
Closes #7687
Closes #7467
2012-09-07 18:01:02 +01:00
Nay 19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
2012-09-07 03:36:47 +01:00
Nay 407286fe81 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-07 03:34:23 +01:00
Nay 21d43781ac Tabs to spaces... 2012-09-07 03:33:16 +01:00
Subv 0709d67e08 Merge pull request #7678 from Aokromes/master
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
2012-09-06 19:08:29 -07:00
Aokromes 6970a28f24 Scripts/Scarlet Monastery: Final boss kill credit closes #7341
When Scarlet Commander Mograine dies and High Inquisitor Whitemane appears, if she is downed very quickly, then she will not perform the ressurection on Mograine and will not stun anyone, thus Mograine wont give the achievement nor loot. She should be invincible till she has ressurected Mograine.
2012-09-07 05:01:04 +03:00