Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,268 Commits 4 Branches 146 Tags
b8a846d33ed0c5fe15f06f0454fbcd50f48c9f38
Commit Graph

18063 Commits

Author SHA1 Message Date
Shauren
b8a846d33e Merge pull request #15504 from Treeston/3.3.5-bosscombatpulse 
Core/Creature: Add default-disabled periodic zone combat pulse (and have base AI enable it for bosses)
 2015-10-10 11:42:28 +02:00
Shauren
15f2706aca Merge pull request #15501 from Treeston/3.3.5-proximitycombat 
Creature/SmartAI: Fix creature aggression behavior
 2015-10-10 11:41:39 +02:00
pete318
cdb16c5181 Rooted vehicle movement (#13342 for example) 
Corrects issue where certain combinations of actions would cause vehicles (usually cannons/artillary) that should be rooted, to be fully movable
 2015-10-06 22:05:11 +02:00
Duarte Duarte
22536641b2 Merge pull request #15654 from ShinDarth/resolvedBy 
Core/Ticket keep always trace of GM who resolves the ticket
 2015-10-06 06:35:45 -07:00
ShinDarth
e66db9e20c Core/Ticket keep always trace of GM who resolves the ticket 2015-10-06 15:31:54 +02:00
joschiwald
3db4c64287 Core/Updater: fixed host parameter is being ignored 
(cherry picked from commit e51b660177)
 2015-10-05 17:15:54 +02:00
Naios
45a60c2d22 CMake: Fix bad generation of "revision_data.h" not including MYSQL_EXECUTABLE. 
* was caused through invoking "FindMySQL" after using ${MYSQL_EXECUTABLE}.
* better re-run CMake if you are affected by the mysql exe wasn't found issue.
 2015-10-05 17:12:00 +02:00
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 2d109b63e2)
 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 8745e08be0)
 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 cd27fd38b9)

# 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 8652f4b4de)
 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 0327927fa6 into compiler errors. 
(cherry picked from commit 7c75160f59)

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 65dbc7082a)

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 ec5700c2a2)
 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 ba6da26e5d)
 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 7eb25f1af6)

Closes #3802
Closes #15598
 2015-09-25 21:26:31 +02:00
Shauren
9207304d32 Core/Commands: Fixed .gobject add command 
(cherry picked from commit b4d044aa13)
 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:
  ca83e14f8b
  ee1c1b97be
  18e4ab6911
  bf37446b3c
  cb854a2b7b

* 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 8ea17647e6.
 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