araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 22:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,651 Commits 17 Branches 140 Tags
e4b14b943d3a2aa5d7b41107adc8c5236b86d1af
Commit Graph

37 Commits

Author SHA1 Message Date
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
jackpoz d5d2805771 Core/MMAPs: Replace an assert with error log 
Replace an assert in PathGenerator::BuildPolyPath() about invalid poly reference with an error log.
Fixes #11493 .
 2014-02-27 21:03:57 +01:00
jackpoz 272009ebee Core/MMAPs: Add support for raycast 
Add an optional parameter "straightLine" to PathGenerator::CalculatePath() which will use raycast instead of path finding and will return only complete path from start to end position.
Implement this new type of path in SPELL_EFFECT_CHARGE , fixing strange behaviors when using Charge with mmaps enabled.
 2014-02-24 21:01:50 +01:00
jackpoz f7bc86a17c Core/MMAPs: Update recast 
Update recast from https://github.com/memononen/recastnavigation/commit/1be9de72d87dcfdecf6bea30f5461745f7d7afe6 to https://github.com/memononen/recastnavigation/commit/740a7ba51600a3c87ce5667ae276a38284a1ce75 .
This differs from https://github.com/TrinityCore/TrinityCore/commit/aa645683b8b25bfb35cb977678daf5c56c1531e6 because it includes a fix https://github.com/memononen/recastnavigation/commit/77ebf643531c90ea712b496e23c48f0b0671f43d which correctly extract tile connections when using rcMergePolyMeshes(), used by mmaps_generator.
MMAPs version is now set to 5.

Re-extract MMAPs using mmaps_generator , any old extracted MMAPs will not work.
 2014-02-23 12:39:16 +01:00
jackpoz 006d72a828 Core/MMAPS: Fix invisible wall issue in MMAPS. 
Fix invisible wall issues in MMAPS caused by tile connections not being extracted correctly.
This reverts aa645683b8 and restores an old version of recastnavigation, most likely https://github.com/memononen/recastnavigation/commit/1be9de72d87dcfdecf6bea30f5461745f7d7afe6 .

Re-extracting MMAPS is required.
 2014-02-13 22:19:56 +01:00
Vincent_Michael ad8c046916 Core/Revert: ... 2014-01-18 01:36:12 +01:00
joschiwald 5b6b26262f Misc: missing changes after merge 2014-01-14 12:38:19 +01:00
Subv 84b20f07e8 Core/MMaps: Clear the points on each CalculatePath call and allow for shortcut paths in case no path is available. 2013-12-30 18:47:34 -05:00
Subv 64ab810595 Tools/MeshExtractor: Corrected a mistake. 2013-12-30 15:31:12 -05:00
Subv b2728cf1a0 Tools/MeshExtractor: Added some debug messages 2013-12-30 15:19:50 -05:00
Vincent_Michael 8658b5338c Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/PathGenerator.cpp
 2013-12-20 17:39:13 +01:00
jackpoz 04cc51a6cf Core/Misc: Fix some static analysis issues 
Fix some static analysis issues, mostly false positive about fields not initialized in the constructor. It's good practice anyway to always initialize them.
 2013-12-01 16:19:30 +01:00
Spp 94e2b9332a Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive) 2013-11-08 10:50:51 +01:00
Sebastian Valle e07d76836d Core/MMaps: Separate the path from the walls to prevent falling off the edges client-side and improve the behavior. 
Thanks to Game2Mesh user in ownedcore.
 2013-10-05 18:11:39 -05:00
Sebastian Valle 6b149d18cd Core/MMaps: Use an enum for the poly flags 2013-10-05 14:28:53 -05:00
Sebastian Valle a27237dedd Core/MMaps: MMaps are now correctly loaded into TC 
P.S: They do behave better in some places, but are still a bit weird in some others, will have to look into that.
P.P.S: I'll have to re-implement all the previous PathGenerator code
 2013-10-04 22:23:17 -05:00
Sebastian Valle d74dcabd85 Core/MMaps: Started this new branch as my playground for mmaps. 
Made some refactoring
Free memory taken by mmaps when a map is destroyed.
 2013-10-03 17:47:38 -05:00
jackpoz 6f9851ec13 Core/PathGenerator: Fix conditional jump on uninitialized value 
Fix conditional jump on uninitialized value in PathGenerator::GetNavTerrain() by checking the result of getLiquidStatus() before accessing the LiquidData, uninitialized in case there's no water at all.

Valgrind log:
 Conditional jump or move depends on uninitialised value(s)
  at : PathGenerator::GetNavTerrain(float, float, float) (PathGenerator.cpp:553)
  by : PathGenerator::UpdateFilter() (PathGenerator.cpp:542)
  by : PathGenerator::CreateFilter() (PathGenerator.cpp:530)
  by : PathGenerator::PathGenerator(Unit const*) (PathGenerator.cpp:46)
  by : Spell::Spell(Unit*, SpellInfo const*, TriggerCastFlags, unsigned long, bool) (Spell.cpp:493)
  by : Unit::CastSpell(SpellCastTargets const&, SpellInfo const*, CustomSpellValues const*, TriggerCastFlags, Item*, AuraEffect const*, unsigned long) (Unit.cpp:846)
  by : Unit::CastSpell(Unit*, SpellInfo const*, TriggerCastFlags, Item*, AuraEffect const*, unsigned long) (Unit.cpp:882)
  by : Unit::CastSpell(Unit*, unsigned int, TriggerCastFlags, Item*, AuraEffect const*, unsigned long) (Unit.cpp:870)
  by : Unit::CastSpell(Unit*, unsigned int, bool, Item*, AuraEffect const*, unsigned long) (Unit.cpp:858)
  by : Player::SendInitialPacketsAfterAddToMap() (Player.cpp:22580)
  by : WorldSession::HandleMoveWorldportAckOpcode() (MovementHandler.cpp:121)
  by : WorldSession::HandleMoveWorldportAckOpcode(WorldPacket&) (MovementHandler.cpp:37)
 2013-09-21 10:58:21 +02:00
kaelima aa645683b8 Core/MMAPS: Update recastnavigation! 
* Complete changelog can be found at http://code.google.com/p/recastnavigation/
* Adjusted a few config values

Important:
* New mmaps extraction is required
* Folder size will be increased
 2013-06-17 05:11:56 +02:00
Malcrom 66978cfc3b Core: Some function renaming. 2013-06-11 19:54:27 -02:30
Spp 00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02:00
Spp d1677b2db0 Core/Logging: Performance-related tweaks to logging system 
All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
    Memleak fix
 2013-05-13 15:07:36 +02:00
Spp 243c325ca4 Core: Declare some functions const and remove use of "using" directive in a couple of files 2013-05-13 15:04:05 +02:00
Nefarion 49fd11ab5a First step of comment style refactoring to doxygen-style. 2013-03-08 21:55:37 +01:00
Nay 6fc17c6b1e Core: Fix compile warnings 2013-01-22 19:34:27 +00:00
kaelima 677ee02b8e Core/Movement: MovementGenerator fixes. 
- vmap height search in FleeingMovementGenerator and ConfusedMovementGenerator (until we can search for a nearby position properly) Should solve #7704, needs testing
- Removed some unused code in CalculatePath and TargetedMovementGenerator. Ty faramir118
- Allow players to charge through slime and lava liquids. Closes #7967
 2012-11-07 16:42:22 +01:00
Nay 4c3266c7af Tools&Core: Whitespace cleanup 
No one likes whitespace, right?
 2012-09-30 15:52:10 +01:00
Subv 5c9e917e5e Core/MMaps: Removed an incorrect call to GetHeight 
Tools/MeshExtractor: Fixed a crash caused by calling fclose in a NULL stream
 2012-09-29 16:19:33 -05:00
Subv 8966347a41 Core/MMaps: Added a little workaround to prevent the crash. 
ref issue #7631
 2012-09-09 15:14:02 -05:00
kaelima 2e80503283 Typo 2012-09-07 12:54:54 +02:00
kaelima a2d533752c Core/MMaps: Add several safety checks to confirm a valid path generation. 
- Address some issues in TargetMovementGenerator. Thanks Chevron
 2012-09-07 04:21:11 +02:00
Venugh e7c0d8bef0 Core/MMaps: Applied Trinity Codestyle to PathGenerator. 2012-09-05 23:47:02 +02:00
Subv 593f08609f Core/Mmaps: Fixed a mistake in BuildPolyPath which could cause swimming creatures to bug in the navmesh generation. 2012-09-05 15:32:35 -05:00
kaelima c2f446ded9 Core/MMaps: Minor warning fix 2012-09-05 17:07:47 +02:00
kaelima 69602df833 Core/MMaps: Fix some uninitialized variable complaints in PathGenerator 2012-09-04 23:33:11 +02:00
kaelima d7eeebe0f3 Core/MMaps: Implement pathed charge effect 2012-09-03 20:30:47 +02:00
Subv e0abbfd86c Core/MMaps: Renamed PathFinderMovementGenerator to PathGenerator, since its not a MovementGenerator, and moved out of the MovementGenerators folder 2012-08-25 21:55:03 -05:00