Commit Graph
5802 Commits
Author SHA1 Message Date
Nay 435a240a9f Merge pull request #7551 from Gacko/utgarde
Utgarde Keep
2012-09-21 18:05:11 -07:00
Gacko f25ff104ef Core/DB: Utgarde Keep - Codestyle and eventmap 2012-09-21 09:20:29 +02:00
Shocker 993fb5b4a6 Core/Spells: Fix SPELL_AURA_MOD_CURRENCY_GAIN 2012-09-21 01:02:18 +03:00
Gacko ee6ff0e5ed Core/DB: Utgarde Keep 2012-09-20 17:45:11 +02:00
Nay 863229afbe Merge remote-tracking branch 'origin/master' into mmaps 2012-09-19 00:02:25 +01:00
Shauren 361034e848 Scripts/Icecrown Citadel: Fixed Unbound Plague
Closes #7791
2012-09-18 23:58:37 +01:00
Faq 0e7ed5ec85 Core/Spells: Implementing some hooks for split damage taken, fixes the limitation of dmg such auras can split, for example at Hand of Sacrifice. Might have unexpected results, but they are called unexpected for a reason.. .Author Tibbi
closes #6025

Made new one as https://github.com/TrinityCore/TrinityCore/pull/7423/ was closed.
2012-09-18 23:28:46 +03:00
Shauren cc08d911f6 Scripts/Icecrown Citadel: Fixed Unbound Plague
Closes #7791
2012-09-18 18:11:22 +02:00
Spp 761060e1f1 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Spells/Spell.cpp
2012-09-18 14:38:44 +02:00
Spp 8c5f011e79 Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr)
Note: No real use in 3.3.5 but will be used in 4.3.4
2012-09-18 14:29:53 +02:00
Spp c4d4beff3b Warning fixes and some minor changes here and there
- Added GetAchievementPoints to AchievementMgr
2012-09-18 11:35:18 +02:00
Nay 23961d0dce Merge remote-tracking branch 'origin/master' into mmaps 2012-09-17 23:50:08 +01:00
Nay 6568b0624d Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_druid.cpp
2012-09-17 23:49:13 +01:00
Warpten 2b9232dddc Core/Spells: Fixed King of the Jungle.
Closes #7098
2012-09-17 18:17:23 +02:00
Nay 2431895a54 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
2012-09-17 00:04:07 +01:00
Nay e3add09fb7 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
2012-09-17 00:03:12 +01:00
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