Commit Graph
17060 Commits
Author SHA1 Message Date
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
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
treeston 6a8524c068 Custom logic for putting people in combat instead of relying on CreatureAI or Creature methods. 2015-09-25 15:14:53 +02:00
treeston f446538cb1 Clean up SmartAI::MoveInLineOfSight. Remove tons of duplicate logic and forward to CreatureAI::MoveInLineOfSight instead of using its own (incorrect) implementation.
Move the removal of the 'distracted' state from SmartAI to UnitAI.cpp.

Fixes and closes #7197 and #15482.
2015-09-25 14:17:32 +02:00
treeston d57193df44 Core/Creature: Add facilities to the Creature class to allow setting an automated, periodic pulse that puts every player in the zone in combat and on the creature's threat list.
Scripts/BossAI: Set the BossAI parent class to make use of this in its _EnterCombat and _Reset methods. Combat pulses happen every 5 seconds.
2015-09-25 14:09:01 +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 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
Carbenium dc577ab1e6 BNet/Build: Fix build after lastest merge 2015-09-20 22:51:55 +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
Aokromes a6077b31ec Core/Gameobject: Fix a crash when enter Hor 2015-09-15 21:20:17 +02:00
Carbenium 221f1405b6 Merge branch '3.3.5' into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	sql/updates/world/2015_08_29_00_world.sql
	sql/updates/world/2015_08_29_01_world.sql
	sql/updates/world/2015_08_30_00_world.sql
	sql/updates/world/2015_08_31_01_world.sql
	sql/updates/world/2015_09_02_00_world.sql
	sql/updates/world/2015_09_02_01_world.sql
	sql/updates/world/2015_09_02_04_world.sql
	sql/updates/world/2015_09_03_00_world.sql
	sql/updates/world/2015_09_03_01_world.sql
	sql/updates/world/2015_09_03_02_world.sql
	sql/updates/world/2015_09_03_03_world.sql
	sql/updates/world/2015_09_03_04_world.sql
	sql/updates/world/2015_09_03_06_world.sql
	sql/updates/world/2015_09_03_07_world.sql
	sql/updates/world/2015_09_03_08_world.sql
	sql/updates/world/2015_09_03_09_world.sql
	sql/updates/world/2015_09_03_10_world.sql
	sql/updates/world/2015_09_03_11_world.sql
	sql/updates/world/2015_09_04_00_world.sql
	sql/updates/world/2015_09_04_01_world.sql
	sql/updates/world/2015_09_04_02_world.sql
	sql/updates/world/2015_09_04_03_world.sql
	sql/updates/world/2015_09_07_00_world.sql
	sql/updates/world/2015_09_07_01_world.sql
	sql/updates/world/2015_09_07_02_world.sql
	sql/updates/world/2015_09_07_03_world.sql
	sql/updates/world/2015_09_07_04_world.sql
	sql/updates/world/2015_09_07_05_world.sql
	sql/updates/world/2015_09_08_00_world.sql
	src/common/Collision/Management/MMapManager.cpp
	src/common/Cryptography/Authentication/AuthCrypt.cpp
	src/common/Cryptography/Authentication/AuthCrypt.h
	src/common/Cryptography/HMACSHA1.cpp
	src/common/Cryptography/HMACSHA1.h
	src/server/CMakeLists.txt
	src/server/collision/CMakeLists.txt
	src/server/game/CMakeLists.txt
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.cpp
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_cheat.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
2015-09-15 20:42:34 +02: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
Shauren ce2aa49715 Merge pull request #15503 from Treeston/3.3.5-patchwerk
Creature/BossAI/Patchwerk: Fix Hateful Strike behavior
2015-09-14 18:37:20 +02:00
treeston 807deaccef Scripts/Naxxramas:
Fixes to Patchwerk AI:
- Hateful Strike can only target the highest 1 (10m)/ 2 (25m) threat targets that aren't the current target. Out of these targets, Hateful Strike hits the highest current HP target.
- Hateful Strike now properly adds threat to all targets eligible for it, plus the current target if it is in melee range. Actual threat amount is not from sniffs - please update this if you have conclusive retail data.
- Cleaned up some millisecond constants and variable names.
2015-09-14 18:18:44 +02:00
treeston a90ae075c9 Scripts/Naxxramas:
Fixed bugs with Sapphiron encounter:
- Sapphiron will now properly re-engage if the previous attempt ended while he was in flight.
- Sapphiron will now properly be hovering while in the air phase instead of standing idly on the ground.
- Move Frost Resistance achievement check from custom script to spell 60539 (Sapphiron Achievement Check), thanks to @Shauren for the heads up.
2015-09-14 18:08:51 +02:00
Shauren 2138726e61 Removed wip leftovers 2015-09-12 22:55:44 +02:00
Shauren 2923dd5bad Default initialize i_path instead of using NULL 2015-09-12 21:21:03 +02:00
Shauren 2056961aae Core/Players: Changed multi-segment taxi paths to fly nearby flight masters along the way, not directly through them
* Taxi cost on multi-segment paths is now charged per segment when it is started
2015-09-12 20:15:34 +02:00
joschiwald 497aa4425b Core/Scripts: fixed startup errors
Closes #14730
2015-09-12 18:51:11 +02:00
jackpoz 4cdab0cdcb Scripts/Ulduar: Fix issue reported by static analysis
Coverity defect ID: 1316690
2015-09-12 16:44:34 +02:00
jackpoz 4013500d24 Core/Quests: Fix issue reported by static analysis
Coverity defect ID: 1323839
2015-09-12 16:24:09 +02:00
ShinDarth 38cbefd3c4 DB/World schema backport: updated quest_template table 2015-09-10 15:54:56 +02:00
MitchesD 8abbb54ad0 Merge pull request #15459 from ShinDarth/quest_template_backport
DB/World schema backport: updated quest_template table
2015-09-10 13:17:13 +02:00