Commit Graph
29917 Commits
Author SHA1 Message Date
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 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
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
Warpten bb03cfb0a2 DB/Spells: Fix druid's Savage Roar
SpellScript was bound to the wrong spell

Closes #2669
2012-09-16 14:48:39 +01:00
Vincent-Michael 72f26fe357 SQL: Rename SQL 2012-09-16 14:12:35 +02:00
Vincent-Michael 5bc913d1da SQL: Add newlines to end of file 2012-09-16 14:08:40 +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 d6b60ce51c Merge pull request #7782 from Trista/master
DB/Skettis: Remove uneeded additions from previous commit and add con…
2012-09-15 14:16:13 -07: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
thesensei 1a992bea9f DB/Skettis: Remove uneeded additions from previous commit and add conditions
* The GO spawn is uneeded and so all connected with it, sorry I failed, the spell is enough
* Conditions thanks to Vincent-Michael and Shauren /noticing my retardness/
2012-09-15 23:44:18 +03:00
Vincent-Michael d079a834c4 DB/Loot: Fix typo in Ionar loot (thx DarkJaxyChan)
Closes #7765
2012-09-15 22:38:19 +02:00
Vincent-Michael 883db2af3e Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling 2012-09-15 22:32:10 +02:00
Nay a95511f35e (TDB 335.49) Also move 4.x-only SQLs to the old directory 2012-09-15 21:18:23 +01:00
Nay 06f96f47e7 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql
2012-09-15 21:13:35 +01:00
Nay 0d3554d4bf TDB 335.49 - 2012/09/15 2012-09-15 21:03:40 +01: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 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
Vincent-Michael 80006a275f SQL: Rename SQL 2012-09-15 20:45:51 +02: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 572b644060 DB/Loot: Fix Sister Svalna loot 2012-09-15 20:32:30 +02:00
Vincent-Michael 5305626214 Core/Conditions: Implemented CONDITION_MAP_DIFFICULTY 2012-09-15 20:27:01 +02:00
Nay 7b3ea36c8c Merge pull request #7777 from Trista/master
Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
2012-09-15 07:44:49 -07:00
ZxBiohazardZx 0b2fb4a5a8 DB/Loot: fix startuperrors caused by previous lootidfix, porting the wrong way :) 2012-09-15 16:37:45 +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
Nay 01139ecd38 Merge pull request #7768 from MacWarrior/master
Fields ID description in GameEventMgr.cpp
2012-09-14 11:16:05 -07: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
Nay b9b344eb88 Merge pull request #7766 from Faq/Misc0
DB/SAI: correct Fix npc Scrapped Fel Reaver. thnx Expecto
2012-09-14 09:05:51 -07:00
kandera 6dd32f56a8 DB/Loot: i am full of fail 2012-09-14 11:45:14 -03:00
kandera 5bd486712b DB/Loot: fix error from previous commit 2012-09-14 11:41:27 -03:00
Kandera 2773adbb38 DB/Loot: Sister svalna is supposed to also drop one emblem of frost 2012-09-14 09:58:42 -04:00
Faq 4a802a376f DB/SAI: correcting npc Scrapped Fel Reavers SAI after 8558a21211 2012-09-14 14:24:16 +03:00
zxbiohazardzx 6e134d4761 DB/Loot: Fixlooting for HC dungeons trash
Closes #7515
2012-09-14 12:42:49 +02: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 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
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