unknown
eae9eafb8c
Merge branch 'master' of gitlab.com:OpenMW/openmw into regionsounds
2020-10-25 14:13:14 +01:00
unknown
eebb320916
Wait for the previous sound to stop
2020-10-25 12:20:14 +01:00
psi29a
08fb9073c6
Merge branch 'cpp17_std_optional' into 'master'
...
use std::optional instead of boost::optional
See merge request OpenMW/openmw!373
2020-10-25 09:23:17 +00:00
Bret Curtis
0e0c091e15
add more optionals and casserts for windows
2020-10-25 01:34:04 +02:00
Bret Curtis
4a54d375cc
add cassert for windows
2020-10-25 01:31:05 +02:00
Bret Curtis
f6bead88a9
purge boost/optional.hpp headers
2020-10-25 00:58:44 +02:00
Bret Curtis
62b0781f7d
use std::optional instead of boost::optional
2020-10-25 00:33:41 +02:00
psi29a
37ac5323f1
Merge branch 'documentation' into 'master'
...
Document object paging settings (task #5512 )
See merge request OpenMW/openmw!371
2020-10-24 22:19:31 +00:00
Alexei Dobrohotov
e7f9fefd2a
Document object paging settings (task #5512 )
2020-10-25 00:01:47 +03:00
psi29a
957a1425d1
Merge branch 'cleanup_1' into 'master'
...
Cleanup 1
See merge request OpenMW/openmw!365
2020-10-24 18:43:03 +00:00
unknown
1ce296aa7f
Use fallback values for region sounds and fix probability
2020-10-24 18:54:46 +02:00
psi29a
fb63f8058f
Merge branch 'hash' into 'master'
...
Rewrite compressed BSA hash calculation again
See merge request OpenMW/openmw!368
2020-10-23 19:55:53 +00:00
Bret Curtis
259f7fcf12
Merge pull request #3020 from unelsson/strippluginindex_cs
...
Strip the plugin index when looking for deleted refs.
2020-10-23 21:51:53 +02:00
Alexei Dobrohotov
45c155b054
Rewrite compressed BSA hash calculation again
2020-10-23 21:19:58 +03:00
Nelsson Huotari
b1ea9f6a5b
Strip the plugin index from refid completely
2020-10-23 20:21:34 +03:00
psi29a
6534bc9b74
Merge branch 'config-fixes' into 'master'
...
Config fixes
See merge request OpenMW/openmw!367
2020-10-23 16:40:18 +00:00
AnyOldName3
f625da9328
Update CHANGELOG.md
2020-10-23 15:51:11 +00:00
AnyOldName3
538314b03a
Make path settings have path type
2020-10-23 15:34:41 +01:00
AnyOldName3
f57851587d
Fix edge case where FallbackMap has no comma
2020-10-23 13:16:51 +01:00
AnyOldName3
ce0966b9b7
Improve validate implementation
2020-10-23 13:13:47 +01:00
psi29a
f592aca6d3
Merge branch 'bsatool' into 'master'
...
Add compressed BSA support to bsatool
See merge request OpenMW/openmw!366
2020-10-23 12:06:58 +00:00
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
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
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
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
