mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity
29478 commits 107 branches 66 tags 133 MiB
Commit graph

29478 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 85f343e87a)

19d01f26 Make r, g, b, a read-only properties, rather than getters
 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
psi29a
d1c79fa8d1 Merge branch 'pre_clang_format_fixes_2' into 'master' 
Fixes before applying clang-format 2

See merge request OpenMW/openmw!2401
 2022-09-15 08:24:23 +00:00
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
 2022-09-15 07:44:35 +00:00
psi29a
ac2b6525e9 Merge branch 'interpcontrollers' into 'master' 
Streamline NiInterpController handling

See merge request OpenMW/openmw!2404
 2022-09-15 07:44:11 +00:00
elsid
9c291535bb
Dump NIFZ and KFFZ sub records by esmtool 2022-09-15 00:01:40 +02:00
elsid
6f00641c8a
Fix reading array of zero terminated strings 
NIFZ and KFFZ subrecords store multiple strings separated by \0 character.
 2022-09-15 00:01:19 +02:00
Alexei Kotov
482de23893 Streamline NiInterpController handling 2022-09-15 00:58:10 +03:00
elsid
ae812701ec Merge branch 'crashfix_debugdraw' into 'master' 
crashfix of debug draw on game exit

Closes #7004

See merge request OpenMW/openmw!2398
 2022-09-14 20:56:03 +00:00
florent.teppe
943198e325 Small changes 2022-09-14 13:20:35 +02:00
elsid
410a2881fe
Add comma to the last array element to prevent putting multiple elements on a single line 2022-09-14 00:36:02 +02:00
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
 2022-09-13 18:26:33 +02:00
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
 2022-09-13 08:53:30 +00:00
psi29a
c977bd3e6e Merge branch 'ai_package_type' into 'master' 
Remove AI_CNDT from AI package types

See merge request OpenMW/openmw!2400
 2022-09-13 07:23:51 +00:00
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.
 2022-09-13 00:05:12 +02:00
elsid
50d8bd9cdd
Disable clang-format for files that should have minimal diff with OSG 2022-09-12 23:57:10 +02:00
elsid
219b9e7cbf
Revert "Use raw string literals for shaders" 
This reverts commit 0e72055385.
 2022-09-12 23:54:13 +02:00
psi29a
20abe6dcf5 Merge branch 'esmtool_string_view' into 'master' 
Use std::string_view for esmtool labels

See merge request OpenMW/openmw!2396
 2022-09-12 20:55:01 +00:00
psi29a
79c70b2e84 Merge branch 'pre_clang_format_fixes' into 'master' 
Fixes before applying clang-format

See merge request OpenMW/openmw!2397
 2022-09-12 20:54:31 +00:00
elsid
52b7b66e9f
Add comma to the last array element to prevent putting multiple elements on a single line 2022-09-12 21:00:51 +02:00
elsid
5b1d6917ef
Add comments to prevent line splitting on formatting 2022-09-12 21:00:51 +02:00
elsid
0e72055385
Use raw string literals for shaders 2022-09-12 21:00:51 +02:00
elsid
4698a4cd2d
Use raw string literals to format command usage messages 2022-09-12 21:00:51 +02:00
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)
    ^
 2022-09-12 21:00:51 +02:00
elsid
409f83a149
Use raw string literal for error marker definition 2022-09-12 21:00:45 +02:00
florent.teppe
565a08b95a crashfix on game exit 2022-09-12 19:13:02 +02:00
elsid
40e899f56d
Use std::string_view for esmtool labels 2022-09-12 18:58:53 +02:00
elsid
6ae15f08e0
Avoid chained operator() calls to prevent formatting issues 2022-09-12 16:48:15 +02:00
psi29a
7e6011751c Update CHANGELOG.md 2022-09-12 09:05:33 +00:00
psi29a
ff65a6e246 Merge branch 'hidpi' into 'master' 
Implement system-scaled HiDPI support (SDL_WINDOW_ALLOW_HIGHDPI - Wayland, macOS, etc)

See merge request OpenMW/openmw!517
 2022-09-12 08:18:09 +00:00
unrelentingtech
1c8fd2ecdb Implement system-scaled HiDPI support (SDL_WINDOW_ALLOW_HIGHDPI - Wayland, macOS, etc) 2022-09-12 08:18:08 +00:00
psi29a
622f906855 Merge branch 'fix_esm4_reader_utf8' into 'master' 
Fix conversion to UTF8 for ESM4 Reader strings

See merge request OpenMW/openmw!2394
 2022-09-12 07:04:39 +00:00
elsid
a9826342b2
Print ESM4 EditorId and Model by esmtool dump 2022-09-12 01:42:08 +02:00
elsid
4f7dcd5ae5
Fix conversion to UTF8 for ESM4 Reader strings 
toUtf8 returns a string view to the input when input string is ASCII and nothing
is written to the buffer which means output string of Reader::getStringImpl is
not modified.

Move input to the output string and resize it in this case.
 2022-09-12 01:42:01 +02:00
psi29a
80d52e3da8 Merge branch 'cursor' into 'master' 
Support high-resolution cursor textures

Closes #6933

See merge request OpenMW/openmw!2262
 2022-09-11 18:32:18 +00:00
psi29a
9e0678083d Merge branch 'fix_build' into 'master' 
Add missing include <array>

See merge request OpenMW/openmw!2392
 2022-09-11 18:31:36 +00:00
elsid
9f35f9b45b
Add missing include <array> 2022-09-11 19:55:53 +02:00
psi29a
ab5023932d Merge branch 'add_additional_osg_plugins' into 'master' 
reorg of cmake osg plugins; add osgSim and osgdb_dae requirements

See merge request OpenMW/openmw!946
 2022-09-11 17:17:52 +00:00
psi29a
435eacdaad Merge branch 'debug_draw_commands' into 'master' 
API to draw primitives

See merge request OpenMW/openmw!2345
 2022-09-11 17:17:16 +00:00
Andrei Kortunov
a2c02d2999 Support high-resolution cursor textures (feature 6933) 2022-09-11 20:54:20 +04:00
psi29a
db619c684f Merge branch 'cellstore_refactor' into 'master' 
CellStore refactor, same idea as ESMStore refactor

See merge request OpenMW/openmw!2389
 2022-09-11 16:37:31 +00:00