Commit Graph
4737 Commits
Author SHA1 Message Date
ariel- 35aa198984 Core/Scripts: Fix startup errors 2016-02-21 20:32:48 -03:00
ariel- 2de8d6b4bb Core/Misc: fix warnings 2016-02-21 19:00:28 -03:00
ariel- bb6089bb8c Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing)
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e2b8eb87e6aed7b031ebe138717403d)
2016-02-21 08:16:32 -03:00
ariel- 8bc477a2de Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
Conflicts:
	sql/base/characters_database.sql
	sql/updates/world/2016_01_26_00_world.sql
	sql/updates/world/2016_01_31_00_world.sql
	sql/updates/world/2016_02_07_00_world.sql
	src/server/authserver/Server/AuthSession.cpp
	src/server/database/Database/Implementation/LoginDatabase.cpp
	src/server/database/Database/Implementation/LoginDatabase.h
	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
	src/server/game/AI/ScriptedAI/ScriptedCreature.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Networking/AsyncAcceptor.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/adt.h
	src/tools/mmaps_generator/MapBuilder.cpp
2016-02-21 07:02:53 -03:00
tkrokli 9e4cc26312 [3.3.5] Core/Logs: English text corrections
This is an attempt to proofread standard error messages and system messages
from both core and DB. The corrections span typos, grammar and punctuation.

Because some of these messages can have multiple meanings depending on context,
this PR will stay in "WIP" status until the corrections have been validated and approved.

You are welcome to suggest improvements and files not yet included in this list.

Thanks to @Kinzcool for suggesting this line of work. :)
2016-02-20 10:05:04 +01:00
Shauren 2ee36facad Merge pull request #16622 from P-Kito/3.3.5
[3.3.5] Core/Spells: Fix Glyph of Arcane Shot
2016-02-19 15:02:17 +01:00
Kittnz 542f5264d3 Core/Pets: Move Egbert & Pandaren Monk into pet_generic.cpp 2016-02-18 21:30:49 +01:00
MitchesD 408572c472 Merge pull request #16258 from sirikfoll/feast
Core/Spells Implemented SpellScripts Needed for Achievement Pilgrim's…
2016-02-18 21:03:11 +01:00
Kittnz 2d753cd783 Merge pull request #16132 from henhouse/smitefix
Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switch…
2016-02-18 20:07:22 +01:00
Kito ab2b0f4168 Core/Spells: Fix Glyph of Arcane Shot 2016-02-17 22:58:04 +01:00
Henry 5ee2be21bf Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switching.
* Fixes Mr. Smite announcing to instance once doors have been destroyed.
* Add missing dialogue to encounter phases.
* Now properly runs in front of his chest, kneels down and equips items, stands, and reengages like he's supposed to.
* Fix weapon model for first phase when he switched to double axes.
2016-02-16 17:07:09 -05:00
treeston ae58f8e616 Revert "Merge pull request #16535 from Eliminationzx/FixWrongSealOfRighteousnessCalculation" while we figure out more details (see discussion in the PR).
This reverts commit 1a213bd921, reversing
changes made to 657adc270a.
2016-02-16 12:34:20 +01:00
Treeston 1a213bd921 Merge pull request #16535 from Eliminationzx/FixWrongSealOfRighteousnessCalculation
[3.3.5] Core/Spells: Fix incorrect Seal of Righteousness calculation.
2016-02-15 14:58:10 +01:00
treeston c70e3e31a7 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528) 2016-02-14 19:53:37 +01:00
Shauren 101c3f9303 Merge pull request #16585 from Treeston/3.3.5-flightform
Core/Spells: Disallow druid flight form while shapeshifted
2016-02-13 23:56:11 +01:00
w5860363 e28cc7161a Scripts/TheEye: Add spell Rend to advisor Thaladred the Darkener
Closes #16594
Closes #15915
2016-02-13 11:33:39 -02:00
Kittnz af5f4ae85b Pet/Misc: Improve Egbert's AI even more 2016-02-13 12:31:29 +01:00
Kittnz 2322ef3f50 Pet/Misc: Improve Egbert's AI 2016-02-13 12:06:19 +01:00
sirikfoll a36d78526d Core/Scripts port _DespawnAtEvade functionality to 3.3.5 branch
Implement _DespawnAtEvade  functionality to boss Lich King
2016-02-12 15:02:28 -02:00
treeston 3535a9fc7b Core/Spells: Disallow druid flight form while in shapeshift forms that prevent mounting. No more swimming zombies. Closes #16354. 2016-02-12 17:28:35 +01:00
treeston a23ccc1b83 Scripts/Naxxramas: Fix an edge case crash in Gothik. Closes #16575. 2016-02-12 12:18:17 +01:00
Keader 8130de1b9a Fix multiple summon of Omen (Lunar Festival) 2016-02-11 19:08:50 -03:00
treeston 6102a7937d Maps/Instances: Implement handling of CMSG_SET_SAVED_INSTANCE_EXTEND 2016-02-10 19:35:11 +01:00
treeston cfed2d7a3d Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments 2016-02-10 17:41:19 +01:00
Treeston 2c437ff8ec Merge pull request #16491 from Treeston/3.3.5-boundarycheck
[3.3.5] Add target boundary check to BossAI CanCreatureAttack call
2016-02-10 17:23:43 +01:00
Elimination ff80f249a7 Fix jump dest orientation 2016-02-10 20:25:29 +07:00
ccrs 983bbe4a4c Core/Spells: Rogue Honor Among Thieves 2016-02-10 14:12:58 +01:00
Elimination ff324e7284 Fix incorrect Seal of Righteousness calculation.
Source http://wowwiki.wikia.com/wiki/Spell_power_coefficient
2016-02-10 16:15:42 +07:00
Nyeriah e9db04a92c Scripts: Fix no-PCH build MKII
Bah
(cherry picked from commit 781152a30c526ff94638a2b10845d1686edb5e62)
2016-02-10 04:07:33 -02:00
Nyeriah 130f744c29 Scripts: Fix no-PCH 2016-02-10 03:19:02 -02:00
Nyeriah 6a56ede179 Scripts/Magister's Terrace: Script Kalecgos' appearance after using the Scryer's Orb
- Added missing waypoints, spells, emotes, proper timing... and prevent him from being summoned multiple times
Closes #13208, #16522
2016-02-10 03:03:59 -02:00
treeston e5e97bedc0 Merge remote-tracking branch 'sirikfoll/npcMyranda' into 3.3.5 (PR #16438) 2016-02-09 23:44:01 +01:00
sirikfoll 9f78dc37f7 Core/Scripts/DB Move script npc_myranda_the_hag to SAI
Moves the entire NPC script to the database and corrects a logic error where players who have rewarded the quest Scarlet Subterfuge and lost the disguise before taking the quest In Dreams were no longer able to get the disguise.
2016-02-09 20:16:41 -02:00
treeston 19ed18c881 AI/BossAI: Make creature never chase targets that are out of bounds
- Add missing const attribute on CheckBoundary arg.
- Prevent AI from attacking a target that is out of bounds. This prevents exploids such as killing Gluth/Deathbringer from out of bounds.
2016-02-09 22:46:57 +01:00
Rushor c8f34656ef Merge pull request #16486 from Rushor/spiderman
[3.3.5][6.x]Scripts/Karazhan: Implement Optional Boss Spawn
2016-02-09 21:18:58 +01:00
Shauren 761c82e65a Core/Maps: Use IsValidMapCoord for checking Z coord instead of just std::isfinite - only acceptable values are between -17066.6656 and 17066.6656
(cherry picked from commit 4d956c89fc6f20c546a396573cf42aa97b844c09)
2016-02-09 19:18:05 +01:00
Shauren aa432db36d Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing)
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e2b8eb87e6aed7b031ebe138717403d)

# Conflicts:
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/Chat/Chat.cpp
#	src/server/game/Conditions/ConditionMgr.cpp
#	src/server/game/DataStores/DBCStores.cpp
#	src/server/game/DataStores/DBCStores.h
#	src/server/game/DataStores/DBCfmt.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Handlers/BattleGroundHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Spells/Spell.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_go.cpp
#	src/server/scripts/Commands/cs_group.cpp
#	src/server/scripts/Commands/cs_lookup.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/tools/map_extractor/System.cpp
#	src/tools/mmaps_generator/TerrainBuilder.cpp
2016-02-09 18:19:28 +01:00
Keader 61f92b9a89 Core/Spells: Fixed Totemic Mastery (Tier 6 2P) Shaman 2016-02-08 22:28:47 +01:00
Rushor 40814c27b5 Merge pull request #16493 from Rushor/KingofEssos
[3.3.5][6.x] DB/Quest: King of the Foulweald - Improve Questevent
2016-02-08 19:52:49 +01:00
Rushor 644b9dcd59 DB/Quest: King of the Foulweald - Improve Questevent
* closes #2381
2016-02-07 14:05:16 +01:00
Vincent-Michael 96cb26de28 Scripts: Fixed warning 2016-02-06 22:12:44 +01:00
Rushor 86a821561a Scripts/Karazhan: Implement Optional Boss Spawn
* closes #15756
2016-02-06 22:03:44 +01:00
Kittnz add2179b75 Build fix 2016-02-06 22:03:24 +01:00
Kittnz 5650b9deb2 Pet/Misc: Implement Pandaran Monk followup 2016-02-06 21:58:16 +01:00
Kittnz 64d1addbbf Pet/Misc: Implement Pandaran Monk's pet abilitys 2016-02-06 21:55:54 +01:00
Rushor c560cb0a0c Scripts/Northrend: Knockbackimmunity Cleanup 2016-02-06 18:17:16 +01:00
joschiwald b259d5c2bc Scripts: addition to 8b6954e81b
Closes #16466
2016-02-06 17:26:27 +01:00
treeston e064000a35 Code style, urand -> urandms. 2016-02-06 15:24:39 +01:00
Kittnz 57a5879070 Fix build & tabs 2016-02-06 15:17:09 +01:00
Kittnz 859b617613 Pet/Misc: Implement Egbert's running around
Closes #16479
2016-02-06 15:06:17 +01:00