mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
24955 commits 38 branches 54 tags 122 MiB
Commit graph

4833 commits

Author SHA1 Message Date
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
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
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
Sergey Fukanchik
f3271cb66b Add unit test for swapEndiannessInplace(). Part of Bug #5837 2021-02-09 13:09:36 -05:00
Petr Mikheev
31b5150e0d Fix implementation of Misc::swapEndiannessInplace 2021-02-07 09:12:38 +01:00
psi29a
dc31e1c680 Merge branch 'refraction_shadow_fix_2' into 'master' 
Fix shadows missing in the refraction RTT on the first and second frame

See merge request OpenMW/openmw!590
 2021-02-06 20:26:46 +00:00
AnyOldName3
3e273a759a Clarify method name now we're using it differently 2021-02-06 16:41:46 +00:00
fredzio
6e969ca3fa Use mesh collision box instead of node bounding sphere for projectile 
size. The bounding sphere is much bigger than the mesh.
 2021-02-05 22:53:45 +01:00
Alexei Dobrohotov
ab28847eaf Merge branch 'collisionextentsandcenter' into 'master' 
Get collision box extents and center from btBvhTriangleMeshShape

See merge request OpenMW/openmw!579
 2021-02-04 23:03:43 +00:00
unelsson
303f1912a6 less debug spam 2021-02-04 23:14:52 +02:00
unelsson
d5844b0982 Use accompanying txt file for textkeys in osgAnimation formats 2021-02-04 23:14:21 +02:00
elsid
68fe6b9114
Use only item size to check whether item fits cache 
Item size has to be counted anyway and there is no reason to check only navmesh
data first.
 2021-02-04 01:12:59 +01:00
elsid
3a2cea5271
Use raw recast mesh data and off mesh connections for navmesh key 
Serialization into a vector of chars produces inconsistent results that leads
to reduced cache hit rate. Using a structured object is a more clear solution
and allows to remove serialization and nontrivial key compare logic with more
straigt forward structured object comparison.
 2021-02-04 01:01:15 +01:00
elsid
ad1f8c1e84
Sort water and off mesh connections for recast mesh 
Inconsisten order of these objects in navmesh cache key leads to cache misses
due to key inequality.
 2021-02-04 01:00:41 +01:00
elsid
489107c5ee
Count navmesh cache key once in item size 
Key is stored only in NavMeshTilesCache::Item, TileMap uses KeyView with
a pointer to a vector.
 2021-02-04 00:44:23 +01:00
elsid
88ca4a1db6
Count navmesh cache hit rate 2021-02-04 00:35:24 +01:00
Nelsson Huotari
45fde84f4f Use nodemasks and visitors for detecting custom collision shapes 2021-02-03 21:16:54 +02:00
Nelsson Huotari
5c32460153 Add underscore-separated node-names to reserved-list 2021-02-03 14:25:50 +02:00
Nelsson Huotari
384112746c Add option for custom collision node with non-nif files 2021-02-03 14:25:09 +02:00