1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 20:29:57 +00:00
Commit graph

22663 commits

Author SHA1 Message Date
psi29a
1e94f53146 Merge branch 'is_starter_spell' into 'master'
Expose starter spells

See merge request OpenMW/openmw!4352
2024-09-06 07:25:09 +00:00
psi29a
8992a9fb8c Merge branch 'master' into 'master'
Navmeshtool as a Library

See merge request OpenMW/openmw!4354
2024-09-06 07:23:22 +00:00
psi29a
46cbee2f21 Merge branch 'input_bindings' into 'master'
Fix input bindings handling (#8115)

Closes #8115

See merge request OpenMW/openmw!4332
2024-09-05 14:52:54 +00:00
Ole Volbracht
e920325073 Build navmeshtool as a library 2024-09-05 16:30:11 +02:00
psi29a
4c28731f6a Merge branch 'optionallightfadeout' into 'master'
Make light attenuation fade optional

See merge request OpenMW/openmw!4267
2024-09-05 07:29:48 +00:00
psi29a
e1875d459a Merge branch 'boost-config-required' into 'master'
Modernise Boost CMake stuff

Closes #8100

See merge request OpenMW/openmw!4307
2024-09-04 19:04:57 +00:00
psi29a
b3677d07fd Merge branch 'pcallallthethings' into 'master'
Wrap all memory allocating Lua functions in protected calls

Closes #8099

See merge request OpenMW/openmw!4336
2024-09-04 07:22:26 +00:00
psi29a
da0e2e7f57 Merge branch 'fix_warning' into 'master'
Fix clang warning: -Wunused-but-set-variable

See merge request OpenMW/openmw!4353
2024-09-03 16:13:12 +00:00
psi29a
89976a9424 Merge branch 'vfs_normalized_path_9' into 'master'
Use normalized path for models settings (#8138)

See merge request OpenMW/openmw!4348
2024-09-02 07:26:53 +00:00
Mehdi Yousfi-Monod
767d7bfecd fixed indent 2024-09-01 15:36:53 +02:00
Mehdi Yousfi-Monod
cb2a8c74dd FEAT: Expose starter spells 2024-09-01 15:26:58 +02:00
elsid
262b31cf08
Fix clang warning: -Wunused-but-set-variable
apps/openmw/mwmechanics/spellcasting.cpp:45:13: warning: variable 'index' set but not used [-Wunused-but-set-variable]
   45 |         int index = -1;
      |             ^
2024-09-01 15:04:18 +02:00
elsid
9e36b3fc0b
Use normalized path for models settings 2024-08-30 20:50:59 +02:00
elsid
e01861140e
Add tests for MWWorld::Ptr 2024-08-30 20:46:56 +02:00
elsid
1cdbbef7ee
Use blank CellRef as default
Default constructed CellRef has some fields uninitialized.
2024-08-30 20:46:56 +02:00
elsid
d998faec1b
Deregister only registered LiveCellRefBase 2024-08-30 20:46:56 +02:00
elsid
4565152b3d
Define LiveCellRefBase functions inside MWWorld namespace block 2024-08-30 20:46:56 +02:00
elsid
ca8869042b
Move LiveCellRef where possible 2024-08-30 20:46:55 +02:00
Andrei Kortunov
b620b9b239 Do not make redundant copies 2024-08-30 17:27:40 +04:00
psi29a
f456978cc3 Merge branch 'blueshift' into 'master'
Launcher: Support extended selection for directories

See merge request OpenMW/openmw!4346
2024-08-30 10:23:08 +00:00
Alexei Kotov
176dec45a7 Make light attenuation fade optional
This also makes Force Per Pixel Lighting caption shorter to provide more space for the new button
2024-08-30 10:03:37 +03:00
Alexei Kotov
073e4639bf Launcher: Support extended selection for directories 2024-08-29 04:18:07 +03:00
Alexei Kotov
f393c40cbd Launcher: Fix Insert Above behavior when the directory is added automatically 2024-08-29 03:54:26 +03:00
Evil Eye
5711a395af Merge branch 'bolt-is-not-a-static' into 'master'
[Lua] rename boltStatic to bolt in magic effect record bindings.

See merge request OpenMW/openmw!4342
2024-08-27 15:57:32 +00:00
psi29a
24a0e42594 Merge branch 'fargothsayshello' into 'master'
Don't turn to face the player to say hello if there is no hello response

Closes #8132

See merge request OpenMW/openmw!4339
2024-08-27 15:38:25 +00:00
Mads Buvik Sandvei
f7f282fc48 bolt is not a static 2024-08-26 13:28:29 +02:00
Dave Corley
daf82d40b9 FIX(CSVRender::Object): Clamp scale edits in render window too 2024-08-25 10:23:04 -07:00
Evil Eye
1f5c314022 Don't turn to face the player to say hello if there is no hello response 2024-08-25 11:48:14 +02:00
psi29a
50465a3cf2 Merge branch 'alternatingrowcolors' into 'master'
Launcher: Alternate row colors in directory and archive list

See merge request OpenMW/openmw!4338
2024-08-25 07:42:43 +00:00
Evil Eye
032d506aa7 Fix components_tests 2024-08-24 09:10:23 +02:00
Evil Eye
4529af9b7f Fix the tests 2024-08-23 22:40:39 +02:00
AnyOldName3
387b63909b Remove vestigial Boost libraries
Boost::zlib is basically part of Boost::iostreams, and depending on how you configure Boost, it can either be a separate library or get embedded into iostreams.
With the third-party-but-linked-on-Boost's-website package we've been using for years, it's a separate library.
Before https://gitlab.com/OpenMW/openmw/-/merge_requests/4307, we needed to explicitly link with it as CMake wasn't handling transitive dependencies for us.
With vcpkg, it's embedded, and doesn't have its own CMake config, so we couldn't explicitly link with it even if we wanted to.

Now CMake *is* handling transitive dependencies for us, we don't even need to think about this library.
It's all automatic.

Boost::locale, on the other hand, used to be something we used directly (I think for doing UTF-16/UTF-8 conversions when dealing with Windows paths).
However, it isn't anymore, and we just didn't purge it from our CMake when we should have.
It can go.
2024-08-23 14:06:13 +01:00
AnyOldName3
26be98966f Modernise Boost CMake stuff
Resolves https://gitlab.com/OpenMW/openmw/-/issues/8100

Also removes some old crud.
Hopefully the old crud is all:
* Handled automatically by CMake now we're using the modern approach.
* A hack-fix for a problem caused by not using the modern approach.
* Massively outdated so no longer necessary.

If it turns out this makes CI fail, I'll tweak things as necessary.

Changes that might not be wanted include:
* Getting rid of our BOOST_STATIC CMake option. In cases where the CMake config doesn't make the one correct choice from the build environment (i.e. because there's a choice) the CMake config exposes the option already.
  However, we were forcing this on for Windows, so that might matter.
  It seems to default to static on my machine even though I thought I read something suggesting otherwise, so we'll see how things go with that.
  If we eventually put CMake in charge of installing dependency DLLs this will be a moot point as we won't need to care.
* Bumping the minimum version of Boost to 1.70.0, as that's the first with working CMake config.
  It's from 2019, so plausibly there are distros too scared to use a library from five years ago as it can't legally drink in the US (although it could in limited quantities with parental supervision in the UK, as long as it's just something inconsequential like a single sip of beer).
2024-08-23 14:06:13 +01:00
Alexei Kotov
3a9e6de6fd Alternate row colors in directory and archive list 2024-08-23 14:28:26 +03:00
Alexei Kotov
951c440c8b Don't apply normal weapon resistance twice for NPCs (#8124) 2024-08-23 13:41:14 +03:00
Evil Eye
c9783344a0 Wrap all memory allocating Lua functions in protected calls 2024-08-22 22:22:28 +02:00
elsid
ca2bacd47a
Revert "Ability to unbind controls in settings menu"
This reverts commit 0836680e36.

To prevent crashes on empty input bindings config.
2024-08-21 00:14:22 +02:00
elsid
6a5bc9f992
Save and rename input bindings file
To reduce the chance of corrupting the file.
2024-08-20 23:59:44 +02:00
psi29a
527fa053c5 Merge branch 'actions_patchup' into 'master'
Lua Actions patchup

See merge request OpenMW/openmw!4311
2024-08-18 10:02:03 +00:00
uramer
2460b5f4ef Merge branch 'swizzle_bop_boom_bazingle_v2' into 'master'
lua - add swizzling to vector types

See merge request OpenMW/openmw!4304
2024-08-16 13:22:22 +00:00
psi29a
dc9c68f61b Merge branch 'fix_android_openmw' into 'master'
Keep separation between openmw and openmw-lib on Android

See merge request OpenMW/openmw!4221
2024-08-14 19:18:32 +00:00
psi29a
73ee8ccc4e Merge branch 'rewrite-vfx' into 'master'
[Lua] Rewrite addvfx and spawnvfx

See merge request OpenMW/openmw!4314
2024-08-13 12:27:12 +00:00
Mads Buvik Sandvei
cd7017e0e4 use string_view 2024-08-12 21:39:29 +02:00
Mads Buvik Sandvei
7f0f2373ea Use sol::optional for optional table instead of function overloading. 2024-08-12 21:24:50 +02:00
psi29a
c8c09b1905 Merge branch 'thirstytherana' into 'master'
Prevent spell priority skyrocketing in useless cases

Closes #8102

See merge request OpenMW/openmw!4310
2024-08-12 08:35:41 +00:00
psi29a
9234b5707f Merge branch 'breaklilacor' into 'master'
Allow GetEffect to detect 0 magnitude spells

Closes #8097

See merge request OpenMW/openmw!4297
2024-08-11 09:06:32 +00:00
Mads Buvik Sandvei
09f6daf155 Rewrite addvfx and spawnvfx to take a model path instead of a static. Mode vfx from core to world. Add event handlers for AddVfx and SpawnVfx. 2024-08-10 14:56:35 +02:00
elsid
a376d20c30
Fix tests on windows 2024-08-09 16:58:10 +02:00
psi29a
761957d28c Merge branch 'less_strict_test' into 'master'
Make test for navmeshdb limit less strict

See merge request OpenMW/openmw!4306
2024-08-08 08:07:40 +00:00
uramer
ab628ea12a Fix memory safety of actions/triggers iteration 2024-08-08 00:09:08 +02:00
Sam Hellawell
ae0660db0a Use nodeMask... lets ignore the previous attempt 2024-08-08 00:08:48 +02:00
Sam Hellawell
de4d97826a Fix: castRenderingRay doesnt hit terrain 2024-08-08 00:08:48 +02:00
Evil Eye
45c7e45905 Prevent spell priority skyrocketing in useless cases 2024-08-07 22:49:23 +02:00
psi29a
e7fc20d279 Merge branch 'fix/render-raycast-doesnt-hit-terrain' into 'master'
Fix: castRenderingRay doesnt hit terrain

Closes #7912

See merge request OpenMW/openmw!4286
2024-08-07 13:17:07 +00:00
elsid
b56de5bcf9
Make test for navmeshdb limit less strict
To avoid rare test failures when tiles are added into the database in different
order.
2024-08-07 00:01:50 +02:00
elsid
20e3eeddde
Fix libavformat version check
2a68d945cd
added const version of a callback functions but didn't enable them. They were
guarded by a version check:

2a68d945cd/libavformat/version_major.h (L48)

So for anything LIBAVFORMAT_VERSION_MAJOR < 61 they are not enabled therefore
they are enabled for everything >= 61.0.100.

See https://github.com/elsid/openmw/actions/runs/10255993574/job/28374152796 as
example of failure when building with 60.16.100.
2024-08-05 23:52:30 +02:00
Evil Eye
fe50b1a22b Allow GetEffect to detect 0 magnitude spells 2024-08-05 20:01:38 +02:00
psi29a
5d57ad7e85 Merge branch 'fix-ffmpeg-latest-version' into 'master'
Support compiling with FFMpeg 5 and greater

See merge request OpenMW/openmw!4281
2024-08-05 15:28:11 +00:00
Cody Glassman
a53d002262 lua - add swizzling to vector types 2024-08-05 06:53:59 -07:00
elsid
ec02e2ba1d Revert "Merge branch 'swizzle_bop_boom_bazingle' into 'master'"
This reverts merge request !4288
2024-08-05 09:08:17 +00:00
Cody Glassman
9951fd8a1a support 0/1 constant swizzles 2024-08-04 11:56:34 -07:00
Cody Glassman
7186b8febc generate all swizzle bindings at API initialization 2024-08-04 11:56:34 -07:00
Cody Glassman
19c0cebb27 lua - add swizzling to vector types 2024-08-04 11:56:34 -07:00
psi29a
6cc2b8de27 Merge branch 'distortion_clear' into 'master'
distortion - make sure color mask is enabled for clear to have an effect (#8082)

See merge request OpenMW/openmw!4294
2024-08-04 08:48:40 +00:00
psi29a
8d290dd581 Merge branch 'launcher' into 'master'
Don't check subdirectories of valid content directories (#8085)

Closes #8085

See merge request OpenMW/openmw!4279
2024-08-03 22:42:05 +00:00
Sam Hellawell
61cb5b4da6 Support compiling with ffmpeg 5 and greater 2024-08-03 21:05:00 +01:00
Jared Davenport
6946d22505 fix sourcetype 2024-08-03 16:54:08 +00:00
Cody Glassman
24452e2c3a distortion - make sure color mask is enabled for clear to have an effect 2024-08-02 11:33:46 -07:00
psi29a
e8fcdae99e Merge branch 'no-more-oversized-demons' into 'master'
Don't apply scale in RotateController

See merge request OpenMW/openmw!4284
2024-08-01 17:38:46 +00:00
psi29a
488a05d14c Merge branch 'lua-add-is-fleeing' into 'master'
lua - add isFleeing() to AI interface

See merge request OpenMW/openmw!4256
2024-08-01 09:55:50 +00:00
psi29a
028ac2354e Merge branch 'controller_tab_type' into 'master'
Allow shoulder buttons to work in menus when text input is active

See merge request OpenMW/openmw!4010
2024-08-01 09:55:15 +00:00
Sebastian Fieber
234476bdae lua - add isFleeing() to lua AI interface 2024-07-31 20:29:33 +02:00
Dave Corley
a4f1e7d918 FIX(rotatecontroller): Actually accounting for scale breaks biped creatures 2024-07-31 05:02:52 -05:00
Sam Hellawell
1b3509d0ad Use nodeMask... lets ignore the previous attempt 2024-07-31 00:30:06 +01:00
Sam Hellawell
dd77c81557 Fix: castRenderingRay doesnt hit terrain 2024-07-30 23:21:10 +01:00
psi29a
30a844ae71 Merge branch 'how-do-you-ambulate' into 'master'
FEAT(types): Expose creature flags

See merge request OpenMW/openmw!4280
2024-07-29 08:07:36 +00:00
psi29a
765d55208f Merge branch 'axis-lock' into 'master'
Feat(CS): Add shortcuts for axis locking, submode selection, switching camera, and fix render arrows

See merge request OpenMW/openmw!3675
2024-07-29 08:04:48 +00:00
Dave Corley
42060be65c FEAT: Add essential and respawning flags for both NPC and Creature types 2024-07-28 17:14:09 -05:00
Dave Corley
ef9d5270a1 FEAT(types): Expose creature flags 2024-07-28 17:14:05 -05:00
elsid
5c92b18875
Avoid using string_view on a temporary 2024-07-28 23:11:15 +02:00
psi29a
fc2f30dc4a Merge branch 'anim-api-cleanup' into 'master'
Anim api cleanup (close #8081)

Closes #8081

See merge request OpenMW/openmw!4274
2024-07-28 09:17:05 +00:00
Cody Glassman
77eeb5bd92 Merge branch 'master' into 'master'
HALF_FLOAT  and normals changes

See merge request OpenMW/openmw!4240
2024-07-27 15:21:45 +00:00
Jared Davenport
349931b5cd HALF_FLOAT and normals changes 2024-07-27 15:21:44 +00:00
psi29a
2967383636 Merge branch 'dialoguesubview' into 'master'
Do not store references to disposed objects

Closes #8046

See merge request OpenMW/openmw!4272
2024-07-27 09:38:17 +00:00
psi29a
79a9f8c23c Merge branch 'thedreughtookmyenchantmentsandarentgivingthemback' into 'master'
Rebuild ESMStore indices before loading any cell or player state

See merge request OpenMW/openmw!4278
2024-07-27 09:37:44 +00:00
psi29a
f4e5d67476 Merge branch 'ridethestorm' into 'master'
Handle GetItemCount on references without a container store gracefully

See merge request OpenMW/openmw!4277
2024-07-27 09:35:58 +00:00
Alexei Kotov
8a7035020a Don't check subdirectories of valid content subdirectories (#8085) 2024-07-26 21:49:51 +03:00
Andrei Kortunov
21db4219de Use QPersistentModelIndex to react to model changes 2024-07-26 09:57:35 +04:00
Evil Eye
5c4deb3f88 Prevent older binaries from incorrectly loading newer saves 2024-07-25 22:37:44 +02:00
Evil Eye
68be9a9544 Rebuild ESMStore indices before loading any cell or player state 2024-07-25 22:22:23 +02:00
Evil Eye
63e1b0ee9d Handle GetItemCount on references without a container store gracefully 2024-07-25 18:34:53 +02:00
Alexei Kotov
03091f8ce0 Make Coverity happy about animation blending 2024-07-25 02:28:07 +03:00
Anton Uramer
a5d1db2afd Use new Context helpers for UI bindings 2024-07-24 09:28:51 +02:00
Anton Uramer
6851e6e56a Context helpers for caching packages, split up core bindings into multiple caches, remove getRealFrameDuration in global context 2024-07-24 09:28:50 +02:00
Dave Corley
9f8ebc7973 FIX: Correct keybind conflict with move submode and drop to terrain 2024-07-23 13:59:31 -05:00
Dave Corley
55ccec7ecc FIX: Update settings declarations to newer standards 2024-07-23 13:59:31 -05:00
Dave Corley
5afdcddefa Consistency fix in keybind names, simplify instancemode and remove some
dead code
2024-07-23 13:59:21 -05:00
Dave Corley
78c41d3eee Feat(instancemode.cpp): Implement keybinds for axis locking & switching submodes
Cleanup(instancemode): Make the axis shortcut using std::string instead
of format
2024-07-23 13:58:43 -05:00
Dave Corley
98750a122d Feat(worldspacewidget.cpp): store the camera mode tool & implement the
shortcut to cycle camera modes
2024-07-23 13:56:19 -05:00
Dave Corley
2e581c4d70 Feat(CS): Add shortcuts for axis locking, submode selection, and camera cycling 2024-07-23 13:56:14 -05:00