Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,718 Commits 4 Branches 146 Tags
c3243e20760a0200be98e94de5f56336b1c2bc35
Commit Graph

21898 Commits

Author SHA1 Message Date
ariel-
e707905764 Port commit 56186319bd (6.x branch) 
Core/Spells: Cooldown updates

Updates #14418
 2015-04-13 12:13:46 -03:00
tkrokli
8126faccda Fix $n bug in NPC text for quest 11664 Escaping the Mist 
Make quest NPC target player character to say the actual name instead of $n

Idea by @DDuarte
Final solution found in similar escort quests.
(Example script: npc_kayra_longmane in zone_zangarmarsh.cpp)
 2015-04-12 10:27:38 +02:00
MitchesD
f9eb3d245f Merge pull request #14497 from tkrokli/Kodo_Roundup 
[Quest] Kodo Roundup
 2015-04-11 23:52:50 +02:00
Nick
a6836e6a91 Core/Scripts: Remove Bloodmaul Brutes script 
As explained by @dr-j in 6b846a4e29
 2015-04-11 02:33:33 +02:00
click
adb39317fa Core: Follow codingstyle guidelines (CamelCase for functions, lowerCamel for vars and local stuff) 2015-04-10 04:14:50 +02:00
click
a09eafa104 Core: Whitespace/tab2spaces cleanup 2015-04-10 04:12:06 +02:00
WishToDie
08a62f19b8 Update LFGMgr.cpp 
Core/LFGMgr: Fix crash in e743f4a479
 2015-04-09 18:29:20 +03:00
click
6c1e4bc20d Core/Spells: Reinstate helperfunction removed in commit 0e3607df (with a new functionname to make more sense out of it), and adjust the remaining code slightly to accomodate that. 2015-04-07 23:51:19 +02:00
click
0e3607df5b Core/Spells: Allow non-skill-based flying mounts to be used in designated areas. 
- Flying mounts that are not in the "SKILL_MOUNT"-tree and area-restricted can now be used properly (ex. 64749 - Loaned Gryphon).
- Remove isKnowHowFlyIn()-function (useless and deprecated since this is handled properly in the spellsystem).
Massive thanks to rat for extremely good help and support on fixing this (most of this is his work).
 2015-04-07 21:26:23 +02:00
click
79696e0871 Core/Command: Sanitize input for .account set gmlevel <username> handling 2015-04-07 06:12:37 +02:00
Nick
77eb89157b Core/Scripts: Remove The Thunderspike script 
As explained by @Killyana in https://github.com/TrinityCore/TrinityCore/issues/4458#issuecomment-90061073
 2015-04-06 21:08:15 +02:00
w1sht0l1v3
e743f4a479 Core/LFGMgr: Fix the case where the last player left in a lfg group would be stuck in party when porting out of the instance. 
If you find a better way or think this is wrong feel free to remove it or improve it.
 2015-04-05 22:03:40 +03:00
Shauren
96b7b7ced5 Build fix for GCC 4.7 
(cherry picked from commit e7deae947c)
 2015-04-05 13:57:45 +02:00
Aokromes
16481d17aa Scripts/Kalimdor: Ashenvale - add missing enum 2015-04-05 12:57:14 +02:00
Rushor
f49a1b0f1f Scripts/Kalimdor: Ashenvale - Remove Torek C++ Script 2015-04-05 12:43:15 +02:00
Shauren
62a3edb84a Core/Misc: Warning fixes 
(cherry picked from commit cc4d79495f)

Partial cherry-picked.

Signed-off-by: Naios <naios-dev@live.de>
 2015-04-05 01:20:11 +02:00
Carbenium
c0b77fc216 Switch abs to std::abs 
(cherry picked from commit 8476c2ac5a)
 2015-04-05 00:41:39 +02:00
Carbenium
aa1971964b Add missing override keyword in scripts 
(cherry picked from commit b948a4275e)

Conflicts:
	src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2015-04-05 00:41:21 +02:00
Carbenium
67238e2166 Rename variables to fix C++11 keyword collision 
(cherry picked from commit 573cda7b52)
 2015-04-05 00:36:33 +02:00
Carbenium
fb3c4911c7 Remove old ACE reference 
(cherry picked from commit 18acb9914a)
 2015-04-05 00:32:50 +02:00
Naios
de490674ff Core/DBUpdater: Exit clean if a query failed to apply. 
* Fix some \W4 warnings about constructors.
 2015-04-05 00:23:12 +02:00
Naios
85d6ff9570 Core/Log: Remove some unnecessary std::move's. 
* This are r-value references already.
* Thanks @Shauren for noticing
 2015-04-05 00:23:11 +02:00
Carbenium
bdc9beacbd Merge pull request #13862 from ariel-/pr_tmp 
Implement CharSections.dbc and Serverside Checks.
 2015-04-05 00:09:03 +02:00
Shauren
548aa119ac Core/Networking: Fixed unsafe access to _worldSession member in WorldSocket 
(cherry picked from commit bed88e0dd4)

Core/Networking: Fixed deadlock in HandlePing if the client is about to be kicked for overspeed pings

(cherry picked from commit 3da0f7e409)

Core/Networking: Cleanup CloseSocket calls from read failures in WorldSocket

(cherry picked from commit 18343a7309)

Conflicts:
	src/server/game/Server/WorldSocket.cpp

Ref #14474
 2015-04-04 23:07:41 +01:00
jackpoz
d23538ce56 Core/Misc: Fix issues reported by static analysis 
Coverity defect IDs: 1227510, 1227434, 1023036, 1062426, 1062425, 1062424, 1062423, 1062422
 2015-04-04 20:20:04 +02:00
click
f44555500b Core: Comment out unused parameter in DBCStructure.h (removes a warning) 2015-04-04 18:21:15 +02:00
jackpoz
76986880c9 Core/Misc: Fix issues reported by static analysis 
Coverity defect IDs: 1267938, 1267937, 1267933, 1267932, 1267929
 2015-04-04 16:40:01 +02:00
tkrokli
1c8486e1a8 [Quest] Kodo Roundup 
by @pete318, closes #12811

Fixes the remaining bugs in the "Kodo Roundup" quest in Desolace:
- removes combat status from creature 11627, Tamed Kodo
- sets normal walking speed as the creature's follow speed
- makes the Tamed Kodo stop at Scrabblescrew's Camp
- enables quest objective count 0/5 -> 5/5, quest complete
- SQL (by @tkrokli) links the missing gossip text in the DB
 2015-04-04 15:57:06 +02:00
jackpoz
2dc97e3f3d Core/Misc: Fix issues reported by static analysis 
Coverity defect IDs: 1292769, 1292768, 1292765, 1292763, 1267939
 2015-04-04 15:28:13 +02:00
jackpoz
c38d4f57b3 Core/Dungeon Finder: Add additional logs for SMSG_LFG_QUEUE_STATUS 
Log the current LfgState of the target player when sending SMSG_LFG_QUEUE_STATUS packet.
 2015-04-04 14:01:11 +02:00
jackpoz
25e86f75f8 Core/Misc: Fix issues reported by static analysis 
Coverity defect IDs: 1292760, 1292761, 1292762, 1292771, 1292770
 2015-04-04 12:44:56 +02:00
jackpoz
1a2c20f95d Scripts/Misc: Fix warning 2015-04-03 23:06:34 +02:00
DDuarte
606c443cb0 Revert "Merge pull request #14424 from Rushor/Rampart" 
This reverts commit 22c0007b42, reversing
changes made to 20bc2c51f6.
 2015-04-03 20:59:15 +01:00
Aokromes
22c0007b42 Merge pull request #14424 from Rushor/Rampart 
Scripts/HellfireRamparts: Vazruden the Herald - Improve Reset-/ Aggrobehaviour
 2015-04-03 21:00:26 +02:00
Duarte Duarte
20bc2c51f6 Merge pull request #14083 from Gooyeth/3.3.5_sample_satisfaction 
Core/Spells: Fixed Sample satisfaction not entering combat
 2015-04-03 18:32:02 +01:00
click
b804539f9b Core/Script: Remove script for Overlord Mor'ghor - converted to SAI in commit 16179f8 2015-04-03 08:52:52 +02:00
MitchesD
93fa363d9a Core/SAI: fix typo 
(cherry picked from commit 9ed21eb5b1)
 2015-04-02 21:30:39 +02:00
MitchesD
a3a7d65c20 Core/SAI: fix typo 
(cherry picked from commit 9ed21eb5b1)
 2015-04-02 21:28:44 +02:00
Naios
1939367108 Core/Database: Remove va_list from PreparedStatement::PAppend. 2015-04-02 21:07:48 +02:00
Naios
c9b0c8a0ca Core/World: Remove va_list from World::RecordTimeDiff. 
* also split it in ResetTimeDiffRecord() and RecordTimeDiff() to avoid passing of null values.
 2015-04-02 21:07:46 +02:00
Naios
df4723af25 Core/Database: Remove va_args from DatabaseWorker::Execute methods. 
* Also delegate SQLQueryHolder::SetPQuery into SetQuery.
 2015-04-02 21:07:44 +02:00
Rat
037fd1b1bb Core/Phases: backported 6.x phase fixes 2015-04-02 20:32:09 +02:00
MitchesD
1103f0889d Core/SmartScripts: added SMART_ACTION_SET_COUNTER and SMART_EVENT_COUNTER_SET 
as per request of DB developers

(cherry picked from commit 23b1c042ad)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScript.h
 2015-04-02 18:52:19 +02:00
MitchesD
8d58bb93c9 Core/SAI: fix merge conflict 
it's good to use CTRL + S
 2015-04-02 18:34:31 +02:00
MitchesD
1de02764c7 Core/SmartScripts: added SMART_ACTION_SET_COUNTER and SMART_EVENT_COUNTER_SET 
as per request of DB developers

(cherry picked from commit 23b1c042ad)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScript.h
 2015-04-02 18:30:27 +02:00
click
d8ef63040a Core/Packet: Correction to packetsize for SMSG_WEATHER 2015-04-02 02:46:25 +02:00
leak
7010671931 Core/Misc: Remove unused headers 2015-03-30 17:16:50 +02:00
click
50bbfeebb9 Core/Entities: Add player name and ID to GetXPrestBonus calculation-log 2015-03-30 02:06:07 +02:00
jackpoz
de1cbf716d Core/Dungeon Finder: Allow to execute "lfg" commands from console 2015-03-29 20:50:17 +02:00
Gacko
1995dcab76 Fix non-pch build. 2015-03-29 20:11:14 +02:00