Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
25,456 Commits 2 Branches 1 Tag
79eb80dcba9f67c01e62d92d7a95494eec2525a3
Commit Graph
1464 Commits
Author SHA1 Message Date
Carbenium 79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Aokromes 7680c90abd Update (C) date 2015-07-19 13:37:44 +02:00
Rat e6cc39258d Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into phases 
Conflicts:
	sql/updates/world/2014_10_30_00_world.sql
 2014-12-30 10:22:55 +01:00
Nayd 24c173f387 Core: Use the correct function to convert strings to unsigned longs and unsigned long longs 
Fixes wrong data being inserted into the database (i.e explored zones).
More info in #13493

Fixes #13493

Thanks to @jackpoz for finding the code issue and @Vavehl for an expectional bug report.

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
 2014-11-26 02:21:50 +00:00
Rat 1f4d52b2ff Core/Phases: 
- Added terrain swap info to .gps command (todo: move text to db)
- RebuildTerrainSwaps when adding a Unit to world
 2014-11-01 20:36:24 +01:00
Rat 50228fc9da Core/Phases: 
- Implemented CONDITION_SOURCE_TYPE_PHASE (26)
- Implemented phase_area DB table to link phases to specific areas using conditions
- updated logic to correctly handle phases gained from auras and areas (they should not remove each other's phases)
 2014-11-01 19:36:05 +01:00
Shauren 5781119c4b Core/Entities: Fixed data sent in movement packets - time3 in transport block is actually the id of a vehicle we are passenger on 2014-11-01 00:24:10 +01:00
Rat 5993b946c9 Core/Phases: some cleanup 
- implemented CopyPhaseFrom(obj)
 2014-10-30 13:35:12 +01:00
Discover- dc9ff5260b Core/Phases: Get rid of IsInSamePhase 2014-10-28 17:40:57 +01:00
Subv 44c14799f3 Core/Phases: Removed some of the usages of phasemask in the Pet code. 2014-10-28 11:35:40 -05:00
DDuarte 5bf55eacfd Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h
 2014-10-19 00:18:06 +01:00
mik1893 ef4043436b Core/Spells: Grounding Totem: - correctly magnet spells and dies - let missile spells fly on it and destroys all spells during the travel time of first one 
Thx @amsjunior1

Closes #13147
Fixes #5611
 2014-10-18 21:13:37 +01:00
trickerer 47359a1ae2 Core/Spells: Trigger extra attacks on proper target 
Ref #6892

Closes #11001
 2014-10-18 20:51:00 +01:00
Vincent-Michael 15520e38d0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/game/Entities/Player/Player.h
 2014-09-22 06:41:14 +02:00
Morgoporc ec59c3ab03 Core/Players/DK: Implement Rune Grace Period mechanic 
Closes #11736
Fixes #6122
 2014-09-22 01:05:13 +01:00
Shauren 8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.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_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-09-20 11:05:30 +02:00
DDuarte cefcde9ba9 Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code) 2014-09-19 03:30:02 +01:00
Unholychick 6477e96cca Core/Spells: Fix some -Wconversion warnings 
Attempt to fix #13152 by properly casting between data types during damage calculations.
 2014-09-16 23:56:05 +02:00
Shauren 7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
 2014-09-16 21:50:01 +02:00
Vincent-Michael 7cbaa028cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-16 21:09:19 +02:00
Shauren 878073d516 Core/Logging: Fixed incorrect usage of guid in logs 2014-09-16 20:47:08 +02:00
jackpoz 9337e257fc Merge branch 'mik1893/fear-vs-stun' 
Merge PR #13095 into master
 2014-09-14 21:03:17 +02:00
Shauren a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
Vincent-Michael ca3961f987 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
 2014-09-13 22:38:25 +02:00
joschiwald 59baaeec48 Core/Chat: cleanup MonsterText methods 2014-09-13 20:41:31 +02:00
ccrs 05aa0d51b1 Core/Units: Take into account HoverHeight in IsWithinMeleeRange 
Fixes #12059
Closes #13104
 2014-09-13 14:06:37 +01:00
Shauren ce67a097bf Core/Entities: Use new PackedGuid class 2014-09-13 01:12:16 +02:00
Shauren 7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp
 2014-09-12 20:26:46 +02:00
mik1893 6153aa7b74 Core/Unit: Fix some movement issues when multiple controls are applied 2014-09-11 10:27:33 +02:00
mik1893 fef376c73c Core/Unit: Do not give client control back to player after fear 
if player is under player charm (UNIT_STATE_POSSESSED)
 2014-09-09 23:27:33 +02:00
Shauren 02e9405e8e Core/Units: Implemented animkit support 2014-08-30 21:09:46 +02:00
Vincent-Michael 741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
 2014-08-26 19:21:22 +02:00
jackpoz 10b7480e70 Merge branch 'trickerer/mulreflect' into master 
Close pull request #11288
 2014-08-25 19:59:19 +02:00
Vincent-Michael 4bdedcb878 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2014-08-24 22:42:47 +02:00
Vincent-Michael 72b9b50bc7 Core/Unit: Fix some phasing change problems with vehicle 2014-08-24 22:09:10 +02:00
Vincent-Michael 547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.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/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz 7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Shauren d0176f985d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2014-08-15 20:13:34 +02:00
joschiwald ccfa82e7d5 Core/Creature: update creature_template and some other small things 
http://www.trinitycore.org/f/topic/9572-creature-damage/
 2014-08-14 16:09:14 +02:00
Shocker 07158af425 Core/Spells: Implement SPELL_ATTR7_IGNORE_DURATION_MODS attribute 2014-08-13 03:53:56 +03:00
Shauren 4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
jackpoz f25a87cda0 Core/Misc: Remove unused variable 2014-08-07 19:23:01 +02:00
Shauren 45e9ef3d93 Core/Loot: Fixed pickpocket refill timer and use send proper loot error packets to master looter 2014-07-31 21:41:41 +02:00
Shauren 2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
 2014-07-27 20:59:22 +02:00
Shauren 6f272ea5b7 Core/Network: Optimized packet sending by removing unneccessary memory copying 2014-07-27 17:46:46 +02:00
DDuarte cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2014-07-24 17:10:21 +01:00
Trisjdc e2d6b9bf8c Core/Units: Properly remove auras that don't pass IsHighestExclusiveAura 2014-07-24 04:06:49 +01:00
Trisjdc 3f9f2e3ee5 Core/Units: IsNonMeleeSpellCast will no longer return false if there's an instant cast spell still arriving at the target with the caster doing a channel 2014-07-24 03:47:04 +01:00
Shauren 909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.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/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-07-19 03:51:11 +02:00
Shauren 7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00