Commit Graph

212 Commits (341ca691fc8a465a81b48d7953fc800a887b46fd)

Author SHA1 Message Date
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
Andrei Kortunov f9d42ed396 Fix MSVC's C4267 warnings 4 years ago
Andrei Kortunov 801e2d6ad0 Avoid to use uninitialized variables 4 years ago
Andrei Kortunov 8084a336b5 Replace zeroes and nulls by nullptrs 4 years ago
Andrei Kortunov 4acd910b37 Rework file error messages handling 4 years ago
Alexei Dobrohotov 53f91a3aa5
Merge pull request #3018 from akortunov/emplace
Use emplace_back instead of push_back
4 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
Andrei Kortunov 065ed5138e Use emplace_back instead of push_back 4 years ago
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
Fanael Linithien e8ec62b298 Use all-lowercase names for windows API headers
This allows the code to successfully cross-compile from hosts with case
sensitive file names, like linux.
5 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
Andrei Kortunov 75fed1d236 Print error code when failed to open file on Windows 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 7b6af4a893 Make sure local path includes trailing slash
Launcher assumes it does
5 years ago
fredzio ca7ac30f6d Use the POSIX pathconf(2) to determine the maximum path length.
It fixes build on BSD platforms where PATH_MAX is defined in
<sys/syslimits.h> vs <linux/limits.h> on Linux.
6 years ago
Alexei Dobrohotov e4c596adf8
Fix CI builds (attempt №2)
Gosh darn dem tabs
6 years ago
Alexei Dobrohotov e4e513c5dc
Fix CI builds
Apparently the only tab characters are in this file.
6 years ago
Nat Meo bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 6 years ago
AnyOldName3 8a6a8086da Make in-memory buffers seekable to fix fog of war 6 years ago
Ilya Zhuravlev 2e1ac51203 Clean up androidpath 6 years ago
Capostrophic e70cc10305 Some more de-boosting 6 years ago
Andrei Kortunov e06f0b797a Replace all NULLs to nullptr 6 years ago
Andrei Kortunov aca6625af4 Avoid possible memory leak by using the unique_ptr 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
Alexander Stillich 70d578d050 Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 7 years ago
Alexander Stillich 7d39c5450c Fixed escaping @ in boost program options filter 7 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
c72aa19d6d first pass on optimization of nif parsing functions from the file stream 7 years ago
Allofich 42402976e3 Fixes for building in MSVC 8 years ago
David Carlier 8a5c62de97 needs this head for getuid 8 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
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 8 years ago
Bret Curtis 07f75e1104 replace boost::shared_ptr in extern and components 8 years ago
Nikolay Kasyanov db69342b5d [macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
8 years ago
Roman Proskuryakov 416466e53e Fix uninitialized escape_hash_filter 8 years ago
scrawl 2f6075329b Clang warning fixes 9 years ago
David Carlier 83bab29e4b Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
9 years ago
AnyOldName3 a0699ce20d Change some <> characters to double quotes, resolving compilation problems. 9 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