1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 23:45:32 +00:00
Commit graph

24983 commits

Author SHA1 Message Date
psi29a
4974b64cbf Update CI/before_install.osx.sh 2021-01-17 15:58:43 +00:00
psi29a
9eba086c34 Merge branch 'sound_buffer_pool_2' into 'master'
Separate sound buffer pool from sound manager

See merge request OpenMW/openmw!520
2021-01-17 12:11:11 +00:00
madsbuvi
018e790ec0 Unite all viewer traversals. 2021-01-17 12:12:14 +01:00
madsbuvi
e59fcf7613 Unit test fix 2021-01-16 17:30:59 +01:00
madsbuvi
329a479f48 Refactoring and a comment reminding that this code is temporary. 2021-01-16 14:43:12 +01:00
madsbuvi
dea89d8168 Merge branch 'openmw-vr' of https://gitlab.com/madsbuvi/openmw into openmw-vr 2021-01-16 14:31:30 +01:00
madsbuvi
70d99fd6d0 Temporary gamma solution 2021-01-16 14:30:59 +01:00
AnyOldName3
a8014b4d97 Merge branch 'osg-find-plugins-2' into 'master'
cmake/FindOSGPlugins: Support lib-prefixed plugins

Closes #5792

See merge request OpenMW/openmw!544
2021-01-15 17:36:50 +00:00
Gleb Mazovetskiy
11dfb9daff cmake/FindOSGPlugins: Support lib-prefixed plugins
With a regular OSG build, the plugin names are prefixed with
`lib`, e.g. `libosgdb_jpeg.a` for a static build.

However, on Debian on Ubuntu they are not.

With this commit we now try both options.

Fixes #5972

Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
2021-01-15 16:52:18 +00:00
Mads Buvik Sandvei
e5bc79706f Update README.md 2021-01-14 19:39:49 +00:00
Mads Buvik Sandvei
2370364938 Update README.md 2021-01-14 19:33:56 +00:00
psi29a
7455dfb3a1 Merge branch 'windowing-system' into 'master'
Fix OSG USE_GRAPHICSWINDOW check

See merge request OpenMW/openmw!541
2021-01-14 15:00:34 +00:00
psi29a
4e39e0b01d Merge branch 'fix-libfind-pkg-detect' into 'master'
cmake: Fix MyGUI detection

See merge request OpenMW/openmw!535
2021-01-14 14:56:44 +00:00
psi29a
c6d5634654 Merge branch 'fix-missing-opengl-include-dir' into 'master'
cmake: Fix missing OPENGL_INCLUDE_DIR

See merge request OpenMW/openmw!542
2021-01-14 14:10:47 +00:00
Gleb Mazovetskiy
24d8412c0c cmake: Fix missing OPENGL_INCLUDE_DIR
OPENGL_INCLUDE_DIR wasn't being included.
It is usually just /usr/include but if it was custom the build failed.
2021-01-14 02:52:59 +00:00
Bret Curtis
e68651e9a6
Merge pull request #3042 from akortunov/helpers
Refactoring pre-requisites for groundcover
2021-01-13 23:09:01 +01:00
Gleb Mazovetskiy
d24a5f7b89 Fix OSG USE_GRAPHICSWINDOW check
When OSG is built with `-DOSG_WINDOWING_SYSTEM=None`, this macro does not exist.

Replaces the Android-specific check with a general one.
2021-01-13 20:45:34 +00:00
Mads Buvik Sandvei
37585d29bd Merge branch 'linux_gl_sys_req' into 'openmw-vr'
call xrGetOpenGLGraphicsRequirementsKHR on linux too

See merge request madsbuvi/openmw!15
2021-01-13 16:43:44 +00:00
Nelsson Huotari
5740258d3b Add changelog entry 2021-01-13 16:23:59 +02:00
Nelsson Huotari
f2fc02cdff Support filtered tables (mapToSource for indexes) 2021-01-13 15:55:16 +02:00
Nelsson Huotari
16e03c151a Implement basic move algorithm, connect it to drag&drop 2021-01-13 15:38:29 +02:00
Christoph Haag
981ed25dac call xrGetOpenGLGraphicsRequirementsKHR on linux too
This call is required per the spec.
2021-01-13 13:32:34 +01:00
Mads Buvik Sandvei
935351d9a0 Merge branch 'include_memory' into 'openxr_vr'
include <memory> for unique_ptr on gcc

See merge request madsbuvi/openmw!13

(cherry picked from commit 1d98299933344a233d532941a87a09d898d02fed)

f70b95ab include <memory> for unique_ptr on gcc
2021-01-13 11:05:21 +00:00
Andrei Kortunov
89f3f860ed Allow to get a rotation vector from ESM::Position 2021-01-13 14:25:25 +04:00
Andrei Kortunov
0418e8e7a6 Add an API to get base wind speed (which is from openmw.cfg) 2021-01-13 14:25:25 +04:00
Andrei Kortunov
f175beb304 Define template ref classes in components 2021-01-13 14:25:21 +04:00
Gleb Mazovetskiy
823e7bea38 Fix MyGUI detection
`libfind_pkg_detect` used `pkg_check_modules`, which requires all the
given modules to be found.

This means it always failed for MyGUI, which passes
`MyGUI${MYGUI_STATIC_SUFFIX} MYGUI${MYGUI_STATIC_SUFFIX}` to it.

Replaces `pkg_check_modules` with `pkg_search_module`, which finds the
first match instead.
2021-01-13 02:51:43 +00:00
psi29a
fd602e2c31 Merge branch 'viewdist' into 'master'
Downgrade FOV-dependent view distance factor to a recommendation

See merge request OpenMW/openmw!531
2021-01-12 19:51:21 +00:00
Bret Curtis
d944f703e8 Merge branch 'master' of gitlab.com:OpenMW/openmw 2021-01-12 19:58:56 +01:00
Bret Curtis
73740013a3 mResourceSystem initialization reorder 2021-01-12 19:58:46 +01:00
psi29a
abdc4cde95 Merge branch 'float' into 'master'
Allow all creatures to float to the water surface (#5790, #5758)

Closes #5758 and #5790

See merge request OpenMW/openmw!534
2021-01-12 18:45:10 +00:00
psi29a
3e35df49df Merge branch 'mResourceSystem_nullptr' into 'master'
mResourceSystem initialise as nullptr

See merge request OpenMW/openmw!533
2021-01-12 12:50:37 +00:00
Alexei Dobrohotov
4638fc36b4 Allow all creatures to float to the water surface 2021-01-12 15:46:19 +03:00
psi29a
3903142152 Update apps/openmw/mwbase/environment.cpp 2021-01-12 12:05:17 +00:00
psi29a
654238fd18 Merge branch 'no_bonus_points' into 'master'
Show mesh origin

Closes #5771

See merge request OpenMW/openmw!507
2021-01-11 21:21:47 +00:00
psi29a
29fdcb3fa1 Merge branch 'hardlanding' into 'master'
Init mJumpState based on saved fallheight (#5739)

See merge request OpenMW/openmw!532
2021-01-11 20:46:42 +00:00
Nelsson Huotari
70087e16fe Disable dialogue info table sorting 2021-01-11 20:49:35 +02:00
fredzio
3087ce9c70 Use saved fallheight to determine a character's jump state.
The jump state initial state is "none", and it is set after physics simulation.
If a save is done just above the ground, the character may land before
the first run of the simulation, effectively cancelling the effect of
falling.
2021-01-11 18:38:20 +01:00
madsbuvi
2a593498de Save game crash. 2021-01-11 17:37:24 +01:00
psi29a
acfd2cfd90 Merge branch 'dialogclonefix' into 'master'
[OpenMW-CS] Fix cloning in info records

See merge request OpenMW/openmw!524
2021-01-11 14:13:53 +00:00
Nelsson Huotari
93b1b444f2 Optimize CreateCommand and CloneCommand configuration 2021-01-11 12:53:34 +02:00
Alexei Dobrohotov
7be7af13d7 Downgrade FOV-dependent view distance factor to a recommendation 2021-01-11 06:53:23 +03:00
psi29a
6863c5a68f Merge branch 'raii' into 'master'
Make all physics object manage their own resources.

See merge request OpenMW/openmw!527
2021-01-10 20:50:55 +00:00
Nelsson Huotari
7196ad7455 Implement an override-value when cloning, use when cloning info records 2021-01-10 21:23:52 +02:00
Alexei Dobrohotov
f150a92775 Merge branch 'respect_almas_personal_space' into 'master'
Tweak follow distance to be more like the original

See merge request OpenMW/openmw!530
2021-01-10 16:48:14 +00:00
madsbuvi
2b7f94aa5d GCC fixes 2021-01-10 17:26:38 +01:00
Petr Mikheev
66559e8827 Merge branch 'endianness' into 'master'
Utility function for little-endian <-> big-endian conversion

See merge request OpenMW/openmw!516
2021-01-10 16:18:06 +00:00
Petr Mikheev
eaaa2f4a1c Use misc/endianness.hpp in components/nif/nifstream 2021-01-10 16:34:47 +01:00
Petr Mikheev
14dd11372f Utility functions for little-endian <-> big-endian conversion. 2021-01-10 16:34:47 +01:00
Evil Eye
1ab4683dce Tweak follow distance to be more like the original 2021-01-10 16:29:32 +01:00