Commit Graph
28223 Commits
Author SHA1 Message Date
Duarte Duarte af0da1dde1 Merge pull request #16101 from NathanHandley/3.3.5
Updated AuctionHouseSeller to have item class stack control
(cherry picked from commit bddf9ec6febc9a77308d074bd10db2ddec4b48d5)
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 5084b17308c3441e1ca7f455aad17b4a3de2da72)
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 1d9d03b2891b5481eff6541a8563599ccc60c48d)
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 c7459327b2c8565e7cb101826f5059e3cf0628c4)
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 ae4fcc3685079e1c24cd46545dae169d5be12046)
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 48d0fd276dad6bbf1de364f692243c78814efbfa)
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 f377a5875cc320934573f5980cd99388ca45f7d3)
2016-03-21 22:18:29 +01:00
Dr-J 0fe4dddfa3 DB/Misc: Victorious Challenger
correct faction for http://www.wowhead.com/npc=30012/victorious-challenger

This npc should not be hostile unless spoken for via gosip to fight for quest
(cherry picked from commit 615906e51fc76de0a8ef1a625b50077757fbc48f)
2016-03-21 21:57:04 +01:00
treeston 0b9269cdad DB/Quests: Betrayal (12713) by @dr-j:
- Fix "Blight Fog" cast behavior
- Fix "Throw Blight Crystal" cast timing

(cherry picked from commit 19462efb4ef04d7b988ec55369dd10f00dd1e895)
2016-03-21 21:55:21 +01:00
treeston 4f6d25d616 DB/Creature: Correct Orbaz Bloodbane creature text (#16168)
(cherry picked from commit 3af1d9196784759bb69dd59ce26599afdfd277a0)
2016-03-21 21:55:05 +01:00
Killyana 3704452bd8 DB/SAI: Moving some scripts from waypoint_script to SAI
Closes #12727

(cherry picked from commit 10757e60f1fbd6ca026c955c7cf687cac1526b8f)
2016-03-21 21:54:48 +01:00
treeston d68b809f9b Merge remote-tracking branch 'tkrokli/move_wyrmrest_temple_taxi_to_sai' into 3.3.5
(cherry picked from commit e0ffc2921b71e8822ac267399c468f2b4a449745)
2016-03-21 21:46:04 +01:00
treeston 94b7e562e2 Merge pull request #16126 from velinath/taxi-to-sai
(partially cherry picked from commit b6ed3d3fc2b8447059ff0aa0e5b6de36947fd006)
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 eb3dc8a4f064d89b78248a511bcf67f805ea3314)
2016-03-21 19:41:28 +01:00
jackpoz 96ca739a0b Merge pull request #14896 from Ofinka/dupl
(cherry picked from commit 263f127d075d56be8fd19ef36871bf245bc4bdcc)
2016-03-21 19:04:39 +01:00
ShinDarth d14de35335 Core/Spells fix Arcane Missiles
- close #15902

(cherry picked from commit 5fae63804ceb61dd009ac77f76911605e255b5c8)
2016-03-21 18:50:55 +01:00
ForesterDev 6ed2cde773 Core/Player: cleanup function CheckInstanceLoginValid
(cherry picked from commit 9573ec52f0ea2fbda0fdcac1bd9ed2617d359338)
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 246e568bbd1c741af7204e4a4941c113b7d63e60)
2016-03-21 18:11:10 +01:00
Dr-J 152b1b494e DB/Misc: Wrong branch 2016-03-21 16:47:21 +00:00
Dr-J 35924df535 DB/Misc: Hellfire Peninsula Again
1) Respawn Shredder Parts for Outland Sucks 
2) Fix How to Serve Goblins so Moh, Manni and Jakk walk out of cage and say line instead of doing nothing
3) Script Foreman Razelcraz, Maiden of Grief, Gan''arg Sapper and Camera Shaker
4) Script a couple of turn in events.
2016-03-21 16:46:10 +00:00
Shauren e3af42e05c Core/Util: Extracted GetPID to separate function 2016-03-21 17:25:34 +01:00
joschiwald 60e1b50b3b Core/Spells: cherry picked relevant changes from commit c498966d23933e323685c3a767d3fe334a60af22 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 ef7a91d1938becb53fc9201275f0b5f02248765c)
2016-03-20 22:23:40 +01:00
Shauren 59f6267573 Dep: Removed zmqpp from package list 2016-03-20 19:00:12 +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 5ac4507c877e9a6b73ca8bd3e2f44254eb06ab4a)
2016-03-19 23:19:59 +01:00
Naios e9567958fc CMake: Fix detection of AppleClang
* Since CMake 3.0 CMAKE_<LANG>_COMPILER_ID is set to "AppleClang"

(cherry picked from commit 174efd0b6b04b243b58bc533999ad2d7b45f383d)
2016-03-19 23:19:58 +01:00
Naios 7f38c4d3f1 CMake/Revision: Use a raw string literal in cmake command define
* Ref 849c906014

(cherry picked from commit 6faddded680202adc74607c653f5707c778b58dd)
2016-03-19 23:19:58 +01:00
Naios 6eba8493e2 CMake: Disable incremental linking in msvc debug builds
* Requested by Shauren

(cherry picked from commit fbc23c0713e98cb16d601c64e2e3e2a7716d2ab8)
2016-03-19 23:19:57 +01:00
Naios 90274d0337 CMake: Remove the workaround for source groups below CMake 2.8.12
* Set the default option to hierarchical
* Add a new "hierarchical-folders" option which enables folders inside IDE's.

(cherry picked from commit bf773ccc417b47d01502c8151cea6188e33e16aa)
2016-03-19 23:19:56 +01:00
Naios a5c2c0c037 CMake: Use inherited dependencies in worldserver and authserver
* Closes #1679

(cherry picked from commit 03d249f0631c3561070ebbdd7301115507c68876)
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 96bc31924a5a418d37bd961ef2880f9072126348)
2016-03-19 23:19:54 +01:00
Naios 5fe83abbe5 CMake: Use inherited dependencies in database, shared and game
(cherry picked from commit 469f2d3ade168de0b5be18112008c337067a8e03)
2016-03-19 23:19:53 +01:00
Naios 0db4f018e8 CMake: Use inherited dependencies in common and tools
(cherry picked from commit abda7a910a760687f9c1b9e0893314e04982c0f1)
2016-03-19 23:19:52 +01:00
Naios 853eee75b0 CMake: Add inherited include directories and definitions to precompiled headers
(cherry picked from commit 2413a82b9343178b613bc6309125eecec8aa9123)
2016-03-19 23:19:51 +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 1a572d242593124f986d3ed08710b96a142a6763)
2016-03-19 23:19:50 +01:00
Naios fee9bb904a Travis: Upgrade CMake to version 3.2
* Since we require at least version 3.0 now

(cherry picked from commit 87bc353b3446fb95e141d44fe49da3e5059f7436)
2016-03-19 23:19:49 +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 3618e0f608 Dep: Fix an oversight in f52495c6
* Thanks dobrMAN for noticing

(cherry picked from commit 83f439ab4306bfa45df23be2bd80832ec0107c54)
2016-03-16 18:53:04 +01:00
Naios 37dbbe22eb Dep/CppFormat: Update cppformat to cppformat/cppformat@5174b8c
(cherry picked from commit f52495c66b1b219f82729221e8023a86b28d54bf)
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