0567dc1fd4
Add OpenMW 0.47 commits up to 25 Jul 2021
3 years ago
109a7c3daf
Merge branch 'base64-fixes' into 'master'
...
Base64 fixes
Closes #6111
See merge request OpenMW/openmw!965
(cherry picked from commit 07c3ed16d0e05df8724b1f45696e9d17a2111938)
873b3b48 Handle empty strings.
d38126ef Pack default CS config
4 years ago
6b45a48116
Add OpenMW 0.47 commits up to 1 Jul 2021
...
# Conflicts:
# components/CMakeLists.txt
4 years ago
5a27d6eed7
Merge branch 'fix-ffmpeg-api-const' into 'master'
...
Fix future FFMpeg API changes
See merge request OpenMW/openmw!922
(cherry picked from commit 3794e6d4b20b6c9f47aeaf3f937118c49de700e5)
70a02290 Fix future FFMpeg API changes
4 years ago
7a6dfc61ec
Add OpenMW commits up to 21 May 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/interpretercontext.cpp
# components/CMakeLists.txt
4 years ago
54d32817d5
Use av_free and maybe get Coverity to understand
4 years ago
4bc7012104
Merge branch 'pack-default-settings' into 'master'
...
Pack default settings
Closes #5925
See merge request OpenMW/openmw!822
4 years ago
081650a2e5
Integrate Base64 library with build
4 years ago
2b1326cb74
Change namespace to Base64
...
The functions do Base64 encoding and decoding and do not feed me
delicious almond and meringue based confectionary.
4 years ago
d66cc3b7ae
Fix undefined behaviour
4 years ago
aba735e615
Check in external Base64 implementation
...
Taken from https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594
MIT licenced
4 years ago
66a527c3de
Merge pull request #3075 from akortunov/warnfix
...
Fix MSVC's C4244 and C4267 warnings
4 years ago
bdfbf01772
Update extern Bullet to 3.17
...
Includes performance improvements that affect OpenMW:
* https://github.com/bulletphysics/bullet3/pull/3287
* https://github.com/bulletphysics/bullet3/pull/3293
4 years ago
69aaf6ab04
don't touch frame->data
4 years ago
ed118537a8
use unique_ptr instead
4 years ago
3b7cef9e88
add PacketGuard and move try/catch up
4 years ago
1b61ec979d
switch to lock_guards
4 years ago
963e1b8b3f
Fix MSVC's C4244 warnings
4 years ago
f9d42ed396
Fix MSVC's C4267 warnings
4 years ago
de37ca8e2c
Catch exceptions in VideoThread
4 years ago
ea6d5c68ae
Add OpenMW commits up to 6 May 2021
...
# Conflicts:
# CMakeLists.txt
# components/CMakeLists.txt
4 years ago
6fd04cb8f6
Remove support for single-precision Bullet, fail during configuration instead of during linking.
4 years ago
cedf70f367
Add OpenMW commits up to 13 Apr 2021
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/summoning.cpp
# apps/openmw/mwphysics/mtphysics.hpp
4 years ago
124a33d8a3
Fix uninitialized variables
4 years ago
93954a961c
Unlock mutex on return to avoid hang
4 years ago
3ad2335d11
Fix FetchContent Bullet with MSVC
4 years ago
f8d32c0576
Merge branch 'upd-mygui' into 'master'
...
Update MyGUI
Closes #5897
See merge request OpenMW/openmw!650
4 years ago
59cb31e0a7
Add OpenMW commits up to 20 Mar 2021
...
# Conflicts:
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/aipursue.cpp
# components/CMakeLists.txt
4 years ago
493659d4f9
MSVC: extern/ tweaks to make it build
...
Not everything is supported but it does build with the following CMakeSettings.json
variables and dependencies from vcpkg:
"variables": [
{ "name": "OPENMW_USE_SYSTEM_BULLET", "value": "False", "type": "BOOL" },
{ "name": "OPENMW_USE_SYSTEM_MYGUI", "value": "False", "type": "BOOL" },
{ "name": "OPENMW_USE_SYSTEM_OSG", "value": "False", "type": "BOOL" },
{ "name": "BULLET_STATIC", "value": "True", "type": "BOOL" },
{ "name": "OSG_STATIC", "value": "False", "type": "BOOL" },
{ "name": "MYGUI_STATIC", "value": "False", "type": "BOOL" }
],
What works: it builds
What does not work: Not all DLLs are copied into the output directory with this set up
(SDL2, MyGUI, Bullet, OSG, are not copied).
4 years ago
918fd174f3
Set `MYGUI_DONT_USE_OBSOLETE=OFF`
...
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5896
4 years ago
36cea2073f
Update MyGUI
...
Includes f01cba4bb3https://gitlab.com/OpenMW/openmw/-/issues/5897
4 years ago
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
4 years ago
1db7d2ec4e
Restore compatibility with FFMpeg < 57.80.100
...
This should fix macOS Travis build broken by 58d33aa95b
4 years ago
36bac353df
AV: Handle varying video frame dimensions
4 years ago
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
eb93fdfbea
Use unique_ptr with custom deleter for VideoPicture::rgbaFrame
4 years ago
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
8a1644885b
MyGUI: Bump version to 3.4.1
...
Also set MYGUI_DONT_USE_OBSOLETE
4 years ago
39dc6fc355
Add OpenMW commits up to 24 Feb 2021
...
# Conflicts:
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# components/CMakeLists.txt
4 years ago
1c9245bd58
Move recastnavigation to FetchContent
4 years ago
e1259fdc41
Add OpenMW commits up to 4 Feb 2021
...
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwrender/globalmap.cpp
4 years ago
3308c717f8
extern/CMakeLists.txt: Switch to openmw's OSG
4 years ago
4098b455f5
extern/CMakeLists.txt: Bump OSG
...
All the necessary fixes have been upstreamed
4 years ago
3d334dae75
Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS
4 years ago
daf080ff19
cmake: Move MYGUI/OSG_STATIC default to top-level
...
Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
4 years ago
377bd27aa7
set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC})
4 years ago
eba151884e
Fix Android build
...
https://github.com/openscenegraph/OpenSceneGraph/pull/1037
4 years ago
f0febe095c
extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on PARENT_SCOPE
4 years ago
402e43678c
extern/CMakeLists.txt: Bump OSG
4 years ago
98564b0aae
cmake: move cmake_minimum_required bump to extern/CMakeLists.txt
4 years ago
David Cernat
psi29a
Evil Eye
AnyOldName3
Gleb Mazovetskiy
Andrei Kortunov
fredzio
AnyOldName3