josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,220 Commits 1 Branch 0 Tags
1ecc55272e210258e9ccbe64d5bff8d6dfbd78fa
Commit Graph
968 Commits
Author SHA1 Message Date
Spp 1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
Spp b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
oMadMano 09ab26ac94 Core/Spells: Fixed mage's Permafrost 2012-11-17 14:15:04 -05:00
Tuxity 98ba51f2e2 Revert "Core/Player: Reset emote state when player stop attacking" 
This reverts commit d3b12738a7.
 2012-11-17 00:23:33 +01:00
Spp a0c8193ee7 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
 2012-11-16 08:51:15 +01:00
Spp 16d9d1e56d Core/Achievements: multiple changes 
- Fix crash when updating criteria with no reference player
- Update progress counter to uint64
- Remove hack introduced for achievement 318 (conditions are already checked in additionalConditions)
- Add extra parameter miscValue3 (needed for type "LOOT_TYPE" with additionalConditions "ITEM_SUBCLASS")
- Correct definition for Additional conditions: 11 (HAS_AURA_TYPE), 17 (SOURCE_AREA_OR_ZONE), 18 (TARGET_AREA_OR_ZONE), 41 (TARGET_ZONE)
 2012-11-12 14:25:51 +01:00
Tuxity d3b12738a7 Core/Player: Reset emote state when player stop attacking 2012-11-11 18:21:53 +01:00
Lorenzo J. Gonzalez Cabrera 532077de4f Doze mechanics Fix - By Arrakio 
Info here:
https://github.com/TrinityCore/TrinityCore/issues/8277
 2012-11-09 11:37:31 +01:00
Spp c97fc99e16 Merge branch 'master' into 4.3.4 
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
 2012-10-30 10:30:05 +01:00
Spp d2ba73d97f Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions) 
Core/Misc: tab to spaces and remove trailing whitespaces
 2012-10-29 12:28:12 +01:00
Shocker 02c182a1ce Core/Spells: Remove unneeded hack for Focus Magic proc 2012-10-28 04:19:37 +02:00
Shocker eed7c46f4e Core/Spells: Remove hack for Glyph of Barkskin 2012-10-28 00:38:11 +03:00
Spp 876ad50dcd Core/Misc: Tweaked ThreatContainer internals 
(and many cosmetic changes here and there)
 2012-10-26 14:31:19 +02:00
Spp 013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +02:00
Subv 705873091b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
 2012-10-16 21:55:01 -05:00
Subv 8536b360a0 Core/Spells: Fix a possible crash in Light's Beacon when a player logged in with the aura. 2012-10-16 09:24:53 -05:00
Subv a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
 2012-10-10 10:29:18 -05:00
Subv ef6e7e0914 Merge pull request #8001 from tibbi/reputation_convert 
correct reputation converting at faction change
 2012-10-10 06:43:47 -07:00
Subv 3e5af53bf7 Core/Achievements: ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL doesn't require a killing blow anymore, only a honorable kill. 
Author: @tibbi
Closes #6224
 2012-10-09 22:59:18 -05:00
tibbi 05eaf75501 adding forgotten UpdateCharacterNameDataLevel call 2012-10-08 20:02:11 +01:00
Subv 00373eee90 Merge pull request #8015 from Retriman/masspellsTIII 
Core/Spells:
 2012-10-07 17:52:14 -07:00
Subv 42d606a81b Core/Spells: Fixed a crash caused by Beacon of Light. 
GroupReference sources should always be checked against NULL pointers.
 2012-10-07 19:02:59 -05:00
Retriman 3c2a523980 Core/Spells:Ranged spells cant be parried or dodged. 2012-10-07 14:46:29 -04:00
Nay 44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
 2012-10-07 14:57:18 +01:00
kandera c4c093ac80 Merge pull request #7971 from Retriman/SpellTi 
Core/Spell: Remove LOS in spell tremor, grounding Totem.
 2012-10-05 05:52:39 -07:00
Retriman 5f90eb831a Core/Spell: Remove LOS in spell tremor, grounding Totem. 2012-10-04 23:32:50 -04:00
Spp f570383fba Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
 2012-10-04 13:33:04 +02:00
Kandera 94b2f90a5a Core/Spells: fix typo from 0f85a1d4f3 2012-10-02 11:58:27 -04:00
Kandera 0f85a1d4f3 Core/Spells: Fix seal procs from tiny abom in a jar. Closes #3463 2012-10-02 10:58:11 -04:00
Kandera c85c0c549a Core/Spells: when charges are removed by a proc they should be handled with AURA_REMOVE_BY_DEFAULT. Closes #7910 2012-10-02 10:23:36 -04:00
Spp 7831ecdb18 Core: "Initial support for C++11 compilers" 2012-10-02 15:06:19 +02:00
Spp 380db44583 Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct 2012-10-02 12:17:42 +02:00
Spp f8846cdeaf Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer 2012-10-02 11:54:41 +02:00
Nay 94c8c7ec4e Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-30 15:46:00 +01:00
Nay 8a18449a74 SQL: Rename file merged in PR; Core: cleanup whitespace and tabs 2012-09-30 15:33:56 +01:00
tibbi 3fae05f6f3 correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT 2012-09-27 00:31:00 +01:00
Kandera c5ada4b487 Core/Spells: fix typo from previous commit that caused a crash. 2012-09-26 09:11:30 -04:00
Nay 424ac73766 Core/Spells: Properly (hopefully) merge 335's Beacon of Light + 434 changes (also fixes build) 
Closes #7871
Closes #7872
 2012-09-25 19:58:18 +01:00
Nay 15c05ed771 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-25 09:26:48 +01:00
kandera c0c64da286 Merge pull request #6788 from Vincent-Michael/charmer 
Core/Spells: Fix no combo points after Mind Control
 2012-09-24 07:55:32 -07:00
Kandera dc935ef8b1 Core/Spells: fix beacon of light being on a non player. 2012-09-24 10:37:58 -04:00
kandera a4e3709dd3 Merge pull request #7811 from Faq/SplitDamage2 
Core/Spells: Implementing some hooks for split damage taken, fixes the l...
 2012-09-24 05:24:01 -07:00
Nay 95d713ac6f Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-22 10:56:41 +01:00
MrSmite ce6785d9db Core/Combat: Fix Evade Mechanics 
- Can now kite mobs beyond ThreatRadius (CONF) if continuing to damage them. World bosses still use ThreatRadius to prevent pulling them to cities
- A mob that is beyond the ThreatRadius, it will return home (evade) after 10 seconds of no damage if there are no valid targets within attack distance of it, otherwise it will still attack
- Mobs now properly report "Evade" if attacked while returning home.

(modified - Nayd)

Closes #830
Closes #7748
 2012-09-22 02:11:31 +01:00
Shauren 50d1a1bf5c Core/Auras: Defined more aura types and implemented aura 361 (used by 4 spells) 2012-09-21 13:35:59 +02:00
Faq 0e7ed5ec85 Core/Spells: Implementing some hooks for split damage taken, fixes the limitation of dmg such auras can split, for example at Hand of Sacrifice. Might have unexpected results, but they are called unexpected for a reason.. .Author Tibbi 
closes #6025

Made new one as https://github.com/TrinityCore/TrinityCore/pull/7423/ was closed.
 2012-09-18 23:28:46 +03:00
Spp 8c5f011e79 Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr) 
Note: No real use in 3.3.5 but will be used in 4.3.4
 2012-09-18 14:29:53 +02:00
Spp c4d4beff3b Warning fixes and some minor changes here and there 
- Added GetAchievementPoints to AchievementMgr
 2012-09-18 11:35:18 +02:00
Nay 6568b0624d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_druid.cpp
 2012-09-17 23:49:13 +01:00
kandera 198c0346e2 Merge pull request #7797 from Warpten/kingOfTehWorld 
Core/Spells: Fixed King of the Jungle. (alphabetical order!)
 2012-09-17 09:44:56 -07:00