Commit Graph
17060 Commits
Author SHA1 Message Date
Naios 7d3cffc297 Core/Database: Close the databases correctly when the DBUpdater fails
* Also fixes a memory leak spotted by Aokromes
2016-03-03 01:06:13 +01:00
Treeston 472e78d682 Merge pull request #16676 from ccrs/summonsinit
Core/TempSummons: avoid use MoveInLineOfSight before InitSummon
2016-03-02 23:54:37 +01:00
ariel- d573bd2fe7 Core/Conditions: Improved mergeability between branches 2016-03-02 10:57:14 -03:00
ccrs 6a339ed5c9 Core/TempSummons: avoid use MoveInLineOfSight before InitSummon 2016-03-01 21:20:47 +01:00
treeston 89e2afb8f9 Core/Creature: Prevent friendly vehicles from trying to attack their rider after dismounting. 2016-03-01 20:12:46 +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
Aokromes 2387dbdda9 Merge pull request #16699 from tkrokli/triple_zone_cleanup
Core/Scripts: triple zone cleanup
2016-02-28 13:07:43 +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
treeston 59d02322a7 Unit/AI: Making Nayd happy. 2016-02-28 03:45:21 +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
treeston bfac62c5c9 Fix some behavioral weirdness resulting from 79a945d5 - thanks ccrs. 2016-02-28 01:56:13 +01:00
treeston 5354b585e3 Unit/AI: Move CharmedPlayerAI logic from the SetCharmedBy/RemoveCharmedBy hooks to Player::Update -> Unit::UpdateCharmAI to guarantee thread safety and prevent race condition crashes. 2016-02-27 23:48:10 +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
joschiwald 75511d0e0a Core/Gossips: fixed long time not seen typo in c81d6e9b4b 2016-02-27 17:32:06 +01:00
Treeston 79a945d5e5 Merge pull request #16666 from Treeston/3.3.5-bodypull
[3.3.5] Fix bosses losing interest in the person running at them
2016-02-27 15:59: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
Shauren 85c912c404 Core/Misc: Added Convenience methods removing auras by predicate
(cherry picked from commit 0953bcf73f01ab5d85bb8665fbf8451d0ed460b3)
2016-02-25 21:01:38 +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
treeston ea53f79aaf DB/Conditions: Add new CONDITION_STAND_STATE (41). value1 selects the type of state check to apply, value2 specifies the particular state we are looking for.
Valuing: 0,x: has exactly state x; 1,0: any standing state; 1,1: any sitting state;
2016-02-25 19:01:21 +01:00
Aokromes 2eb9621f19 Core/Misc: fix header 2016-02-25 09:34:24 +01:00
Aokromes b1eff7c1f8 Core/Misc: fix header 2016-02-25 09:33:39 +01:00
Naios eee75b80ac Core/Scripts: Prepare commands once
* Thanks @joschiwald pointing this out
2016-02-24 23:26:11 +01:00
treeston d10c698430 build fix 2016-02-24 19:38:14 +01:00
treeston a8f760b692 Core/PlayerAI: Some more helper methods added. Also, charmed players no longer break crowd control. 2016-02-24 19:35:19 +01:00
treeston 5a3a21c2d0 Core/PlayerAI: More follow-up. Helper functions and some internal cleanup. 2016-02-24 18:21:08 +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
Kittnz 2df2f56f8c Core/Weather: Fix small weather system bug
https://github.com/cmangos/mangos-wotlk/commit/5ef2f17
2016-02-23 17:36:31 +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
treeston b5b7ce44cf Core/Threat: Prevent bosses (and other stuff using DoZoneInCombat) from switching off of the person pulling if they are pulled without generating threat. 2016-02-22 23:00:35 +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 5534915f743c707c07cb977bca67c2ff15487597)
2016-02-22 16:25:54 +01:00
Naios b5369b7d87 Core/Common: Add a generic config helper to access built-in overwriteable paths.
* Adds CMAKE_COMMAND and CMAKE_BINARY_DIR to revision_data.h
* Move the source and mysql exe path handling out of the DBUpdater.
* Make some Config methods const for correctness.
* Remove C & CXX flags from revision_data.h
 (was unused and didn't capture all cxx vars)
* Reorder the link order to prevent `ld` from ignoring the file
* Ref #15671

(cherry picked from commit 719159e2074ac2d0902c70bdd3c7a39e0d311bbe)
2016-02-22 16:25:47 +01:00
Naios f2233f5d14 Core/Updater: Convert an assertion into a fatal error
* The error is triggered when it fails to open an update for hashing
* See 'https://community.trinitycore.org/topic/12352-worldserver-crashes-on-database-update/'
  for details
* And a minor cleanup in the UpdateFetcher

(cherry picked from commit c43b80866593af3e9743fb55a395508c7dfb5d71)
2016-02-22 16:01:27 +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
joschiwald 31b1da4a14 Merge pull request #16651 from ariel-/movespeedfix
Core/Unit: Fix typo
2016-02-21 15:06:50 +01:00
Shauren 2345e84855 Final build fix for gcc 4.7 (no longer supported in 8 days) 2016-02-21 14:13:00 +01: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
ariel- 405917e70f Core/Unit: Fix typo introduced in 6f2b086048 2016-02-21 00:38:21 -03:00
Naios ae1a5c6c2b Core/Updater: Use a different method for file reading
* Current method causes issues under CentOS 6 and could possibly
  lead to cutted buffer content when reading in textmode.
* Closes #16209
2016-02-20 20:18:42 +01:00