araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-23 23:20:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,713 Commits 17 Branches 140 Tags
8a110f2645efdba4e15ddd13745b1b4110a7c8cb
Commit Graph

7603 Commits

Author SHA1 Message Date
Vincent-Michael 8a110f2645 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-04-19 19:57:46 +02:00
Unholychick 574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript 
Closes #11896
Closes #3464
 2014-04-18 20:21:05 +02:00
Vincent-Michael 89cc056a50 Fix 2014-04-18 17:02:04 +02:00
Vincent-Michael 20c9981578 Core/Misc: Added missing field in npc_text table for loading 2014-04-18 16:56:05 +02:00
QAston 57e78dac6b Merge pull request #11853 from Unholychick/patch-2 
Done & taken procs & a few trinket fixes
 2014-04-17 18:18:02 +02:00
joschiwald 0a014e1431 Scripts/UtgardeKeep: fixed some issues on Ingvar the Plunderer 
Closes #10859
 2014-04-17 00:09:43 +02:00
Unholychick 057169c21c Fix done & taken procs 
Corrects the logic for dot/hot procs and fixes spells such as althor's abacus, egg of mortal essence, black magic, spiritual attunement etc etc.
Reverts the remaining part of 8edf6247c0
 2014-04-15 00:03:01 +02:00
jackpoz dc58ec0d6c Scripts/Commands: ".modify speed" targets current Player by default 
Allow ".modify speed" command to target current Player if there is no target or if the selected Unit is a Creature.
This behavior could be extended to other commands that require target Players.
 2014-04-13 14:06:21 +02:00
Shauren e51976e17a Core/Spells: Fixed players being able to mount with all transform auras 
Closes #11852
 2014-04-13 01:06:46 +02:00
Vincent-Michael 5454e10b52 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
 2014-04-11 23:12:12 +02:00
jackpoz 7b9b0edb5d Core/GameObjects: Fix crash with Summoning Ritual GOs 
Fix a crash happening with GAMEOBJECT_TYPE_SUMMONING_RITUAL GameObjects if a Player clicked on the GO, logged out and let another Player click on it.
Issue added in 464c0c1611
Fixes #11856
 2014-04-10 20:41:34 +02:00
Vincent-Michael 4e59d0b922 Core/Chat: Fix build 2014-04-09 22:03:28 +02:00
Vincent-Michael 6131e4d722 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2014-04-09 21:03:08 +02:00
joschiwald 8b8aaa06fc Core/ChatLog: handle chatlog options with extended logging system 2014-04-08 22:52:05 +02:00
joschiwald 92a71b45aa Merge pull request #11840 from Rochet2/AddonMessaging 
Core/Chat: Fix AddonMessaging and logging
 2014-04-08 21:31:01 +02:00
jackpoz a3afd4bb9d Merge pull request #11857 from Unholychick/master 
Core/Spells: Fix SPELL_DAMAGE_CLASS_NONE unable to crit
 2014-04-08 19:34:18 +02:00
Vincent-Michael 5fd0e9783b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-08 17:27:41 +02:00
Unholychick 7a0c2fc4f7 Fix SPELL_DAMAGE_CLASS_NONE unable to crit 
Corrected logic mistake where switch fallthrough was intended (or should have been).
Fixes the following.
// Earth Shield
// Lifebloom Final Bloom
// Divine Hymn
// Item - Bauble of True Blood 10m
// Item - Bauble of True Blood 25m
 2014-04-08 14:32:31 +02:00
Дмитрий 5be05913e6 .cheat god should also affect on falling damage. 2014-04-08 14:40:16 +03:00
jackpoz 8927a04253 Core/Movement: Fix LoS issue of NPCs chasing targets 
Add Line of Sight checks to WorldObject::GetNearPoint(), fixing to TargetedMovementGenerator not reaching a point with valid LoS to the target and MotionMaster::MoveKnockbackFrom() knocking creatures inside walls.
Remove unused code.
 2014-04-07 22:16:31 +02:00
Unholychick 7b55dcf0f8 Fix SPELL_AURA_MOD_AOE_AVOIDANCE 
There is not a single spell using this aura, but now it works :)
 2014-04-07 09:50:05 +02:00
Rochet2 d222a0864d Core/Chat: Fix AddonMessaging and logging 2014-04-06 15:19:15 +03:00
Vincent-Michael 19751f36f6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-06 01:25:59 +02:00
Vincent-Michael 4043680a5e Fix merge fail 2014-04-05 21:44:38 +02:00
Unholychick 28ba3d04b3 Partly revert 8edf6247c0 
This wasnt the correct way to fix trinkets and talents that should proc on periodic heals, as it also made talents that procs off spells with casttime proc...
Mentioned are affected, but there is a potential fix in:
https://github.com/TrinityCore/TrinityCore/issues/1896

NOTE to self: learn to use the proc_flag table
 2014-04-05 21:06:14 +02:00
Vincent-Michael e4b14b943d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_character.cpp
	src/server/scripts/Commands/cs_lookup.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-04-05 20:43:05 +02:00
joschiwald 29610b250d Core/Spells: fixed Throw Shield Visual and Clone Weapon 2014-04-05 00:37:07 +02:00
jackpoz c4f4a023ea Core/Chat: Fix valid chat links being handled as invalid 
Fix a case where valid chat links would have been handled as invalid.
This happened if these conditions were true:
- the link was a profession and the link name started with the same name of the profession, like spell id 61120 in esES locale "Inscripción de la tormenta de maestro" with profession name "Inscripción"
- the profession name was the same for more than 1 locale available, like esES and esMX, or enUS and enGB

Restore memmove() instead of memcpy() wrongly replaced in 791130f6fa , it's unsafe to use memcpy() with overlapping memory regions.
 2014-04-04 22:16:14 +02:00
MitchesD 718b0e6bdd Core/SmartScripts: SMART_ACTION_EQUIP prevent to false errors 2014-04-03 19:47:27 +02:00
jackpoz 0930482fa4 Core/Misc: Fix uninitialized values 
Fix Position members not being always initialized.
Valgrind log:
 at : Position::NormalizeOrientation(float) (Object.h:388)
 by : Position::SetOrientation(float) (Object.h:315)
 by : Position::Relocate(Position const&) (Object.h:310)
 by : spell_ulduar_stone_grip::spell_ulduar_stone_grip_AuraScript::OnRemoveVehicle(AuraEffect const*, AuraEffectHandleModes) (boss_kologarn.cpp:592)
 2014-04-02 20:42:46 +02:00
Unholychick 8edf6247c0 Fix trinkets/talents procs on hots taken/done 2014-04-01 10:09:26 +02:00
Unholychick 8f607ed8a3 Revert f79a8813a0 2014-04-01 10:06:37 +02:00
jackpoz f47962f670 Core/Misc: Fix some static analysis issues 
Add some asserts and additional NULL checks as sanity checks.
 2014-03-31 20:59:33 +02:00
Vincent-Michael bacfbdc4ee Core/Sai: Added new db errors :P (hihi) 2014-03-31 17:32:39 +02:00
Gacko a01fd35dc9 Core/CreatureText: Unify log messages and add GUID 2014-03-30 22:17:03 +02:00
Shauren b949d0b982 Core/Misc: Defined a few fields in Map.dbc and rewritten InstanceMap::GetMaxPlayers to match what the client does to determine max players 2014-03-30 15:42:05 +02:00
Gacko 7630b3c627 SmartAI: Use same method for removing auras in EnterEvadeMode as in CreatureAI 
Also fixes warnings about duplicate auras. Self-casted auras were not removed on entering evade mode in SAI as they are in CreatureAI.
 2014-03-30 15:05:04 +02:00
jackpoz 0056ec04c0 Core/Misc: Fix warning with GCC 2014-03-30 13:30:00 +02:00
jackpoz dfca19444a Core/Misc: Fix warning 2014-03-29 21:51:45 +01:00
jackpoz 4cffd2e707 Core/Commands: Handle "" as empty string argument 
Fixes #11548
 2014-03-29 21:07:46 +01:00
Shauren 973888ea2c Core/Maps: Fixed incorrect difficulty markers shown on the interface inside Icecrown Citadel (always displaying normal mode) 2014-03-29 13:31:06 +01:00
Shauren 3fd6dd6175 Core/Loot 
* Master Looter cannot freely loot items under threshold
* Update round robin looter only if loot is not empty
* Fixed loot bag icon appearing in raid frames when loot method was not Master Looter
* Fixed changing loot method reseting current round robin looter
 2014-03-29 13:29:22 +01:00
Shauren dee867547d Merge pull request #11719 from Dehravor/master-loot 
Core/Loot: Fix master loot
 2014-03-29 13:24:48 +01:00
jackpoz f7659e5c1a Core/Battlegrounds: Fix log errors about creatures not found 
Move "Battleground::GetBGCreature: creature not found for BG" error log to INFO level when the caller expects no creatures to be found, like on Battleground startup.
Closes #3538
 2014-03-28 22:30:33 +01:00
jackpoz 8c44259fae Core/Misc: Fix some static analysis issues 
Fix uninitialized values, most of which are false positives, always initialized before being accessed.
Add some asserts and additional NULL checks as sanity checks. Use SpellMgr::EnsureSpellInfo() if the spell id is valid and always supposed to return a valid not-NULL SpellInfo* .
 2014-03-27 21:43:59 +01:00
Discover- 17674182c4 Core/SAI: Allow only creature sources to use the event types SMART_EVENT_DISTANCE_CREATURE and SMART_EVENT_DISTANCE_GAMEOBJECT for now. 2014-03-26 13:50:36 +01:00
Discover- 76641bc7dc Core/SAI: Only allow SMART_EVENT_TARGET_BUFFED to be used from creature sources. 2014-03-26 13:44:36 +01:00
deathicon 78e9a3eb65 Core/SAI: Implement two new event types that are triggered when a certain creature/gameobject entry or guid gets within a given distance of the source. 2014-03-26 10:23:34 +01:00
jackpoz 5570e32d0e Core/Misc: Fix assertion triggered 
Change an assertion added in 6dcd8c8545 with a NULL check, properly handling the case of a NULL parameter.
Fixes #11771
 2014-03-24 20:13:55 +01:00
Shauren c3d2236d14 Core/Misc: Removed unused defines, added missing include and removed a few warnings 2014-03-23 22:14:25 +01:00