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

31128 commits

This branch
This branch
All branches
Author SHA1 Message Date
elsid
183202cd65
Remove WorldModel::getCellByPosition function 
It's used in a single place. Move the code there.
 2023-05-27 15:49:36 +02:00
elsid
235eb65c97
Rename positionToCellIndex to match return type 2023-05-27 15:49:36 +02:00
elsid
98e80d65b0
Remove unused include 2023-05-27 15:49:36 +02:00
elsid
b6cd6402cc
Use ranged for loop 2023-05-27 15:49:36 +02:00
elsid
a04eb9d26c
Move WorldModel::getPtr(const ESM::RefId&, CellStore&) to CellStore 
The function does not depend on WorldModel.
 2023-05-27 15:49:36 +02:00
elsid
df6630a15c
Move WorldModel private functions to bottom 
This is API class. A reader most likely need to know public functions first.
 2023-05-27 15:49:36 +02:00
psi29a
67cf3879ac Merge branch 'macos' into 'master' 
Support macOS: AMD64 and ARM64

Closes #7393

See merge request OpenMW/openmw!3059
 2023-05-27 13:34:31 +00:00
psi29a
a5c2ad45dc Support macOS: AMD64 and ARM64 2023-05-27 13:34:31 +00:00
psi29a
2fa4f6c226 Merge branch 'reuse_cell_store' into 'master' 
Cleanup WorldModel::getPtr(const ESM::RefId&)

See merge request OpenMW/openmw!3066
 2023-05-26 22:48:33 +00:00
elsid
181c894e4c
Skip already visited cells when looking for ptr 2023-05-26 22:51:03 +02:00
elsid
466a7cedbb
Convert pointer to referece where nullptr is not acceptable 2023-05-26 22:42:50 +02:00
elsid
1b116240a3
Try return existing CellStore from WorldModel::getCellStore first 2023-05-26 22:40:03 +02:00
psi29a
05555947c3 Merge branch 'specialdedup' into 'master' 
Deduplicate specialization code

See merge request OpenMW/openmw!3063
 2023-05-26 12:08:05 +00:00
psi29a
6af3ddfb56 Merge branch 'another_assert' into 'master' 
Replace another assert with a throw

See merge request OpenMW/openmw!3064
 2023-05-26 12:04:32 +00:00
jvoisin
44a65512e8 Replace another assert with a throw 2023-05-26 10:23:58 +00:00
Evil Eye
877f6747be Deduplicate specialization code 2023-05-26 12:16:47 +02:00
jvoisin
2ab5b8e7b0 Merge branch 'cs_log' into 'master' 
Make editor failure to load content files more detailed

See merge request OpenMW/openmw!3062
 2023-05-25 20:38:05 +00:00
elsid
dc8dfe81ce
Add more details to exceptions 2023-05-25 20:56:07 +02:00
elsid
d852ac20f5
Log loading content file 2023-05-25 20:56:07 +02:00
psi29a
fec74b7c41 Merge branch 'activeeffect-signature-fix' into 'master' 
Fix signature of MWMechanics::MagicEffects::get

See merge request OpenMW/openmw!3061
 2023-05-25 18:51:51 +00:00
Mads Buvik Sandvei
85a30c9ad0 Fix signature of MWMechanics::MagicEffects::get. Fix a mistake in the docs. 2023-05-25 18:12:18 +02:00
jvoisin
03ff03005d Merge branch 'missing_include' into 'master' 
missing include in attr.cpp

See merge request OpenMW/openmw!3060
 2023-05-25 12:47:27 +00:00
Pierre Mossler
e6838cddc7 missing include in attr.cpp 2023-05-25 10:49:27 +00:00
psi29a
c667d414d8 Merge branch '7275-follow-up-from-formatting-and-coverage-related-cmake-files-fixes-add-cmake-and-cmakelists-txt' into 'master' 
Resolve "Follow-up from "Formatting and coverage related CMake files fixes" - add .cmake and CMakeLists.txt to .editorconfig"

Closes #7275

See merge request OpenMW/openmw!2827
 2023-05-25 09:47:45 +00:00
Petr Mikheev
4ed283bb15 Merge branch 'create_record_types' into 'master' 
Allow creating Activator, Armor, Clothing, Misc, Weapon records via lua

See merge request OpenMW/openmw!2944
 2023-05-25 08:00:13 +00:00
Zackhasacat
ef004e5eba Allow creating Activator, Armor, Clothing, Misc, Weapon records via lua 2023-05-25 08:00:12 +00:00
psi29a
d3ed04c551 Merge branch 'lua-activeeffects' into 'master' 
Lua: Actor api for active effects and active spells

See merge request OpenMW/openmw!3036
 2023-05-25 07:49:08 +00:00
AnyOldName3
38823cb983 Merge branch 'ci_integration_tests_asan' into 'master' 
Add CI job to run integration tests with AddressSanitizer

See merge request OpenMW/openmw!3056
 2023-05-24 20:16:53 +00:00
Petr Mikheev
e74161ea8e Merge branch 'slashrslashmarijuanaenthusiasts' into 'master' 
Improve Skyrim tree loading (limited)

See merge request OpenMW/openmw!3054
 2023-05-24 19:16:55 +00:00
jvoisin
218dd3c141 Merge branch 'fix_gcc_build' into 'master' 
Add missing include

See merge request OpenMW/openmw!3058
 2023-05-24 12:38:24 +00:00
elsid
89eccab7f1
Add missing include 
In file included from /home/elsid/dev/openmw/apps/openmw_test_suite/settings/testvalues.cpp:1:
/home/elsid/dev/openmw/components/misc/strings/conversion.hpp: In function ‘std::string Misc::StringUtils::toHex(std::string_view)’:
/home/elsid/dev/openmw/components/misc/strings/conversion.hpp:139:87: error: ‘uint8_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
  139 |             const std::ptrdiff_t space = static_cast<std::ptrdiff_t>(static_cast<std::uint8_t>(v) <= 0xf);
      |                                                                                       ^~~~~~~
      |                                                                                       wint_t
/home/elsid/dev/openmw/components/misc/strings/conversion.hpp:140:97: error: ‘uint8_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
  140 |             const auto [ptr, ec] = std::to_chars(out + space, out + space + 2, static_cast<std::uint8_t>(v), 16);
      |                                                                                                 ^~~~~~~
      |                                                                                                 wint_t
 2023-05-24 12:45:50 +02:00
Mads Buvik Sandvei
40170d8953 is_automagical false line for ActorStore 2023-05-23 22:55:43 +02:00
elsid
7a20af6d9d Merge branch 'asanstats' into 'master' 
Fix invalid memory usage in stats tooltip

See merge request OpenMW/openmw!3057
 2023-05-23 19:48:33 +00:00
Evil Eye
17c8e63d3a Fix invalid memory usage in stats tooltip 2023-05-23 20:03:12 +02:00
Mads Buvik Sandvei
97ea626ba2 Clang'd 2023-05-23 19:49:47 +02:00
Mads Buvik Sandvei
4f88988131 Moved check for actor/non-actor to ActorStore constructor. Refactor ActorSpells type to be an ActorStore type. 2023-05-23 19:44:51 +02:00
Mads Buvik Sandvei
410e8b100a Elsid comments 2023-05-23 19:30:29 +02:00
Mads Buvik Sandvei
b5aefc872b Document the optional attribute/skill parameter of getEffect. 2023-05-23 18:17:31 +02:00
Mads Buvik Sandvei
5a8c6df633 clang'd 2023-05-23 18:12:06 +02:00
Mads Buvik Sandvei
5f6bd5466f #number -> #string in documentation 2023-05-23 18:12:06 +02:00
Mads Buvik Sandvei
4bf23f152b Revert use of string_view to std::string for effectIdTo* methods. 2023-05-23 18:12:06 +02:00
Mads Buvik Sandvei
6cfc06d7d8 There is no typo 2023-05-23 18:12:06 +02:00
Mads Buvik Sandvei
9a59330561 refactor effect names in loadmgef. Added a map from effect index to non-gmst effect name for use in lua scripts. 2023-05-23 18:11:59 +02:00
Mads Buvik Sandvei
151521bb68 Unused function 2023-05-23 18:11:44 +02:00
Mads Buvik Sandvei
8ac7b04770 ActiveEffects / ActiveSpells documentation 2023-05-23 18:11:44 +02:00
Mads Buvik Sandvei
c03c3c40d5 documentation of MagicEffectId enum 2023-05-23 18:11:44 +02:00
Mads Buvik Sandvei
b791ce9132 Remove redundant qualifiers 2023-05-23 18:11:44 +02:00
Mads Buvik Sandvei
448658ce5b Check class validity before using it. 2023-05-23 18:11:44 +02:00
Mads Buvik Sandvei
87250bfabf clang warnings/errors 2023-05-23 18:11:44 +02:00
Mads Buvik Sandvei
7ba43c9426 actor.ActiveEffects and actor.ActiveSpells 2023-05-23 18:11:44 +02:00