Commit Graph

20385 Commits

Author SHA1 Message Date
Rat
dcd18eef2a Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 2015-03-29 17:56:49 +02:00
Rat
81df6b2ad2 Core/Phases: Defined default phaseID 2015-03-29 17:56:20 +02:00
Gacko
833d57fa27 Fix non-pch build 2015-03-29 16:50:40 +02:00
Shauren
4040631a7c Core/PacketIO: Fixed bad opcode name 2015-03-29 16:50:10 +02:00
Naios
ed4722b6e6 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

(cherry picked from commit c386711972)

Conflicts:
	src/server/authserver/CMakeLists.txt
2015-03-29 16:13:22 +02:00
Rat
3d84ab74b0 Core/Phases: updated packet handling to new format 2015-03-29 15:36:56 +02:00
Naios
83bbe00785 Core/Database: Return an unknown error code instead of false (0) if mysql_init failed.
* Thanks @et65 for noticing.
* ref #14139
2015-03-29 15:03:32 +02:00
jackpoz
9ba60b52c5 Core/Misc: Revert a static analysis "fix"
Revert assertion check added in 5dfd07fa4f , the issue reported by Coverity is a false positive.
2015-03-29 14:28:59 +02:00
Naios
47410157b1 Core/Database: Fix a mistake in 54ee526724
* Also use proper errno instead of 0 when reconnecting.
* Thanks @et65 for reporting
* ref #14139
2015-03-29 14:25:10 +02:00
Rat
3660c3a37f Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
2015-03-29 11:25:48 +02:00
Vincent-Michael
c26dbb786a Core/Enum: Update ResponseCodes for 6.1.2 2015-03-29 06:12:23 +02:00
Vincent-Michael
61ffd31078 Core/PacketIO: Enable some char opcodes 2015-03-29 03:47:26 +02:00
Vincent-Michael
dc67c9c801 Core/PacketIO: Fix warning 2015-03-29 03:28:29 +02:00
Vincent-Michael
3214665952 Core/PacketIO: Enable who/whois opcodes for 6.1.2 2015-03-29 03:23:12 +02:00
Vincent-Michael
f5257631ee Core/PacketIO: Fix typo (thx @xerkoss) 2015-03-29 03:01:16 +02:00
Shauren
429b8bb2a5 Core/PacketIO: Added 1 more server opcode 2015-03-29 01:59:11 +01:00
Vincent-Michael
cf3df0a396 Core/PacketIO: Enabled some others and channel opcodes for 6.1.2 2015-03-29 00:45:26 +01:00
Vincent-Michael
2ccd7653a5 Core/PacketIO: Enabled some movement opcodes for 6.1.2 2015-03-28 22:17:08 +01:00
Shauren
18d567ea20 Core/Currencies: Restores updating conquest caps - thanks @soulfrost for noticing 2015-03-28 22:09:47 +01:00
Shauren
942f9f079c Build fix 2015-03-28 21:50:58 +01:00
Shauren
bed88e0dd4 Core/Networking: Fixed unsafe access to _worldSession member in WorldSocket 2015-03-28 21:45:27 +01:00
Vincent-Michael
801fc634b5 Core/PacketIO: Disabled SMSG_LOAD_CUF_PROFILES 2015-03-28 21:02:01 +01:00
Vincent-Michael
d1205ffffe Core/PacketIO: Enabled some chat opcodes 2015-03-28 20:57:50 +01:00
Shauren
5ac0b7844c Core/PacketIO: Implemented CMSG_ENABLE_NAGLE 2015-03-28 20:51:01 +01:00
Vincent-Michael
e6f9006f95 Core/PacketIO: Enabled CMSG_TUTORIAL_FLAG and update TutorialAction enum for 6.1.2 2015-03-28 19:18:15 +01:00
MitchesD
580a50f7e7 Core/PacketIO: SMSG_BARBER_SHOP_RESULT, CMSG_ALTER_APPEARANCE, SMSG_ENABLE_BARBER_SHOP and enabled some opcodes 2015-03-28 18:12:26 +01:00
Naios
a2e280c8a8 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
2015-03-28 17:12:24 +01:00
Naios
9b0b1185e4 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
2015-03-28 17:12:11 +01:00
Naios
54ee526724 Core/Database Improve commit 39bdd06446
* found a better way where no cast is needed.
* ref #14430
2015-03-28 17:12:02 +01:00
Vincent-Michael
9fb96ed3f8 Core/PacketIO: Enabled some char opcodes
Closes #14468
2015-03-28 16:42:08 +01:00
MitchesD
aa33d66f6b Merge pull request #14466 from gigatotem/6.x
Spells/Mage: Correct typo in Time Warp script
2015-03-28 16:38:47 +01:00
Gigatotem
9f3018c694 Spells/Mage: Correct typo in Time Warp script 2015-03-28 15:13:45 +00:00
Carbenium
e9b60fb092 Core/Support: Added missing sql execute
Core/PacketIO: Enabled support system related opcodes
2015-03-28 11:54:03 +01:00
click
c696f2195d Core/Script: Fix non-PCH build
(cherry picked from commit 058457dda9)

Conflicts:
	src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
2015-03-27 23:11:13 +01:00
Carbenium
e471c75288 Merge pull request #14459 from Gigi1237/6.1.2_Opcodes
Core/PacketIO: Sync with WPP
2015-03-27 22:35:07 +01:00
Shauren
8cfb542ee4 Core/PacketIO: Updated values of all known server opcodes 2015-03-27 22:21:24 +01:00
Gigi1237
a476ccfc1f Core/PacketIO: Sync with WPP
Removed SMSGs from sync.
2015-03-27 21:02:54 +01:00
MitchesD
b05d74ba46 Merge pull request #14461 from gigatotem/6.x
[6.x] Heroism/Bloodlust/Time Warp
2015-03-27 15:34:53 +01:00
Naios
39bdd06446 Core/Database: Prepare statements at reconnect.
* Closes #14430
2015-03-27 15:34:13 +01:00
MitchesD
65275fd57d Scripts/Misc: small changes after recent commits 2015-03-27 14:47:10 +01:00
Gigatotem
bc8f4ee976 Spells/Mage:
Time Warp should also check for the Fatigued debuff given when a Hunter's Nether Ray pet casts Netherwinds.
2015-03-27 13:40:15 +00:00
Gigatotem
65b27fef91 Spells/Shaman:
Bloodlust and Heroism should also check for the Fatigued debuff from Nether Ray Hunter Pets "Netherwinds" ability.
2015-03-27 13:36:46 +00:00
Carbenium
49a61538a8 Core/PacketIO: Fixed a typo (CMSG_UPDATE_ACCOUNT_DATA should be STATUS_AUTHED) and assigned correct opcode value 2015-03-27 02:02:59 +01:00
Carbenium
75ab5b0aa6 Core/Support: Fix some static analysis issues 2015-03-26 21:00:13 +01:00
Carbenium
1262072949 Core/Misc: Update base stuff for V6.1.2 build 19802 2015-03-26 17:18:43 +01:00
Rushor
01ee7ecc69 Scripts/Bloodmyst Isle: Script Quest: Ending Their World
closes #1815

* Add missing Waypoint
* Improve Aggrobehaviour
* Add BroascasttextIDs
* Update to current GUID-Handling

Original Patch by @trickerer

(cherry picked from commit f1101b145b)
2015-03-26 16:14:38 +01:00
joschiwald
766eb599ea Scripts/Spells: implement some eject passenger spells 2015-03-25 17:43:59 +01:00
cr4st
5cee106524 Core/Creature: fixed trigger visibility of vehicles 2015-03-25 17:43:12 +01:00
Rushor
e88f276946 Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation
closes #12165

(cherry picked from commit 6080234e98)
2015-03-25 16:37:21 +01:00
Naios
b2b8de5786 Core/DBUpdater: Use correct formatter for size_t
* thanks @DDuarte pointing this out.
2015-03-24 22:00:19 +01:00