Commit Graph

235 Commits (openmw-39)

Author SHA1 Message Date
Marc Zinnschlag 8f699b5d39 avoid creating move tags for instances that exist only in the currently edited content file 9 years ago
Marc Zinnschlag 1774f6d9bf moved ref num assingment from instance creation to save procedure 9 years ago
scrawl b0431833a1 Fix some defects reported by Coverity CI 9 years ago
Aesylwinn bbda5fe634 Removed hints from error messages and fixed naming to match conventions 9 years ago
Aesylwinn 1d86f705ba gmst verifier 9 years ago
scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
Conflicts:
	apps/opencs/view/render/instancemode.cpp
9 years ago
scrawl 091ca9743e Do not write LandData twice (Fixes #3140) 9 years ago
scrawl fb849014bd Pass the fallback map to CSMWorld::Data 9 years ago
scrawl 11496b8075 Read fallback settings in OpenCS 9 years ago
Marc Zinnschlag 466f91db67 Fixed wrong GMST name for newly created game files (Fixes #3132) 9 years ago
scrawl daa94cc50e Fix cppcheck warnings 9 years ago
Marc Zinnschlag c646533448 removed old user settings system 9 years ago
Marc Zinnschlag 67cf260144 final batch of changing over user settings usage to the new system 9 years ago
scrawl af4923577b Fix double writing of Dialogue NAME in OpenCS 9 years ago
scrawl 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
cc9cii 7c007d9c6d Rename a variable to make it less confusing. 9 years ago
cc9cii 78c735adc6 Fix saving when only topic info was modified (topic itself unchanged) 9 years ago
Marc Zinnschlag a445683312 Merge branch 'mergetool'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
9 years ago
Marc Zinnschlag 85f6bb892b removed indirection in OpenMW-CS land record 9 years ago
Marc Zinnschlag 69b9eadb52 refactored loading of land data 9 years ago
Marc Zinnschlag 9cf793c0b5 silenced a warning 9 years ago
Marc Zinnschlag c92898a5bc flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 9 years ago
scrawl 32ad8c86bf Fix the ESM::LandTexture NAME being discarded on loading 10 years ago
scrawl 031d64d0d3 Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records 10 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
Marc Zinnschlag 47dd9505a9 copy meta data from game file when merging 10 years ago
Marc Zinnschlag 1b663f01af create merged document and open a view for it (document is still empty at this point) 10 years ago
Marc Zinnschlag 904ad94952 added merge operation (doesn't do anything yet) 10 years ago
Marc Zinnschlag b83f9445a9 added UI for merge tool (merge tool itself is still missing) 10 years ago
Marc Zinnschlag 6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 10 years ago
Stanislav Bas 13bb6be238 Load methods (for ESM records) accept a deleted flag in OpenCS 10 years ago
Stanislav Bas 1e8182220a Fix build errors & warnings 10 years ago
Stanislav Bas 8e6a7be6f5 Implement saving of deleted records 10 years ago
Marc Zinnschlag cdfa3006a3 incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 10 years ago
Marc Zinnschlag 9b12b4f1e2 refactored mapping from message severity enum to string 10 years ago
scrawl 1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
10 years ago
Marc Zinnschlag 2dada1a162 Merge branch 'meta' 10 years ago
Marc Zinnschlag 1870b087e7 ported setting of meta data for saving to the new mechanism 10 years ago
Marc Zinnschlag f3ff90e1fd moved meta data into a new single-row table 10 years ago
Marc Zinnschlag 6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 10 years ago
scrawl a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
10 years ago
Marc Zinnschlag c644f15167 calm down travis 10 years ago
Marc Zinnschlag 197b8ec731 added severity attribute for operation messages (Fixes #2717) 10 years ago
Marc Zinnschlag 8791832c86 standarised on the use of the Message struct when passing operations messages around 10 years ago
Marc Zinnschlag 0e21c61297 replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct 10 years ago
Marc Zinnschlag 1ee1934053 framework for accessing user settings in operation stages 10 years ago
scrawl 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
scrawl d03880fbf0 Compile fix for old boost versions 10 years ago
scrawl e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago