Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,392 Commits 4 Branches 146 Tags
e743f4a479ce7ddd3f13d51ca1c19a591c803fc0
Commit Graph

10067 Commits

Author SHA1 Message Date
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
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
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
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
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
click
e040c56d45 Core/Logger: Add basic account-info to addon-scans to make them a little bit more useful (@Aokromes, you can stop asking for this now...) 2015-03-29 19:19:45 +02:00
jackpoz
be9294dc09 Core/Dungeon Finder: Restore ".lfg queue debug" logging additional information 
Restore ".lfg queue" behavior to print additional debug informations when an additional argument is passed (any character/word will work).
 2015-03-29 18:11:26 +02:00
Naios
c386711972 CMake: Use source_groups to represent the source tree 
* It let ide's (like vs) display the source tree.
* Disabled by default.
* Soft requirement is cmake >= 2.8.12 .
* Offers 2 modes: flat & hierarchical.
* For detailed description see #14471
* Thanks @click for help and advises.
* Closes #14471
 2015-03-29 16:08:28 +02:00
Naios
c61fac843b Core/Database: Return an unknown error code instead of false (0) if mysql_init failed. 
* Thanks @et65 for noticing.
* ref #14139

(cherry picked from commit 83bbe00785)
 2015-03-29 15:04:51 +02:00
Naios
6486827204 Core/Database: Fix a mistake in 54ee526724 
* Also use proper errno instead of 0 when reconnecting.
* Thanks @et65 for reporting
* ref #14139

(cherry picked from commit 47410157b1)
 2015-03-29 14:28:18 +02:00
Naios
832234c47b Core/Log: Improve creation of log prefixes. 
* this also fixes non whitespace seperated timestamps in logs after 95ebe4f31c @Aokromes
* remove an unnecessary stringstream in Log::outCommand
* delete copy constructor of LogMessage to prevent unwanted copies

(cherry picked from commit a2e280c8a8)
 2015-03-28 17:29:56 +01:00
Naios
71c0d4f792 Core/Log: Fix linker errors that occur on msvc 12 lower then update 4 
* http://stackoverflow.com/questions/4891067/weird-undefined-symbols-of-static-constants-inside-a-struct-class
* http://www-01.ibm.com/support/knowledgecenter/SSGH3R_8.0.0/com.ibm.xlcpp8a.doc/language/ref/cplr038.htm%23cplr038
* closes #14463
* ref #14317

(cherry picked from commit 9b0b1185e4)

Conflicts:
	src/server/game/Server/WorldSocketMgr.cpp
 2015-03-28 17:29:43 +01:00
Naios
11e1f4af60 Core/Database Improve commit 39bdd06446 
* found a better way where no cast is needed.
* ref #14430

(cherry picked from commit 54ee526724)
 2015-03-28 17:25:16 +01:00
click
058457dda9 Core/Script: Fix non-PCH build 2015-03-27 21:38:23 +01:00
Naios
62a5ee8e2c Core/Database: Prepare statements at reconnect. 
* Closes #14430

(cherry picked from commit 39bdd06446)
 2015-03-27 15:38:58 +01:00
MitchesD
eced90d4f8 Merge pull request #14149 from Rushor/Ending 
Scripts/Bloodmyst Isle: Script Quest: Ending Their World
 2015-03-26 15:08:23 +01:00
joschiwald
6777addbee Scripts/Spells: implement some eject passenger spells 
(cherry picked from commit 766eb599ea)
 2015-03-25 17:52:48 +01:00
cr4st
81dcfa4077 Core/Creature: fixed trigger visibility of vehicles 
(cherry picked from commit 5cee106524)
 2015-03-25 17:52:10 +01:00
MitchesD
0659f5d823 Merge pull request #14048 from Rushor/Worgen 
Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation
 2015-03-25 16:27:04 +01:00
Naios
0778cc3332 Core/DBUpdater: Use correct formatter for size_t 
* thanks @DDuarte pointing this out.

(cherry picked from commit b2b8de5786)
 2015-03-24 22:02:08 +01:00
Naios
4201ca021b Core/DBUpdater: Add the possibility to limit the remove of orphaned entries. 
* This will save you from loosing your update history if you use a repository in bad state (revision or branch) by mistake.
* Also turned 1 error message into a warning

(cherry picked from commit 966282fbed)
(cherry picked from commit 3ad7776d50)
 2015-03-24 13:03:55 +01:00