psi29a
10b799653b
Merge branch 'opt-out-compose' into 'master'
...
Make it possible to opt out of composing variables
Closes #6186
See merge request OpenMW/openmw!1076
(cherry picked from commit 15d278de554818fef6fecf300456800523e91adf)
4727ae4b Make it possible to opt out of composing variables
04e9b6d2 Abort on duplicate content file
2021-08-01 08:54:11 +00:00
Bret Curtis
66a527c3de
Merge pull request #3075 from akortunov/warnfix
...
Fix MSVC's C4244 and C4267 warnings
2021-05-14 21:28:56 +02:00
jvoisin
06ae26037f
Remove some superfluous includes in the opencs
2021-05-14 10:57:31 +02:00
Andrei Kortunov
f9d42ed396
Fix MSVC's C4267 warnings
2021-05-12 10:34:39 +04:00
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
2020-11-29 11:14:07 +04:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
2020-11-01 01:58:56 +03:00
Andrei Kortunov
065ed5138e
Use emplace_back instead of push_back
2020-10-18 10:27:35 +04:00
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
2020-10-16 22:18:54 +04:00
elsid
ef4a7089e4
Use template specialization for writeHNT to write raw arrays
...
To avoid passing explicit size argument where it's possible.
2020-04-04 01:12:49 +02:00
Andrei Kortunov
3704acf857
Unify streams usage to support non-ASCII paths (bug #5239 )
2020-01-03 07:10:17 +04:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Bret Curtis
dc1c2358b9
Merge pull request #2089 from akortunov/qthelp
...
Editor: Add basic info window
2019-02-25 16:40:11 +01:00
Stomy
71be4cdd20
Ensure Unique Instance Refnum after clone, add, or move
2019-01-21 19:30:11 +00:00
Andrei Kortunov
8687a49c19
Editor: Added basic info window
2018-12-21 18:51:02 +04:00
Andrei Kortunov
4ee15ddcb9
Fix many Coverity Scan warnings
2018-11-14 11:21:49 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Capostrophic
dabdb0bfaf
Get rid of deprecated Messages::push_back()
2018-09-14 21:06:50 +03:00
Andrei Kortunov
c7a5548475
Use new logging system for editor
2018-08-14 20:01:09 +04:00
Marc Zinnschlag
7ca56ccd29
set search status bar to 'no results' message when search yields no results
2018-06-13 15:48:24 +02:00
Kyle Cooley
6d8666d80d
Force new project file when creating new project
2017-10-18 20:21:44 -04:00
Kyle Cooley
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
d7744e8b16
A bit of cleanup
2017-08-20 19:07:23 -04:00
Kyle Cooley
d31ed83b54
Preliminary asset reloading
2017-08-19 03:43:31 -04:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
Allofich
ccacad51be
Fix shadowing warnings
2016-10-16 01:34:54 +09:00
Marc Zinnschlag
48c257b939
Merge remote-tracking branch 'aesylwinn/ContentNumberFix'
2016-09-06 15:48:05 +02:00
Aesylwinn
fab7549b42
Fix windows path issue in editor debug run.
...
- The problem was caused by spaces in the data directory
2016-09-03 17:49:49 -04:00
Aesylwinn
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
2016-08-30 16:42:38 -04:00
Aesylwinn
3ae2fc17c6
Fix some issues with content file numbers in the editor.
...
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
2016-08-29 18:06:56 -04:00
Aesylwinn
f6c3b44cfb
Fix QTimer not being stopped in right thread
2016-06-10 12:10:14 -04:00
scrawl
703dba902b
Set the shader path in OpenCS
2016-05-20 00:40:59 +02:00
Marc Zinnschlag
8f699b5d39
avoid creating move tags for instances that exist only in the currently edited content file
2016-04-02 10:08:03 +02:00
Marc Zinnschlag
1774f6d9bf
moved ref num assingment from instance creation to save procedure
2016-03-24 11:12:05 +01:00
scrawl
b0431833a1
Fix some defects reported by Coverity CI
2016-01-21 16:08:04 +01:00
Aesylwinn
bbda5fe634
Removed hints from error messages and fixed naming to match conventions
2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba
gmst verifier
2016-01-17 21:55:03 -05:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
scrawl
091ca9743e
Do not write LandData twice ( Fixes #3140 )
2016-01-14 16:41:50 +01:00
scrawl
fb849014bd
Pass the fallback map to CSMWorld::Data
2016-01-11 23:10:16 +01:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
Marc Zinnschlag
466f91db67
Fixed wrong GMST name for newly created game files ( Fixes #3132 )
2016-01-06 13:10:09 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
Marc Zinnschlag
c646533448
removed old user settings system
2015-12-15 12:49:55 +01:00
Marc Zinnschlag
67cf260144
final batch of changing over user settings usage to the new system
2015-12-15 12:44:04 +01:00
scrawl
af4923577b
Fix double writing of Dialogue NAME in OpenCS
2015-11-15 16:04:52 +01:00
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
2015-11-13 01:34:36 +01:00
cc9cii
7c007d9c6d
Rename a variable to make it less confusing.
2015-10-31 20:45:16 +11:00
cc9cii
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
2015-10-31 20:42:42 +11:00
