Commit Graph

86 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
Allofich 502a26a7ff Use getWeightString() to avoid casting to int 8 years ago
Allofich caf025f93d Don't show 0 weight tooltips except for potions 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 da7ebfde99 Accept a ConstPtr in copyToCell 9 years ago
scrawl d77f785cbc Accept a ConstPtr in get*SoundId 9 years ago
scrawl e0bb284804 Accept a ConstPtr in getWeight 9 years ago
scrawl 0047a2d330 Accept a ConstPtr in canSell 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
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 45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
9 years ago
scrawl 41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 9 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 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
Marc Zinnschlag 83ded18af0 encapsulated reference collections 10 years ago
scrawl 0285d18fc2 Respect items belonging to a faction 11 years ago
scrawl cd756a8a39 Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips. 11 years ago
Chris Robinson 89c7f5bc70 Handle object activation as a werewolf 11 years ago
Chris Robinson 076e7d8e16 Make insertBegin internal 11 years ago
Chris Robinson 0458fd5531 Remove unused/unneeded parameters 11 years ago
scrawl 0c4a963132 Container UI rewrite 11 years ago
scrawl f3c8cd2065 Don't buy/sell keys which are set to open a lock 11 years ago
scrawl 84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 11 years ago
scrawl 00db13be32 Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed. 11 years ago
Marc Zinnschlag 918316168f Merge remote-tracking branch 'greye/store' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
12 years ago
emoose 7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 12 years ago
greye 2fa4ac177a initial resolving 12 years ago
scrawl 9f2668b45b Task #400 Review GMST access 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Douglas Diniz 82e7c04c0a Changing sounds to Action.
Adding onActor to Action to choose between playSound and playSound3D.
12 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 12 years ago