Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 13:47:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,173 Commits 4 Branches 146 Tags
83de75e31b9d9bafcd2c81d290ada03d22bcf09e
Commit Graph

4963 Commits

Author SHA1 Message Date
Shauren
e73d5a7bf4 Core/Commands: Fixed incorrect use of GetGUID instead of GetSpawnId in waypoint commands 
Updates #16732
 2016-03-05 20:14:58 +01:00
sirikfoll
c4e4ee3ae1 Core/Scripts: Fixed Yogg-Saron Portals 
Closes #16390
Closes #16708
 2016-03-04 20:45:28 +01:00
treeston
f46a0e7eb3 Instance/SunkenTemple: Some cleanup. 2016-03-04 17:52:07 +01:00
MitchesD
e081bc36dc Merge pull request #16720 from tkrokli/npc_thrall_warchief 
Core/Scripts: npc_thrall_warchief hardcoded text
 2016-03-04 10:49:57 +01:00
durotar
768a5cf354 Scripts/SunkenTemple: Quest 3447 Secret of the Circle Thanks to Tkrokli, Kilyana and Nayd Closes #808 
Signed-off-by: MitchesD

Closes https://github.com/TrinityCore/TrinityCore/pull/16367
 2016-03-04 00:05:52 +01:00
tkrokli
2bbe00e5f4 Core/Scripts: npc_thrall_warchief hardcoded text 
7 more text lines removed in the ongoing series:
"Remove hardcoded text from core scripts".

Core script for quest 6566, What The Wind Carries
(part of the Horde Onyxia quest chain)

- create new gossip_menu_option entries
- link the options via the table gossip_menu
- remove hardcoded text from the script
 2016-03-03 21:40:39 +01:00
Nyeriah
ecd9dec384 Scripts/Karazhan: Use the correct method to access Opera's side entrance door 2016-03-01 12:38:09 -03:00
tkrokli
c897988a7e Core/Scripts/Zul'Aman: sound handled in creature_text 
- Sound playback is handled via creature_text
- remove `DoPlaySoundToSet()` to avoid duplicate playback
- remove redundant 'me' parameter from `Talk()` entries
 2016-02-29 19:31:47 +01:00
Aokromes
b646bcbb91 Update boss_nalorakk.cpp 2016-02-29 03:45:14 +01:00
tkrokli
9806f7812a Core/Scripts: Zul'Aman boss script text cleanup 
Replacing more hardcoded text with DB entries.
A little bit extra enum alignment and sorting.
 2016-02-29 03:16:23 +01:00
Nyeriah
f9eff81388 Scripts/Karazhan: Clean up instance script 
Closes: #16533
 2016-02-28 11:49:48 -03:00
Aokromes
5accd69863 Merge pull request #16692 from tkrokli/headless_horseman_emote 
Core/Scripts/boss_headless_horseman: remove hardcoded text
 2016-02-28 13:32:54 +01:00
tkrokli
6ffac018dd Core/Scripts: triple zone cleanup 
Remove hardcoded (as well as deprecated) text in the following places:
- blackrock_depths.cpp
- zone_burning_steppes.cpp
- zone_stormwind_city.cpp

Updates https://github.com/velinath/TrinityCore/issues/2
 2016-02-28 12:25:23 +01:00
tkrokli
1602be1253 Core/Scripts/boss_headless_horseman: remove hardcoded text 
Remove the old
`#define EMOTE_LAUGHS    "Headless Horseman laughs"`

No emote is ever used on retail. It would have created log spam.
 2016-02-28 03:23:36 +01:00
joschiwald
ffdf75a233 Scripts/Spells: Glyph of Arcane Shot is affected by own debuffs on target only 2016-02-27 17:55:43 +01:00
jackpoz
31cd082833 Scripts/Ulduar: Fix crash 
Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload.
Close #16662
 2016-02-27 12:02:32 +01:00
treeston
d1a9d7765c Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680) 2016-02-25 20:47:54 +01:00
MitchesD
b7e93f68c3 Merge pull request #16671 from tkrokli/zone_terokkar_forest 
Core/Scripts: zone_terokkar_forest cleanup
 2016-02-25 20:41:39 +01:00
tkrokli
7c9a26c608 Core/Scripts: move npc_tirion_fordring to DB/SAI 
This removes the current core script npc_tirion_fordring
and replaces it with database entries in:

- `conditions` 9 (quest taken) + 41 (unit_state)
- `gossip_menu_option` (3502,3681,3682,3683)
- `smart_scripts` (SmartAI)

Gossip text / `npc_text` is already in the database.

Closes  #16430 (my old attempt at removing hardcoded text)
 2016-02-25 20:06:16 +01:00
Naios
eee75b80ac Core/Scripts: Prepare commands once 
* Thanks @joschiwald pointing this out
 2016-02-24 23:26:11 +01:00
treeston
1fbe7979ff Nobody saw that. 2016-02-24 15:47:57 +01:00
Treeston
4e4b2b9a13 Merge pull request #16644 from Treeston/3.3.5-customcharmai 
Core/UnitAI: Rework creature-controlled player behavior.
 2016-02-24 13:39:31 +01:00
tkrokli
043ed7159e Core/Scripts: zone_terokkar_forest cleanup 
- moved spell, quest and gossip IDs into enum
- replaced hardcoded text with DB gossip IDs
- restored correct gossip option order for Skull Pile

Replaces the crashed PR attempt in #16668
 2016-02-24 02:49:28 +01:00
treeston
2f14664340 Core/UnitAI: Rework creature-controlled player behavior. 
- Removed hacked control mechanism, use proper PlayerAI instead
- Port old hacky code to new SimpleCharmedPlayerAI class
- Make adjustments to aforementioned code to fix bugs:
    - Properly clean up movement after charm ends
    - Only try to attack a target if charmer is engaged in combat
 2016-02-23 13:41:56 +01:00
Naios
ecd74a8ccc Core/Scripts: Remove the npc_netherweb_victim script which is handled through sai now 
* Ref 546c8a5b8e
 2016-02-22 16:47:42 +01:00
Naios
9e43365b3d Core/Scripts: Split the huge scriptloader into smaller pieces 
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671

(cherry picked from commit 5534915f74)
 2016-02-22 16:25:54 +01:00
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 db0b8bf24e)
 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