Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,242 Commits 4 Branches 146 Tags
f6b60d461e293d30d4ac90ddc814c1df63deeeca
Commit Graph

28242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Killyana
a09468ea52 DB: Game_tele to Emerald Dream 
By @Helias
Closes #16131

(cherry picked from commit 614ae6cba9)
 2016-03-22 21:47:37 +01:00
Killyana
2ae4248179 DB/SAI: Fix the react state for Darkfallen Bloodbearer 
Closes #16159

(cherry picked from commit 69d59885c4)
 2016-03-22 21:46:23 +01:00
Killyana
9b214db05b DB/SAI: Harvest Collector 
Closes #16158

(cherry picked from commit 2668258fe2)
 2016-03-22 21:44:13 +01:00
Killyana
87527e1fe3 DB/Creature: Fix The Crippler unit_flags 
Closes #16148

(cherry picked from commit 4194309873)
 2016-03-22 21:43:01 +01:00
Killyana
cbb0e5ce66 DB/SAI: Fix Windroc Matriarch script and text 
By @Saben65 and @velinath
Closes #16215

(cherry picked from commit 70868ceee7)
 2016-03-22 21:41:38 +01:00
treeston
dd3ac6eaa8 Fix a spawndist start-up warning. 
(cherry picked from commit 91fa2154e8)
 2016-03-22 21:35:42 +01:00
Aokromes
01cccc1ed1 Rename 2016_03_21_10_world2016_01_09_00_world.sql to 2016_03_21_10_world_2016_01_09_00_world.sql 2016-03-22 20:30:54 +01:00
Killyana
5816960851 DB/Creature: Remove a wrong spawn 
(cherry picked from commit 5d9370a0f7)
 2016-03-22 19:13:17 +01:00
Dr-J
e4ddd96da0 DB/Misc: Sholazar Guardians (Updates) 
1) Move the http://www.wowhead.com/spell=52214/rainspeaker-treasures-see-invisibility and http://www.wowhead.com/spell=50735/frenzyheart-chicken-see-invisibility to spell area instead of been cast and removed by quest giver on quest accept and return - this solves the issue of Gods Like Shiny Things, Appeasing the Great Rainstone , Flown the Coop! and Chicken Party not working properly (due to player not been able to see npcs) if player relogged or left zone while had quest uncompleted in log unles quest was abandoned and retaken
2) Someone had put non repeatable flags on some of the events for Guardians since I originally scripted these npcs which resulted in that once guardian and dug up one treasure or threw net at one chicken would not work again, all events on these npcs need to repeatable
(cherry picked from commit 4f2cd84625)
 2016-03-22 19:10:29 +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
Aokromes
674e00db06 DB/Misc: Fix import 2016-03-22 08:48:41 +01:00
Shauren
fb8f66f936 Buildsystem: Removed unneeded FindZMQ script 2016-03-22 00:07:04 +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
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 615906e51f)
 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 19462efb4e)
 2016-03-21 21:55:21 +01:00
treeston
4f6d25d616 DB/Creature: Correct Orbaz Bloodbane creature text (#16168) 
(cherry picked from commit 3af1d91967)
 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 10757e60f1)
 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 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
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 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
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 5ac4507c87)
 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 174efd0b6b)
 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 6faddded68)
 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 fbc23c0713)
 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 bf773ccc41)
 2016-03-19 23:19:56 +01:00