Commit Graph

25072 Commits (690995988bd4f0251ebb2de0a71aa6813566139e)
 

Author SHA1 Message Date
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
Gleb Mazovetskiy 8a1644885b MyGUI: Bump version to 3.4.1
Also set MYGUI_DONT_USE_OBSOLETE
4 years ago
Gleb Mazovetskiy 4495b67d77 MyGUI HEAD compatibility
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614

Refs #5806
4 years ago
Evil Eye e2fc5d87b3 Merge branch 'elemental_shields' into 'master'
Don't let elemental shields harm the player in god mode

Closes #5875

See merge request OpenMW/openmw!631
4 years ago
Alexei Dobrohotov 023bc80f55 Don't let elemental shields harm the player in god mode 4 years ago
psi29a eb11e1fcdb Merge branch 'build-accelerator' into 'master'
heightfield: Only `buildAccelerator` on Bullet 2.89+

Closes #5874

See merge request OpenMW/openmw!630
4 years ago
Gleb Mazovetskiy 1fb442e701 heightfield: Only `buildAccelerator` on Bullet 2.89+
Fixes #5874
4 years ago
psi29a 570bf567cd Merge branch 'fix_navigator_tests' into 'master'
Fix navigator tests (Bullet changes related)

See merge request OpenMW/openmw!629
4 years ago
elsid fac5759748
Set bounding min and max height for btHeightfieldTerrainShape
They must be set for proper AABB based filtering. Use
+-max(abs(min), abs(max)) to make sure bullet does not shift coordinates by z.
4 years ago
elsid fdca76ce86
Remove unused includes 4 years ago
Gleb Mazovetskiy 044e784072 gl4es: Delay feature detection until a context exists
gl4es feature detection does not work reliably with EGL.

If a context already exists, gl4es can instead reliably detect
the underlying GLES features from the context itself.

This requires gl4es to be configured with:

    -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON

This also requires gl4es to have this fix: https://github.com/ptitSeb/gl4es/pull/271
4 years ago
psi29a 28be5a259b Merge branch 'russian_console' into 'master'
Don't assume unmapped keycodes outside the extended ASCII range are unprintable

Closes #5871

See merge request OpenMW/openmw!622
4 years ago
psi29a 937549c99e Merge branch 'fix_still_actors' into 'master'
Make actor flee from a combat when cannot reach a target (#5851)

See merge request OpenMW/openmw!601
4 years ago
psi29a 20e6db917b Merge branch 'fix-osg-static' into 'master'
CMake: Fix support for OSG static lib paths

See merge request OpenMW/openmw!624
4 years ago
psi29a 7088e790dd Merge branch 'include-tuple' into 'master'
Fix compilation of tests with MSVC

See merge request OpenMW/openmw!625
4 years ago
AnyOldName3 46a1715d8a Actually return something 4 years ago
AnyOldName3 16e8cf89af Fix compilation of tests with MSVC 4 years ago
AnyOldName3 f5a87ee46d Refactor out duplicated RTT setup code 4 years ago
AnyOldName3 e3547fe689 Merge branch 'heightfield-accel' into 'master'
heighfield: buildAccellerator()

See merge request OpenMW/openmw!623
4 years ago
Gleb Mazovetskiy 21a70b7d2b heighfield: buildAccellerator()
This enables accelleration of heightfield collisions.

Unfortunately, `btHeightfieldTerrainShape::processAllTriangle` does not
yet use the accellerator data, so this change does not improve
performance yet but might do so in future bullet versions.

References:

* Accellerator introduced in:
  https://github.com/bulletphysics/bullet3/pull/2062

* Feature request to use the accellerator in `processAllTriangle`:
  https://github.com/bulletphysics/bullet3/issues/3276
4 years ago
Gleb Mazovetskiy 13c5b1b0c5 CMake: Fix support for OSG static lib paths
`$<TARGET_FILE:...>` fails if the argument is already a path (instead of
a library name). This happens when a static library is found via
`osg_find_library`.

If the argument contains `/` or `.`, do not use `$<TARGET_FILE:...>`
4 years ago
Alexei Dobrohotov 92300733c5
Merge pull request #3047 from akortunov/master
Remove outdated entries from gitignore
4 years ago