Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,500 Commits 4 Branches 146 Tags
07c10ded2ebbb9851c277630ce483b051c720f62
Commit Graph

13528 Commits

Author SHA1 Message Date
Nyeriah
07c10ded2e Scripts/TheEye: Update Kael'thas Sunstrider's script 
Closes #4180
Closes #4181
Closes #8479
Updates #1885

(cherry picked from commit fe07614916)

# Conflicts:
#	src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
 2015-10-16 13:13:09 +02:00
sirikfoll
59742469fb Core/Scripts: Friend or Fowl Achievement 
Change AURA_EFFECT_HANDLE_REAL to AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK, the hook needs to be called on every apply/reapply to keep tracking the stack amount.

(cherry picked from commit f877b6af0a)
 2015-10-16 12:50:51 +02:00
MitchesD
68d725e211 Scripts/ZulAman: fix build after cherry pick 2015-10-16 12:49:25 +02:00
treeston
0bf78d5761 Custom logic for putting people in combat instead of relying on CreatureAI or Creature methods. 
(cherry picked from commit 6a8524c068)
 2015-10-16 12:45:53 +02:00
treeston
89357f5425 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.

(cherry picked from commit d57193df44)

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
#	src/server/game/Entities/Creature/Creature.cpp
 2015-10-16 12:44:17 +02:00
treeston
c64b71d01e 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.

(cherry picked from commit f446538cb1)
 2015-10-16 12:37:42 +02:00
joschiwald
2bc4dea4da Core/Misc: renamed sGossipSelect parameters 
(cherry picked from commit ad38c27124)

# Conflicts:
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp
 2015-10-16 11:56:53 +02:00
Tomatoes
3874178da8 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!

(cherry picked from commit 817a2ce4f7)
 2015-10-16 11:49:01 +02:00
Incorrect
7b1249270b Core/Misc: Fix a typo 
(cherry picked from commit e99e69d31f)

# Conflicts:
#	src/server/game/Entities/Player/Player.h
 2015-10-16 11:46:57 +02:00
ShinDarth
e9a4e4cfa4 Core/Misc split Rate.XP.Kill and Rate.XP.BattlegroundKill settings 
(cherry picked from commit 2185165e84)
 2015-10-16 11:32:06 +02:00
Shauren
45994a177c Core/Players: Check if player can enter the instance during login before trying to add him to map 
* Fixes name displaying as "Unknown"
 2015-10-15 23:29:19 +02:00
Shauren
b808910a89 Core/Auras: Fixed auras limited to a single target not being removed in all cases as expected 
* Fixes possible assertion failure in Aura::UnregisterSingleTarget
Closes #15696
Ref #15668
 2015-10-14 08:29:19 +02:00
Shauren
559c58f1c2 Core/Battle.net: Fixed warnings about uninitialized values 2015-10-12 17:14:26 +02:00
Naios
40e1fc0670 Core/Battle.net: Fix "comparison of integers of different signs" warning 2015-10-12 02:28:52 +02:00
Shauren
ee2b43e368 Core/Battle.net: Updated packet enums and added new build data 2015-10-10 20:19:41 +02:00
Sean Rhone
c28ee6a9a9 Update bnetserver.conf.dist 
- New line for consistency
- Same as https://github.com/TrinityCore/TrinityCore/pull/15628 only for 6.x
 2015-10-09 22:19:32 -04:00
Shauren
5743333e46 Core/Bnetserver: Fixed copypaste mistake for packet names 2015-10-07 23:48:50 +02:00
Naios
a2908719c0 Core/Bnetserver: Fix warnings caused through non virtual destructors. 2015-10-06 16:11:54 +02:00
Shauren
63def8aa32 Core/Battle.net: 
* Changed packet structures to mirror client names
* Simplified ToString Building
* Removed deprecated structures

World: Cleaned up duplicate realm info 'realm' and 'realmHandle' variables (realmHandle was removed, that data is fully contained in realm)
 2015-10-06 00:30:47 +02:00
Naios
1bce131bdc 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.

(cherry picked from commit 45a60c2d22)
 2015-10-05 17:18:15 +02:00
Naios
02ab60a133 Core/Updater: Fix mysql in path check/search. 
(cherry picked from commit a561edefb9)
 2015-10-05 17:17:56 +02:00
Shauren
aaaa1c3441 Core/World: Store account id in CharacterInfo to reduce the amount of database queries 2015-10-05 15:06:27 +02:00
joschiwald
fe0c07a6fe Core: fixed warning introduced in last commit 2015-10-05 00:12:38 +02:00
joschiwald
cf1e80e3d0 Core/Misc: removed some useless map checks 2015-10-04 14:53:05 +02:00
Shauren
705e5ea5d9 Core/Battle.net 
* Updated game account flags
* Fixed infinite loop in ReadFourCC if value in packet was 0
* Corrected ClosingReason enum in ConnectionClosing
 2015-10-04 00:26:38 +02:00
Shauren
8ebb105498 Core/Players: Added missed changes to previous commit 2015-10-03 17:59:21 +02:00
Shauren
fd17ea1643 Core/Players: Removed db queries from friend packet builders 2015-10-02 20:00:49 +02:00
Zedron
ff755dbc07 Core/Conditions: Fixed a typo 
Fixed a typo which caused implicit target conditions to only be applied to the first effect
bug was introduced in 926a37a
 2015-10-01 02:05:25 -05:00
Shauren
8745e08be0 Core/Transports: Fixed accessing deleted instance transports 
Thanks @jackpoz for valgrind log and @pete318 for reproduction steps

Closes #15633
 2015-09-30 00:31:21 +02:00
Shauren
3fceabfa11 Core/Players: Fixed automatic learning skills gained from learning spells when leveling 
Closes #15391
 2015-09-29 00:11:26 +02:00
Shauren
9418484691 Warning fix 2015-09-28 18:48:33 +02:00
Shauren
cd27fd38b9 Core/Maps: Moved corpse management to map level 2015-09-28 17:20:27 +02:00
Shauren
3bc3b67a8f Core/Player: Changed ranged weapons to be equipped in main hand slot instead of no longer used ranged slot 
Closes #14675
Closes #15296
 2015-09-27 00:06:08 +02:00
joschiwald
e51b660177 Core/Updater: fixed host parameter is being ignored 2015-09-26 19:18:05 +02:00
Shauren
20423c363a Build fix 2015-09-26 00:50:22 +02:00
Shauren
2d109b63e2 Core/Updater: Pipe mysql process output into worldserver log 2015-09-26 00:24:22 +02:00
Naios
dd51cd575e Core/Server: Fix address of array '...' will always evaluate to 'true' warning. 
* fix a magic number.
* ref adf6d968ed
 2015-09-25 15:57:23 +02:00
Aokromes
8170d3957e Core/Creature: Better formations implementation 
By Malcrom
(cherry picked from commit f84655cac7)
 2015-09-25 00:23:12 +02:00
Aokromes
6667977edf Merge pull request #15587 from Pirricli/patch-1 
minor typo
(cherry picked from commit 2eafbe6bf0)
 2015-09-25 00:22:37 +02:00
Carbenium
512c2ab83c Merge pull request #15538 from pete318/combat_bug 
Combat with distant creatures (Mk II)
(cherry picked from commit a40d855337)
 2015-09-25 00:22:05 +02:00
Duarte Duarte
a53a8fff98 Merge pull request #15582 from mthsena/3.3.5 
Config: Typo/Cosmetic changes
(cherry picked from commit 0720414042)
 2015-09-25 00:21:17 +02:00
Duarte Duarte
c65aa4cbbe Merge pull request #15579 from M-Pan/3.3.5 
Config ; Minor Typo
(cherry picked from commit 7c4dd4059e)
 2015-09-25 00:20:39 +02:00
Duarte Duarte
3b1ae19371 Merge pull request #15577 from M-Pan/3.3.5 
Revise MaxPrimaryTradeSkill comment

Closes #15575
(cherry picked from commit f7e9acb6ed)
 2015-09-25 00:20:12 +02:00
Aokromes
78b1923da2 Core/Creature: Fixes Issue with Formations with 2 waypoints 
By Malcrom
(cherry picked from commit 75842fb1a5)
 2015-09-25 00:19:34 +02:00
Shauren
ef5e3fff04 Merge pull request #15554 from MrSmite/AHBot_Buyer 
Fix AHBot Buyer to stop counting own auctions
(cherry picked from commit 811b557b3b)
 2015-09-25 00:17:57 +02:00
Aokromes
0eace20ac3 Core/Creature: Fix formations to prevent crossover 
By Malcrom
(cherry picked from commit 57fabc78e4)
 2015-09-25 00:16:55 +02:00
Shauren
074b00af37 Core/PacketIO: Updated and enabled SupportTicketSubmitComplaint, SupportTicketSubmitSuggestion 2015-09-25 00:11:54 +02:00
Shauren
5cf28316ff Merge pull request #15503 from Treeston/3.3.5-patchwerk 
Creature/BossAI/Patchwerk: Fix Hateful Strike behavior
(cherry picked from commit ce2aa49715)
 2015-09-25 00:09:34 +02:00
treeston
888c4c07b6 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.

(cherry picked from commit a90ae075c9)
 2015-09-25 00:07:34 +02:00
jackpoz
f2ca107fc8 Scripts/Ulduar: Fix issue reported by static analysis 
Coverity defect ID: 1316690

(cherry picked from commit 4cdab0cdcb)
 2015-09-25 00:06:30 +02:00