Thomas
|
61341d4206
|
Removed mLocked, kept it as "Negative lock level means unlocked"
|
2014-04-23 10:00:18 -04:00 |
|
Thomas
|
420163d35f
|
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
|
2014-04-23 05:19:34 -04:00 |
|
Marc Zinnschlag
|
a623f03850
|
reduced object state for objects in containers
|
2014-01-28 13:49:59 +01:00 |
|
scrawl
|
03cf383be7
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
|
2014-01-24 18:28:35 +01:00 |
|
Marc Zinnschlag
|
d8d4f1a15e
|
some fixes to record structs
|
2014-01-16 12:02:45 +01:00 |
|
Marc Zinnschlag
|
e453468eff
|
moved CellRef loading code to the CellRef class
|
2014-01-12 19:23:08 +01:00 |
|
Marc Zinnschlag
|
9025210965
|
Merge branch 'refnum' into savedgame
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
|
2014-01-12 16:58:06 +01:00 |
|
scrawl
|
0285d18fc2
|
Respect items belonging to a faction
|
2014-01-07 20:24:01 +01:00 |
|
Marc Zinnschlag
|
fefaec5804
|
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
|
2014-01-06 22:30:08 +01:00 |
|
Marc Zinnschlag
|
43dd3b8ef2
|
removed redundant deletion flag from CellRef
|
2014-01-06 13:53:20 +01:00 |
|
scrawl
|
783c501d70
|
Some checks to prevent bound item abuse
|
2014-01-02 01:36:08 +01:00 |
|
Marc Zinnschlag
|
c22e38f825
|
removing 255 content file limitation
|
2013-12-17 21:19:05 +01:00 |
|
Marc Zinnschlag
|
874ce26bef
|
added missing consts to record save functions
|
2013-09-16 12:32:35 +02:00 |
|
Marc Zinnschlag
|
744198fc44
|
added blank function to CellRef and moved a function that was in the wrong file
|
2013-06-08 15:49:59 +02:00 |
|
Marc Zinnschlag
|
8c7d578ddc
|
moved the CellRef struct to its own header
|
2013-04-04 12:13:15 +02:00 |
|