Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,206 Commits 4 Branches 146 Tags
98a1e712d419e5632b14ca8be2f6a00852dab5d7
Commit Graph

13238 Commits

Author SHA1 Message Date
ariel-
98a1e712d4 Bnetserver: Fix warning 2016-03-11 20:06:59 -03:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
Dr-J
c9f9e93c22 Remove Lady Jaina Proudmores CPP script from zone_dustwallow_marsh.cpp 2016-03-09 23:31:36 +00:00
Nyeriah
c1905771f0 Scripts/Command: Solve several format exception crashes introduced in a recent commit 
Ref #16648
Closes #16751
 2016-03-09 00:42:45 -03:00
DDuarte
7b687be4ba Core/Auth: Fix the "Added realm" spam 2016-03-07 00:06:13 +00:00
DDuarte
6cd63ca3d4 Core/Authserver: Partial port of 56cf7ff2a8 
Change the "UpdateIfNeed" logic to a deadline_timer
 2016-03-06 19:46:59 +00:00
DDuarte
2ea31027e5 Core: Backport 6.x realm changes 
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches

Original changes by Shauren

Partial port of bacc90b6ba and 63def8aa32
 2016-03-06 19:46:59 +00:00
jackpoz
510bb30b2c Scripts/Misc: Fix issues reported by static analysis 2016-03-06 16:11:55 +01:00
Aokromes
9ba8fe52d2 Core/Quest: Remove duplicate things 2016-03-06 09:35:55 +01:00
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
Shauren
7fe5a77f5e Warning fix 2016-03-05 20:17:37 +01:00
Shauren
3d0b065135 Core/Commands: Fixed a crash in .wp mod by @Magnifikator 
Closes #16732
 2016-03-05 20:16:42 +01:00
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
treeston
49de12b1cf Unit/PlayerAI: Yeah, we allow charmer to be null now, should probably check for that. 
Fixes and closes #16728.
 2016-03-05 13:29:49 +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
MitchesD
8e152e0d4a Merge pull request #16523 from tkrokli/smart_action_set_corpse_delay 
[3.3.5][6.x]Core/SmartScript: create SMART_ACTION_SET_CORPSE_DELAY
 2016-03-03 23:16:59 +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
treeston
fe707db96f Core/AI: Fix an edge case crash with PlayerAI. Again. Sheesh. 2016-03-03 20:57:03 +01: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
Naios
62815c6e1c Core/Database: Use RAII for resource management in MySQLConnection 
* Prevents double deletion of MySQLConnection after errors
* The object stays valid after an error and will wait for a reconnect
* Also crash the server if 5 reconnects fail
* Corrects an issue where the server was crashed after one reconnect
  because mysql_thread_id was invoked with an invalid handle
 2016-03-03 01:19:58 +01:00
Naios
09fa0ab46a Core/Database: Move DatabaseWorkerPool into it's own translation unit 2016-03-03 01:06:13 +01:00
Naios
5ed0180994 Core/Database: Use RAII instead of raw pointers for resource management 
* Corrects dirty usage of vectors with array indexes
* Removes _connectionCount which is now handled through the vector size
* Rename magic identifier "t" to "connection"
 2016-03-03 01:06:13 +01:00
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 0953bcf73f)
 2016-02-25 21:01:38 +01:00