Commit Graph
29917 Commits
Author SHA1 Message Date
Nay 0b7a59a98a Merge remote-tracking branch 'origin/master' into mmaps 2012-09-22 02:03:36 +01:00
Nay 7090197c6a Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
2012-09-22 02:02:57 +01:00
Shocker 7213843c22 Merge pull request #7828 from Trista/master
Core/Conditions: Add relation to creator
2012-09-21 10:16:45 -07:00
Shocker a692526b88 Core/Spells: Ffix typo in recent commit 2012-09-21 20:06:32 +03:00
Shauren 50d1a1bf5c Core/Auras: Defined more aura types and implemented aura 361 (used by 4 spells) 2012-09-21 13:35:59 +02:00
Gacko b779aa0848 DB: Utgarde Keep - Codestyle 2012-09-21 09:29:40 +02:00
Gacko f25ff104ef Core/DB: Utgarde Keep - Codestyle and eventmap 2012-09-21 09:20:29 +02:00
Shocker 84eb642957 Core/Spells: Don't update weather on zone change if player has SPELL_AURA_FORCE_WEATHER 2012-09-21 02:37:54 +03:00
Shocker 6d2a74a201 Core/Spells: Fix SPELL_AURA_FORCE_WEATHER 2012-09-21 02:24:02 +03:00
Shocker 5a9d3e90f2 Core/Spells: Rename some unknown spell auras 2012-09-21 02:00:12 +03:00
Shocker 993fb5b4a6 Core/Spells: Fix SPELL_AURA_MOD_CURRENCY_GAIN 2012-09-21 01:02:18 +03:00
thesensei e34b7e70c5 Core/Conditions: Add relation to creator
* This is used in spells with effect summon where the summoned creature doesn't get a *summonedby* flag and so relation to owner is not working. This way the unit get relation to the master who created it.
* World case where I'm going to use this is summoning Oculus drakes
* Blizzard seems to handle such cases with special spells in dbc that are missing and sniff gives nothing for them.  The number of spells is unknown, but existence of atleast 10 is seen. They are used usually as bonus effects to make the check however mechanic is unknown. Guessing it is good as adding this.
2012-09-21 00:07:56 +03:00
Gacko ee6ff0e5ed Core/DB: Utgarde Keep 2012-09-20 17:45:11 +02:00
Nay 1f03439fc2 Merge pull request #7820 from Trista/master
DB/Achievements: Dwarfageddon (10/25) repair previous fix
2012-09-19 11:16:05 -07:00
thesensei 8ccb95e8c8 DB/Achievements: Dwarfageddon (10/25) repair previous fix
* Remake SAI in a way it will work with a broken attribute for cast while dead
* Null some fields in spell.dbc, add proper attributes in case it get fixed and fix spell radius type
* Add conditions to prevent lag

Renew commit: 61d7252
2012-09-19 21:10:58 +03:00
Kandera b2a7d5d34a Core/SmartAI: revert previous setfly change. 2012-09-19 10:00:46 -04:00
Vincent-Michael 54bd7d9773 Core/Spells: Fix Crash 2012-09-19 11:34:49 +02:00
zxbiohazardzx 09b47ecad1 DB/Loot: Fix loot for VoA (thx to Gecko32 for the work)
closes #6833
2012-09-19 11:23:03 +02:00
Spp 2a89658e96 Battlegrounds: Better log message for unhandled area triggers in battlegrounds 2012-09-19 10:01:30 +02:00
Subv 6446a73cc1 Core/PacketIO: Fixed CMSG_MESSAGECHAT_ADDON_BATTLEGROUND 2012-09-18 19:19:38 -05:00
Nay 863229afbe Merge remote-tracking branch 'origin/master' into mmaps 2012-09-19 00:02:25 +01:00
Nay 139cdf5254 Small correction to readme file 2012-09-18 23:58:39 +01:00
Vincent-Michael 63f88dd03c DB/Creatures: Update Razorscale movement 2012-09-18 23:58:38 +01:00
Shauren 361034e848 Scripts/Icecrown Citadel: Fixed Unbound Plague
Closes #7791
2012-09-18 23:58:37 +01:00
Vincent-Michael def796c5c8 DB/Creatures: Update unit_flags2 for some ulduar creatures 2012-09-18 23:58:36 +01:00
Nay 92119c9c38 Small correction to readme file 2012-09-18 23:49:35 +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
Vincent-Michael 378f83df4e DB/Creatures: Update Razorscale movement 2012-09-18 18:20:49 +02:00
Shauren cc08d911f6 Scripts/Icecrown Citadel: Fixed Unbound Plague
Closes #7791
2012-09-18 18:11:22 +02:00
Vincent-Michael 959aa4cd97 DB/Creatures: Update unit_flags2 for some ulduar creatures 2012-09-18 17:44:20 +02:00
Spp 69ad5e8c4b Fix merge error 2012-09-18 14:54:56 +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
kaelima b5af7c5c2e Core/Defines: Updated SpellCustomErrors and HolidayIds to 4.3.4 2012-09-18 01:31:38 +02:00
kaelima c83d2dc406 Core/Protocol: Implemented CMSG_OPENING_CINEMATIC and enabled CMSG_GUILD_BANK_WITHDRAW_MONEY 2012-09-18 01:30:17 +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
Nay 2e21fa6b92 Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations
.diff with TC changes added
2012-09-17 23:21:01 +01:00
Vincent-Michael 6ebc6b9a76 Core/SmartAI: Add missing break on 2e5e8331f3 2012-09-17 21:17:48 +02:00
Kandera cc86f567ab Core/SmartAI: fix SMART_ACTION_SET_FLY. was backwards :P 2012-09-17 14:29:14 -04:00
Kandera 2e5e8331f3 Core/SmartAI: add SMART_ACTION_SET_HEALTH_REGEN (102). 2012-09-17 14:11:57 -04:00
Kandera 64115461fa DB/Quests: fix The Scarlet Oracle, Demetria (Closes #7773) and The Call to Command quest chain (Closes #7673)
DB/Creature: fixes sound for Twilight Lord Kelris (Closes #7309)
2012-09-17 13:11:23 -04:00
kandera 198c0346e2 Merge pull request #7797 from Warpten/kingOfTehWorld
Core/Spells: Fixed King of the Jungle. (alphabetical order!)
2012-09-17 09:44:56 -07:00
Kandera 80b3531890 DB/Spells: fix a typo from the previous commit. im back! 2012-09-17 12:34:11 -04:00
Kandera b7de25d170 DB/Spells: fix DoT bonus for Righteous Vengance 2012-09-17 12:23:54 -04:00
Warpten 2b9232dddc Core/Spells: Fixed King of the Jungle.
Closes #7098
2012-09-17 18:17:23 +02:00
Kandera 3f64286132 Core/Spells: fix beacon of light proc thx (oMadMono) 2012-09-17 12:08:26 -04:00
Kandera d3dd3a2b83 DB/Spells: fix druid final lifebloom tick closes #6707 (thx diton) 2012-09-17 10:17:52 -04:00
kandera 6516139290 Merge pull request #7280 from Faq/PrayerOfMending
Core/Spells: Only auras that has triggered spell should proc from fully absorbed damage.
2012-09-17 06:04:55 -07:00