David Cernat
17ee3d54e4
[General] Lower priority of WorldRegionAuthority packets
...
Previously, sending a PlayerCellChange packet and a WorldRegionAuthority packet to the player at the same time made the latter arrive first even if the former was intended by a server script to arrive first.
2021-03-25 11:25:22 +02:00
David Cernat
4940687455
[General] Remove 'using namespace std' from multiplayer components
2021-03-21 00:07:12 +02:00
David Cernat
59cb31e0a7
Add OpenMW commits up to 20 Mar 2021
...
# Conflicts:
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/aipursue.cpp
# components/CMakeLists.txt
2021-03-20 16:44:11 +02:00
Bret Curtis
68c1adec0f
Merge pull request #3055 from akortunov/keyinit
...
Init animation key struct before usage
2021-03-18 12:28:10 +01:00
Andrei Kortunov
a22f6b24d5
Init animation key struct before usage
2021-03-18 11:47:06 +04:00
Alexei Dobrohotov
7acebbd6e8
Merge branch 'no-using-namespace-std' into 'master'
...
Minor cleanup: Remove `using namespace std`
See merge request OpenMW/openmw!664
2021-03-17 16:49:32 +00:00
Gleb Mazovetskiy
b9c2f6ea1a
Minor cleanup: Remove using namespace std
...
I came across these while trying to figure why MSVC build triggers
https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889
In the end, the issue was not in openmw but in OSG, but it's good to
clean up here anyway.
2021-03-16 19:58:02 +00:00
AnyOldName3
ba74fbf30e
Fix MyGUI log
...
Also actually print an error to the regular log when the MyGUI log can't
be opened so we notice if we kill it again in under five years.
2021-03-15 22:35:13 +00:00
AnyOldName3
20852e82b2
Merge branch 'zbuffer' into 'master'
...
NiZBufferProperty: handle depth test flag (bug #5902 )
Closes #5902
See merge request OpenMW/openmw!658
2021-03-15 15:20:50 +00:00
Dobrohotov Alexei
952b31ac5c
NiZBufferProperty: handle depth test flag (bug #5902 )
2021-03-15 13:40:02 +03:00
Bret Curtis
90baf8ad60
Merge pull request #3053 from akortunov/master
...
Add move assignment operator for the ESM::Variant
2021-03-14 22:12:23 +01:00
AnyOldName3
9466d6a409
Hide macro usage from Macs where it isn't defined
2021-03-14 03:42:23 +00:00
Andrei Kortunov
4d48c81998
Add move assignment operator and move constructor for the ESM::Variant
2021-03-13 22:28:13 +04:00
psi29a
cc6f08930b
Merge branch 'alpha-meddling' into 'master'
...
Replace deprecated alpha test in shader visitor
Closes #4899
See merge request OpenMW/openmw!473
2021-03-13 08:13:19 +00:00
AnyOldName3
0431ba4c87
Merge branch 'alpha-meddling-shader-side-mip-meddling' into alpha-meddling
2021-03-13 01:23:30 +00:00
AnyOldName3
d52ae28b7a
Fix linking on MacOS
2021-03-11 00:28:14 +00:00
psi29a
9f47190411
Merge branch 'now-it-blends' into 'master'
...
Convert blending factors properly for the character preview
See merge request OpenMW/openmw!644
2021-03-10 23:27:04 +00:00
AnyOldName3
cb2cbb4181
Convert blending factors properly for the character preview
2021-03-10 22:07:14 +00:00
AnyOldName3
450b971bb0
Merge branch 'gl4es-patch' into 'master'
...
gl4es: Delay feature detection until a context exists
See merge request OpenMW/openmw!626
2021-03-10 19:01:39 +00:00
AnyOldName3
deb184cdce
Merge branch 'fix-build' into 'master'
...
Fix linking with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`
See merge request OpenMW/openmw!640
2021-03-08 19:01:02 +00:00
Evil Eye
eb07818f13
Ignore agents without bounding boxes
2021-03-07 20:58:09 +01:00
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
2021-03-06 21:17:52 +00:00
Gleb Mazovetskiy
4495b67d77
MyGUI HEAD compatibility
...
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614
Refs #5806
2021-03-02 13:24:30 +00:00
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
2021-02-28 07:59:48 +00:00
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
2021-02-26 23:25:05 +00:00
AnyOldName3
46a1715d8a
Actually return something
2021-02-26 20:10:58 +00:00
AnyOldName3
16e8cf89af
Fix compilation of tests with MSVC
2021-02-26 20:10:03 +00:00
AnyOldName3
f5a87ee46d
Refactor out duplicated RTT setup code
2021-02-26 19:01:27 +00:00
AnyOldName3
153ab57ae3
Make assignment in while loop condition obviously intentional
2021-02-24 17:45:44 +00:00
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
2021-02-24 13:02:57 +02:00
AnyOldName3
2b144ff3dd
Merge branch 'fix_frame_rate_limit' into 'master'
...
Fix frame rate limit (#5686 )
See merge request OpenMW/openmw!603
2021-02-21 16:20:51 +00:00
AnyOldName3
9be258d260
Make it possible to reinstate FFP state easily
2021-02-19 19:59:48 +00:00
psi29a
5c0214142b
Merge branch 'static-build' into 'master'
...
Optional local source builds of OSG, MyGUI, Bullet
See merge request OpenMW/openmw!547
2021-02-19 16:58:05 +00:00
psi29a
de28a89a43
Merge branch 'navigator_cleanup' into 'master'
...
Navigator cleanup
See merge request OpenMW/openmw!612
2021-02-19 16:37:45 +00:00
psi29a
59e09cba5b
Merge branch 'boltsize' into 'master'
...
Use projectile mesh size (#5829 )
See merge request OpenMW/openmw!587
2021-02-15 08:40:30 +00:00
elsid
561628087c
Merge branch 'profiler_fix' into 'master'
...
Fix profiler glitches (#5850 )
See merge request OpenMW/openmw!605
2021-02-15 00:01:06 +00:00
elsid
bc67669a97
Comment unused argument
2021-02-15 00:22:48 +01:00
elsid
4983684fda
Fix implicit int to float conversion warning
2021-02-15 00:20:15 +01:00
elsid
bb0c478954
Add missing include and use std malloc and free
2021-02-15 00:20:15 +01:00
elsid
3a9b1ce63a
Use camel case for local constant
2021-02-15 00:20:14 +01:00
elsid
a7fe6c7ba1
Move duplicated usage patter of dtNavMeshQuery::findNearestPoly into a separate function
2021-02-14 23:54:59 +01:00
elsid
d3ab6c972f
Avoid set unused position from dtNavMeshQuery::findNearestPoly result
2021-02-14 23:54:59 +01:00
AnyOldName3
4f510d85ba
Merge remote-tracking branch 'upstream/master' into alpha-meddling
2021-02-14 22:42:55 +00:00
David Cernat
7e188f2dd6
Add OpenMW commits up to 14 Feb 2021
...
# Conflicts:
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwscript/aiextensions.cpp
2021-02-14 19:49:22 +02:00
elsid
8dba61f7ae
Use navmesh raycast to find reachable position around target
2021-02-14 04:14:22 +01:00
fredzio
c4e909c29e
Silence a clang warning:
...
warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
2021-02-12 19:36:03 +01:00
fredzio
bc4047d815
Update engine stats for all levels above first, not only at the second.
2021-02-12 19:03:02 +01:00
elsid
8ab5fd9b40
Fix frame rate limit
...
Measure time at the computation end but before sleep. This allows to adjust
sleep interval for the next frame in case sleep is not precise due to syscall
overhead or too low timer resolution.
Remove old frame limiting mechanism.
2021-02-12 00:03:11 +01:00
psi29a
c33b2e0100
Merge branch 'dehardcodebaseanim' into 'master'
...
Dehardcode Base_animation and improve Collada support
See merge request OpenMW/openmw!510
2021-02-10 16:29:47 +00:00
David Cernat
a379d12529
[General] Turn Utils::printVersion() into Utils::getVersionInfo()
2021-02-10 02:54:37 +02:00