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

25458 commits

Author SHA1 Message Date
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
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
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
Bret Curtis
08059247b8
Merge pull request #3081 from akortunov/master
Skip hidden nodes for ObjectPaging
2021-05-10 09:19:47 +02:00
psi29a
13fd0e11ff Merge branch 'no_time_to_talk' into 'master'
Don't stop and turn to the player while sneaking or jumping

Closes #6016

See merge request OpenMW/openmw!838
2021-05-10 06:51:49 +00:00
psi29a
69d3f91186 Merge branch 'unused' into 'master'
Remove unimplemented method declaration

See merge request OpenMW/openmw!837
2021-05-10 06:51:08 +00:00
elsid
6492e9522a
Run benchmarks on gitlab CI 2021-05-10 00:21:03 +02:00
Evil Eye
c5aa3d4f77 Don't stop and turn to the player while sneaking or jumping 2021-05-09 19:55:27 +02:00
Evil Eye
ffd84502f9 Remove unimplemented method declaration 2021-05-09 19:07:15 +02:00
Petr Mikheev
e65b285f06 Merge branch 'use_min' into 'master'
Use existing min implementation

See merge request OpenMW/openmw!828
2021-05-09 13:05:39 +00:00
elsid
b806445a36
Use existing min implementation 2021-05-09 13:58:05 +02:00
Andrei Kortunov
132fedf290 Analyze only used LOD levels in ObjectPaging 2021-05-09 15:43:13 +04:00
Andrei Kortunov
a939cb6692 Skip hidden nodes for ObjectPaging 2021-05-09 14:10:35 +04:00
Frederic Chardon
caf382c19f Merge branch 'barrier' into 'master'
Do not store callback inside Misc::Barrier

See merge request OpenMW/openmw!821
2021-05-07 22:21:44 +00:00
Andrei Kortunov
2e8873af51 Add new scene nodes to scene graph serializer blacklist 2021-05-07 19:27:23 +04:00
psi29a
08e1a8e0fb Merge branch 'esm_opti' into 'master'
Teensy optimisation for esmtool

See merge request OpenMW/openmw!826
2021-05-07 14:21:37 +00:00
psi29a
621cf47085 Merge branch 'master' into 'master'
Add information about DX format being used in normal maps

See merge request OpenMW/openmw!827
2021-05-07 12:29:06 +00:00
Joakim Berg
60649792ba Add information about DX format being used in normal maps 2021-05-07 12:29:06 +00:00
jvoisin
8a56ba6aaa Fix compilation 2021-05-07 13:58:30 +02:00
psi29a
9b017ef04d Merge branch 'internal_includes_openmw' into 'master'
Clean up some internal includes of the openmw component

See merge request OpenMW/openmw!796
2021-05-07 10:53:25 +00:00
Bret Curtis
d4dce30952
Merge pull request #3077 from akortunov/master
Fix uninitialized variable
2021-05-07 12:47:20 +02:00
elsid
fbeccc2908 Apply 1 suggestion(s) to 1 file(s) 2021-05-07 09:28:47 +00:00
Bret Curtis
e720a56030
Merge pull request #3080 from akortunov/fix_ci
Add missing include for std::inserter
2021-05-07 11:18:33 +02:00
Andrei Kortunov
8d4a374516 Add missing include for std::inserter 2021-05-07 11:30:10 +04:00
Bret Curtis
5548033440
Merge pull request #3078 from akortunov/fix_ci
Fix AppVeyor CI
2021-05-07 09:28:13 +02:00
Andrei Kortunov
e8ed66767b Fix AppVeyor CI 2021-05-07 11:04:49 +04:00
psi29a
6263ade01a Merge branch 'esmcleanup' into 'master'
Minor ESM code cleanup

See merge request OpenMW/openmw!825
2021-05-07 06:47:45 +00:00