Marc Zinnschlag
|
a623f03850
|
reduced object state for objects in containers
|
11 years ago |
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
|
11 years ago |
|
Marc Zinnschlag
|
d8d4f1a15e
|
some fixes to record structs
|
11 years ago |
|
Marc Zinnschlag
|
e453468eff
|
moved CellRef loading code to the CellRef class
|
11 years ago |
|
Marc Zinnschlag
|
9025210965
|
Merge branch 'refnum' into savedgame
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
|
11 years ago |
|
scrawl
|
0285d18fc2
|
Respect items belonging to a faction
|
11 years ago |
|
Marc Zinnschlag
|
fefaec5804
|
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
|
11 years ago |
|
Marc Zinnschlag
|
43dd3b8ef2
|
removed redundant deletion flag from CellRef
|
11 years ago |
|
scrawl
|
783c501d70
|
Some checks to prevent bound item abuse
|
11 years ago |
|
Marc Zinnschlag
|
c22e38f825
|
removing 255 content file limitation
|
11 years ago |
|
Marc Zinnschlag
|
874ce26bef
|
added missing consts to record save functions
|
11 years ago |
|
Marc Zinnschlag
|
744198fc44
|
added blank function to CellRef and moved a function that was in the wrong file
|
12 years ago |
|
Marc Zinnschlag
|
8c7d578ddc
|
moved the CellRef struct to its own header
|
12 years ago |