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

29904 commits

This branch
This branch
All branches
Author SHA1 Message Date
jvoisin
c90d22f3b2 Replace usage of QRegularExpression::anchoredPattern with ^ and $ 
Using `^` and `$` is shorter than `QRegularExpression::anchoredPattern`,
and even allows us in one case to get rid of a trailing `.*`.
 2023-01-12 22:52:00 +01:00
psi29a
94259317bb Merge branch 'streams' into 'master' 
Handle UTF-8 in Qt streams in the Qt6-compatible way

See merge request OpenMW/openmw!2606
 2023-01-12 17:55:05 +00:00
Andrei Kortunov
bfcbc2350d Handle UTF-8 in Qt streams in the Qt6-compatible way 2023-01-12 15:39:50 +04:00
psi29a
6a9af5ccca Merge branch 'qregexp' into 'master' 
Migrate from QRegExp to more modern QRegularExpression

See merge request OpenMW/openmw!2602
 2023-01-11 14:08:12 +00:00
Andrei Kortunov
307a60e87c Migrate from QRegExp to more modern QRegularExpression 2023-01-11 11:21:46 +04:00
psi29a
7c078883d5 Merge branch 'default_ref_num' into 'master' 
Use default initializers for ESM::RefNum members

See merge request OpenMW/openmw!2598
 2023-01-10 09:12:37 +00:00
psi29a
0028127b42 Merge branch 'lua_mwscript' into 'master' 
Access local mwscript variables in Lua scripts

See merge request OpenMW/openmw!2589
 2023-01-10 08:47:12 +00:00
psi29a
21051999c1 Merge branch 'correct_shader_name' into 'master' 
Correct shader name

See merge request OpenMW/openmw!2599
 2023-01-10 08:46:36 +00:00
elsid
c173348cbe
Use default initializers for ESM::RefNum members 
Instead of unset function that is removed now and assignments all over the code.
 2023-01-10 00:44:51 +01:00
elsid
42a3b3ca49
Drop -fsanitize=pointer-compare for Ubuntu_GCC_tests_asan CI job 
Otherwise compiler may produce a code that linker fails to link.

For openmw it fails with following error
(https://gitlab.com/elsid/openmw/-/jobs/3571943608):

Linking CXX executable ../../openmw_test_suite mold: error: undefined symbol:
CMakeFiles/openmw_test_suite.dir/lua/test_configuration.cpp.o:
std::__cxx11::basic_stringbuf<char, std::char_traits<char>, std::allocator<char>
>::_M_high_mark() const

Related issue in a different project with links to GCC bug tracker:
https://github.com/cms-sw/cmssw/issues/36480
 2023-01-10 00:44:31 +01:00
glassmancody.info
23708b1ba6 correct shader name 2023-01-09 10:27:52 -08:00
psi29a
896905b7a8 Merge branch 'openmw-confpyupdate' into 'master' 
Update conf.py for Windows Mark II (!2581 replacement)

See merge request OpenMW/openmw!2597
 2023-01-09 09:17:56 +00:00
psi29a
b1571b92bf Merge branch 'fix_7135' into 'master' 
Add missing initializer in mwworld/worldmodel.cpp (fixes #7135)

Closes #7135

See merge request OpenMW/openmw!2596
 2023-01-09 09:15:23 +00:00
psi29a
c24f43ec32 Merge branch 'occlusion_tweaks' into 'master' 
Weather occlusion updates

See merge request OpenMW/openmw!2595
 2023-01-08 22:13:36 +00:00
AnyOldName3
1e921162ee Merge branch 'master' into 'openmw-confpyupdate' 
There were conflicts as I'd based this off the original attempt to ensure the original contributor got credit.

# Conflicts:
#   docs/source/conf.py
 2023-01-08 21:19:59 +00:00
AnyOldName3
82ec319ea6 Use the correct interpreter 2023-01-08 21:14:13 +00:00
Petr Mikheev
2b4e613522 Add missing initializer in mwworld/worldmodel.cpp (fixes #7135) 2023-01-08 21:55:42 +01:00
psi29a
2754d63e45 Merge branch 'cleanup_actions' into 'master' 
Cleanup unused actions

See merge request OpenMW/openmw!2591
 2023-01-08 20:14:35 +00:00
glassmancody.info
ee1acd6eb1 add sfc setting, only add to subgraph when enabled 2023-01-08 11:55:33 -08:00
psi29a
6c77498e80 Merge branch 'Fix_openCS_EditRecord' into 'master' 
Fixes issue with topic info edition.

Closes #7136

See merge request OpenMW/openmw!2594
 2023-01-08 16:41:54 +00:00
florent.teppe
0de6b79966 Fixes issue with topic info edition. 
Also future proofs reference on RefId's string.
 2023-01-08 12:59:47 +01:00
psi29a
5a6a25361a Revert "Merge branch 'confpyupdate' into 'master'" 
This reverts merge request !2581
 2023-01-07 22:48:38 +00:00
Petr Mikheev
7a0b998d4f Cleanup unused actions 2023-01-07 23:42:53 +01:00
psi29a
b6d0d09c5a Merge branch 'cell_hastag' into 'master' 
[Lua] New function `cell.hasTag`

See merge request OpenMW/openmw!2567
 2023-01-07 22:22:31 +00:00
psi29a
238715f02f Merge branch 'confpyupdate' into 'master' 
Update conf.py for Windows

See merge request OpenMW/openmw!2581
 2023-01-07 22:21:43 +00:00
psi29a
6a250c5900 Merge branch 'baby_it_is_occluded_outside' into 'master' 
Weather Particle Occlusion (#5492)

Closes #5492

See merge request OpenMW/openmw!1328
 2023-01-07 22:18:45 +00:00
psi29a
83718878b2 Merge branch 'Load_ESM4' into 'master' 
Loading ESM4 data and storing them in the ESMStore

See merge request OpenMW/openmw!2557
 2023-01-07 22:17:17 +00:00
psi29a
a9d3186173 Merge branch 'fix_esm_fixed_string_warning' into 'master' 
Fix gcc warning: array subscript n is outside array bounds of ‘const char [n]’

See merge request OpenMW/openmw!2585
 2023-01-07 22:15:16 +00:00
psi29a
9aab934028 Merge branch 'cuphead' into 'master' 
Regression fixes for animation-less knockout

See merge request OpenMW/openmw!2588
 2023-01-07 22:14:27 +00:00
Petr Mikheev
8c7cad024b Access local mwscript variables in Lua scripts 2023-01-07 22:10:10 +01:00
Alexei Kotov
fa7991fcb3 For hit state, cancel non-biped idle if there is an active animation 2023-01-07 22:35:29 +03:00
Alexei Kotov
152bdb2f65 Prevent missing KO animations from cancelling KO 2023-01-07 22:21:56 +03:00
psi29a
6aaceb44c2 Merge branch 'quest_list' into 'master' 
Sort quests in journal by name

See merge request OpenMW/openmw!2584
 2023-01-07 17:03:47 +00:00
Kindi
7cf9aa5d31 the simplest bodge 2023-01-07 23:35:54 +08:00
Andrei Kortunov
9630246cae Sort quests in journal by name (bug 7054) 2023-01-07 18:55:51 +04:00
glassmancody.info
9a4977d334 rain occlusion 2023-01-06 22:23:03 -08:00
elsid
2bbed8cc06
Fix gcc warning: array subscript 5 is outside array bounds of ‘const char [5]’ 
In function ‘bool ESM::operator==(const FixedString<capacity>&, const T* const&) [with long unsigned int capacity = 5; T = char; <template-parameter-1-3> = void]’,
    inlined from ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = ESM::FixedString<5>; T2 = const char*]’ at /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:1358:11,
    inlined from ‘static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = ESM::FixedString<5>; T2 = const char*; typename std::enable_if<((! std::is_integral<_Tp>::value) || (! std::is_pointer<_Dp>::value))>::type* <anonymous> = 0]’ at /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:1377:64,
    inlined from ‘virtual void {anonymous}::EsmFixedString_equality_operator_for_not_convertible_to_uint32_with_const_char_pointer_Test::TestBody()’ at apps/openmw_test_suite/esm/test_fixed_string.cpp:165:9:
components/esm/esmcommon.hpp:134:19: warning: array subscript 5 is outside array bounds of ‘const char [5]’ [-Warray-bounds]
  134 |         return rhs[capacity] == '\0';
      |                ~~~^
apps/openmw_test_suite/esm/test_fixed_string.cpp: In member function ‘virtual void {anonymous}::EsmFixedString_equality_operator_for_not_convertible_to_uint32_with_const_char_pointer_Test::TestBody()’:
apps/openmw_test_suite/esm/test_fixed_string.cpp:164:20: note: at offset 5 into object ‘other’ of size 5
  164 |         const char other[5] = { 'a', 'b', 'c', 'd', '\0' };
      |                    ^~~~~
 2023-01-06 22:09:07 +01:00
elsid
c80ba92ab7
Add more tests for ESM::FixedString 2023-01-06 21:00:29 +01:00
elsid
7c60905266
Put ESM::FixedString tests into unnamed namespace 2023-01-06 21:00:29 +01:00
psi29a
c9d57788fb Merge branch 'save_fix' into 'master' 
Clear character name in the loading menu when there are no saves left

See merge request OpenMW/openmw!2583
 2023-01-06 18:09:00 +00:00
Andrei Kortunov
760135591b Clear character name in the loading menu when there are no saves left (bug 7088) 2023-01-06 19:36:53 +04:00
psi29a
55ba5ed7ea Merge branch 'mygui_log' into 'master' 
Use OpenMW logging levels for MyGUI log

Closes #7130

See merge request OpenMW/openmw!2582
 2023-01-06 15:09:46 +00:00
Andrei Kortunov
b217d1fc36 Use OpenMW logging levels for MyGUI log (feature 7130) 2023-01-06 16:01:30 +04:00
psi29a
452ea3d353 Merge branch 'skeleton_b_gone' into 'master' 
Don't use a levelled creature's base pointer when spawning a new instance

See merge request OpenMW/openmw!2578
 2023-01-06 10:14:32 +00:00
psi29a
0d8d15a732 Merge branch 'fixcolladaanimopbug' into 'master' 
Fix Collada animated object bug #7051

Closes #7051

See merge request OpenMW/openmw!2565
 2023-01-06 10:10:27 +00:00
Petr Mikheev
7f117a28c8 Merge branch 'updateluacoredoc' into 'master' 
update lua doc : recordid desc

See merge request OpenMW/openmw!2576
 2023-01-05 11:27:33 +00:00
Kindi
e088fb6d9e updateconfpy 2023-01-05 18:45:48 +08:00
unelsson
5b0713517a Clang-format 2023-01-05 01:40:36 +02:00
unelsson
bfa0e751dd Skip merging for only animated models (Collada) 2023-01-05 01:34:26 +02:00
psi29a
c2b0c01ff2 Merge branch 'addScript' into 'master' 
Raise an error if initData in obj:addScript has incorrect type

See merge request OpenMW/openmw!2577
 2023-01-04 22:53:50 +00:00