Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,233 Commits 4 Branches 146 Tags
bbbf8df8e52693699059669ffaecd512ccd02657
Commit Graph

224 Commits

Author SHA1 Message Date
treeston
bbbf8df8e5 Entities/Gossip: The Big One™ that gets rid of all uses of The Bad™ and The Ugly™, e.g. gossip preprocessor macros, and replaces them with the new-and-shiny gossip functions. 
(cherry picked from commit d55426f5b4)
 2017-02-18 17:50:00 +01:00
treeston
f94dc007ae Fix dynamic build. 
(cherry picked from commit 54f923fdee)
 2017-02-18 17:30:23 +01:00
treeston
a0d48b92d5 Creature/Gossip: offer replacement functions for the existing preprocessor gossip macros 
(cherry picked from commit 175db157f7)

You saw nothing (build fix).
(cherry picked from commit 72a7f4b507)

Build fix. Again. Oops.
(cherry picked from commit 61eb70fd82)

....right, I actually went through a full rebuild now just to make sure it works.
(cherry picked from commit 8531f012a2)

Last one. For real. Please. (Build fix #5).
(cherry picked from commit a32536d490)
 2017-02-18 17:22:53 +01:00
treeston
5c01d14056 Entities/Creature: Add arg2 to DespawnOrUnsummon to allow overriding respawn time. This matches changes that will be merged as part of dynamic spawning, allowing scripts to transition early. 
(cherry picked from commit 4bcc8078d7)
 2017-02-18 17:16:10 +01:00
Aokromes
db668cde46 Core/Logs: Fine tunning some logs 
(cherry picked from commit b51409a5d3)

# Conflicts:
#	src/server/game/Texts/CreatureTextMgr.cpp
 2017-02-11 22:35:00 +01:00
treeston
8d7ab10efa Scripts/SmartAI: Some clean-up work: 
- NULL -> nullptr
- Rename "AssistPlayerInCombat(who)" to "AssistPlayerInCombatAgainst(who)" to reflect what the method actually does
- Code style

No functionality was changed.

(cherry picked from commit 152b3ad5b9)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/AI/SmartScripts/SmartScript.cpp
 2017-02-11 22:34:59 +01:00
treeston
d176be59b8 ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds. 
(cherry picked from commit 4030e4d780)
 2017-02-11 22:03:16 +01:00
Gustavo
accaee579e Core/AI Prevent bosses respawn when BossState is set to DONE (#17616) 
(cherry picked from commit f826ecb4b2)
 2017-02-05 21:09:43 +01:00
treeston
9046483f3c Entities/Creature: Add some more std::chrono overloads 
(cherry picked from commit 0547926f17)
 2017-02-05 00:57:17 +01:00
ForesterDev
5c2705fadc Core: updated creature type flags enum (#17128) 
Core/Misc: Update CreatureTypeFlags enum according to TrinityCoreWiki
(cherry picked from commit fb0881398a)

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
#	src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Miscellaneous/SharedDefines.h
 2017-01-09 02:00:17 +01:00
treeston
86aa3997e4 Allow BossAI::_DespawnAtEvade to work on creatures other than the boss itself (optional argument). 
(cherry picked from commit 6040e30fa3)
 2017-01-08 17:31:42 +01:00
treeston
416afdfec5 Creature/CreatureAI: 
- Default range for DoZoneInCombat: 50.0f -> 250.0f.
- Add optional second arg to SummonList::DoZoneInCombat to specify range.
- Also a bunch of random NULL -> nullptr cleanup.

(cherry picked from commit b7f2c87d37)

Too many damn stars in that damn argument list.
(cherry picked from commit afbda04767)
 2017-01-08 03:01:51 +01:00
treeston
489027703e Entities/Unit: Finally fix no-path evasion. 
- When a creature cannot find a path to its victim, it begins evading all attacks and regenerating health.
- If this persists for 5 seconds, it evades back to spawn position with new EvadeReason value EVADE_REASON_NO_PATH.
- Also some SmartAI cleanup (why oh why does it have so much duplicated code) and getting rid of #defines in favor of type-checked compile-time constants.

(cherry picked from commit 7b1560fccb)
 2017-01-07 21:33:28 +01:00
vincent-michael
86b98686a9 Update copyright note for 2017 
Happy new year
 2017-01-01 16:23:13 +01:00
Shauren
5c2c9a684f Core/DataStores: Updated dbc/db2 to 7.0.1.20810 2016-05-20 23:46:17 +02:00
Naios
a0dacd90cb Core/Game: Remove some unnecessary export macros 
(cherry picked from commit f50c4b71a1)
 2016-05-10 19:24:30 +02:00
Vincent-Michael
179b521dce Core: Remove whitespaces 
(cherry picked from commit 5e74c2223b)
 2016-04-09 17:14:08 +02:00
treeston
b2e4a962d9 Incorrect AI aggression as a consequence of the LineOfSight change, episode three, revenge of the special AIs. Also, hopefully the last. No original trilogy please. 
(cherry picked from commit ab194d5ae3)
 2016-04-08 18:43:03 +02:00
treeston
c9b24515a5 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528) 
(cherry picked from commit c70e3e31a7)
 2016-04-08 18:07:34 +02:00
treeston
53722a81a2 AI/BossAI: Make creature never chase targets that are out of bounds 
- Add missing const attribute on CheckBoundary arg.
- Prevent AI from attacking a target that is out of bounds. This prevents exploids such as killing Gluth/Deathbringer from out of bounds.

(cherry picked from commit 19ed18c881)
 2016-04-05 18:37:20 +02:00
Naios
bf33159a70 Core/Game: Converted the game library to a shared library. 
* There is still the possibility to static link against game.
 2016-03-24 01:31:51 +01:00
treeston
e2f2c70ba4 Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089) 
(cherry picked from commit 5b8b8c6530)
 2016-03-22 22:56:43 +01:00
jackpoz
0c81c1c184 Core/Quest: Fix issues reported by static analysis 
(cherry picked from commit bffaa92633)

# Conflicts:
#	src/server/game/Entities/Pet/Pet.h
#	src/server/game/Texts/CreatureTextMgr.cpp
 2016-01-15 20:29:43 +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
joschiwald
92b08fc74b Scripts/VioletHold: rewrote the whole instance 
thanks @MitchesD for help

(cherry picked from commit df21162fe4)
(cherry picked from commit 3a4f54197c)
(cherry picked from commit f50df72820)
(cherry picked from commit 95bae7143f)
(cherry picked from commit 5406f82044)
 2015-11-01 13:09:30 +01: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
Vincent-Michael
2e586bc520 Core: Header cleanup in game/*/*.cpp 2015-07-25 20:18:42 +02:00
DDuarte
7d9843c380 Core/Misc: Add a few consts to methods 2015-07-22 23:24:56 +01:00
mik1893
fa0e5289a8 Merge pull request #14974 from pete318/stealth_work 
Stealth changes (Player stealthed vs NPCs) - 3.3.5
(cherry picked from commit 90fcfb3f2d)

Conflicts:
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Unit/Unit.cpp
 2015-07-19 01:43:05 +01:00
Shauren
585f978c58 Core: Started work on 6.2.0.20182 2015-07-01 02:22:03 +02:00
Shauren
edbd44a675 Core/Creatures: Extended npcflags to uint64 2015-05-04 12:39:36 +02:00
Shauren
0ba2e0d5ee Core/Spells: Implemented multiple spell power costs 2015-03-08 13:31:57 +01:00
Epicurus4
4ffdf3396d Added a player searcher 
This can be used in scripts to search for Player* objects within a given
range.
 2015-02-10 22:16:07 -05: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
588143b9b6 Core/Spells: Spell system updates (don't even try to compile this) 2014-11-16 14:20:01 +01:00
Shauren
76f1f85d8b Core/Entities: Second part of required database changes for migrating guids to 128 bit - all fields storing lowguid must be extended to uint64 2014-10-23 21:34:03 +02:00
Shauren
bea5cad67d Core/Entities: Fourth part of removing GetGUIDLow() uses 2014-10-22 21:22:04 +02:00
Shauren
9cc7044546 Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64 2014-10-21 19:23:32 +02:00
Kinzcool
bc97908822 Core/Defines: Updated some enums to build 6.0.2.18988 
* Fixed build
 2014-10-06 18:37:38 -04: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
joschiwald
0f1f7ef401 Core/Misc: multiple changes 
* fixed build
* apply tc codestyle to ObjectGuid class
* fixed warning
 2014-09-19 03:16:59 +02:00
Shauren
6c1a33d62d Core/Scripts: Fixed incorrect guid usage in logs 2014-09-16 19:47:10 +02:00
Shauren
48deb443f9 Core/Scripts: Fixed build of misc scripts, only zone_* and instance_* remain 2014-09-15 22:52:09 +02:00
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
Vincent-Michael
5cdea8b30c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-08 22:15:42 +02:00
joschiwald
3930606032 Core/Scripts: made BossAI::CheckInRoom virtual 2014-09-08 05:02:03 +02:00
DDuarte
d7dfef900f Core/Misc: Update enums related to tradeskills in ScriptedGossip.h 2014-09-03 19:22:37 +01: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
DDuarte
a394205eca Core/Server: Add missing overrides 2014-08-09 20:17:40 +01:00