1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:49:56 +00:00
Commit graph

25543 commits

Author SHA1 Message Date
Ilya Zhuravlev
13f060623f Fix out-of-bounds access in JournalBooks::createCyrillicJournalIndex 2021-05-15 10:45:39 -04:00
jvoisin
690d85d0e9 Don't use at() instead [] when length is checked/known 2021-05-15 15:38:17 +02:00
elsid
5373cf1cd5
Replace raw pointer by observer_ptr to avoid dangling pointer dereferencing
When game exit is requests when initial loading screen is active LightManager
can be destructed in the main thread before LightManagerStateAttribute::apply
is completed by different thread. Given that it uses raw pointer at some point
it becomes dangling because object is destructed this leads to UB and eventual
SIGSEGV.
2021-05-15 15:23:28 +02:00
Andrei Kortunov
b63f53f5bb Disable shield animation when we launch a torch one (bug #6043) 2021-05-15 11:31:08 +04:00
AnyOldName3
5d83de189a Merge branch 'insert_or_assign' into 'master'
Use insert_or_assign() instead of hand rolled version.

See merge request OpenMW/openmw!862
2021-05-14 22:57:07 +00:00
fredzio
fb344d27e0 Use insert_or_assign() instead of hand rolled version. 2021-05-14 23:38:39 +02:00
elsid
eeba92d48b Merge branch 'includes_detournavigator' into 'master'
Remove some superfluous includes in components/detournavigator

See merge request OpenMW/openmw!860
2021-05-14 21:09:22 +00:00
elsid
59f89d22f8
Apply min distance only for not present tiles
To avoid waiting when navmesh update is triggered by transformed object for
already present tiles.
2021-05-14 22:41:11 +02:00
elsid
d0ea9c482a
Reorder async navmesh updater jobs when player tile changes
When player tile changes distance to player that is part of jobs priority is
invalidated. So jobs are no longer in the right order. This can lead to
processing of farests tiles first.

Sort queue each time player tile is changed.
2021-05-14 22:41:05 +02: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
AnyOldName3
a46f217afb Merge branch 'correct_particle_quota' into 'master'
Use NiParticleData info for particle system quota

Closes #6028

See merge request OpenMW/openmw!855
2021-05-14 19:07:29 +00:00
jvoisin
28d5e5e8be Remove some superfluous includes in components/detournavigator 2021-05-14 20:45:59 +02:00
glassmancody.info
4bbbbb00f6 use particle data for particle system quota 2021-05-14 10:52:19 -07:00
psi29a
3944648f0b Merge branch 'opencs_remove_inclde' into 'master'
Remove some superfluous includes in the opencs

See merge request OpenMW/openmw!829
2021-05-14 13:33:06 +00:00
jvoisin
06ae26037f Remove some superfluous includes in the opencs 2021-05-14 10:57:31 +02:00
AnyOldName3
82bd88c818 Merge branch 'update-bullet2' into 'master'
Update extern Bullet to 3.17

See merge request OpenMW/openmw!854
2021-05-14 00:18:01 +00: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
psi29a
d843ec321e Merge branch 'DoNotSearchTwice' into 'master'
Search only in the niffilemanager for nif files

See merge request OpenMW/openmw!823
2021-05-13 17:11:57 +00:00
psi29a
6a5a9fbde4 Merge branch 'static-access' into 'master'
[Launcher] Replacing static method access through instances

See merge request OpenMW/openmw!834
2021-05-13 17:06:44 +00:00
psi29a
a8898a3d4c Merge branch 'remove_extra_box' into 'master'
[Launcher] Removing extra box surrounding all main content

See merge request OpenMW/openmw!832
2021-05-13 17:04:25 +00:00
psi29a
fd89582e0c Merge branch 'navmesh_wait' into 'master'
Wait until navmesh is generated within given distance around player (#5500)

Closes #5500

See merge request OpenMW/openmw!819
2021-05-13 16:56:39 +00:00
psi29a
5cd4dc2840 Merge branch 'catchy_video' into 'master'
Catch exceptions in VideoThread

Closes #6007

See merge request OpenMW/openmw!835
2021-05-13 16:48:01 +00:00
Petr Mikheev
4a7147e222 Merge branch 'constexpr_esm' into 'master'
Use a constexpr for esm cc

See merge request OpenMW/openmw!849
2021-05-13 13:30:01 +00:00
Petr Mikheev
b0c9f6167c Merge branch 'fix_crash_ai' into 'master'
Fix a crash in aipackage.cpp

Closes #5966

See merge request OpenMW/openmw!848
2021-05-13 13:07:20 +00:00
Evil Eye
69aaf6ab04 don't touch frame->data 2021-05-13 14:45:13 +02:00
jvoisin
bcd8190516 Fix a crash in aipackage.cpp 2021-05-13 14:19:12 +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
jvoisin
89f721fad3 Use a constexpr for esm cc 2021-05-12 22:35:00 +02:00
psi29a
e74ea56434 Merge branch 'update_changelog' into 'master'
Add changelog entries for navigator features

See merge request OpenMW/openmw!846
2021-05-12 15:53:07 +00:00
elsid
6e19e3a9bb
Add changelog entries for navigator features 2021-05-12 09:51:41 +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
Bret Curtis
a70f93a3cf
Merge pull request #3086 from akortunov/master
Make groundcover to use rendering distance in units instead of cells
2021-05-12 08:31:50 +02:00
Andrei Kortunov
49a744b65a Make groundcover to use rendering distance in units instead of cells 2021-05-12 09:29:25 +04:00
Andrei Kortunov
852c71fe22
Merge pull request #3087 from akortunov/near_clip
Temporary increase default near clip distance
2021-05-12 08:56:24 +04:00
Andrei Kortunov
08f30e6f50 Temporary increase default near clip distance, until reverse-z depth buffer is implemented 2021-05-11 21:41:29 +04:00
Bret Curtis
a89b9f338c
Merge pull request #3085 from akortunov/master
Recreate a special case for IntersectionVisitor on QuadTreeWorld
2021-05-11 15:06:27 +02:00
Andrei Kortunov
54c8375672 Recreate a special case for IntersectionVisitor on QuadTreeWorld 2021-05-11 16:34:02 +04:00
elsid
4d7e5245a3
Support benchmarks for windows
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
2021-05-11 13:16:59 +02:00
Bret Curtis
340801e08b
Merge pull request #3084 from akortunov/master
Return check for distance when we try to reuse data
2021-05-11 11:30:23 +02:00
psi29a
3a0a2b7d68 Merge branch 'adding_category_groups_to_advanced_visuals' into 'master'
[Launcher] Grouping settings on Advanced -> Visuals

See merge request OpenMW/openmw!843
2021-05-11 08:47:33 +00:00
psi29a
f7b8c817f8 Merge branch 'performance-faster-string-find' into 'master'
Fixing performance-faster-string-find issues

See merge request OpenMW/openmw!842
2021-05-11 08:42:01 +00:00
Andrei Kortunov
3e281f625d Return check for distance when we try to reuse data (bug #6026) 2021-05-11 09:36:46 +04:00
Thunderforge
ad6cc6e775 Grouping settings on Advanced -> Visuals
Since we'll be adding additional settings in the near future and the list is already getting very long, I figured I would group these like we do on the "Miscellaneous" tab.
2021-05-10 23:04:37 -05:00
Thunderforge
339d347aea Fixing performance-faster-string-find issues
This addresses the Clang Tidy check [performance-faster-string-find](https://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html).
2021-05-10 22:44:07 -05:00
Evil Eye
de37ca8e2c Catch exceptions in VideoThread 2021-05-10 17:47:57 +02:00
psi29a
2042a66cf3 Merge branch 'bench_ci' into 'master'
Run benchmarks on gitlab CI

See merge request OpenMW/openmw!789
2021-05-10 11:11:32 +00:00
Bret Curtis
f84e9f5fb9
Merge pull request #3082 from akortunov/warnfix2
Add new scene nodes to scene graph serializer blacklist
2021-05-10 09:21:42 +02:00