a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
895634cd16
[General] Change type of MpNum to "unsigned int"
7 years ago
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
7 years ago
06acd3cbc4
[Client] Add a multiplayer object index and matching methods to CellRef
8 years ago
f0f78c9d64
Slight adjustments to disintegration fix
8 years ago
9624d8aade
Added new method and variable to track float remainders of disintegration effections
8 years ago
671561ea37
Write moved references to the save game file (not resolved on loading yet)
9 years ago
f9b0b7ede5
Make saving of deleted ESM records more consistent
10 years ago
4a16eba716
Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records
10 years ago
e8a9567be3
Move DELE handling to CellRef record
10 years ago
607a16eb01
removed leftover ignoreRefNum argument
10 years ago
acb800b8f9
Resolve merge issues and fix typos.
10 years ago
f1a58994c6
Merge branch 'master' into moveref
...
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
10 years ago
3b7a23aa72
Fixed charge checks for light and other objects, corrected CellRef charge union comments
10 years ago
89998a6a03
save MVRF subrecords
10 years ago
c7d15e6f74
Revert "Revert "Light charge handling fix""
...
This reverts commit b95748d044
10 years ago
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b
10 years ago
764c155cec
moved code for writing/reading ref nums into RefNum struct
10 years ago
5e0428243b
Light charge handling fix
10 years ago
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
10 years ago
19ed047dec
ESSImport: add some subrecords to CellRef and others, most files should load now, importacdt/cellref class structure need some refactoring
10 years ago
7aa0f887c0
Minor changes to ESM::RefNum
...
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
10 years ago
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
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
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
11 years ago
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
11 years ago
d8440e1fdc
implemented reference record merging
11 years ago
a623f03850
reduced object state for objects in containers
11 years ago
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
d8d4f1a15e
some fixes to record structs
11 years ago
e453468eff
moved CellRef loading code to the CellRef class
11 years ago
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
11 years ago
0285d18fc2
Respect items belonging to a faction
11 years ago
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
11 years ago
43dd3b8ef2
removed redundant deletion flag from CellRef
11 years ago
783c501d70
Some checks to prevent bound item abuse
11 years ago
c22e38f825
removing 255 content file limitation
11 years ago
874ce26bef
added missing consts to record save functions
11 years ago
744198fc44
added blank function to CellRef and moved a function that was in the wrong file
12 years ago
8c7d578ddc
moved the CellRef struct to its own header
12 years ago
David Cernat
Koncord
Andrei Kortunov
mrohrlach
scrawl
Stanislav Bas
Marc Zinnschlag
cc9cii
Kamil Bar
dteviot