openmw-tes3coop/apps/openmw/mwmechanics
David Cernat ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
2018-02-12 06:50:52 +02:00
..
activespells.cpp [Client] Clear FortifyAttribute effects when server sets modifier to 0 2017-12-02 09:22:36 +02:00
activespells.hpp [Client] Clear FortifyAttribute effects when server sets modifier to 0 2017-12-02 09:22:36 +02:00
actor.cpp
actor.hpp
actors.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 2018-01-29 02:57:48 +02:00
actors.hpp Merge pull request #351 from OpenMW/master while resolving conflicts 2017-11-30 10:06:38 +02:00
actorutil.cpp
actorutil.hpp
aiactivate.cpp
aiactivate.hpp
aiavoiddoor.cpp
aiavoiddoor.hpp
aibreathe.cpp
aibreathe.hpp
aicombat.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
aicombat.hpp
aicombataction.cpp implement rateAmmo() function 2018-01-11 21:08:11 +04:00
aicombataction.hpp
aiescort.cpp
aiescort.hpp
aiface.cpp
aiface.hpp
aifollow.cpp
aifollow.hpp
aipackage.cpp AiWander: do not allow flying/swimming creatures to use pathgrid 2017-11-28 18:03:13 +04:00
aipackage.hpp AiWander: do not allow flying/swimming creatures to use pathgrid 2017-11-28 18:03:13 +04:00
aipursue.cpp Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 2017-12-25 02:25:01 +02:00
aipursue.hpp
aisequence.cpp
aisequence.hpp
aistate.hpp
aitravel.cpp
aitravel.hpp
aiwander.cpp AiWander: do not allow flying/swimming creatures to use pathgrid 2017-11-28 18:03:13 +04:00
aiwander.hpp AiWander fast forwarding improvements (bug #3638) 2017-11-11 15:31:06 +04:00
alchemy.cpp Update alchemy effects after every created potion (#4079) 2017-09-06 15:11:47 +04:00
alchemy.hpp
autocalcspell.cpp
autocalcspell.hpp
character.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 2018-01-29 02:57:48 +02:00
character.hpp Don't update off-screen animations 2018-01-11 01:49:35 +00:00
combat.cpp Merge pull request #313 from OpenMW/master while resolving conflicts 2017-10-16 07:37:29 +03:00
combat.hpp Fix some style issues flagged by cppcheck 2017-10-15 17:06:58 +02:00
coordinateconverter.cpp
coordinateconverter.hpp
creaturestats.cpp
creaturestats.hpp
difficultyscaling.cpp
difficultyscaling.hpp
disease.hpp
drawstate.hpp
enchanting.cpp
enchanting.hpp
levelledlist.hpp
magiceffects.cpp
magiceffects.hpp
mechanicsmanagerimp.cpp Merge pull request #383 from OpenMW/master 2018-02-11 06:57:54 +02:00
mechanicsmanagerimp.hpp Merge pull request #349 from OpenMW/master 2017-11-29 03:52:15 +02:00
movement.hpp
npcstats.cpp Merge pull request #287 from OpenMW/master while resolving conflicts 2017-09-12 07:38:49 +03:00
npcstats.hpp
objects.cpp
objects.hpp
obstacle.cpp
obstacle.hpp
pathfinding.cpp Move PathgridGraph out of CellStore 2017-11-27 21:20:31 +00:00
pathfinding.hpp Move PathgridGraph out of CellStore 2017-11-27 21:20:31 +00:00
pathgrid.cpp Move PathgridGraph out of CellStore 2017-11-27 21:20:31 +00:00
pathgrid.hpp Move PathgridGraph out of CellStore 2017-11-27 21:20:31 +00:00
pickpocket.cpp
pickpocket.hpp
repair.cpp
repair.hpp
security.cpp
security.hpp
spellcasting.cpp [General] Implement Mark location sync as part of PlayerMiscellaneous 2018-01-31 04:50:29 +02:00
spellcasting.hpp Added checkMagicka parameter 2017-11-28 23:35:54 +01:00
spellpriority.cpp Do not summon the bound bow if there is no suitable ammo 2018-01-11 21:08:30 +04:00
spellpriority.hpp
spells.cpp
spells.hpp
stat.cpp
stat.hpp
steering.cpp
steering.hpp
summoning.cpp
summoning.hpp
trading.cpp
trading.hpp
weaponpriority.cpp implement rateAmmo() function 2018-01-11 21:08:11 +04:00
weaponpriority.hpp implement rateAmmo() function 2018-01-11 21:08:11 +04:00