Commit Graph

24244 Commits (5869ac71e3655eeeeb822518941a7cd0b7526ba5)
 

Author SHA1 Message Date
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
psi29a 74dfc09e2d Merge branch 'removeitem' into 'master'
Fix remove item regression

Closes #5663

See merge request OpenMW/openmw!380
4 years ago
Evil Eye 0512a574e8 Fix remove item regression 4 years ago
psi29a f6e4c7cb42 Merge branch 'regionsounds' into 'master'
Fix region sounds

See merge request OpenMW/openmw!370
4 years ago
psi29a 3ccb424faf Merge branch 'nifstuff' into 'master'
Try to fix macOS build

See merge request OpenMW/openmw!378
4 years ago
Alexei Dobrohotov 7e521788e9 Try to fix build 4 years ago
psi29a fa9278e25b Merge branch 'boost_min_ver' into 'master'
set minimal boost version; remove #ifdef boost version checks

See merge request OpenMW/openmw!376
4 years ago
psi29a ff6f0413f0 Merge branch 'nifstuff' into 'master'
Minor NIF fixes and cleanup

See merge request OpenMW/openmw!377
4 years ago
Bret Curtis 175e29af00
Merge pull request #3022 from akortunov/shaders
Allow to assign custom shaders to nodes
4 years ago
Alexei Dobrohotov 4fc5e22e9e NIF fixes and cleanup
Get rid of NodeIndexHolder
Use unsigned 32-bit type for NIF record index
Fix calculation of the number of UV sets
4 years ago
Bret Curtis 4032b754e4 set minimal boost version; remove #ifdef boost version checks 4 years ago
Alexei Dobrohotov a78aa6b22c Merge branch 'nipixeldata' into 'master'
Clean up palettized NiPixelData loading

See merge request OpenMW/openmw!374
4 years ago
psi29a b66ba7c718 Merge branch 'includes' into 'master'
Re-add missing includes removed in 5a824d0333

See merge request OpenMW/openmw!375
4 years ago
Andrei Kortunov 660df19ff7 Allow to assign custom shaders to nodes 4 years ago
unknown 71e78c66cd Re-add missing includes removed in 5a824d0333 4 years ago
unknown eae9eafb8c Merge branch 'master' of gitlab.com:OpenMW/openmw into regionsounds 4 years ago
Alexei Dobrohotov 71056c6014 Clean up palettized NiPixelData loading 4 years ago
unknown eebb320916 Wait for the previous sound to stop 4 years ago
psi29a 08fb9073c6 Merge branch 'cpp17_std_optional' into 'master'
use std::optional instead of boost::optional

See merge request OpenMW/openmw!373
4 years ago
Bret Curtis 0e0c091e15 add more optionals and casserts for windows 4 years ago
Bret Curtis 4a54d375cc add cassert for windows 4 years ago
Bret Curtis f6bead88a9 purge boost/optional.hpp headers 4 years ago
Bret Curtis 62b0781f7d use std::optional instead of boost::optional 4 years ago
psi29a 37ac5323f1 Merge branch 'documentation' into 'master'
Document object paging settings (task #5512)

See merge request OpenMW/openmw!371
4 years ago
Alexei Dobrohotov e7f9fefd2a Document object paging settings (task #5512) 4 years ago
psi29a 957a1425d1 Merge branch 'cleanup_1' into 'master'
Cleanup 1

See merge request OpenMW/openmw!365
4 years ago
unknown 1ce296aa7f Use fallback values for region sounds and fix probability 4 years ago
psi29a fb63f8058f Merge branch 'hash' into 'master'
Rewrite compressed BSA hash calculation again

See merge request OpenMW/openmw!368
4 years ago
Bret Curtis 259f7fcf12
Merge pull request #3020 from unelsson/strippluginindex_cs
Strip the plugin index when looking for deleted refs.
4 years ago
Alexei Dobrohotov 45c155b054 Rewrite compressed BSA hash calculation again 4 years ago
Nelsson Huotari b1ea9f6a5b Strip the plugin index from refid completely 4 years ago
psi29a 6534bc9b74 Merge branch 'config-fixes' into 'master'
Config fixes

See merge request OpenMW/openmw!367
4 years ago
AnyOldName3 f625da9328 Update CHANGELOG.md 4 years ago
AnyOldName3 538314b03a Make path settings have path type 4 years ago
AnyOldName3 f57851587d Fix edge case where FallbackMap has no comma 4 years ago
AnyOldName3 ce0966b9b7 Improve validate implementation 4 years ago
psi29a f592aca6d3 Merge branch 'bsatool' into 'master'
Add compressed BSA support to bsatool

See merge request OpenMW/openmw!366
4 years ago
AnyOldName3 350f6e61f7 Move FallbackMap validator implementation to source file 4 years ago
Alexei Dobrohotov 129bd51672 Add compressed BSA support to bsatool 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
Bret Curtis 5aa053c53e components/compiler/streamerrorhandler.cpp needs sstream for MacOS 4 years ago
Bret Curtis e51ca542d4 components/config cleanup 4 years ago
Bret Curtis 5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 4 years ago
Bret Curtis 5475e696c8 components/bullethelpers cleanup; removed warnings by using override 4 years ago
AnyOldName3 651a5a27f6 Fix inconsistent indentation
This has been irritating me for years.
4 years ago
Bret Curtis d826fbdadf components/bsa cleanup 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
Bret Curtis 43614e2204
Merge pull request #3021 from akortunov/warnfix
Do not use deprecated Qt functions
4 years ago