Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,718 Commits 4 Branches 146 Tags
c3243e20760a0200be98e94de5f56336b1c2bc35
Commit Graph

21898 Commits

Author SHA1 Message Date
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
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
Aokromes
f1ff51cdc6 Core/Misc: Fix memleak 2015-09-18 19:58:53 +02:00
Aokromes
bb021f4515 Core/Misc: Fix memleak 2015-09-18 19:25:24 +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
ShinDarth
33892e0f9d DB/World schema backport: updated quest_template table 2015-09-10 13:16:05 +02:00
treeston
946fdbc06b Allow player-created temporary summons (quest "helper" NPCs summoned by item etc.) to contribute to the 50% player damage requirement. 
Fixes quests such as "Valduran the Stormborn" (12984) or "The Air Stands Still" (13125) which previously required the player to out-damage the "helper" NPC to get credit.
 2015-09-09 18:47:50 +02:00
Duarte Duarte
6cdfe9dc09 Merge pull request #15452 from Treeston/3.3.5 
Core/Unit: Allow mounting for certain transformations
 2015-09-09 08:37:03 -07:00
m_pan
1503be010b Config: Minor Typo 
#    Updates.SourcePath   >   #    Updates.MySqlCLIPath
 2015-09-08 13:49:14 -05:00
Aokromes
1709282c2c Core/AHbot: fix seller guids 
closes ##18
 2015-09-08 05:16:08 +02:00
treeston
d42a498063 Allow mounting while under transformations that can be cast while mounted. 
Closes #12042.

Credit to @SeTM for base code used.
 2015-09-07 19:04:44 +02:00
jackpoz
166e66cc06 Core/Spells: Fix crash happening when using items to cast spells 
Fix a crash happening when using items casting spells like Item ID 37198
Fix #14900
 2015-09-05 22:45:15 +02:00
jackpoz
42a71133fa Core/Dungeon Finder: Fix groups queuing broken by 1e71aba2ee 
Fix queuing in LFG with 5-men groups leaving the party in queue forever, caused by group GUID being added to list of party members.
 2015-09-05 21:18:52 +02:00
jackpoz
16e9882aa8 Core/Dungeon Finder: Improve ".lfg queue debug" command 
Log roles of every combinations in ".lfg queue debug" output
 2015-09-05 17:08:37 +02:00
jackpoz
7c91984a64 Core/Chat: Allow to sanitize | characters when sending messages to clients 
Add an optional parameter "escapeCharacters" to ChatHandler::SendSysMessage() to properly escape | character, otherwise it might freeze the client.
 2015-09-05 13:54:44 +02:00
MitchesD
02d014c69d Core/SmartScripts: SMART_ACTION_TALK - added action param 3 to set target as talk target (used for $vars in texts and whisper target) 
* by default (action param 3 is 0), it will try to trigger talk of the target

(cherry picked from commit 7b491046e9)
 2015-09-04 11:02:23 +02:00
chaodhib
6d080d0c44 Core/Spells: Make players immune to the taunt aura. 2015-09-03 19:39:02 +02:00
ShinDarth
b41e0156db DB/World: fix bad field rename introduced in 6b43e72f01 2015-09-03 15:02:21 +02:00
Duarte Duarte
139598a07e Merge pull request #15384 from ShinDarth/quest_backports2 
DB/World schema backport: sort some quest_template fields using 6.x style
 2015-09-02 07:20:20 -07:00
Duarte Duarte
e28ee38664 Merge pull request #15356 from ShinDarth/quest_backports 
DB/World schema backport: quest_details, _request_items and _offer_reward
 2015-09-02 07:20:04 -07:00