josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,218 Commits 1 Branch 0 Tags
20c3eebfa70d07b4020f44dafdeb36a331a9d7d7
Commit Graph
3531 Commits
Author SHA1 Message Date
Vincent_Michael ad8c046916 Core/Revert: ... 2014-01-18 01:36:12 +01:00
Vincent_Michael 4027686b5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/ItemHandler.cpp
 2014-01-18 01:01:11 +01:00
Zabustak 101cad1f28 Show Kick, Mute and Ban in world 2014-01-17 12:23:36 +01:00
joschiwald 5b6b26262f Misc: missing changes after merge 2014-01-14 12:38:19 +01:00
Vincent_Michael cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-01-13 20:34:21 +01:00
Vincent_Michael a73e8511f9 Fix non pch build 2014-01-12 02:02:02 +01:00
zengwf 23acf75d3b Core/Movement: Add LOS check for fleeingmovement target point. 
Prevents fleeing or feared units from going to upper floor ignoring walls/ceilings with mmaps on(and usually get stucked).

Current implementation just randomly selects a distance and angle against the frighting unit, when in narrow circumstance such as underground caves, such targeting point would be at another floor.

Closes #11300
Ref #9475 (needs fixed confirmation)
 2014-01-12 00:33:33 +00:00
Duarte Duarte 65c941b88d Merge pull request #11342 from Carbenium/Svala 
Scripting/Utgarde Pinnaccle: Fix visual during Svala's transformation
 2014-01-11 16:20:16 -08:00
Dr-J b83c252851 Scripts/NPCs: Remove core script for rogue trainers which was overriding db conditions 
SAI and conditions for rogue trainers to provide elegant leter to rogues provided that is level 24 or higher, does not have elegant letter and does not have taken, rewarded or complete the quest which elegant letter starts

Closes #11378

Signed-off-by: DDuarte <[email protected]>
 2014-01-12 00:17:21 +00:00
DDuarte b204d71cb4 Core: Fix build due to merge resolution errors 2014-01-11 23:29:27 +00:00
DDuarte 08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.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_nalorakk.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/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
DDuarte 33c2bd5ce1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.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_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.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/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
 2014-01-10 18:32:05 +00:00
DDuarte 352a2682b1 Core&Scripts: Compile fix 2014-01-10 17:23:14 +00:00
joschiwald 7378baee49 Scripts/PoS/Garfrost: cleanup saronit blocks after death 2014-01-10 17:37:03 +01:00
DDuarte 25d1be5a75 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/Battlefield.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Texts/CreatureTextMgr.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-01-10 06:13:26 +00:00
DDuarte 86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
joschiwald 6fff9d08b2 Fix build 2014-01-09 23:31:52 +01:00
joschiwald e80d1f3465 Scripts/BloodFurnace: 
* cleanup InstanceScript
* fix broggok poison cloud

Scripts/Naxxramas/Grobbulus:
* fix poison cloud
* fix mutating injection
 2014-01-09 23:17:02 +01:00
joschiwald a60ba240b7 Core/Entities: add some log messages in CheckCreatureTemplate 
* Happy Error Spam
 2014-01-06 20:30:11 +01:00
Shauren 619edff196 Misc: 
* Tools: Fixed a compile warning
* Commands: Fixed npcflag format in .npc info
 2014-01-06 13:53:29 +01:00
joschiwald 95f14f921b Scripts/HoS: update Maiden of Grief 2014-01-05 16:47:07 +01:00
joschiwald cd76d32907 Core/Entities: correct creature damage, offhand damage should work too 
* todo: some creatures need dmg_multiplier update in creature_template
 2014-01-04 18:22:06 +01:00
Vincent_Michael 20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Subv dffa010f8a Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-12-31 12:57:10 -05:00
jackpoz 64b42c75d2 Scripts/Misc: Code cleanup 
Remove some NULL checks not needed anymore after 3744c14184 .
Fix an invalid Creature to TempSummon cast.
 2013-12-30 23:36:49 +01:00
Subv 5145281435 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-12-30 14:51:49 -05:00
Nawuko 6d21d33aac Core: user defined literals need a space in front 2013-12-30 20:35:37 +01:00
jackpoz 5c64dade0f Scripts/Misc: Fix uninitialized values 
Fix uninitialized values in scripts reported by valgrind.
Fix target and GetOwner() NULL dereferences .
 2013-12-29 23:01:00 +01:00
Subv d234d0f3d0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-12-29 15:13:14 -05:00
jackpoz c40cdc2968 Core/Chat: Fix assert triggered by .npc add 
Fix an assert in Aura::_UnapplyForTarget() caused by ".npc add" changing the guid of the spawned Creature.
 2013-12-29 19:37:20 +01:00
jackpoz e016ef3dbd Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-12-29 16:27:25 +01:00
Malcrom 0e0b00cab6 Scripting/War Master Voone: Fix Cleave spell and minor cleanup. 2013-12-29 11:41:46 -03:30
jackpoz 90c63e4818 Scripts/Misc: Fix uninitialized values 
Fix uninitialized values in scripts reported by valgrind.
 2013-12-29 16:05:31 +01:00
Shauren 079905e29a Core/Transports 
* Fixed transport orientation
* Fixed transport position desynchronization for stoppable transports
* Ignore spawnMask errors for objects spawned on transports
 2013-12-29 14:59:06 +01:00
Malcrom 9af36d887b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2013-12-28 20:52:49 -03:30
Malcrom 4c66a3f79d Scripting/Boss Jandice Barov: Fix wrong spell id. 2013-12-28 20:51:21 -03:30
jackpoz 3744c14184 Scripts/Misc: Ensure Creatures are in instances when required 
Create ScriptedAIs that require a InstanceScript reference only if the InstanceScript exists, so if these Creatures are in an instance. ScriptedAIs that don't require a InstanceScript reference have not been modified.
This fixes many possible NULL dereference crashes happening when spawning a scripted Creature outside of an instance.
Fixed a GetOwner() and a ToPlayer() NULL dereference crashes too.
 2013-12-29 01:19:52 +01:00
MitchesD 3921f20c18 Scripts/ObsidianSanctum: added creature_formations for surrounding creatures and some clean up 2013-12-27 19:56:01 +01:00
jackpoz 9b88a789e6 Scripts/Blood Furnace: Fix crash in Broggok script 
Fix a NULL dereference exception in Broggok npc id 17380 script, happening when spawning it outside of an instance.
Fixes #11344
 2013-12-25 19:17:44 +01:00
Malcrom fe95371d9a Core/Scripting: Replace casted with cast as casted is not a word. 2013-12-25 14:16:55 -03:30
Malcrom fa29ddc529 Db/Misc: Fix more dup aura messages. 2013-12-25 12:39:47 -03:30
Shauren 890b47c861 Build fix 2013-12-25 12:37:00 +01:00
Malcrom b8e626199c Scripting/Multi: Some cleanup. 2013-12-24 17:56:38 -03:30
Malcrom 54dbf870b8 Scripting: Some cleanup. Please keep broken English comments to yourself. 2013-12-24 14:45:45 -03:30
Malcrom dbce8d93f3 Scripting/Hinterlands: Convert to TC style. 2013-12-24 13:40:27 -03:30
Malcrom 9d2d4ba921 Scripting/Hellfire: Moved some gossip to db and fix some magic numbers. 2013-12-24 12:15:41 -03:30
Malcrom eacc165a12 Scripting/Ghostlands: Moved some gossip to db and fixed some magic numbers. 2013-12-24 08:39:35 -03:30
Malcrom 8f4011cf6e Scripting/Zones: Some cleanup. 2013-12-24 00:56:15 -03:30
joschiwald fd6167cf66 Scripts: 
- cleanup obsidian sanctum script
- prevent yelling texts if non player died in some scripts
 2013-12-23 23:55:15 +01:00
Malcrom 6858a234b3 Scripting/Borean Tundra: Fix some magic numbers. 2013-12-23 19:13:29 -03:30