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

10289 Commits

Author SHA1 Message Date
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
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
Shauren
f6b60d461e Core/Quests: Fixed party accept quests 
(cherry picked from commit 48940e292f)
 2016-03-22 22:10:12 +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
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
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
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
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
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
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
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
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
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
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
5c91586797 Core/Common: Move singleton instances into compilation units 
* Fixes issues when building shared libraries
  (prevents gcc and clang from providing several instance)
 2016-03-11 18:22:39 +01:00
Shauren
f123c39659 Core/Networking: Added new AsyncRead method to Socket class allowing to pass a custom completion handler and refactor world socket initialization string handling 2016-03-10 23:33:56 +01:00
Shauren
52bb648541 Merge pull request #15140 from RelevantJesse/6.x 
[Core/Pet] Spellcooldown in UpdateAI
 2016-03-09 13:07:17 +01:00
Lopfest
4ffa2c141d Core/Phase: phase update probably shouldn't be affected by quest_status. only via spells/manual update 2016-03-08 17:36:16 +01:00
moJIto-ice
2db53374cf Core: fixed typo at locale checking on GameTables loading 2016-03-08 11:55:01 +03:00
Shauren
d47f23ef7c Merge pull request #16404 from Lopfest/6.x 
Core/Scripts: SMSG_PLAY_ONE_SHOT_ANIM_KIT can now be used in waypoint_scripts
 2016-03-08 08:25:58 +01:00
Shauren
95d3156f95 Core/PacketIO: Updated and enabled SMSG_SET_FACTION_STANDING 2016-03-07 23:26:54 +01:00
Shauren
7b5d92926e Core/PacketIO: Updated and enabled SMSG_RAID_INSTANCE_MESSAGE 2016-03-06 23:48:28 +01:00
Aokromes
ec62a02f57 Merge pull request #16716 from ariel-/conditionleak 
Core/Conditions: fix a memory leak
 2016-03-05 19:50:57 +01:00
MitchesD
82cc37e130 Core/Opcodes: enabled SMSG_PET_NAME_INVALID 2016-03-03 17:50:59 +01:00
ariel-
3a7f311547 Core/Conditions: fix a memory leak for CONDITION_SOURCE_TYPE_TERRAIN_SWAP 
Reported by Aokromes.
 2016-03-02 23:31:22 -03:00
Shauren
cf2fead644 Core/Spells: Adjusted implicit targeting for SPELL_EFFECT_DESTROY_ITEM 2016-03-02 17:24:07 +01:00
DDuarte
a939a3119f Fix non PCH build after 67b977c86a 2016-03-02 02:03:49 +00:00
DDuarte
43f9fdecff Minor 67b977c86a typo fix 2016-03-02 01:46:37 +00:00
DDuarte
67b977c86a Merge branch 'pets' of https://github.com/myran2/TrinityCore into myran2-pets 
# Conflicts:
#	src/server/game/Handlers/PetHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Server/Packets/PetPackets.cpp
#	src/server/game/Server/Packets/PetPackets.h
#	src/server/game/Server/Protocol/Opcodes.cpp
#	src/server/game/Server/WorldSession.h
 2016-03-02 01:38:39 +00:00
Shauren
397519debf Core/PacketIO: Updated and enabled SMSG_PENDING_RAID_LOCK 2016-03-01 23:44:18 +01:00