9116c701d5
esmtool fix
9 years ago
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
a47617c21f
Fix tab indentations in apps/ and components/
9 years ago
69b9eadb52
refactored loading of land data
9 years ago
8243fb2479
Load methods (for ESM records) accept a deleted flag in ESMTool
10 years ago
ede4bfcf52
Rework EsmTool code. Remove explicit NAME handling
10 years ago
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
10 years ago
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
10 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
bf92d5cde9
removed redundant mScript field in ESM::StartScript
10 years ago
227c7bb55f
esmtool works again
10 years ago
5096e5dc0c
esmtool minor/major skills fix
10 years ago
6d097fbfbd
Normalise spelling of "levelled" throughout the code
10 years ago
e712b0353b
Terrain refactoring, reduce game startup time and memory usage
10 years ago
6367b4dc0b
Improve INFO struct naming
10 years ago
89132ff741
Add --name option to esmtool to print record with the given name
10 years ago
9d3f0b2ed5
Remove some unused code, include cleanup
10 years ago
c883a73d30
Several warning fixes
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
5e0428243b
Light charge handling fix
10 years ago
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
7252cb63a6
Fix cppcheck issues
10 years ago
ab9d9c7001
Add magic effect flags from ESM files to esmtool
10 years ago
f59c7fcb36
Fix esmtool FactionId output
10 years ago
44642ae21b
Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd)
10 years ago
ccde462308
Fix typo (RefId -> RefNum)
11 years ago
4e0c133fb3
Add comment to Cell NAM0 (it's a RefId counter)
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
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
11 years ago
bbe77d656a
Minor fixes from static analysis.
11 years ago
49a6579d3a
Fixed esmtool
11 years ago
1677fcf324
Dialogue merging
11 years ago
f69d61976e
minor performance improvements in other apps subdirectories
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
805843d7ff
Closes #1086 : Implement blood effects
11 years ago
de64c57179
Fix some typos and accidental commit
11 years ago
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
11 years ago
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
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
1d19d36bd6
Remove unused magic effect flags and update esmtool output
11 years ago
d536ff3cdc
printAIPackage: changed field name from Unknown to ShouldRepeat too.
11 years ago
scrawl
Marc Zinnschlag
Stanislav Bas
cc9cii
dteviot
Thoronador
Sergey Shambir