Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,287 Commits 4 Branches 146 Tags
cfe8a6a58b37280e4ed922e4d70878579dbc8bee
Commit Graph

13959 Commits

Author SHA1 Message Date
Shauren
cfe8a6a58b Core/Misc: Moved RealmList to shared 2016-03-26 13:39:46 +01:00
MitchesD
98fb5dc9bc Merge pull request #16750 from Lopfest/Spell 
[6.x] Core/Spell: changed target of spell 102445 Summon Master Li Fei
 2016-03-25 21:56:07 +01:00
Shauren
9ad79934d3 Core/PacketIO: Updated packet structures to 6.2.4.21355 2016-03-25 21:33:55 +01:00
Shauren
45c857a6bf Core/Networking: Updated packet headers for 6.2.4 2016-03-24 21:15:02 +01:00
Shauren
6de7a0b879 Core/PacketIO: Updated opcode values to 6.2.4.21348 and disabled packets that had their structures changed 2016-03-24 19:28:16 +01:00
Nertx
363731aac8 Core/Game: Fix Tremor Totem in LoS 
* Closes #15012

Signed-off-by: Naios <naios-dev@live.de>

(cherry picked from commit c9751eb1f8)
 2016-03-24 15:12:06 +01:00
sirikfoll
5ba2e2dd8e Core/AI Remove Reset() call from JustRespawned() hook 
* Not needed, and causes trouble when using _DespawnAtEvade()
* Closes #16786

(cherry picked from commit acf6681353)
 2016-03-24 15:04:03 +01:00
Naios
46daaf7689 Dep: Add efsw (entropia file system watcher) 
* Uses system API's which reduces the overhead
  instead of checking periodically for changes.
* Will be used in the hotswap system to reload
  shared libraries on changes.
 2016-03-24 13:53:10 +01:00
Naios
0cfdac70c4 Core/Game: Fix the no PCH build 
* Ref cd777f97a1
 2016-03-24 02:50:56 +01:00
Naios
cd777f97a1 Core/Game: Fix the clang build when building shared libraries 
* Hackfix to solve an unresolved issue in clang that the visibility
  flag is ignored in some explicit template specializations.
* See https://llvm.org/bugs/show_bug.cgi?id=24815
* See https://llvm.org/bugs/show_bug.cgi?id=23667
 2016-03-24 02:33:04 +01:00
Naios
428908b8db Core/Scripts: Link the script project always statically 2016-03-24 01:31:52 +01:00
Naios
bf33159a70 Core/Game: Converted the game library to a shared library. 
* There is still the possibility to static link against game.
 2016-03-24 01:31:51 +01:00
Naios
25b0e743b1 Core/Shared: Converted the shared library to a shared library ,-). 
* There is still the possibility to static link against shared.
 2016-03-24 01:29:00 +01:00
Naios
6cfea2d8f7 Core/Database: Converted the database library to a shared library. 
* There is still the possibility to static link against database.
 2016-03-24 01:28:59 +01:00
Shauren
3d32fd6ce0 Dep: Add rapidjson 2016-03-23 22:09:55 +01:00
Kittnz
18e6b2574f Core/Weather: Fix small weather system bug 
https://github.com/cmangos/mangos-wotlk/commit/5ef2f17
(cherry picked from commit 2df2f56f8c)
 2016-03-23 19:16:52 +00:00
DDuarte
0d643fdff2 Build fix 2016-03-23 00:34:47 +00:00
pete318
28f51306d4 Improved Auction house deposit handling. 
Including the weird quirks.

Changes:
* Deposit caculated according to same rule as client. (detailed below). Should always match client deposit now
* Deposit for multiple auctions now only collected once. Deferred calculation of deposit until all auctions listed.

Deposit calculation is as follows:

Base deposit calculation = MSV x 15/75% (depending on AH). However this is not rounded. Case to int is used (so always round down)
The remainder is held in a float.
The base is then multiplied by number of items, and the time multiplier (x2 for 24 hour, x4 for 48 hour)
The nearest (no of items or lower) no of items when multiplied by the remainder that creates a whole number is then multiplied by the time multiplier (x1/x2/x4) and then added to deposit.

Example:

Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 1 = 36c. Remainder = 0.75 (n) Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 2 = 72c. Remainder = 1.50 (n)  Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 3 = 108c. Remainder = 2.25 (n) Min = 1s. Deposit 1s08c
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 4 = 144c. Remainder = 3.00 (n) Min = 1s. Deposit 1s50c (144c + (3c * 2))

Horrible kludge, to re-create a very weird deposit method.

Closes #15674 (PR)
Closes #15643 (Issue)

(cherry picked from commit 0ac442f19f)

# Conflicts:
#	src/server/game/AuctionHouse/AuctionHouseMgr.h
 2016-03-23 00:28:03 +00:00
DDuarte
9660848385 Scripts: Add override to CheckInRoom() definitions 
Fixes -Winconsistent-missing-override

(cherry picked from commit ac727ab208)
 2016-03-22 23:42:16 +01:00
DDuarte
cb7238e983 Core/Instances: Fix build in older VS versions 
Relax const uses in BossBoundaryEntry so the compiler can generate proper
copy assignment operator (error C2582: 'operator =' function is unavailable in 'BossBoundaryEntry')

Also renamed its members to match our coding standards
(public members should be UpperCamelCase)

(cherry picked from commit 954323d9cb)
 2016-03-22 23:41:10 +01:00
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