Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,088 Commits 4 Branches 146 Tags
effaed4e33a9d2e2c974acf83ffd177ca3895a0f
Commit Graph

20842 Commits

Author SHA1 Message Date
ariel-
691b0df6ae Core/Conditions: fix a memory leak for CONDITION_SOURCE_TYPE_TERRAIN_SWAP 
Reported by Aokromes.

(cherry picked from commit 3a7f311547)

Conflicts:
	src/server/game/Entities/Object/Object.cpp
 2016-03-06 04:08:04 -03:00
ariel-
bf6eb656ee Core/Quests: initialize Emotes array 
Ref #59
 2016-03-06 03:52:42 -03:00
ariel-
95b6332bef Revert "Core/Auras: Should not remove other targets' aura if it keeps on same phase than caster" 
Was causing assertion fails in UnregisterSingleTarget, further research into the issue is needed.

This reverts commit d44dd09737.

Reopens #42
 2016-03-06 03:40:06 -03:00
ariel-
d44dd09737 Core/Auras: Should not remove other targets' aura if it keeps on same phase than caster 
Closes #42
 2016-03-03 01:57:46 -03:00
ariel-
5df10956c0 Core/Misc: Fix crash in .reload creature_template 2016-03-03 01:36:03 -03: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-
b7c914b27e Core/Tools: fix build 2016-02-21 08:23:47 -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
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 97a79af470)
 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
treeston
c70e3e31a7 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528) 2016-02-14 19:53:37 +01:00
Shauren
ce6221b10b Warning fix 2016-02-14 18:47:12 +01:00
Shauren
5bf90b3338 Core/Auth: Performance/security improvements 
* Changed all db queries to async
* Added buffer length checks
* Only allow one challenge/proof packet per socket lifetime

Closes #13217
Closes #16602
 2016-02-14 18:41:25 +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
treeston
98860911e2 Check to make sure we aren't dispelling a buff for _all_ dispel types, not just magic. Closes #15321. 2016-02-13 11:44:37 +01:00
treeston
26bbba4b8d Revert "Merge pull request #16483 from Treeston/3.3.5-debuffimmunity" to fix #16589 while I investigate the retail behavior of SPELL_ATTR_0_UNAFFECTED_BY_INVULERABILITY further. 
This reverts commit d67e87733b, reversing
changes made to cfed2d7a3d.
 2016-02-13 03:17:01 +01:00
Shauren
ff45a422c5 Warning fix. 2016-02-12 20:45:09 +01:00
Shauren
fa3f106693 Core/Maps: Use map.dbc zone fallback if no area is found in grid files, not only if grid files don't exist 
Closes #16583
Closes #16584

Extracting new maps is NOT needed.
 2016-02-12 20:39:25 +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
Shauren
9f6a7c7526 Merge pull request #16548 from Keader/omen 
[3.3.5][6.x]Core/Scripts Fix multiple summon of Omen (Lunar Festival)
 2016-02-12 10:04:49 +01:00
Keader
8130de1b9a Fix multiple summon of Omen (Lunar Festival) 2016-02-11 19:08:50 -03:00
treeston
8e6fb3b1c5 Core/AI: Fully move react state check from CreatureUnitRelocationWorker to CreatureAI::MoveInLineOfSight. This means that AI for passive/defensive creatures can now once again use MoveInLineOfSight (and fixes that weird thing where triggers decided it would be funny to attack players). 2016-02-11 18:36:01 +01:00
Shauren
7f817a4fc0 Core/Scripts: Fixed calling UnitScript hooks 
Closes #16543

(cherry picked from commit f809e5e13e)
 2016-02-11 16:36:08 +01:00