Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,695 Commits 4 Branches 146 Tags
361034e8484e1ad7ef7cb7ebd560d0565f620ce9
Commit Graph

7022 Commits

Author SHA1 Message Date
Shauren
361034e848 Scripts/Icecrown Citadel: Fixed Unbound Plague 
Closes #7791
 2012-09-18 23:58:37 +01: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
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
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
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
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
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
kaelima
639f1b6788 Core/BG: Fix logical mistake in b8d55cc019. 
Making it again possible to leave arena queues when status is STATUS_WAIT_NONE.
Closes #7749
 2012-09-17 12:06:30 +02:00
Spp
25d2ab9172 Revert last change. Leaving UpdateField names "as is" 2012-09-17 12:04:35 +02:00
Spp
74aea5e055 Cosmetic: PLAYER__FIELD_KNOWN_TITLES --> PLAYER_FIELD_KNOWN_TITLES 2012-09-17 11:49:25 +02:00
Shocker
8c4feb4c4e Core/Battlegrounds: Use correct constant for groups iterator in BattlegroundQueue::RemovePlayer (same value, correct semantics) 2012-09-17 03:54:31 +03:00
Subv
4f21324762 Merge pull request #7793 from Elron103/pull-requests 
Core/Calendar: Add TwoSide Interaction configuration option for Calendar...
 2012-09-16 17:31:13 -07:00
hexa-
6df92dad61 Core/Calendar: Add TwoSide Interaction configuration option for Calendar Invites 2012-09-17 02:13:36 +02: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
Shauren
bc912af806 Core/Spells: Defined and implemented SPELL_ATTR5_DONT_TURN_DURING_CAST. 
This attribute controls whether unit can turn during casting spells (fixes Ingvar's Dark Smash)
 2012-09-16 23:34:30 +02: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
Shauren
547895762d Compile fixes 2012-09-16 00:35:48 +02:00
Vincent-Michael
59e86f8df9 DB/Creatures: Fix "Frostbrood Vanquisher" flying 
CLoses #5927
 2012-09-15 23:20:58 +02:00
Nay
e7155144df Merge pull request #7781 from Sovak/resists 
Core/Auras: Fix some spells with effect
 2012-09-15 13:57:29 -07:00
Vincent-Michael
883db2af3e Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling 2012-09-15 22:32:10 +02:00
Shauren
a51ab0abc4 Core/Spells 
* Removed unneeded ported helper functions and use our own
* Corrected filling pet spells
 2012-09-15 22:02:17 +02: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
Sovak
6c7961ad9c Core/Auras: Fix some spells with effect SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE 
Thanks to SkyFire

Signed-off-by: Sovak <Sovak007@gmail.com>
 2012-09-15 20:35:30 +02:00
Vincent-Michael
5305626214 Core/Conditions: Implemented CONDITION_MAP_DIFFICULTY 2012-09-15 20:27:01 +02: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
MacWarrior
5d4cc81e16 Core/misc: Correct fields ID description 
Core/misc: Correct fields ID description in GameEventMgr.cpp
 2012-09-14 20:50:52 +03:00
Vincent-Michael
0c02c574dc Core: Fix build 2012-09-14 11:30:21 +02:00
Faq
90cb5f29ee Core/misc: forgotten Unk0. thnx Elron103 for noticing 2012-09-14 09:43:26 +03:00
Shauren
130cc423d2 Scripts/Commands: Fixed crashes in unstuck command 
Closes #7754
 2012-09-13 23:58:45 +02:00
Nay
8249a43cf2 Fix build 2012-09-13 18:29:32 +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
cyberbrest
ed1ece2bb7 Core/Quest: allow to complete quest by new auto-submit system with getting next quest in chain. 
Closes #7752

(Modified)
 2012-09-13 16:16:33 +01:00
Shauren
f03e650474 Core/Calendar: Fixed breaking calendar event UI after relogging 2012-09-13 16:38:18 +02: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
b9434b6377 Merge pull request #7753 from Faq/ScrollOfRecall 
Core/Spells: Scroll of Recall
 2012-09-13 07:03:57 -07: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
Nay
97a7775c9b Merge pull request #7747 from Elron103/pull-requests 
Core/Mail: Fix merging of items taken from mail leading to invalid entries in item_instance
 2012-09-13 06:28:04 -07:00
Faq
9b76acbd3a Core/Spells Scroll of Recall 2012-09-13 15:19:52 +03:00
kaelima
f746c2d975 Core/ItemTemplate: 
Rename unk0 column.
Weapons have special sounds on impact. This column is used to override these sounds by specifying another subclass. For example an item with misc subclass can sound like a stave on impact by overriding the subclass here.
 2012-09-13 11:38:50 +02:00
Elron103
5b14848a10 Core/Mail: Fix merging of items taken from mail leading to invalid entries in item_instance 2012-09-13 03:15:22 +02:00