AnyOldName3
ebbd4e059e
Merge branch 'std-filesystem-time-hotfix' into 'master'
...
Fix "7020-crash-when-clicking-load-shortly-after-quicksaving"
Closes #7020
See merge request OpenMW/openmw!2428
2022-09-24 21:37:14 +00:00
Project579
6fe89ff22b
Fix dumb regression, initialize "std::filesystem::file_time_type" with "clock::now()".
2022-09-24 21:52:10 +02:00
Project579
5cf2a958eb
Make conversions between std::chrono time_point and string safer by not using "localtime" directly.
2022-09-24 21:47:27 +02:00
psi29a
6d3de520e8
Merge branch 'clang-format-all' into 'master'
...
Apply clang-format project wide
See merge request OpenMW/openmw!2393
2022-09-24 15:10:28 +00:00
ζeh Matt
79ccd8720a
Single process fix
2022-09-22 23:33:16 +03:00
ζeh Matt
62138630d2
Fix files with spaces causing issues
2022-09-22 23:15:36 +03:00
ζeh Matt
afa1b0077d
Improve clang-format checking script
2022-09-22 22:57:03 +03:00
ζeh Matt
cd7fe60134
Ignore clang-format commit in .git-blame-ignore-revs
2022-09-22 22:13:19 +03:00
ζeh Matt
ad0d33ba6f
Disallow clang-format check failing
2022-09-22 22:10:55 +03:00
ζeh Matt
45bfed3b42
Use clang-format --dry-run instead of relying on git diff
2022-09-22 22:07:08 +03:00
clang-format-bot
ddb0522bbf
Apply clang-format to code base
2022-09-22 21:35:26 +03:00
psi29a
f37d0be806
Merge branch 'clang-format-ci-2' into 'master'
...
Test clang-format project wide in same pipeline
See merge request OpenMW/openmw!2423
2022-09-22 15:56:55 +00:00
AnyOldName3
1dd392d33d
Merge branch 're-sign-mac-applications' into 'master'
...
Re-sign Mac Applications before creating install package
See merge request OpenMW/openmw!2418
2022-09-21 22:15:43 +00:00
Andrew Dunn
9f7e132479
Made CMake 3.19 requirement specific to macOS app packaging.
2022-09-22 00:49:24 +10:00
Andrew Dunn
71f6f95020
Make Mac Plugins osgPlugins symlink relative
...
Was an absolute path.
2022-09-21 07:44:56 +10:00
ζeh Matt
91ed7f73b9
Allow the check to fail for the time being
2022-09-20 23:18:19 +03:00
ζeh Matt
3e9fccd7f0
Test clang-format project wide in same pipeline
2022-09-20 23:18:19 +03:00
psi29a
9a9c7fa7cf
Merge branch 'std-filesystem-hotfix' into 'master'
...
Use std::filesystem for unit tests temporary files path.
See merge request OpenMW/openmw!2402
2022-09-19 20:47:33 +00:00
psi29a
525f81393a
Merge branch 'physics_refactor' into 'master'
...
Small physics refactoring
See merge request OpenMW/openmw!2417
2022-09-19 19:57:23 +00:00
psi29a
fb90d35805
Merge branch 'weather_the_sun' into 'master'
...
Implement sun damage based on the research on the wiki
Closes #6977
See merge request OpenMW/openmw!2422
2022-09-19 19:56:01 +00:00
Project579
b82176410b
Use std::filesystem for unit tests temporary files path.
2022-09-19 21:42:18 +02:00
Evil Eye
7cc55022a1
Implement sun damage based on the research on the wiki
2022-09-19 19:05:22 +02:00
psi29a
92680ab9cf
Merge branch 'fix_shader_prefix' into 'master'
...
Use nv_default shader prefix for unhandled types
See merge request OpenMW/openmw!2419
2022-09-17 16:41:04 +00:00
elsid
63b51ead84
Use nv_default shader prefix for unhandled types
2022-09-17 17:35:25 +02:00
psi29a
553fa8cc58
Merge branch 'nifctrl' into 'master'
...
Further NIF controller updates
See merge request OpenMW/openmw!2415
2022-09-17 09:17:15 +00:00
Andrew Dunn
e4f04390b5
Merge commit 'cd8b20439ec707574826679a8f851546c78e294e' into re-sign-mac-applications
2022-09-17 18:25:20 +10:00
Andrew Dunn
52501b7b65
Re-sign Mac Applications before creating install package
...
On Apple Silicon, the changes to linking paths done to "relativise"
paths in App bundles invalidates the code signature, so we need to
recalculate the signatures *after* the path changes have been performed
but before the install package is created. This depends on a new CMake
feature introduced in 3.19.
2022-09-17 18:24:06 +10:00
elsid
feb645d15f
Remove redundant Scene::updatePosition function
2022-09-17 01:14:04 +02:00
elsid
aeb4611d6c
Mark MWPhysics::Actor constructor and assignment operators as deleted
2022-09-17 01:14:04 +02:00
elsid
bceca33699
Do not lock mutex in MWPhysics::Actor constructor
2022-09-17 01:14:04 +02:00
elsid
bd98404890
Initialize PtrHolder::mPtr and positions by its constructor
2022-09-17 01:14:04 +02:00
Alexei Kotov
7aee22be91
Further controller updates
...
Correct NiMaterialColorController base class
Load everything in NiGeomMorpherController
Make a guess at how weighted interpolators might be supposed to work like
2022-09-16 23:45:54 +03:00
psi29a
cd8b20439e
Merge branch 'fix_reserved_nodes' into 'master'
...
Add missing non-prefixed reserved nodes
See merge request OpenMW/openmw!2414
2022-09-16 11:45:03 +00:00
elsid
ac01fd5e75
Add missing non-prefixed reserved nodes
2022-09-16 12:36:00 +02:00
psi29a
86ff454ca2
Merge branch 'thirdtimesthecharm' into 'master'
...
Rehash the rehashing of rehashed morph loading
See merge request OpenMW/openmw!2413
2022-09-16 06:09:21 +00:00
psi29a
46935e9e97
Merge branch 'renormalise' into 'master'
...
Renormalise line endings
See merge request OpenMW/openmw!2412
2022-09-16 06:08:36 +00:00
psi29a
5d47a0a068
Merge branch 'pre_clang_format_fix_3' into 'master'
...
Add missing include
See merge request OpenMW/openmw!2411
2022-09-16 06:04:11 +00:00
Alexei Kotov
e2ed313389
Don't load keys for Gamebryo morphs
2022-09-16 05:55:37 +03:00
AnyOldName3
ee39806366
Add line renormalisation to .git-blame-ignore-revs
2022-09-16 00:56:22 +01:00
AnyOldName3
84f8a6848a
Renormalise line endings
...
This should replace accidental CRLF with LF
2022-09-16 00:53:24 +01:00
elsid
fd93b7186f
Add missing include
2022-09-16 01:39:59 +02:00
psi29a
4d01489011
Merge branch 'fix_asan_error_on_save' into 'master'
...
Fix dangling pointer access on clicking save in the main menu (#7007 )
Closes #7007
See merge request OpenMW/openmw!2408
2022-09-15 22:09:45 +00:00
psi29a
16fd01a765
Merge branch 'fix_reserved_names_init' into 'master'
...
Initialize reserved names once to avoid race condition (#7008 )
Closes #7008
See merge request OpenMW/openmw!2409
2022-09-15 22:09:08 +00:00
psi29a
ce90484898
Merge branch 'fix_lua_color' into 'openmw-48'
...
Make r, g, b, a read-only properties, rather than getters
See merge request OpenMW/openmw!2380
(cherry picked from commit 85f343e87a19d01f26
2022-09-15 22:01:59 +00:00
elsid
8068d0153f
Initialize reserved names once to avoid race condition
...
CanOptimizeCallback::isReservedName function may be executed by multiple threads
simultaneously. One of them creates a static but both of them run if statement
and see it's empty because none of them added elements there yet. Both of them
go to the branch where new elements are added doing it without any
synchronization possibly causing SIGSEGV.
2022-09-15 23:37:57 +02:00
elsid
a0cfcc50a2
Fix dangling pointer access on clicking save in the main menu
...
getSignature() returns an object which means expression like:
className = it->getSignature().mPlayerClassName;
assigns a temporary object to className that does not outlive the statement.
Having className a string view such code leads to a dangling pointer.
Return a reference from getSignature to save on redundant copying.
Change getSignature implementation to make it visible that it finds a maximum
element.
Do not call getSignature multiple times when possible to avoid seaching for the
same max element multiple times.
2022-09-15 22:49:20 +02:00
psi29a
ff90c9ce4f
Merge branch 'fix_clang_format' into 'master'
...
Adjust clang-format
See merge request OpenMW/openmw!2407
2022-09-15 20:24:40 +00:00
elsid
536e7f32c6
Adjust clang-format
2022-09-15 21:19:20 +02:00
psi29a
3fbed432df
Merge branch 'revert-115f814d' into 'master'
...
Revert "Merge branch 'ci-improvement' into 'master'"
See merge request OpenMW/openmw!2406
2022-09-15 15:01:25 +00:00
Matt
869a0ce2c1
Revert "Merge branch 'ci-improvement' into 'master'"
...
This reverts merge request !2387
2022-09-15 13:58:32 +00:00
