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
7 years ago
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
7 years ago
fa2bf0663e
[General] Simplify vectorContains
7 years ago
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.
7 years ago
3efe05a88e
[General] Implement WorldCollisionOverride packet
7 years ago
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
739cd5ba45
Fixed more spelling mistakes
8 years ago
b9d1d6144a
Don't reveal unknown potion effects in alchemy window ( Fixes #3146 )
9 years ago
32d5dece58
Add count argument to getToolTipInfo
9 years ago
b0894ea20d
Accept a ConstPtr in hasToolTip
9 years ago
04f7a8f8eb
Remove redundant getId function
9 years ago
da7ebfde99
Accept a ConstPtr in copyToCell
9 years ago
d77f785cbc
Accept a ConstPtr in get*SoundId
9 years ago
e0bb284804
Accept a ConstPtr in getWeight
9 years ago
0047a2d330
Accept a ConstPtr in canSell
9 years ago
beb8805a12
Accept a ConstPtr in getInventoryIcon
9 years ago
f258c5c508
Accept a ConstPtr in getModel
9 years ago
d9bbd83b09
Accept a ConstPtr in getToolTipInfo
...
Accept a ConstPtr in functions used by getToolTipInfo
9 years ago
b48445dea7
Accept a ConstPtr in getScript
9 years ago
fc449233be
Restore support for inserting objects into a cell
9 years ago
0975f60d59
Stub out CellStore::get<T> accessors in preparation of reference movement between cells
9 years ago
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
47758c11cd
Readded collision objects and movement physics
10 years ago
c31b416ba1
Move physicssystem to a new mwphysics module
10 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
10 years ago
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
10 years ago
cf22d2fa36
Make Potions reveal two effects for every fWortChanceValue of alchemy skill ( Fixes #1792 )
11 years ago
c9cd7fb6b7
Merge branch 'scripts'
11 years ago
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
11 years ago
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
11 years ago
4fb897f2f8
added missing getId functions to classes derived from MWWorld::Class
11 years ago
8ac019611d
Fix Potion use action removing the potion even when the action is not executed ( Fixes #1521 )
11 years ago
91ed5183c8
Show base item value in tooltip, not real value ( Fixes #1469 )
11 years ago
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
11 years ago
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. :)
11 years ago
83ded18af0
encapsulated reference collections
11 years ago
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
11 years ago
0285d18fc2
Respect items belonging to a faction
11 years ago
cd756a8a39
Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.
11 years ago
61ab6e1739
Use fWortChanceValue for making ingredient/potion effects visible
11 years ago
10abb9d297
Call ContainerStore::remove() to remove items from inventory
...
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
11 years ago
89c7f5bc70
Handle object activation as a werewolf
12 years ago
076e7d8e16
Make insertBegin internal
12 years ago
0458fd5531
Remove unused/unneeded parameters
12 years ago
0c4a963132
Container UI rewrite
12 years ago
f3c8cd2065
Don't buy/sell keys which are set to open a lock
12 years ago
84afd87321
Placeable objects should not collide unless they have a NiRootCollisionNode
12 years ago
e1957e4ee9
Potion effects should be hidden until discovered
12 years ago
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.
12 years ago
David Cernat
Andrei Kortunov
Koncord
Bret Curtis
Leon Krieg
scrawl
dteviot
Alexander "Ace" Olofsson
Marc Zinnschlag
Emanuel Guevel
Chris Robinson