Commit Graph

139 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
Koncord fa2bf0663e [General] Simplify vectorContains 6 years ago
David Cernat 9102df7fde [General] Make WorldCollisionOverride also work with specific refIds
For now, this only makes it possible to enforce collision for specific refIds for placed objects.
6 years ago
David Cernat 3efe05a88e [General] Implement WorldCollisionOverride packet 6 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 7 years ago
scrawl 1692b7f38e Merge pull request #1209 from dhustkoder/master
Added ConstContainerStoreIterator (Task #3092)
7 years ago
Rafael Moura 05cc69f6f1 Porting more ContainerStoreIterator usage to const version 7 years ago
MiroslavR f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 7 years ago
Allofich 506d0e8e54 Correction to display of 0-weight tooltips 8 years ago
Allofich 160da0b149 Treat 0-weight armor as light armor in some respects 8 years ago
Allofich cf7278f8ae Don't show weight tooltip for 0-weight equipment 8 years ago
scrawl 32d5dece58 Add count argument to getToolTipInfo 9 years ago
scrawl b0894ea20d Accept a ConstPtr in hasToolTip 9 years ago
scrawl 04f7a8f8eb Remove redundant getId function 9 years ago
scrawl c43f80633a Accept a ConstPtr in getEnchantmentPoints 9 years ago
scrawl 648ee6e7fb Accept a ConstPtr in applyEnchantment 9 years ago
scrawl da7ebfde99 Accept a ConstPtr in copyToCell 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 b48445dea7 Accept a ConstPtr in getScript 9 years ago
scrawl fc449233be Restore support for inserting objects into a cell 9 years ago
scrawl 0975f60d59 Stub out CellStore::get<T> accessors in preparation of reference movement between cells 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 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 47758c11cd Readded collision objects and movement physics 9 years ago
scrawl c31b416ba1 Move physicssystem to a new mwphysics module 9 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
9 years ago
scrawl 239c0071f5 Armor tooltip should show the effective armor rating 9 years ago
scrawl 41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 9 years ago
Alexander "Ace" Olofsson 462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 10 years ago
scrawl 59720b7dc6 Implement MagicItems flag for vendors (Fixes #1861) 10 years ago
scrawl 0f1451babd Add epsilon to armor class calculation 10 years ago
Marc Zinnschlag c9cd7fb6b7 Merge branch 'scripts' 10 years ago
scrawl 75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 10 years ago
scrawl 2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 10 years ago
Marc Zinnschlag 4fb897f2f8 added missing getId functions to classes derived from MWWorld::Class 10 years ago
scrawl 4aab4e1c26 Ignore item condition when determining value, except in trade (Fixes #1557) 10 years ago
scrawl 91ed5183c8 Show base item value in tooltip, not real value (Fixes #1469) 10 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
10 years ago
scrawl a05c8fd3ce Make applyEnchantment return the record ID instead of modifying Ptr 10 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
10 years ago
Marc Zinnschlag 83ded18af0 encapsulated reference collections 10 years ago
scrawl 190512156d Use some more GMSTs for enchanting 10 years ago