psi29a 7a9eb34403 Merge branch 'master' into 'freeunrealestate' ... # Conflicts: # CHANGELOG.md		2021-02-07 21:03:51 +00:00
..
activespells.cpp
activespells.hpp
actor.cpp
actor.hpp
actors.cpp
actors.hpp
actorutil.cpp
actorutil.hpp
aiactivate.cpp
aiactivate.hpp
aiavoiddoor.cpp
aiavoiddoor.hpp
aibreathe.cpp
aibreathe.hpp
aicast.cpp
aicast.hpp
aicombat.cpp
aicombat.hpp
aicombataction.cpp
aicombataction.hpp
aiescort.cpp
aiescort.hpp
aiface.cpp
aiface.hpp
aifollow.cpp
aifollow.hpp
aipackage.cpp
aipackage.hpp
aipackagetypeid.hpp
aipursue.cpp
aipursue.hpp
aisequence.cpp
aisequence.hpp
aistate.hpp
aitravel.cpp
aitravel.hpp
aiwander.cpp
aiwander.hpp
alchemy.cpp
alchemy.hpp
autocalcspell.cpp
autocalcspell.hpp
character.cpp
character.hpp
combat.cpp
combat.hpp
creaturestats.cpp
creaturestats.hpp
difficultyscaling.cpp
difficultyscaling.hpp
disease.hpp
drawstate.hpp
enchanting.cpp
enchanting.hpp
levelledlist.hpp
linkedeffects.cpp
linkedeffects.hpp
magiceffects.cpp
magiceffects.hpp
mechanicsmanagerimp.cpp
mechanicsmanagerimp.hpp
movement.hpp
npcstats.cpp
npcstats.hpp
objects.cpp
objects.hpp
obstacle.cpp
obstacle.hpp
pathfinding.cpp
pathfinding.hpp
pathgrid.cpp
pathgrid.hpp
pickpocket.cpp
pickpocket.hpp
recharge.cpp
recharge.hpp
repair.cpp
repair.hpp
security.cpp
security.hpp
spellabsorption.cpp
spellabsorption.hpp
spellcasting.cpp
spellcasting.hpp
spelllist.cpp
spelllist.hpp
spellpriority.cpp
spellpriority.hpp
spellresistance.cpp
spellresistance.hpp
spells.cpp
spells.hpp
spellutil.cpp
spellutil.hpp
stat.cpp
stat.hpp
steering.cpp
steering.hpp
summoning.cpp
summoning.hpp
tickableeffects.cpp
tickableeffects.hpp
trading.cpp
trading.hpp
typedaipackage.hpp
weaponpriority.cpp
weaponpriority.hpp
weapontype.cpp
weapontype.hpp