Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,256 Commits 4 Branches 146 Tags
5fb88c71213e0a64ec7e3312fc4460c4cc34abfa
Commit Graph

13938 Commits

Author SHA1 Message Date
treeston
5fb88c7121 Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270) 
(cherry picked from commit 1050b68899)
 2016-03-22 23:37:02 +01:00
treeston
9a24c7175d Fix stuff™. 
(cherry picked from commit 0316dff245)
 2016-03-22 22:57:51 +01:00
treeston
e2f2c70ba4 Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089) 
(cherry picked from commit 5b8b8c6530)
 2016-03-22 22:56:43 +01:00
Kittnz
78885769cb Merge pull request #16245 from sirikfoll/Turkinator 
Core/Spells Implement SpellScript needed for Achievement The Turkinator
(cherry picked from commit 529899675a)
 2016-03-22 22:13:31 +01:00
Shauren
f6b60d461e Core/Quests: Fixed party accept quests 
(cherry picked from commit 48940e292f)
 2016-03-22 22:10:12 +01:00
treeston
a254bdff59 Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base 
(cherry picked from commit 9091451818)
 2016-03-22 22:06:54 +01:00
Shauren
f7624e7206 Core/Quests: Fixed quest sharing 
Closes #12304
Closes #16183

(cherry picked from commit 3c3cde028c)
 2016-03-22 22:00:06 +01:00
Vincent-Michael
7cd0ddc529 Core: Fix non pch build 2016-03-22 10:04:55 +01:00
Aokromes
3a38bc6ff9 Core/AuctionHouse: Fix compile 2016-03-22 09:56:07 +01:00
Aokromes
b9e090a4ae Core/AuctionHouse: Fix compile (Part 2) 2016-03-22 09:53:04 +01:00
Aokromes
a82e9fe4d3 Core/AuctionHouse: Fix compile 2016-03-22 09:48:32 +01:00
jackpoz
f837fc875a Merge pull request #15977 from tkrokli/landmine_knockback_achievement 
Scripts/Spells: Mine Sweeper achievement

(cherry picked from commit e59b4324b8)
 2016-03-21 23:35:57 +01:00
Duarte Duarte
af0da1dde1 Merge pull request #16101 from NathanHandley/3.3.5 
Updated AuctionHouseSeller to have item class stack control
(cherry picked from commit bddf9ec6fe)
 2016-03-21 23:33:00 +01:00
treeston
68c3af4166 Merge remote-tracking branch 'velinath/sai-migrations-3' into 3.3.5-base 
(cherry picked from commit 5084b17308)
 2016-03-21 23:22:03 +01:00
treeston
40ea130f5a Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-base 
(cherry picked from commit 1d9d03b289)
 2016-03-21 23:21:18 +01:00
treeston
c9fdb6af59 Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base 
(cherry picked from commit c7459327b2)
 2016-03-21 23:20:26 +01:00
Treeston
8225fb09c2 Merge pull request #16156 from Treeston/3.3.5-instancerevive2 
Game/Maps: Instance handling bug-fix follow-up
(cherry picked from commit ae4fcc3685)
 2016-03-21 22:41:02 +01:00
Treeston
e6ab6b4b0b Merge pull request #16182 from velinath/sai-migrations 
Core/Scripts: remove unused npc_taxi scripts
(cherry picked from commit 48d0fd276d)
 2016-03-21 22:35:20 +01:00
joschiwald
ee38d8b4a1 Merge pull request #16171 from velinath/sai-migrations 
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
(cherry picked from commit f377a5875c)
 2016-03-21 22:18:29 +01:00
treeston
d68b809f9b Merge remote-tracking branch 'tkrokli/move_wyrmrest_temple_taxi_to_sai' into 3.3.5 
(cherry picked from commit e0ffc2921b)
 2016-03-21 21:46:04 +01:00
treeston
94b7e562e2 Merge pull request #16126 from velinath/taxi-to-sai 
(partially cherry picked from commit b6ed3d3fc2)
 2016-03-21 21:29:53 +01:00
Treeston
7422557d03 Merge pull request #16110 from Treeston/3.3.5-instancerevive 
Game/Maps: Clean up instance zone-in handling
(cherry picked from commit eb3dc8a4f0)
 2016-03-21 19:41:28 +01:00
jackpoz
96ca739a0b Merge pull request #14896 from Ofinka/dupl 
(cherry picked from commit 263f127d07)
 2016-03-21 19:04:39 +01:00
ShinDarth
d14de35335 Core/Spells fix Arcane Missiles 
- close #15902

(cherry picked from commit 5fae63804c)
 2016-03-21 18:50:55 +01:00
ForesterDev
6ed2cde773 Core/Player: cleanup function CheckInstanceLoginValid 
(cherry picked from commit 9573ec52f0)
 2016-03-21 18:49:45 +01:00
ShinDarth
ed39275675 Core/Spells: fix conflicts between duration and cast time of channeled spells 
(cherry picked from commit 246e568bbd)
 2016-03-21 18:11:10 +01:00
joschiwald
60e1b50b3b Core/Spells: cherry picked relevant changes from commit c498966d23 to minimize differences between branches 2016-03-20 22:44:54 +01:00
joschiwald
77e32e3af5 Scripts: Added combat abilities to trash mobs in Ruby Sanctum 
Thx @sirikfoll

SAI by @Keader

Closes #16703

(cherry picked from commit ef7a91d193)
 2016-03-20 22:23:40 +01:00
Shauren
92e247b226 Core/Dep: Removed ZMQ dependency in preparation for future changes 2016-03-20 18:50:25 +01:00
Naios
1fea358bec Core/Game: Fix no PCH build 
* ref 680c12a
 2016-03-20 00:07:20 +01:00
Naios
ef75a2e731 Core/Shared: Fix no PCH build 
(cherry picked from commit 5ac4507c87)
 2016-03-19 23:19:59 +01:00
Naios
a5c2c0c037 CMake: Use inherited dependencies in worldserver and authserver 
* Closes #1679

(cherry picked from commit 03d249f063)
 2016-03-19 23:19:55 +01:00
Naios
28d8f7f70d CMake: Use inherited dependencies in scripts 
* Removes the circular dependency between game <-> scripts

(cherry picked from commit 96bc31924a)
 2016-03-19 23:19:54 +01:00
Naios
5fe83abbe5 CMake: Use inherited dependencies in database, shared and game 
(cherry picked from commit 469f2d3ade)
 2016-03-19 23:19:53 +01:00
Naios
0db4f018e8 CMake: Use inherited dependencies in common and tools 
(cherry picked from commit abda7a910a)
 2016-03-19 23:19:52 +01:00
Naios
b0ac332d58 CMake: Provide proper interface targets from dependencies 
* to make use of cmakes inherited link dependencies which
  imports all include directories/ definitions from the link library

(cherry picked from commit 1a572d2425)
 2016-03-19 23:19:50 +01:00
Shauren
680c12a4bf Core/Crypto: Renamed SHA1Randx/WardenKeyGeneration and made it a template class 2016-03-19 23:15:54 +01:00
Shauren
8f80b3e0ec Core/PacketIO: Updated and enabled SMSG_DISPEL_FAILED 2016-03-18 23:53:29 +01:00
Shauren
ca4e8c6ff8 Core/PacketIO: Updated and enabled CMSG_GM_TICKET_GET_CASE_STATUS, CMSG_GM_TICKET_GET_SYSTEM_STATUS, SMSG_GM_TICKET_CASE_STATUS 2016-03-17 23:31:26 +01:00
Shauren
743acbb913 Merge pull request #16652 from Lopfest/phase 
[6.x] Core/Phase: fixed phase update on area change
 2016-03-16 23:16:20 +01:00
Naios
37dbbe22eb Dep/CppFormat: Update cppformat to cppformat/cppformat@5174b8c 
(cherry picked from commit f52495c66b)
 2016-03-16 16:12:04 +01:00
Shauren
a56a402190 Core/PacketIO: Marked CMSG_LEAVE_GROUP as not threadsafe 2016-03-15 23:17:39 +01:00
Shauren
f4f4cb9dec Core/PacketIO: Updated and enabled SMSG_QUEST_UPDATE_ADD_PVP_CREDIT (+added explicit typing in appending values to bytebuffer in QuestPackets.cpp) 2016-03-14 22:32:45 +01:00
Shauren
50c8efecc5 Core/Misc: Removed OnUnknownPacketReceive script hook - it could never be called 2016-03-13 00:12:42 +01:00
Shauren
0daba931ef Core/Networking: Fixed DelayedCloseSocket when compiled without TC_SOCKET_USE_IOCP (linux) 
Closes #16769
 2016-03-12 19:43:07 +01:00
Shauren
16953c9025 Merge pull request #16763 from mateusdemboski/patch-1 
Added locales id for "ptBR" and "itIT" on worldserver.conf.dist
 2016-03-11 23:48:44 +01:00
Naios
7c257aab5e Core/Worldserver: Move the Realm instance into the game library 2016-03-11 18:35:50 +01:00
Naios
329225b40d Core/Game: Move singleton instances into compilation units 
* Fixes issues when building shared libraries
  (prevents gcc and clang from providing several instance)
 2016-03-11 18:35:49 +01:00
Naios
a8fe7f6eb7 Core/Database: Move singleton instances into compilation units 
* Fixes issues when building shared libraries
  (prevents gcc and clang from providing several instance)
* Also instantiate the database worker pools in DatabaseEnv.cpp now.
 2016-03-11 18:25:55 +01:00
Naios
30517cb1d3 Core/Common: Generalize platform specific includes in common/Platform 2016-03-11 18:25:55 +01:00