Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,915 Commits 4 Branches 146 Tags
d9849fb87b41828af07f8abce85074976dbc2d91
Commit Graph

251 Commits

Author SHA1 Message Date
Shauren
d9849fb87b Core/DataStores: Implemented checking PlayerCondition for future use 2016-01-03 00:40:18 +01:00
Vincent-Michael
478cc756eb Update copyright note for 2016 
Happy new year (Again new year with idiots ...)
 2016-01-01 00:34:25 +01:00
MitchesD
cdb5bd3eb7 Core/Conditions: extended CONDITION_NEAR_CREATURE, condition value 3 is now used to check for dead creature entries (0 - alive, 1 - dead) 
* I used 0 for alive to avoid touching all conditions with this type
 2015-12-03 21:37:33 +01:00
Vincent-Michael
d80f38ed4f Core/Condition: Remove unused code 2015-11-15 00:40:29 +01:00
Vincent-Michael
39a5844c6e Core: Fix warning 
(cherry picked from commit d0c28c66eb)
 2015-11-14 04:25:11 +01:00
Vincent-Michael
700508e484 Core/Condition: Fix issue reported by static analysis 
Coverity defect ID: 1339314

(cherry picked from commit d188960216)
 2015-11-14 04:24:51 +01:00
Naios
b7b49fe35f Core/Globals: Use std::string rather than char* to pass script names around. 2015-11-04 20:52:13 +01:00
Shauren
d8391f23b1 Build fix after cherry-picks 2015-10-31 00:05:09 +01:00
Shauren
db0c48c17f Core/Conditions: Optimizations part 3 changed ConditionStore to a simple array 2015-10-25 13:35:45 +01:00
Shauren
b09e63e9de Core/Conditions: Optimizations part 3 removed copying condition containers all over the place 2015-10-25 13:20:28 +01:00
Shauren
2cce998e90 Core/Conditions: Add const to methods not modifying ConditionMgr 2015-10-25 12:22:53 +01:00
Shauren
e5c1e7d71c Core/Conditions: Optimizations part 2 removed unneeded code 2015-10-25 12:22:04 +01:00
Shauren
9fa938f3e0 Core/Conditions: Optimizations part 1 - use containers more suited for their role 2015-10-25 12:00:05 +01:00
Shauren
5e0cee85dd Core/Conditions: Type renaming 2015-10-25 10:59:58 +01:00
Shauren
52d5de1a7f Core/Conditions: Phase condtion changes 
* SourceGroup defines which phase should the condition affect
* SourceEntry limits the area of the phase (alternatively 0 means all areas)
 2015-10-25 00:22:21 +02:00
joschiwald
cf1e80e3d0 Core/Misc: removed some useless map checks 2015-10-04 14:53:05 +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
Kittnz
21e0880fba Core/Condition: Add In Water Condition 
Updates #7019

(cherry picked from commit 5f8db04761)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h

Closes #15285

CONDITION_TERRAIN_SWAP (40) has been changed to 41 to keep compatibility with the 3.3.5 branch
 2015-08-15 18:34:48 +01:00
Vincent-Michael
2e586bc520 Core: Header cleanup in game/*/*.cpp 2015-07-25 20:18:42 +02:00
DDuarte
2ce76a25c3 Fix build after recent cherry picks 2015-06-26 03:57:57 +01:00
ariel-
7ee455df59 Spell logging corrections 
(cherry picked from commit fe83ecb2cf)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
 2015-06-26 03:27:29 +01:00
Shauren
ca83e14f8b Core/Entities: Reworked guid scopes 
* Added ObjectGuid traits to easily access whether guid type can be generated globally (ObjectMgr) or not
* This adds separate (per map) guid sequences depending on object type
* Ported map object container from cmangos/mangos-wotlk@a2d396eb0b
* 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
 2015-04-28 21:19:46 +02:00
joschiwald
355928305a Core/Conditions: adjust logging code after recent phases changes 2015-03-30 16:08:48 +02:00
Rat
eebc468e62 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
 2015-03-24 20:01:02 +01:00
Duarte Duarte
ec640e3840 Merge pull request #14370 from Kittnz/realm_achievement 
Core/Condition: Realm Achievement condition
(cherry picked from commit 769acfbd02)
 2015-03-18 00:36:17 +00:00
Rat
8f3a80c1cf Core/Phases: Ported new phasing system from 4.3.4 branch and fixed some map swap logic 2015-03-16 07:28:49 +01:00
jackpoz
e6f26cfb1f Core/Misc: Fix static analysis issues 
Fix some static analysis issues reported by Coverity.
Rename SpellMgr::EnsureSpellInfo() to SpellMgr::AssertSpellInfo() to be consistent with other similar methods.
 2015-02-08 19:40:03 +01:00
jackpoz
5dfd07fa4f Core/Misc: Fix static analysis issues 
Fix some static analysis issues reported by Coverity
 2015-01-18 18:30:34 +01:00
Shauren
faa583c784 Core/Maps: Updated map difficulties 2015-01-10 01:35:47 +01:00
Vincent-Michael
ab90f74486 Update copyright note for 2015 
Happy new year
 2015-01-01 00:28:09 +01:00
Rat
eda9094226 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into Spells 2014-11-29 14:52:53 +01:00
Rat
926a37a305 Core/Spells: more code updates... 2014-11-22 17:18:16 +01:00
joschiwald
eeef284a53 Resolve merge conflict 2014-11-21 01:36:50 +01:00
joschiwald
fe2649f6e5 Core/Logging: improved conditions error log messages 
(cherry picked from commit d9c6b8fd89)
 2014-11-21 01:14:17 +01:00
Intel
b5236a6cdc Core/DataStores: Updated AreaTable.dbc 
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2014-11-15 04:27:35 +00:00
Shauren
9e1930959d Core/Entities: Changed object lowguid to uint64 2014-10-26 02:57:28 +02:00
Shauren
08c56eb110 Core/Entities: First step to 128 bit guids 
* Database fields storing full guid have been converted to BINARY(16)
 2014-10-23 17:01:26 +02: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
Shauren
56f46e3ce5 Scripts 
* Introduced GetGuidData/SetGuidData to store guids in instance scripts (GetData64/SetData64 are still there)
* CONDITION_INSTANCE_INFO: Changed existing DATA64 condition to GUID_DATA to preserve current use of this instance info type (most/all assume the data is a guid) and moved DATA64 to a different value - no db changes needed
* Fixed compile in boss scripts starting with letter A
 2014-09-14 23:23:23 +02:00
Vincent-Michael
4a58341e6d Core: Fix warnings 2014-08-24 18:08:29 +02:00
Vincent-Michael
560048cf33 Core: meh, fix build and warnings 2014-08-24 02:22:14 +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
joschiwald
2a36d2bf5b Core/Conditions: allow CONDITION_OBJECT_ENTRY to check for object guid 
Ref #12910
 2014-08-24 00:10:09 +02:00
Vincent-Michael
a917b6599f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-07-30 22:26:59 +02:00
Vincent-Michael
04f8a902af Core/Conditions: Added more infos for CONDITION_SPELL error log 2014-07-29 17:41:06 +02: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
Subv
402b9b055c Core/Conditions: Removed deprecated CONDITION_PHASEMASK and implemented CONDITION_PHASEID 2014-06-07 19:42:08 -05:00
Subv
48ec2df81f Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4 
Put here for peer review.
 2014-06-01 22:27:29 -05: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