Commit Graph

25043 Commits (b9a40bc5fced081d08e9ffcec4ffaa3e8e553957)
 

Author SHA1 Message Date
AnyOldName3 d52ae28b7a Fix linking on MacOS 4 years ago
psi29a 9f47190411 Merge branch 'now-it-blends' into 'master'
Convert blending factors properly for the character preview

See merge request OpenMW/openmw!644
4 years ago
AnyOldName3 cb2cbb4181 Convert blending factors properly for the character preview 4 years ago
AnyOldName3 450b971bb0 Merge branch 'gl4es-patch' into 'master'
gl4es: Delay feature detection until a context exists

See merge request OpenMW/openmw!626
4 years ago
Chris Djali 9bfe941d4b
Merge pull request #3050 from akortunov/master
Double-buffer shader water stateset
4 years ago
Andrei Kortunov 38679013fe Give meaningful name to the mEffectFade 4 years ago
psi29a 35266314e2 Merge branch 'fix-old-ffmpeg' into 'master'
Restore compatibility with FFMpeg < 57.80.100

See merge request OpenMW/openmw!642
4 years ago
Gleb Mazovetskiy 1db7d2ec4e Restore compatibility with FFMpeg < 57.80.100
This should fix macOS Travis build broken by 58d33aa95b
4 years ago
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
4 years ago
psi29a 611a63acc6 Merge branch 'threesacharm' into 'master'
Attempt to fix restocking items in old saves

Closes #5823

See merge request OpenMW/openmw!580
4 years ago
psi29a 699bdab620 Merge branch 'drip' into 'master'
Ignore agents without bounding boxes

Closes #5879

See merge request OpenMW/openmw!641
4 years ago
psi29a 194875dec1 Merge branch 'fix-video-arm' into 'master'
osg-ffmpeg-videoplayer: Fix crash on ARM

Closes #5807

See merge request OpenMW/openmw!564
4 years ago
Andrei Kortunov d805886de7 Double-buffer shader water stateset (bug #5026) 4 years ago
Gleb Mazovetskiy 7f6339c61f AV: Add changelog entry 4 years ago
Gleb Mazovetskiy 36bac353df AV: Handle varying video frame dimensions 4 years ago
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.
4 years ago
Evil Eye eb07818f13 Ignore agents without bounding boxes 4 years ago
Gleb Mazovetskiy eb93fdfbea Use unique_ptr with custom deleter for VideoPicture::rgbaFrame 4 years ago
Chris Djali 213525c372
Merge pull request #3049 from akortunov/master
Use correct mCursorActive flag initial value
4 years ago
Alexei Dobrohotov e9aa161ffc Merge branch 'reallyskipphysics' into 'master'
Close race that breaks scripted teleporting (#5873)

See merge request OpenMW/openmw!639
4 years ago
Andrei Kortunov 482f04c836 Use correct mCursorActive flag initial value 4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
psi29a 4340142c22 Merge branch 'macosx_gitlab' into 'master'
give qt5 a show for brew

See merge request OpenMW/openmw!636
4 years ago
Bret Curtis 9fbb530dde be explicit and print version information to verification 4 years ago
Bret Curtis 53cb20454f add path hack only to verify, will remove later 4 years ago
Bret Curtis f03beb7963 uninstall qt@6 4 years ago
Bret Curtis 8fc0f965bb which qmake? 4 years ago
Bret Curtis 87ede9284b be more explicit 4 years ago
Bret Curtis 17059cefea give qt@5 a try 4 years ago
Bret Curtis caa8b0ca1a give qt5 a show for brew 4 years ago
Andrei Kortunov 7cc97297e7
Merge pull request #3048 from akortunov/master
Fix formatting in the groundcover docs
4 years ago
Andrei Kortunov 41b3090a49 Fix formatting in the groundcover docs 4 years ago
Evil Eye 8ae4ee291f Attempt to fix restocking items in old saves 4 years ago
psi29a d990c425b8 Merge branch 'recastnavigation_custom_path' into 'master'
Support custom path for recastnavigation

See merge request OpenMW/openmw!635
4 years ago
elsid b9575180b5
Support custom recastnavigation system path 4 years ago
elsid b47573f36b
Fix recastnavigation debug library suffixes 4 years ago
Bret Curtis 741584472e another cleanup to FindRecastNavigation.cmake 4 years ago
AnyOldName3 da1d7d7480 Merge branch 'effect_icons' into 'master'
Reset effect icon transparency when they're hidden (#5877)

Closes #5877

See merge request OpenMW/openmw!633
4 years ago
Dobrohotov Alexei fc329050b3 AIPursue: Pursue the player until LOS is established (#5869) 4 years ago
Alexei Dobrohotov 5e91af230d Reset effect icon transparency when they're hidden (#5877) 4 years ago
psi29a 54a7048eed Merge branch 'recast_cmake' into 'master'
initial attempt at FindRecastNavigation.cmake

See merge request OpenMW/openmw!617
4 years ago
Bret Curtis 2bc5a44e15 Added copyright, refactored to be more clear and marked certain things as advanced. 4 years ago
Bret Curtis c4064fca0c include feedback and add DebugUtils and Detour 4 years ago
Bret Curtis ed74834e01 put back the recast stuff 4 years ago
Bret Curtis 28cb14289a initial attempt at FindRecastNavigation.cmake 4 years ago
psi29a 787a976fb8 Merge branch 'mygui-upgrade' into 'master'
MyGUI 3.4.1 compatibility

Closes #5806

See merge request OpenMW/openmw!560
4 years ago