Commit Graph

196 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
Andrei Kortunov c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
David Cernat 74c2a0b311
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
6 years ago
Capostrophic 409d466e42 Make 0/0 encumbrance 0% encumbrance 6 years ago
David Cernat ec1311fcb7 [Client] Make it possible to check whether a class has a ContainerStore 6 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 7 years ago
scrawl 22482b7eec Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes 7 years ago
MiroslavR f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 7 years ago
MiroslavR 5e46121046 Implement fleeing AI (Closes #1118) 8 years ago
MiroslavR 52e00f5fef Do not show uncarriable lights in item views 8 years ago
MiroslavR f323f231db Allow activating actors without a name (Fixes #3551) 8 years ago
Allofich 34851349de Pass hitPosition by const reference 8 years ago
Allofich bce0166931 Don't play blood effects for resisted hits 8 years ago
scrawl effe022bb2 Move preload model list to MWClass, preload NPC head/hair 8 years ago
scrawl e5d9ee30f4 Add count argument to copyObjectToCell
Fixes the gold bug introduced in c9ca5bc946
9 years ago
scrawl 32d5dece58 Add count argument to getToolTipInfo 9 years ago
scrawl b0894ea20d Accept a ConstPtr in hasToolTip 9 years ago
scrawl 51c77c5045 Accept a ConstPtr in getDoorState 9 years ago
scrawl 04f7a8f8eb Remove redundant getId function 9 years ago
scrawl 266fbbef48 Accept a ConstPtr in canLock 9 years ago
scrawl c43f80633a Accept a ConstPtr in getEnchantmentPoints 9 years ago
scrawl 303521002d Accept a ConstPtr in adjustScale 9 years ago
scrawl 09bdb0ad4b Accept a ConstPtr in getServices 9 years ago
scrawl 648ee6e7fb Accept a ConstPtr in applyEnchantment 9 years ago
scrawl 3c98f8dde3 Accept a ConstPtr in isPersistent 9 years ago
scrawl 3fe3091275 Accept a ConstPtr in isEssential 9 years ago
scrawl 4a47fc32fa Accept a ConstPtr in getBloodTexture 9 years ago
scrawl 2bd8d60e9f Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank 9 years ago
scrawl 2ac92012e8 Accept a ConstPtr in isClass 9 years ago
scrawl 5b082be79f Accept a ConstPtr in getBaseGold 9 years ago
scrawl da7ebfde99 Accept a ConstPtr in copyToCell 9 years ago
scrawl 954186fe1e Accept a ConstPtr in canFly, canSwim & canWalk 9 years ago
scrawl b09bdd6af5 Accept a ConstPtr in isBipedal 9 years ago
scrawl 92a3acfa56 Accept a ConstPtr in getBaseFightRating 9 years ago
scrawl d120f76031 Accept a ConstPtr in getSound 9 years ago
scrawl d77f785cbc Accept a ConstPtr in get*SoundId 9 years ago
scrawl dc92fefd2b Accept a ConstPtr in canBeEquipped, getEquipmentSlots & hasItemHealth 9 years ago
scrawl e0bb284804 Accept a ConstPtr in getWeight 9 years ago
scrawl 0047a2d330 Accept a ConstPtr in canSell 9 years ago
scrawl 2bc851c7d3 Accept a ConstPtr in getEnchantment 9 years ago
scrawl beb8805a12 Accept a ConstPtr in getInventoryIcon 9 years ago
scrawl f258c5c508 Accept a ConstPtr in getModel 9 years ago
scrawl d9bbd83b09 Accept a ConstPtr in getToolTipInfo
Accept a ConstPtr in functions used by getToolTipInfo
9 years ago
scrawl ed3486e816 Improve const-correctness in writeAdditionalState 9 years ago
scrawl b48445dea7 Accept a ConstPtr in getScript 9 years ago
scrawl bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
9 years ago
scrawl 211deeb63e Don't attempt to lock or unlock unsuitable objects (Fixes #2826) 9 years ago
scrawl 7f66339790 Remove a redundant function 9 years ago
scrawl 882e359008 Move attackStrength to the CharacterController, where it should have been to begin with
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
9 years ago