mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 12:39:59 +00:00
Code Issues Projects Releases Wiki Activity
31,497 Commits 17 Branches 68 Tags
Commit Graph

483 Commits

Author SHA1 Message Date
AnyOldName3
2b1326cb74 Change namespace to Base64 
The functions do Base64 encoding and decoding and do not feed me
delicious almond and meringue based confectionary.
 2021-05-17 22:50:32 +01:00
AnyOldName3
d66cc3b7ae Fix undefined behaviour 2021-05-17 22:47:08 +01:00
AnyOldName3
aba735e615 Check in external Base64 implementation 
Taken from https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594

MIT licenced
 2021-05-17 22:45:10 +01:00
Bret Curtis
66a527c3de
Merge pull request #3075 from akortunov/warnfix 
Fix MSVC's C4244 and C4267 warnings
 2021-05-14 21:28:56 +02:00
Gleb Mazovetskiy
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
 2021-05-14 00:05:00 +01:00
Evil Eye
69aaf6ab04 don't touch frame->data 2021-05-13 14:45:13 +02:00
Evil Eye
ed118537a8 use unique_ptr instead 2021-05-13 14:02:36 +02:00
Evil Eye
3b7cef9e88 add PacketGuard and move try/catch up 2021-05-13 12:01:32 +02:00
Evil Eye
1b61ec979d switch to lock_guards 2021-05-13 11:25:58 +02:00
Andrei Kortunov
963e1b8b3f Fix MSVC's C4244 warnings 2021-05-12 10:34:40 +04:00
Andrei Kortunov
f9d42ed396 Fix MSVC's C4267 warnings 2021-05-12 10:34:39 +04:00
Evil Eye
de37ca8e2c Catch exceptions in VideoThread 2021-05-10 17:47:57 +02:00
fredzio
6fd04cb8f6 Remove support for single-precision Bullet, fail during configuration instead of during linking. 2021-05-02 17:48:50 +02:00
Andrei Kortunov
124a33d8a3 Fix uninitialized variables 2021-04-10 10:58:00 +04:00
Andrei Kortunov
93954a961c Unlock mutex on return to avoid hang 2021-04-10 09:30:58 +04:00
AnyOldName3
3ad2335d11 Fix FetchContent Bullet with MSVC 2021-04-07 20:23:39 +00:00
psi29a
f8d32c0576 Merge branch 'upd-mygui' into 'master' 
Update MyGUI

Closes #5897

See merge request OpenMW/openmw!650
 2021-03-22 21:28:13 +00:00
Gleb Mazovetskiy
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).
 2021-03-16 19:52:10 +00:00
Gleb Mazovetskiy
918fd174f3 Set MYGUI_DONT_USE_OBSOLETE=OFF 
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5896
 2021-03-14 12:39:55 +00:00
Gleb Mazovetskiy
36cea2073f Update MyGUI 
Includes f01cba4bb3
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5897
 2021-03-13 12:10:14 +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
1db7d2ec4e Restore compatibility with FFMpeg < 57.80.100 
This should fix macOS Travis build broken by 58d33aa95b729d81c236a587b59352c6a7c7f017
 2021-03-08 19:29:34 +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
Gleb Mazovetskiy
eb93fdfbea Use unique_ptr with custom deleter for VideoPicture::rgbaFrame 2021-03-07 17:58:09 +00: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
8a1644885b MyGUI: Bump version to 3.4.1 
Also set MYGUI_DONT_USE_OBSOLETE
 2021-03-02 13:26:23 +00:00
Gleb Mazovetskiy
1c9245bd58 Move recastnavigation to FetchContent 2021-02-19 18:35:34 +00:00
Gleb Mazovetskiy
3308c717f8 extern/CMakeLists.txt: Switch to openmw's OSG 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
4098b455f5 extern/CMakeLists.txt: Bump OSG 
All the necessary fixes have been upstreamed
 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
3d334dae75 Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
daf080ff19 cmake: Move MYGUI/OSG_STATIC default to top-level 
Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
377bd27aa7 set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC}) 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
eba151884e Fix Android build 
https://github.com/openscenegraph/OpenSceneGraph/pull/1037
 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
f0febe095c extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on PARENT_SCOPE 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
402e43678c extern/CMakeLists.txt: Bump OSG 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
98564b0aae cmake: move cmake_minimum_required bump to extern/CMakeLists.txt 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
93fe84aea8 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99ba45a308 Optional static builds of OSG, MyGUI, Bullet 2021-01-26 19:00:55 +00:00
Andrei Kortunov
7fc4c9f3f6 Avoid dead code 2021-01-09 13:52:01 +04:00
Andrei Kortunov
8084a336b5 Replace zeroes and nulls by nullptrs 2020-11-29 11:14:07 +04:00
elsid
9363bc2d48
Update recastnavigation to 6624e7aef5e15df11cb2f5673574df8e4c96af6a 2020-11-18 18:03:29 +01:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
Eli2
257a6b4629 Use cmake method to enable interprocedural optimizations 2020-09-03 20:01:20 +01:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads 
Replace OpenThreads by std types
 2020-07-04 13:11:23 +02:00
Andrei Kortunov
230e06dec7 Make joysticks dead zone configurable (bug #5502) 2020-06-28 13:12:12 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
Andrei Kortunov
2b4274bca8 Use modern Qt flag declarations 2020-06-22 18:46:45 +04:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
psi29a
b9cd8d23a4 Merge branch 'cs-crash-on-exit-fix' into 'master' 
Stop the CS crashing on exit - Close graphics context while it still exists

See merge request OpenMW/openmw!182
 2020-05-02 10:25:59 +00:00