Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,544 Commits 4 Branches 146 Tags
de4aea093bdb7bba5a3c2aad98a52dfa7d5071e2
Commit Graph

11523 Commits

Author SHA1 Message Date
Shauren
de4aea093b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.h
 2014-09-12 20:27:46 +02:00
Shauren
7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp
 2014-09-12 20:26:46 +02:00
Shauren
b3f7210f4d Core/WorldSocket: Refactored client packet header check 2014-09-12 20:25:13 +02:00
Shauren
8f5ae1fb90 Core/Misc: Added const modifier to MessageBuffer::Write parameter 2014-09-12 20:20:35 +02:00
Vincent-Michael
53ee1eff0b Core: Fix warning 2014-09-12 19:51:29 +02:00
Shauren
6dff6b7425 Core/NetworkIO: Set non blocking mode on sockets properly 2014-09-12 19:34:26 +02:00
DDuarte
dcba0106d6 Core/Skills: Fix rogue's lock picking 
Fixes #12677
Closes #13111
 2014-09-12 18:11:19 +01:00
Subv
b7865a3eb5 Core/Quests: Only prompt the player to take the next quest in a chain if he meets the conditions for that quest. 2014-09-12 11:32:50 -05:00
Malcrom
be8111b0a2 Scripting: Felwood: A little cleanup to my previous commit 2014-09-12 12:40:58 -02:30
Malcrom
43597c4474 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-09-12 12:20:37 -02:30
Malcrom
6686c952b5 Scripting/Felwood: And some quest spells for quest 27989 & 27995 2014-09-12 12:13:38 -02:30
MitchesD
d7b0ee7c03 Merge pull request #12927 from MitchesD/misc_3 
Scripts/CoS: implemented Infinite Corruptor, improvements in instance sc...
 2014-09-12 15:25:07 +02:00
Dr-J
4e25304a66 Remove mount vendor cpp script 2014-09-12 13:48:51 +01:00
MitchesD
cc00d2f181 Scripts/CoS: implemented Infinite Corruptor, improvements in instance script and Meathook converted to BossAI 
Guardian of Time should have some text, but I have not found anything in sniff. Also the whole event needs to be rewritten and improved.
 2014-09-12 14:46:41 +02:00
DDuarte
d60beaccf6 Misc/Config: Update CharacterCreating.Disabled.RaceMask 
Ref #13110
 2014-09-12 13:21:07 +01:00
DDuarte
1d166d07bc Misc/Config: Update CharacterCreating.Disabled.RaceMask 
Fixes  #1311
 2014-09-12 04:08:58 +01:00
DDuarte
b3166030a0 Core/Group: Update enum GroupType 2014-09-12 02:15:14 +01:00
w1sht0l1v3
c4ce889344 Core/Misc: Kill few more warnings. 2014-09-12 00:16:04 +03:00
w1sht0l1v3
0392bf9bdf Core/Misc: Get rid of some warnings. 2014-09-11 23:08:02 +03:00
Vincent-Michael
dd687592ca Core: Fix typo in cec2cc806b 2014-09-11 21:54:10 +02:00
Dr-J
cec2cc806b a correction 2014-09-11 20:50:37 +01:00
Dr-J
4331c714d7 Remove a Gossip Script which is already in DB 
Remove script for Khadgar all of the gossip menus and options are already in db and this is only a gossip script, will deal with db stuff in next commit
 2014-09-11 20:46:00 +01:00
DDuarte
cc9aa9e4e7 Core/Groups: Send correct group member count in SMSG_REAL_GROUP_UPDATE 
Fixes the error of incorrect party size on joining arenas
 2014-09-11 17:24:25 +01:00
DDuarte
0f36199120 Core/Arenas: Correct values of enum ArenaTeamEvents 
Fixes "Internal guild error" message when a player joins an arena team
 2014-09-11 14:29:38 +01:00
MitchesD
1e3aa97098 Scripts/Misc: some small changes after recent commits 2014-09-11 15:22:30 +02:00
Nyeriah
b35edcabb6 Scripts/AV: Drekthar updated to EventMaps 2014-09-11 03:25:15 -03:00
Nyeriah
ce97e9194c Scripts/Gundrak: Eck the Ferocious updated to EventMap/BossAI 
- Moved his spawn handling to instance script
 2014-09-11 02:39:57 -03:00
DDuarte
92ff34fc6a Core/Net: Fix SMSG_CHAR_ENUM structure when player has no characters 2014-09-11 04:24:07 +01:00
DDuarte
a84bfc3807 Core/Groups: Handle CMSG_GROUP_REQUEST_JOIN_UPDATES & SMSG_REAL_GROUP_UPDATE 2014-09-11 04:02:37 +01:00
Takenbacon
e427ad6e41 Core/BGs&Arenas: Fix queing 
Closes #11551
 2014-09-11 04:02:36 +01:00
jackpoz
8bb4f33852 Core/DB: Fix crash on shutdown 
Fix race condition crash on shutdown, closing MySQL connections with queries still being executed
 2014-09-10 22:39:03 +02:00
Shauren
5f62f1b6d2 Core/Misc: Fixed build with intel compiler 2014-09-10 21:18:28 +02:00
Shauren
946e2d0ca6 Core/Authserver: Added missing auth socket manager 
Closes #13085
 2014-09-10 21:17:55 +02:00
Nyeriah
561cc47a00 Scripts/AV: Captain Galvangar updated to EventMaps 2014-09-10 03:45:44 -03:00
joschiwald
9008442a3e Core/Creature: added HealthModifierExtra value to creature_template 
Requested by @Malcrom
 2014-09-10 03:35:00 +02:00
Duarte Duarte
9b2737c068 Core/Loot: Fix a possible unintialized slot_type in LootMgr 
Noticed by @joschiwald
 2014-09-09 23:40:35 +01:00
DDuarte
2bba219106 Core/Loot: Fix some issues with master loot 
Thanks to @PortgasDAce for the initial patch

Closes #12732
 2014-09-09 23:11:37 +01:00
Duarte Duarte
04415f33a7 Merge pull request #13077 from mik1893/fear_vs_possess 
Core/Unit: Do not give client control back to player after fear/confuse if player is under player charm (UNIT_STATE_POSSESSED)
 2014-09-09 23:07:18 +01:00
dkmbasura
08b2cf6cba Scripts/The Barrens: Make BIG WILL attackable in quest id 1719 (the affray) 
Closes #13072
Ref #4764
 2014-09-09 22:57:57 +01:00
Duarte Duarte
2697b18cf2 Core/Net: Fix GCC build 2014-09-09 22:32:27 +01:00
mik1893
fef376c73c Core/Unit: Do not give client control back to player after fear 
if player is under player charm (UNIT_STATE_POSSESSED)
 2014-09-09 23:27:33 +02:00
Dr-J
29951ba394 Remove CPP script for Jenny/Jezzix Geartwist 2014-09-09 21:38:05 +01:00
Dr-J
02a1c92ea7 Remove seaforium depth charge 
Remove cpp script for seaforium depth charge ((Bury those cockroaches)).
 2014-09-09 20:35:23 +01:00
Shauren
0c40ca8574 Build fix 2014-09-09 21:32:21 +02:00
Vincent-Michael
48297860f1 Merge commit 'a2ba49afa428ed9297f98bf8a5e00f6f7a6f4c3a' into 4.3.4 2014-09-09 19:22:41 +02:00
Shauren
e0ce4528c5 Core/NetworkIO: Use reactor style sending on linux to reduce locking overhead 2014-09-09 19:19:25 +02:00
Vincent-Michael
a2ba49afa4 Core/Creature: Implement CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING 2014-09-09 19:17:19 +02:00
Nyeriah
8907904757 Scripts/Onyxia Lair: Slight change so we don't call Reset() in the 'ctor 2014-09-08 18:02:06 -03:00
Vincent-Michael
8b41754854 Core: Fix build 2014-09-08 22:20:24 +02:00
Vincent-Michael
5cdea8b30c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-08 22:15:42 +02:00