Commit Graph
18510 Commits
Author SHA1 Message Date
joschiwald 9beeca79ac Core/Logging: fixed default logger (partial reverts 0904858624) 2016-02-27 17:47:35 +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
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- 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
Aokromes 4cd937140b Merge pull request #16038 from tkrokli/grammar_and_spelling_corrections_335
[3.3.5] Core/Logs: English text corrections
2016-02-20 13:23:35 +01:00
Shauren e60f575ac8 Core/Misc: Fixed a crash happening when a db string array was NULL
Closes #15670
2016-02-20 13:13:29 +01:00
Shauren b2e03a7448 Core/Networking: Rewrite networking threading model
Each network thread has its own io_service - this means that all operations on a given socket except queueing packets run from a single thread, removing the need for locking
Sending packets now writes to a lockfree intermediate queue directly, encryption is applied in network thread if it was required at the time of sending the packet

(cherry picked from commit 97a79af4701621ec04b88c8b548dbc35d120e99e)
2016-02-20 13:08:03 +01: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
treeston d4184065b6 I don't like drycoding. It's coarse and rough and irritating and it gets everywhere. 2016-02-20 03:20:43 +01:00
treeston ab194d5ae3 Incorrect AI aggression as a consequence of the LineOfSight change, episode three, revenge of the special AIs. Also, hopefully the last. No original trilogy please. 2016-02-20 03:13:11 +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
Treeston 3e250fe4e8 Merge pull request #16633 from Treeston/3.3.5-talentinspect
Core/Packets: Adjust 'TalentsInspecting' option
2016-02-19 14:04:18 +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
Treeston 59e59e412f Merge pull request #16637 from P-Kito/lfg_quest
[3.3.5/6.x] Core/Player: Fix dungeonfinder quests not rewarding
2016-02-18 20:57:09 +01:00
treeston 1134b5e2f4 Core/Packets: Adjust 'TalentsInspecting' option so it no longer doesn't actually do what it says (but would instead disable talent inspecting completely). 2016-02-18 20:54:59 +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
Kito 97e0d1bbdf Core/Player: Fix dungeonfinder quests not rewarding 2016-02-17 22:39:14 +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
Shauren 655fc0135f Core/Auth: Cancel ban expiry check timer on shutdown 2016-02-16 00:16:31 +01:00
Shauren 811c8bbd69 Build fix 2016-02-15 19:40:34 +01:00
Shauren dfbb3bec56 Core/Auth: Moved expiring bans to background task - no longer blocking queries during login by default running every minute (configurable) 2016-02-15 19:38:53 +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