Bret Curtis
6efa7eea5a
Merge pull request #3025 from akortunov/iterator
...
Do not remove active effects in the active effects loop
2020-11-02 17:12:45 +01:00
Andrei Kortunov
c1d56d94c4
Do not remove active effects in loop (bug #3789 )
2020-11-02 17:51:36 +04:00
Frederic Chardon
ecd10a731e
Compute the rotation normal relative to the door axe, not the world.
2020-11-02 14:12:42 +01:00
psi29a
646760a484
Merge branch 'dont_hold_door' into 'master'
...
Do not block a door when it turns away #4083
See merge request OpenMW/openmw!390
2020-11-01 22:49:56 +00:00
fredzio
18e38d8810
Do not block a door when it turns away.
2020-11-01 23:01:18 +01:00
psi29a
ba3aad31c1
Merge branch 'hitdebug' into 'master'
...
Visualize hits in the debug overlay
See merge request OpenMW/openmw!379
2020-11-01 10:20:14 +00:00
psi29a
7ee7041399
Merge branch 'stretch' into 'master'
...
Put a stretch menu background checkbox into the launcher (#5672 )
Closes #5672
See merge request OpenMW/openmw!387
2020-11-01 09:26:19 +00:00
Alexei Dobrohotov
f49bf028b9
Put a stretch menu background checkbox into the launcher ( #5672 )
2020-11-01 02:14:25 +03:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
2020-11-01 01:58:56 +03:00
Alexei Dobrohotov
942334c489
Merge branch 'changelog' into 'master'
...
Add missing changelog entries
See merge request OpenMW/openmw!386
2020-10-31 22:48:41 +00:00
Alexei Dobrohotov
73f866fc65
Add missing changelog entries
2020-11-01 01:32:36 +03:00
AnyOldName3
449506fef1
Attempt to explain what shadowsbin is doing
2020-10-31 19:06:20 +00:00
AnyOldName3
3c5d025849
Merge branch 'fallinglift' into 'master'
...
Unbreak elevators (#5670 )
See merge request OpenMW/openmw!385
2020-10-31 00:12:26 +00:00
fredzio
4876969153
Use the PhysicsSystem::movementQueue instead of a serie of
...
setPosition(getPosition() + diff) to move actor in scripts.
With background physics, this is very slightly off with the collision
object position.
When the script run long enough (a few dozen frames for instance),
the accumulated error becomes too big. It make actors fall through lifts floors.
2020-10-30 23:59:09 +01:00
psi29a
4bbed3c860
Merge branch 'savecontainers' into 'master'
...
Save and load container records
Closes #5668
See merge request OpenMW/openmw!384
2020-10-29 20:35:43 +00:00
Evil Eye
7065282127
Save and load container records; fixes #5668
2020-10-29 13:55:24 +01:00
Bret Curtis
0eaac4b522
Merge pull request #3024 from akortunov/coverity
...
Fix some issues, found by CoverityScan
2020-10-28 19:26:51 +01:00
Andrei Kortunov
64ba81ecf2
Fix some issues, found by CoverityScan
2020-10-28 18:02:31 +04:00
Andrei Kortunov
00503d86e1
Try to disable CoverityScan warning in code with explanation
2020-10-28 18:01:42 +04:00
AnyOldName3
fb53b397ff
Merge branch 'even-fixier-config' into 'master'
...
Merge all composing variables, not just those in destination already
See merge request OpenMW/openmw!383
2020-10-28 02:02:18 +00:00
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
psi29a
8f68f08aee
Merge branch 'moonmoon' into 'master'
...
Change moon phase to an enum class
See merge request OpenMW/openmw!381
2020-10-27 19:44:30 +00:00
psi29a
67e7fbb798
Merge branch 'trade' into 'master'
...
Fix regression #5666
Closes #5666
See merge request OpenMW/openmw!382
2020-10-27 18:35:48 +00:00
Evil Eye
3bf5247c0b
remove forward declaration
2020-10-27 19:23:07 +01:00
Alexei Dobrohotov
9763995892
Fix regression #5666
2020-10-27 18:08:14 +03:00
psi29a
74dfc09e2d
Merge branch 'removeitem' into 'master'
...
Fix remove item regression
Closes #5663
See merge request OpenMW/openmw!380
2020-10-26 23:13:35 +00:00
Evil Eye
2c4cafa41a
Change moon phase to an enum class
2020-10-26 22:16:31 +01:00
Evil Eye
0512a574e8
Fix remove item regression
2020-10-26 20:13:24 +01:00
psi29a
f6e4c7cb42
Merge branch 'regionsounds' into 'master'
...
Fix region sounds
See merge request OpenMW/openmw!370
2020-10-26 16:29:45 +00:00
psi29a
3ccb424faf
Merge branch 'nifstuff' into 'master'
...
Try to fix macOS build
See merge request OpenMW/openmw!378
2020-10-26 13:32:19 +00:00
fredzio
e8c0a7bec0
Visualie projectile hits
2020-10-26 13:53:36 +01:00
Frederic Chardon
574ccbf7bd
Visualize hand to hand hits
2020-10-26 13:48:15 +01:00
fredzio
435b2e37f8
Allow to display collision points in the debug viewer
2020-10-26 13:42:46 +01:00
Alexei Dobrohotov
7e521788e9
Try to fix build
2020-10-26 15:09:31 +03:00
psi29a
fa9278e25b
Merge branch 'boost_min_ver' into 'master'
...
set minimal boost version; remove #ifdef boost version checks
See merge request OpenMW/openmw!376
2020-10-26 08:13:24 +00:00
psi29a
ff6f0413f0
Merge branch 'nifstuff' into 'master'
...
Minor NIF fixes and cleanup
See merge request OpenMW/openmw!377
2020-10-26 08:12:49 +00:00
Bret Curtis
175e29af00
Merge pull request #3022 from akortunov/shaders
...
Allow to assign custom shaders to nodes
2020-10-26 09:07:13 +01:00
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
2020-10-26 02:51:25 +03:00
Bret Curtis
4032b754e4
set minimal boost version; remove #ifdef boost version checks
2020-10-25 22:43:10 +01:00
Alexei Dobrohotov
a78aa6b22c
Merge branch 'nipixeldata' into 'master'
...
Clean up palettized NiPixelData loading
See merge request OpenMW/openmw!374
2020-10-25 21:22:15 +00:00
psi29a
b66ba7c718
Merge branch 'includes' into 'master'
...
Re-add missing includes removed in 5a824d0333OpenMW/openmw!375
2020-10-25 20:18:56 +00:00
Andrei Kortunov
660df19ff7
Allow to assign custom shaders to nodes
2020-10-25 18:22:16 +04:00
unknown
71e78c66cd
Re-add missing includes removed in 5a824d0333
2020-10-25 14:33:23 +01:00
unknown
eae9eafb8c
Merge branch 'master' of gitlab.com:OpenMW/openmw into regionsounds
2020-10-25 14:13:14 +01:00
Alexei Dobrohotov
71056c6014
Clean up palettized NiPixelData loading
2020-10-25 14:37:29 +03: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
