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
3 years ago
AnyOldName3
5869ac71e3
Merge all composing variables, not just those in destination already
...
This resolves a regression where the local openmw.cfg doesn't exist, so
we fall back to the global openmw.cfg, but because we've not loaded
anything from the local openmw.cfg, there are no variables with which to
merge.
4 years ago
AnyOldName3
8b28b6e55e
Compose BSA, context and script blacklist lists
...
These would only take their value from the highest priority source, so
specifying `openmw --content anExtraEsp.esp` would override all the
content files in the user cfg file, and the user cfg file would override
any in the global/local one.
4 years ago
AnyOldName3
fca8634b74
Remove debugging lines
4 years ago
AnyOldName3
cf81f1bbb7
Make composing variables compose in the expected order
4 years ago
AnyOldName3
6c311f4a3d
Partially revert 3a912485
...
While it solved the bug it was supposed to, it caused a regression where
the user config could no longer override the global config.
4 years ago
p4r4digm
0741fe5b80
removed path configuration and made screenshots just save in a folder
5 years ago
p4r4digm
2b54e6216b
Added setting to change the directory screenshots are stored in
5 years ago
Capostrophic
3a912485ca
openmw.cfg-related fixes
...
Make sure the defaults exist in local openmw.cfg too
Make sure constant attenuation settings are defined now that they are implemented
Fix config file loading order once and for all (bug #2976 )
5 years ago
Capostrophic
e70cc10305
Some more de-boosting
6 years ago
Andrei Kortunov
c7a5548475
Use new logging system for editor
6 years ago
Andrei Kortunov
1452684d9e
Use new logging system for components
6 years ago
AnyOldName3
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
7 years ago
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
8 years ago
Bret Curtis
98752a9702
replace boost::bind
8 years ago
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
9 years ago
AnyOldName3
7243583963
Change a switch to a series of if/else if/.../else, hopefully resolving compilation issues on OSX and Linux.
9 years ago
AnyOldName3
2b829f7f7b
Move some stuff to a header, removing the need for a dodgy hack.
9 years ago
AnyOldName3
becc053555
Trick the software into building by using what I assume is a really dirty hack.
9 years ago
AnyOldName3
32f0ded8f6
Fix bug in unescape filter, but still manage not to fix build issue.
9 years ago
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
9 years ago
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
9 years ago
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
9 years ago
AnyOldName3
08df463c94
Separate declaration and definition of some static members to hopefully calm Travis down.
9 years ago
AnyOldName3
5121e77a95
Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it
9 years ago
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
9 years ago
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
9 years ago
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
9 years ago
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
9 years ago
scrawl
f3e9fd49f3
Don't add the autodetected mw path in global config file
...
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
9 years ago
scrawl
647bed7f40
Do not read openmw.cfg from global path if one was found in the local path
9 years ago
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
10 years ago
scrawl
ef3ba12cb6
Add silent mode to ConfigurationManager, used by essimporter
10 years ago
bogglez
c006393178
Fix http://bugs.openmw.org/issues/768
...
Changes application_name in configuration manager to OpenMW instead of
openmw, if on windows. This shouldn't break anything since Windows uses
case-insensitive filesystems. Strictly speaking the installation
directory must be OpenMW now though (not sure whether this is the case)
11 years ago
scrawl
5645c9185b
Fix location of local data path
11 years ago
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
11 years ago
scrawl
33389b9b63
XDG compliant paths
11 years ago
scrawl
aef0fd1460
Rename some path methods
11 years ago
Marc Zinnschlag
25b7cd33ea
added FileWidget; fixed OpenCS configuration
11 years ago
scrawl
c27ff546e4
shader cache
13 years ago
Marc Zinnschlag
2c5d3d8df9
Merge remote branch 'scrawl/shadersystem' into shadersystem
...
Attention: We have submodules again. Don't forget to update!
Conflicts:
components/files/configurationmanager.cpp
13 years ago
Lukasz Gromanowski
1dde806add
Fixes #313 : openmw without a ~/.config/openmw folder segfault.
...
Added creation of $HOME/.config/openmw directory.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
13 years ago
Lukasz Gromanowski
d9e39bd90e
Changed order of plugins.cfg file paths.
...
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
13 years ago
Lukasz Gromanowski
9a4cd6c2b1
Fixes #200 - Paths with quotes for data-local option.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag
728e9cce5a
Merge remote branch 'lgro/config_fixes'
13 years ago
Lukasz Gromanowski
3da6af6e38
Bug fixes for configuration handling.
...
Added erasing double quotes from paths, corrected retriveing
installation path from wine registry. Updated doxygen comments.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Pieter van der Kloet
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
13 years ago
Lukasz Gromanowski
0c0b594090
Issue #168 - Configuration cleanup
...
Removed unnecessary path methods - according to forum disscusion:
http://openmw.org/forum/viewtopic.php?f=6&t=448
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago