Commit Graph

29544 Commits (88ec8a95231341e7962b85716510d414e9f0c424)
 

Author SHA1 Message Date
elsid 63b51ead84
Use nv_default shader prefix for unhandled types 2 years ago
psi29a 553fa8cc58 Merge branch 'nifctrl' into 'master'
Further NIF controller updates

See merge request OpenMW/openmw!2415
2 years ago
Andrew Dunn e4f04390b5 Merge commit 'cd8b20439ec707574826679a8f851546c78e294e' into re-sign-mac-applications 2 years ago
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.
2 years ago
elsid feb645d15f
Remove redundant Scene::updatePosition function 2 years ago
elsid aeb4611d6c
Mark MWPhysics::Actor constructor and assignment operators as deleted 2 years ago
elsid bceca33699
Do not lock mutex in MWPhysics::Actor constructor 2 years ago
elsid bd98404890
Initialize PtrHolder::mPtr and positions by its constructor 2 years ago
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
2 years ago
psi29a cd8b20439e Merge branch 'fix_reserved_nodes' into 'master'
Add missing non-prefixed reserved nodes

See merge request OpenMW/openmw!2414
2 years ago
elsid ac01fd5e75
Add missing non-prefixed reserved nodes 2 years ago
psi29a 86ff454ca2 Merge branch 'thirdtimesthecharm' into 'master'
Rehash the rehashing of rehashed morph loading

See merge request OpenMW/openmw!2413
2 years ago
psi29a 46935e9e97 Merge branch 'renormalise' into 'master'
Renormalise line endings

See merge request OpenMW/openmw!2412
2 years ago
psi29a 5d47a0a068 Merge branch 'pre_clang_format_fix_3' into 'master'
Add missing include

See merge request OpenMW/openmw!2411
2 years ago
Alexei Kotov e2ed313389 Don't load keys for Gamebryo morphs 2 years ago
AnyOldName3 ee39806366 Add line renormalisation to .git-blame-ignore-revs 2 years ago
AnyOldName3 84f8a6848a Renormalise line endings
This should replace accidental CRLF with LF
2 years ago
elsid fd93b7186f
Add missing include 2 years ago
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
2 years ago
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
2 years ago
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 85f343e87a)

19d01f26 Make r, g, b, a read-only properties, rather than getters
2 years ago
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.
2 years ago
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.
2 years ago
psi29a ff90c9ce4f Merge branch 'fix_clang_format' into 'master'
Adjust clang-format

See merge request OpenMW/openmw!2407
2 years ago
elsid 536e7f32c6
Adjust clang-format 2 years ago
psi29a 3fbed432df Merge branch 'revert-115f814d' into 'master'
Revert "Merge branch 'ci-improvement' into 'master'"

See merge request OpenMW/openmw!2406
2 years ago
Matt 869a0ce2c1 Revert "Merge branch 'ci-improvement' into 'master'"
This reverts merge request !2387
2 years ago
psi29a d1c79fa8d1 Merge branch 'pre_clang_format_fixes_2' into 'master'
Fixes before applying clang-format 2

See merge request OpenMW/openmw!2401
2 years ago
psi29a 6f95154ca8 Merge branch 'esm4_zero_terminated_strings' into 'master'
Fix reading array of zero terminated strings (ESM4 NIFZ and KFFZ sub records)

See merge request OpenMW/openmw!2403
2 years ago
psi29a ac2b6525e9 Merge branch 'interpcontrollers' into 'master'
Streamline NiInterpController handling

See merge request OpenMW/openmw!2404
2 years ago
elsid 9c291535bb
Dump NIFZ and KFFZ sub records by esmtool 2 years ago
elsid 6f00641c8a
Fix reading array of zero terminated strings
NIFZ and KFFZ subrecords store multiple strings separated by \0 character.
2 years ago
Alexei Kotov 482de23893 Streamline NiInterpController handling 2 years ago
elsid ae812701ec Merge branch 'crashfix_debugdraw' into 'master'
crashfix of debug draw on game exit

Closes #7004

See merge request OpenMW/openmw!2398
2 years ago
florent.teppe 943198e325 Small changes 2 years ago
elsid 410a2881fe
Add comma to the last array element to prevent putting multiple elements on a single line 2 years ago
florent.teppe e811f7ed00 Simplified the data structures.
DebugCustomDraw owns the vector of drawcalls and the line geometry.
There are two DebugCustomDraw, so anything they own is double buffered.
Because DebugDrawer has a ref_ptr on the DebugCustomDraw, they live at least as long as DebugDrawer, making memory access from it safe.

removed redundent this
2 years ago
psi29a 675c0f9b31 Merge branch 'disable_clang_format_for_osg' into 'master'
Disable clang-format for files that should have minimal diff with OSG

See merge request OpenMW/openmw!2399
2 years ago
psi29a c977bd3e6e Merge branch 'ai_package_type' into 'master'
Remove AI_CNDT from AI package types

See merge request OpenMW/openmw!2400
2 years ago
elsid 51314db2f1
Remove AI_CNDT from AI package types
AI_CNDT is a label of subrecord containing cell name. It's not AI package type.
2 years ago
elsid 50d8bd9cdd
Disable clang-format for files that should have minimal diff with OSG 2 years ago
elsid 219b9e7cbf
Revert "Use raw string literals for shaders"
This reverts commit 0e72055385.
2 years ago
psi29a 20abe6dcf5 Merge branch 'esmtool_string_view' into 'master'
Use std::string_view for esmtool labels

See merge request OpenMW/openmw!2396
2 years ago
psi29a 79c70b2e84 Merge branch 'pre_clang_format_fixes' into 'master'
Fixes before applying clang-format

See merge request OpenMW/openmw!2397
2 years ago
elsid 52b7b66e9f
Add comma to the last array element to prevent putting multiple elements on a single line 2 years ago
elsid 5b1d6917ef
Add comments to prevent line splitting on formatting 2 years ago
elsid 0e72055385
Use raw string literals for shaders 2 years ago
elsid 4698a4cd2d
Use raw string literals to format command usage messages 2 years ago
elsid f269406061
Do not wrap emit expresison with parenthesis
To avoid warnings like following after clang-format applied:

apps/launcher/utils/profilescombobox.cpp:85:9: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
    emit(signalProfileChanged(mOldProfile, currentText()));
        ^
apps/launcher/utils/profilescombobox.cpp:82:5: note: previous statement is here
    if (index == -1)
    ^
2 years ago
elsid 409f83a149
Use raw string literal for error marker definition 2 years ago