AnyOldName3
f09b0fc1bd
Put groundcover alphafunc where shader visitor can see it
...
I'd already made this change so don't know why it disappeared instead of
being included in b8ee32e3
2021-03-12 17:21:36 +00:00
psi29a
f388de861d
Merge branch 'update-bullet' into 'master'
...
Update Bullet to improve performance
See merge request OpenMW/openmw!627
2021-03-12 13:26:08 +00:00
Gleb Mazovetskiy
fe6b990f2e
Update Bullet to improve performance
...
Updates Bullet to include https://github.com/bulletphysics/bullet3/pull/3287
This massively improves heightfield collision detection performance in
some areas.
E.g. with single-threaded bullet in the `--skip-menu` starting area
on my test desktop: 30 FPS -> 60 FPS
2021-03-12 12:40:19 +00:00
Gleb Mazovetskiy
351d11449b
Avoid heightfield conversion in newer Bullet
...
Takes advantage of the direct `float` support implemented in
https://github.com/bulletphysics/bullet3/pull/3293
2021-03-11 23:52:12 +00:00
Bret Curtis
36d5d1c25c
Merge pull request #3051 from akortunov/master
...
Changelog fixes
2021-03-11 18:12:58 +01:00
Chris Djali
32424b4b6a
Merge pull request #3052 from akortunov/crashfix
...
Fix a crash during new game
2021-03-11 16:28:08 +00:00
Andrei Kortunov
39b7260ab4
Fix a crash during new game
2021-03-11 11:46:44 +04:00
Andrei Kortunov
63958c6d61
Changelog fixes
2021-03-11 10:00:11 +04:00
Andrei Kortunov
79c4140ebb
Merge branch 'macos-valueobject' into 'master'
...
Fix linking on MacOS
See merge request OpenMW/openmw!645
2021-03-11 04:55:30 +00:00
AnyOldName3
64ddb4c1b0
Fix linking on MacOS
2021-03-11 01:01:55 +00:00
AnyOldName3
d52ae28b7a
Fix linking on MacOS
2021-03-11 00:28:14 +00:00
psi29a
9f47190411
Merge branch 'now-it-blends' into 'master'
...
Convert blending factors properly for the character preview
See merge request OpenMW/openmw!644
2021-03-10 23:27:04 +00:00
AnyOldName3
cb2cbb4181
Convert blending factors properly for the character preview
2021-03-10 22:07:14 +00:00
AnyOldName3
450b971bb0
Merge branch 'gl4es-patch' into 'master'
...
gl4es: Delay feature detection until a context exists
See merge request OpenMW/openmw!626
2021-03-10 19:01:39 +00:00
Chris Djali
9bfe941d4b
Merge pull request #3050 from akortunov/master
...
Double-buffer shader water stateset
2021-03-10 15:56:40 +00:00
Andrei Kortunov
38679013fe
Give meaningful name to the mEffectFade
2021-03-10 19:10:17 +04:00
psi29a
35266314e2
Merge branch 'fix-old-ffmpeg' into 'master'
...
Restore compatibility with FFMpeg < 57.80.100
See merge request OpenMW/openmw!642
2021-03-08 20:28:09 +00:00
Gleb Mazovetskiy
1db7d2ec4e
Restore compatibility with FFMpeg < 57.80.100
...
This should fix macOS Travis build broken by 58d33aa95b
2021-03-08 19:29:34 +00:00
AnyOldName3
deb184cdce
Merge branch 'fix-build' into 'master'
...
Fix linking with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`
See merge request OpenMW/openmw!640
2021-03-08 19:01:02 +00:00
psi29a
611a63acc6
Merge branch 'threesacharm' into 'master'
...
Attempt to fix restocking items in old saves
Closes #5823
See merge request OpenMW/openmw!580
2021-03-08 10:45:13 +00:00
psi29a
699bdab620
Merge branch 'drip' into 'master'
...
Ignore agents without bounding boxes
Closes #5879
See merge request OpenMW/openmw!641
2021-03-08 10:32:55 +00:00
psi29a
194875dec1
Merge branch 'fix-video-arm' into 'master'
...
osg-ffmpeg-videoplayer: Fix crash on ARM
Closes #5807
See merge request OpenMW/openmw!564
2021-03-08 08:05:25 +00:00
Andrei Kortunov
d805886de7
Double-buffer shader water stateset (bug #5026 )
2021-03-08 10:58:51 +04:00
Gleb Mazovetskiy
7f6339c61f
AV: Add changelog entry
2021-03-08 04:16:33 +00:00
Gleb Mazovetskiy
36bac353df
AV: Handle varying video frame dimensions
2021-03-08 04:00:11 +00:00
Gleb Mazovetskiy
58d33aa95b
AV: Fix all memory leaks
...
The most substantial memory leak came from `PacketQueue::get`
not unreferencing its argument packet.
Other leaks came from using `av_free` instead of type-specific free
functions.
Also modifies `PacketQueue::put` for readability.
2021-03-08 03:16:55 +00:00
Evil Eye
eb07818f13
Ignore agents without bounding boxes
2021-03-07 20:58:09 +01:00
Gleb Mazovetskiy
eb93fdfbea
Use unique_ptr with custom deleter for VideoPicture::rgbaFrame
2021-03-07 17:58:09 +00:00
Chris Djali
213525c372
Merge pull request #3049 from akortunov/master
...
Use correct mCursorActive flag initial value
2021-03-07 15:35:38 +00:00
Alexei Dobrohotov
e9aa161ffc
Merge branch 'reallyskipphysics' into 'master'
...
Close race that breaks scripted teleporting (#5873 )
See merge request OpenMW/openmw!639
2021-03-07 08:41:20 +00:00
Andrei Kortunov
482f04c836
Use correct mCursorActive flag initial value
2021-03-07 12:08:43 +04:00
Gleb Mazovetskiy
b7076549a3
osg-ffmpeg-videoplayer: Fix crash on ARM
...
osg-ffmpeg-videoplayer handled frame allocation incorrectly.
It used a `vector<uint8_t>` as its buffer, meaning the addresses could
did not respect alignment.
Instead, changes it to use `AVFrame` as buffers, allocated via `av_image_alloc`.
We also now only allocate the buffer once, instead of on every frame,
which should improve the framerate of videos.
Fixes the following crash on startup on ARM:
> Invalid address alignment (signal 7)
Fixes #5807
2021-03-07 03:33:00 +00:00
Gleb Mazovetskiy
455be9dbbb
Fix linking with -DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON
...
1. CMake's built-in OSG finder does not use pkgconfig, so we have to
manually ensure the order is correct for inter-library dependencies.
https://gitlab.kitware.com/cmake/cmake/-/issues/21701
2. OSG plugin pkgconfig files are missing dependencies on the underlying
libraries (e.g. freetype, png, jpeg), so we have to link them manually.
https://github.com/openscenegraph/OpenSceneGraph/issues/1052
2021-03-06 21:17:52 +00:00
fredzio
31d8ce266b
Close a race between main and physics threads when actor is positioned by scripts.
...
When a position is forced, the actor position in physics subsystem is
overriden. The background physics thread is not made aware of this,
its result are simply discarded.
There is a short window where this doesn't work (in this
example, actor is at A and script moves it to B)
1) actor position is set to B. (among others, Actor::mPosition is set to B)
2) physics thread reset Actor::mPosition with stale value (around A)
3) main thread read simulation result, reset Actor::mSkipSimulation flag => actor is at B
4) physics thread fetch latest Actor::mPosition value, which is around A
5) main thread read simulation result, actor is around A
To avoid this situation, do not perform 2) until after 3) occurs. This
way, at 4) starts the simulation with up-to-date Actor::mPosition
2021-03-06 10:41:55 +01:00
Alexei Dobrohotov
2bfee281fd
Merge branch 'restore_caster' into 'master'
...
Restore projectile caster from savegame (#5860 )
See merge request OpenMW/openmw!616
(cherry picked from commit d595c7adb0fb45eafed6d3d0403ad640a91411ed)
c5426bec In the savegame, projectile caster is identified by its actor id. When
2021-03-05 21:07:29 +00:00
Evil Eye
c9d3da498a
Merge branch 'pursue' into 'master'
...
AIPursue: Pursue the player until LOS is established (#5869 )
Closes #5869
See merge request OpenMW/openmw!634
2021-03-05 16:45:47 +00:00
psi29a
4340142c22
Merge branch 'macosx_gitlab' into 'master'
...
give qt5 a show for brew
See merge request OpenMW/openmw!636
2021-03-05 12:46:32 +00:00
Bret Curtis
9fbb530dde
be explicit and print version information to verification
2021-03-05 13:25:46 +01:00
Bret Curtis
53cb20454f
add path hack only to verify, will remove later
2021-03-05 13:20:03 +01:00
Bret Curtis
f03beb7963
uninstall qt@6
2021-03-05 13:12:42 +01:00
Bret Curtis
8fc0f965bb
which qmake?
2021-03-05 13:10:22 +01:00
Bret Curtis
87ede9284b
be more explicit
2021-03-05 13:08:38 +01:00
Bret Curtis
17059cefea
give qt@5 a try
2021-03-05 13:07:26 +01:00
Bret Curtis
caa8b0ca1a
give qt5 a show for brew
2021-03-05 13:03:21 +01:00
Andrei Kortunov
7cc97297e7
Merge pull request #3048 from akortunov/master
...
Fix formatting in the groundcover docs
2021-03-05 14:29:40 +04:00
Andrei Kortunov
41b3090a49
Fix formatting in the groundcover docs
2021-03-05 14:27:01 +04:00
Evil Eye
8ae4ee291f
Attempt to fix restocking items in old saves
2021-03-04 22:52:03 +01:00
psi29a
d990c425b8
Merge branch 'recastnavigation_custom_path' into 'master'
...
Support custom path for recastnavigation
See merge request OpenMW/openmw!635
2021-03-04 18:12:28 +00:00
elsid
b9575180b5
Support custom recastnavigation system path
2021-03-04 18:13:13 +01:00
elsid
b47573f36b
Fix recastnavigation debug library suffixes
2021-03-04 18:12:08 +01:00
