1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 12:19:55 +00:00
openmw-tes3mp/components
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.
2020-10-28 00:36:49 +00:00
..
bsa Merge branch 'cleanup_1' into 'master' 2020-10-24 18:43:03 +00:00
bullethelpers components/bullethelpers cleanup; removed warnings by using override 2020-10-22 22:46:18 +02:00
compiler Re-add missing includes removed in 5a824d0333 2020-10-25 14:33:23 +01:00
config Merge branch 'cleanup_1' into 'master' 2020-10-24 18:43:03 +00:00
contentselector Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
crashcatcher Add env variable to enable/disable crash catcher 2020-04-25 15:42:06 +02:00
debug Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
detournavigator add more optionals and casserts for windows 2020-10-25 01:34:04 +02:00
esm components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
esmterrain Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
fallback set minimal boost version; remove #ifdef boost version checks 2020-10-25 22:43:10 +01:00
files Merge all composing variables, not just those in destination already 2020-10-28 00:36:49 +00:00
fontloader Catch MyGUI exceptions in the FontLoader destructor 2020-06-18 15:13:02 +04:00
interpreter Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
loadinglistener Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
misc Use some C++17 where it makes the code more readable 2020-10-22 07:15:16 +02:00
myguiplatform components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
nif NIF fixes and cleanup 2020-10-26 02:51:25 +03:00
nifbullet Try to resolve CI concerns 2020-05-14 10:00:33 +03:00
nifosg Try to fix build 2020-10-26 15:09:31 +03:00
process Remove redundant includes 2019-02-23 08:02:12 +04:00
resource Allow to assign custom shaders to nodes 2020-10-25 18:22:16 +04:00
sceneutil NIF fixes and cleanup 2020-10-26 02:51:25 +03:00
sdlutil Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
settings Support vectors in settings.cfg 2020-07-24 21:47:49 +02:00
shader Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
terrain Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
to_utf8 Remove redundant includes 2019-02-23 08:02:12 +04:00
translation Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
version Allow getting available version information even when clone is shallow 2017-03-07 21:53:49 +01:00
vfs Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
widgets components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
CMakeLists.txt removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00
doc.hpp second set of additional doxygen comments 2010-09-25 20:15:05 +02:00