AnyOldName3
350f6e61f7
Move FallbackMap validator implementation to source file
2020-10-23 13:03:36 +01:00
Alexei Dobrohotov
129bd51672
Add compressed BSA support to bsatool
2020-10-23 14:04:21 +03:00
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.
2020-10-23 01:58:43 +01:00
AnyOldName3
fca8634b74
Remove debugging lines
2020-10-23 01:46:49 +01:00
AnyOldName3
cf81f1bbb7
Make composing variables compose in the expected order
2020-10-23 01:41:28 +01:00
Bret Curtis
5aa053c53e
components/compiler/streamerrorhandler.cpp needs sstream for MacOS
2020-10-23 00:13:51 +02:00
Bret Curtis
e51ca542d4
components/config cleanup
2020-10-23 00:03:14 +02:00
Bret Curtis
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
2020-10-22 23:57:53 +02:00
Bret Curtis
5475e696c8
components/bullethelpers cleanup; removed warnings by using override
2020-10-22 22:46:18 +02:00
AnyOldName3
651a5a27f6
Fix inconsistent indentation
...
This has been irritating me for years.
2020-10-22 21:44:47 +01:00
Bret Curtis
d826fbdadf
components/bsa cleanup
2020-10-22 22:39:59 +02:00
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.
2020-10-22 21:38:22 +01:00
Mads Buvik Sandvei
a86e5a0b67
Merge branch 'openxr_vr' of https://gitlab.com/madsbuvi/openmw into openxr_vr
2020-10-22 20:40:27 +02:00
Mads Buvik Sandvei
4f8f0cc8ac
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr
2020-10-22 20:39:53 +02:00
Bret Curtis
43614e2204
Merge pull request #3021 from akortunov/warnfix
...
Do not use deprecated Qt functions
2020-10-22 17:17:13 +02:00
psi29a
fa1765816f
Merge branch 'somecpp17' into 'master'
...
C++17 cosmetics
See merge request OpenMW/openmw!357
2020-10-22 13:06:15 +00:00
Andrei Kortunov
46a1950b0e
Do not use deprecated Qt functions
2020-10-22 15:50:47 +04:00
fredzio
a19db73eca
Fix bad rebase
2020-10-22 09:24:56 +02:00
psi29a
916c3bed98
Merge branch 'onclose' into 'master'
...
Don't reset temporarily hidden container window
Closes #5658
See merge request OpenMW/openmw!363
2020-10-22 07:11:31 +00:00
fredzio
1357bba0a0
Use some C++17 where it makes the code more readable
...
Also replace boost::optional
2020-10-22 07:15:16 +02:00
fredzio
4fc5b6f6f4
Sort headers
2020-10-22 07:15:16 +02:00
fredzio
212b293803
Use same parameter name in definition and declaration
2020-10-22 07:15:16 +02:00
AnyOldName3
420569c699
Merge branch 'chocolatey-log' into 'master'
...
Copy Chocolatey log so it gets picked up as an artefact
See merge request OpenMW/openmw!361
2020-10-22 00:27:30 +00:00
AnyOldName3
534fffb83d
Chocolatey has one L
2020-10-21 23:30:39 +00:00
Alexei Dobrohotov
f1b7cd5404
Don't reset temporarily hidden container window
2020-10-22 02:12:31 +03:00
psi29a
4ae504970f
Merge branch 'blocking' into 'master'
...
Fix lower body blocking animation priority (bug #5656 )
Closes #5656
See merge request OpenMW/openmw!359
2020-10-21 22:32:24 +00:00
psi29a
7f59751946
Merge branch 'standing' into 'master'
...
Fix standing actors logic
See merge request OpenMW/openmw!360
2020-10-21 22:31:01 +00:00
psi29a
0d21ab6bbe
Merge branch 'require_cpp17' into 'master'
...
C++17; make it count
See merge request OpenMW/openmw!362
2020-10-21 21:24:02 +00:00
Mads Buvik Sandvei
bf9edec4ce
Merge branch 'index-controller-support-v2' into 'openxr_vr'
...
Update bindings for Valve Index controllers
See merge request madsbuvi/openmw!3
2020-10-21 21:02:50 +00:00
Bret Curtis
449e7ce86f
C++17; make it count
2020-10-21 22:12:24 +02:00
AnyOldName3
7efd48e6fd
Copy Chocolatey log so it gets picked up as an artefact
2020-10-21 20:06:16 +00:00
Mads Buvik Sandvei
4c4fc0c69a
Refactoring. Moved changes to MWRender::Camera into a new subclass MWVR::VRCamera. Moved head tracking code to VRCamera.
2020-10-21 21:34:47 +02:00
fredzio
2916a9462e
Fix standing actors logic:
...
it is updated in the solver only if the actor is standing on
"something". The ground is not "something", so in case the actor goes
from standing on an object to the standing on the ground, this change was not taken
into account.
Clear the value before the simulation to solve this problem.
2020-10-21 21:32:06 +02:00
Alexei Dobrohotov
2972033a72
Merge branch 'thelevelling' into 'master'
...
Allow adding levelled lists using AddItem
Closes #2404
See merge request OpenMW/openmw!358
2020-10-21 16:53:46 +00:00
Alexei Dobrohotov
7da8479d25
Fix lower body blocking animation priority (bug #5656 )
2020-10-21 19:35:01 +03:00
Evil Eye
bdcd2bc802
Allow adding levelled lists with AddItem
2020-10-21 17:21:28 +02:00
Dean Allen
ac00ce7a13
Update bindings for Valve Index controllers
2020-10-21 00:45:15 -07:00
Bret Curtis
7d16b6f26c
Merge pull request #2992 from akortunov/service_refusal
...
Add support for service-specific refusals
2020-10-21 00:29:19 +02:00
psi29a
226a611add
Merge branch 'cpp_17' into 'master'
...
Bump std:: to C++17
See merge request OpenMW/openmw!329
2020-10-20 22:25:35 +00:00
Bret Curtis
82431b752d
removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd
2020-10-20 23:38:05 +02:00
psi29a
c62546fb12
make it count
2020-10-20 23:38:05 +02:00
psi29a
c86094e4db
Bump to C++17
2020-10-20 23:38:05 +02:00
psi29a
64913dea9d
Merge branch 'macos_lz4' into 'master'
...
MacOS and LZ4
See merge request OpenMW/openmw!356
2020-10-20 21:34:53 +00:00
Bret Curtis
06689cfe2a
bingo; cleanup
2020-10-20 23:22:37 +02:00
Bret Curtis
8b5aa4c001
try for link overwriting
2020-10-20 23:06:08 +02:00
Bret Curtis
c3b464a0c8
brew reinstall lz4; purge /tmp/openmw-deps just in case
2020-10-20 23:00:37 +02:00
Bret Curtis
0719b75307
try to use brew version of lz4
2020-10-20 22:28:09 +02:00
Evil Eye
f62905eb0a
remove redundant argument
2020-10-20 21:04:35 +02:00
psi29a
09373a757d
Merge branch 'radioactive' into 'master'
...
Container base record mutations
See merge request OpenMW/openmw!353
(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)
275908a0 mutate container base records
16fca11d add changelog entry
2020-10-20 16:56:22 +00:00
psi29a
db126a2688
Merge branch 'old-liblz4-fix' into 'master'
...
Ensure compatibility with old liblz4
See merge request OpenMW/openmw!355
2020-10-20 16:36:06 +00:00
