Commit Graph
18053 Commits
Author SHA1 Message Date
Naios a561edefb9 Core/Updater: Fix mysql in path check/search. 2015-10-05 17:11:59 +02:00
Shauren 0cf04cc166 Core/Updater: Pipe mysql process output into worldserver log
(cherry picked from commit 2d109b63e2f1d03a961dd58947598f73e4e43ba0)
2015-10-05 17:11:57 +02:00
Shauren 5b8f1469ca Merge pull request #15646 from ShinDarth/ticket
Core/Player: implement ResetCoolDownAfterDuel configurable feature
2015-10-05 16:57:02 +02:00
ShinDarth 24b41a5211 Core/Player: implement ResetCoolDownAfterDuel configurable feature 2015-10-05 15:57:53 +02:00
Killyana 7225b7abf1 Scripts/ICC: moved saurfang gossips to db
Closes #14904
2015-10-04 16:59:55 +02:00
joschiwald ad38c27124 Core/Misc: renamed sGossipSelect parameters 2015-10-04 16:16:56 +02:00
CreshandKesh 359df54b79 Core/Scripts: Salanar the Horseman, Into the Realm of Shadows
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected

Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.

Closes #15603
Closes #15657
2015-10-04 15:10:29 +02:00
jackpoz aee4c29670 Merge pull request #15533 from Tomatodev/3.3.5
Core/AuctionHouse: fix config value RATE_AUCTION_DEPOSIT < 1 ignored by deposit formula
2015-10-04 14:20:00 +02:00
Shauren 325336137d Core/Transports: Fixed accessing deleted instance transports
Thanks @jackpoz for valgrind log and @pete318 for reproduction steps

Closes #15633

(cherry picked from commit 8745e08be020471db886e11a3a7512a751141562)
2015-09-30 19:58:09 +02:00
MitchesD d028f33ed9 Merge pull request #15637 from Tonghost/3.3.5
Core/Misc: Fix a typo
2015-09-30 15:20:34 +02:00
MitchesD 51edeb91a2 Merge pull request #15628 from Espionage724/patch-1
Update authserver.conf.dist
2015-09-30 14:55:31 +02:00
Incorrect e99e69d31f Core/Misc: Fix a typo 2015-09-30 07:34:13 +03:00
Shauren 402a3c45ff Core/Maps: Moved corpse management to map level
(cherry picked from commit cd27fd38b93884797c094a82dc7beb0498e2f124)

# Conflicts:
#	src/server/database/Database/Implementation/CharacterDatabase.cpp
#	src/server/database/Database/Implementation/CharacterDatabase.h
#	src/server/game/Entities/Corpse/Corpse.cpp
#	src/server/game/Entities/Creature/GossipDef.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Globals/ObjectAccessor.cpp
#	src/server/game/Globals/ObjectAccessor.h
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Globals/ObjectMgr.h
#	src/server/game/Grids/ObjectGridLoader.cpp
#	src/server/game/Handlers/AuctionHouseHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/ChatHandler.cpp
#	src/server/game/Handlers/QueryHandler.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Server/Packets/CharacterPackets.cpp
#	src/server/game/World/World.cpp
#	src/server/scripts/Commands/cs_reload.cpp
2015-09-29 18:45:01 +02:00
Sean Rhone c0224d7874 Update authserver.conf.dist
- Added new line for consistency
2015-09-28 19:12:29 -04:00
pete318 01ae5c4bf6 Auction house changes:
- Stop storing guid for auctioneer.
 - Store instead house ID
 - No separate ID for various houses. Only Horde, Alliance and Neutral.
 - Removed non-needed faction checks.
 - Use enum for auction house IDs

NOTE: This will expire all current auctions and return item to player (or
award to high bidder) in order to prepare database for the changes.
2015-09-28 22:26:23 +02:00
jackpoz fcc6ef6b18 Core/DBLayer: Build fix in addition to 25c0303976 2015-09-27 17:19:49 +02:00
Shauren 5c3ba60d54 Core/DBLayer: Allocate a single buffer for entire prepared result set instead of separate ones for each field
(cherry picked from commit 8652f4b4de5ed02c89f9db91367125a04ce52dd4)
2015-09-27 17:11:35 +02:00
Shauren 25c0303976 Core/DBLayer: Added compile time validation for prepared statement indexes passed to DatabaseWorkerPool::GetPreparedStatement turning mistakes like the one fixed in 0327927fa61434d432f9749fd9242ae5dce9a5cd into compiler errors.
(cherry picked from commit 7c75160f590812f0c5d70fd9c68441068e2ded48)

Conflicts:
	src/server/database/Database/Implementation/HotfixDatabase.h
	src/server/shared/DataStores/DB2StorageLoader.cpp
	src/server/shared/DataStores/DB2StorageLoader.h
	src/server/shared/DataStores/DB2Store.h
2015-09-27 17:08:50 +02:00
Shauren d2076ef8b0 Core/DBLayer: Optimized prepared statement query results by eliminating unneeded buffer copies
* Improved error logs for using incorrect Field getters to also include table name, field name and field index.

(cherry picked from commit 65dbc7082a60b67b76966259130aedc337af3eca)

Conflicts:
	src/server/database/Database/Field.h
	src/server/game/Globals/ObjectMgr.cpp
2015-09-27 16:28:04 +02:00
Shauren 0d0c2e1ca6 Core/Misc: Fixed macro redefinition warnings when building for running under helgrind
(cherry picked from commit ec5700c2a25e64842a9d3f81b48535b349a9d466)
2015-09-27 13:57:15 +02:00
Rushor 513b756ea8 Merge pull request #15191 from Rushor/action
Core/SAI: Add SMART_ACTION_RISE_UP for Z Axis
(cherry picked from commit ba6da26e5db8cd6c3418d2a401e84d8701ac89f1)
2015-09-27 12:21:04 +02:00
Tomatoes 817a2ce4f7 Server/Game/AuctionHouse
Fixes world config value of less than 1 being ignored by deposit formula.

Had problems with the last commits and pr, sorry

Update AuctionHouseMgr.cpp

Adds another check to config to handle values over 1 and properly adjust the minimum higher. Thanks jackpoz!
2015-09-26 20:31:10 -05:00
jackpoz 3f24853e29 Merge pull request #15473 from Treeston/3.3.5-fixplayerdamagereq
Core/Unit: Player-summoned creature damage counts towards quest credit
2015-09-25 22:51:42 +02:00
Shauren e68ff4186e Core/Commands: Fixed .gobject move and turn
(cherry picked from commit 7eb25f1af6b74d3559b541d45da6cce50e657ba4)

Closes #3802
Closes #15598
2015-09-25 21:26:31 +02:00
Shauren 9207304d32 Core/Commands: Fixed .gobject add command
(cherry picked from commit b4d044aa13b06ae50b4e468d6647bd7a9eb1cc3e)
2015-09-25 19:58:13 +02:00
Duarte Duarte 2c16edbdf3 Merge pull request #15590 from unknown-8H3D/patch-1
Fix TYPO in config file
2015-09-24 10:15:45 -07:00
Aokromes f84655cac7 Core/Creature: Better formations implementation
By Malcrom
2015-09-24 14:46:16 +02:00
Carbenium 3b164c5047 Build: Fix non-pch build after dcb7082277 2015-09-24 00:12:05 +02:00
Pirricli 6fd289dd2e minor typo 2015-09-23 23:11:50 +02:00
pete318 3c188ac10e Combat with distant creatures
Iterate creatures in combat with players during map update, and also visit
their cells if greater than player visibility distance away.
2015-09-23 22:03:27 +02:00
unknown-8H3D 722a22801b Fix typo 2015-09-23 21:32:57 +03:00
Carbenium ff31a1d9ed Merge pull request #15313 from pete318/map_local_guid_335
[3.3.5/Core/Map] map local guids 6.x -> 3.3.5
2015-09-23 20:21:20 +02:00
mthsena a5131d299f Config: Typo/Cosmetic changes 2015-09-23 11:35:50 -03:00
m_pan 595f819632 Config ; Minor Typo
#    Updates.SourcePath > #    Updates.MySqlCLIPath
2015-09-22 19:11:58 -05:00
m_pan 0453320b6b Revise MaxPrimaryTradeSkill comment
see https://github.com/TrinityCore/TrinityCore/issues/15575
2015-09-22 18:58:28 -05:00
pete318 dcb7082277 Map local guids 6.x -> 3.3.35:
Implemented:
  https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
  https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
  https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
  https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
  https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8

* This adds separate (per map) guid sequences depending on object type
* Ported map object container from cmangos/mangos-wotlk@a2d396e
* Added type container visitor for TypeUnorderedMapContainer
* Implemented helper function to erase unique pairs from multimap containers
* Moved object storage of all objects except players and transports to map level
* Added containers linking database spawn id with creature/gameobject in world
* Renamed DBTableGuid to spawnId
* Added a separate spawn id sequence generator for creatures and gameobjects - this will be used in db tables
* Moved building SMSG_UPDATE_OBJECT - updatefields changes broadcast to map update
* Added new function to return but not increment guid
* Adjusted .debug loadcells to show low guid in map before/after load
* Added debug messages for creature spawn/destroy, for map guid debugging
* Store all Gameobjects and Creatures added to OutdoorPvP, so the callback script can be removed when OutdoorPvP instance is destroyed.
2015-09-22 21:33:57 +02:00
Aokromes 75842fb1a5 Core/Creature: Fixes Issue with Formations with 2 waypoints
By Malcrom
2015-09-22 18:29:22 +02:00
Shauren 7af320c419 Partially revert "Core/Build: Added missing abort() calls on error handlers"
This reverts commit 8ea17647e6bced9d4d027c94ecdc63369cb4c6df.
2015-09-22 18:08:49 +02:00
Shauren 811b557b3b Merge pull request #15554 from MrSmite/AHBot_Buyer
Fix AHBot Buyer to stop counting own auctions
2015-09-22 08:56:29 +02:00
MrSmite 5fb32c525e Fix AHBot Buyer to stop counting own auctions 2015-09-21 19:27:07 -04:00
Killyana a513abc02c DB/NPC: Stable Masters
Closes #15505
2015-09-21 22:52:02 +02:00
Aokromes 57fabc78e4 Core/Creature: Fix formations to prevent crossover
By Malcrom
2015-09-21 22:18:34 +02:00
StormBytePP 7b245a0b6b Core: Added ABORT() macro to prevent the usage of ASSERT(false) as a quick hack to crash the core misusing assert 2015-09-21 15:11:06 +02:00
treeston 36d464d563 Scripts/Naxxramas: Fixed an incorrect spellid for Naxx10 Hateful Strike. 2015-09-20 16:36:55 +02:00
Nyeriah 9a43dd35cd Core/ObjectMgr: Fix loading quest's RewardSpells
(spells rewarded on quest completion)
2015-09-16 18:45:03 -03:00
Shauren 1321427901 Core/Unit: Fixed incorrect value sent in highest threat unit update 2015-09-15 16:58:30 +02:00
MitchesD 0eea8d686b Merge pull request #15497 from ShinDarth/335-misc
[3.3.5] Low priority changes after latest backports
2015-09-15 10:45:40 +02:00
Carbenium 20ce8cbbc2 Merge pull request #15514 from ShinDarth/ticket
Scripts/Commands enhance .ticket complete command
2015-09-14 23:38:21 +02:00
ShinDarth b1d773f3d5 Core/Misc: rename some variables after latest backports 2015-09-14 23:35:58 +02:00
ShinDarth bbaa7f0d73 Scripts/Commands enhance .ticket complete command 2015-09-14 23:27:25 +02:00