David Cernat
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
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).
4 years ago
Gleb Mazovetskiy
918fd174f3
Set `MYGUI_DONT_USE_OBSOLETE=OFF`
...
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5896
4 years ago
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
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
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
Gleb Mazovetskiy
eb93fdfbea
Use unique_ptr with custom deleter for VideoPicture::rgbaFrame
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
8a1644885b
MyGUI: Bump version to 3.4.1
...
Also set MYGUI_DONT_USE_OBSOLETE
4 years ago
David Cernat
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
Gleb Mazovetskiy
1c9245bd58
Move recastnavigation to FetchContent
4 years ago
David Cernat
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
Gleb Mazovetskiy
3308c717f8
extern/CMakeLists.txt: Switch to openmw's OSG
4 years ago
Gleb Mazovetskiy
4098b455f5
extern/CMakeLists.txt: Bump OSG
...
All the necessary fixes have been upstreamed
4 years ago
Gleb Mazovetskiy
3d334dae75
Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS
4 years ago
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.
4 years ago
Gleb Mazovetskiy
377bd27aa7
set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC})
4 years ago
Gleb Mazovetskiy
eba151884e
Fix Android build
...
https://github.com/openscenegraph/OpenSceneGraph/pull/1037
4 years ago
Gleb Mazovetskiy
f0febe095c
extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on PARENT_SCOPE
4 years ago
Gleb Mazovetskiy
402e43678c
extern/CMakeLists.txt: Bump OSG
4 years ago
Gleb Mazovetskiy
98564b0aae
cmake: move cmake_minimum_required bump to extern/CMakeLists.txt
4 years ago
Gleb Mazovetskiy
93fe84aea8
cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level
4 years ago
Gleb Mazovetskiy
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
4 years ago
Andrei Kortunov
7fc4c9f3f6
Avoid dead code
4 years ago
David Cernat
4620adc662
Add OpenMW commits up to 30 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwphysics/actor.cpp
4 years ago
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
elsid
9363bc2d48
Update recastnavigation to 6624e7aef5e15df11cb2f5673574df8e4c96af6a
4 years ago
David Cernat
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
David Cernat
0eedf8fd9f
Add OpenMW commits up to 30 Sep 2020
...
# Conflicts:
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/summoning.cpp
# components/CMakeLists.txt
4 years ago
Eli2
257a6b4629
Use cmake method to enable interprocedural optimizations
4 years ago
David Cernat
5eb7eb8d88
Add OpenMW commits up to 4 Jul 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/charactercreation.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/character.cpp
5 years ago
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
...
Replace OpenThreads by std types
5 years ago
Andrei Kortunov
230e06dec7
Make joysticks dead zone configurable (bug #5502 )
5 years ago
elsid
40ad87bc4d
Replace OpenThreads by std types
5 years ago
David Cernat
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
Andrei Kortunov
2b4274bca8
Use modern Qt flag declarations
5 years ago
Bret Curtis
61a5c6125d
#5480 : Drop Qt4 support and require Qt 5.12 or later.
5 years ago
David Cernat
053a5a6258
Add OpenMW commits up to 9 May 2020
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/aiextensions.cpp
5 years ago
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
5 years ago
David Cernat
a20f8e77dc
Add OpenMW commits up to 25 Apr 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
5 years ago
elsid
847cd41b01
Update recastnavigation to 57610fa6ef31b39020231906f8c5d40eaa8294ae
5 years ago
AnyOldName3
ac256f05ff
Close graphics context while it still exists
5 years ago
David Cernat
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
Andrei Kortunov
2e7712a390
Fix C5204 warnings by adding default virtual destructors
5 years ago
David Cernat
a58f09fd6c
Add OpenMW commits up to 2 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/enchanting.cpp
# apps/openmw/mwworld/scene.cpp
5 years ago
Andrei Kortunov
fd17a5acf4
Make R&D patch more noticable
5 years ago
David Cernat
ca9cd90a4d
Add OpenMW commits up to 20 Dec 2019
...
# Conflicts:
# apps/openmw/mwworld/scene.cpp
5 years ago
Andrei Kortunov
e1958b671e
Make dtMeshTile POD
5 years ago