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

35008 commits

Author SHA1 Message Date
psi29a
070a72eb13 Merge branch 'clarify-activeeffects' into 'master'
Update activeeffects docs

See merge request OpenMW/openmw!4340
2024-08-26 13:50:08 +00:00
Mads Buvik Sandvei
2faf7036f5 bump lua api revision 2024-08-26 14:03:20 +02: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
Mads Buvik Sandvei
e9b4efdc87 Some clarifications of the activeeffects docs 2024-08-25 13:49:52 +02: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
ea6561a5e0 Merge branch 'ohmslawfornormalweapons' into 'master'
Don't apply normal weapon resistance twice for NPC victims (#8124)

Closes #8124

See merge request OpenMW/openmw!4337
2024-08-24 11:49:28 +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
AnyOldName3
0e2119c638 Ditch old AppVeyor stuff
We've not used AppVeyor for years.
If we started again, it'd use a different version of Boost and that aspect would need redoing anyway.
Everything else that was AppVeyor-specific is something we've got away without in GitLab CI so can't have been especially important.
2024-08-23 14:05:21 +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
jvoisin
830a26f75e Merge branch 'realloc' into 'master'
Don't assume realloc always succeeds

See merge request OpenMW/openmw!4331
2024-08-23 10:34:38 +00:00
psi29a
3c0353e8e2 Merge branch 'vcpkg_deps' into 'master'
Use vcpkg packages by before_scripts.msvc.sh (#7863)

See merge request OpenMW/openmw!4308
2024-08-23 07:23:42 +00:00
Evil Eye
c9783344a0 Wrap all memory allocating Lua functions in protected calls 2024-08-22 22:22:28 +02:00
Alexei Kotov
03e8b8db0d Merge branch 'vcpkg-bump-to-openmw_2' into 'master'
Update vcpkg deps commit

See merge request OpenMW/openmw!4333
2024-08-22 18:32:43 +00:00
psi29a
566e5b5588 Merge branch 'some-launcher-fixes' into 'master'
Some launcher fixes

Closes #8080

See merge request OpenMW/openmw!4287
2024-08-22 11:11:23 +00:00
elsid
0c15b403dd
Use vcpkg packages by before_scripts.msvc.sh 2024-08-22 02:32:13 +02:00
Evil Eye
aa808d63bc Return nullptr straight away 2024-08-21 16:40:39 +02:00
AnyOldName3
a4a1f55736 Update vcpkg deps commit 2024-08-21 13:39:41 +00:00
psi29a
10419adc58 Merge branch 'vfs_normalized_path_8' into 'master'
Use normalized path for l10n manager

See merge request OpenMW/openmw!4329
2024-08-21 07:23:13 +00:00
elsid
58b72e3836
Access channels and controls via at function
To avoid UB on out of range access.
2024-08-21 00:14:36 +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
Evil Eye
4652151630 Don't assume realloc always succeeds 2024-08-20 19:49:13 +02:00
AnyOldName3
16fc0541da Escape ' 2024-08-19 17:24:50 +01:00
AnyOldName3
5e78135f72 French translation from Jvoisin 2024-08-19 17:07:58 +01:00
elsid
92a0bbb454
Use normalized path in l10m manager 2024-08-18 21:07:46 +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
psi29a
3489609987 Merge branch 'someone-thought-they-were-writing-docs-in-markdown' into 'master'
Improve formatting after someone pointed out a problem on Discord

See merge request OpenMW/openmw!4322
2024-08-17 19:09:43 +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
AnyOldName3
0d0e80f2a1 Improve formatting after someone pointed out a problem on Discord
and then I noticed a bunch of other problems
2024-08-15 22:15:05 +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
uramer
d8cd0788e4 Merge branch 'madsbuvi-master-patch-56327' into 'master'
Update lua api revision

See merge request OpenMW/openmw!4320
2024-08-14 08:02:21 +00:00
psi29a
1d836dedc8 Merge branch 'remove_find_recastnavigation' into 'master'
Remove no longer required FindRecastNavigation.cmake

See merge request OpenMW/openmw!4316
2024-08-13 22:02:16 +00:00
Mads Buvik Sandvei
fadcf5d255 Update lua api revision 2024-08-13 18:46:28 +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
elsid
e186e4f7ae
Remove no longer required FindRecastNavigation.cmake
It's possible to find the library without having it. But also it prevents target
options from propagation to the openmw targets.
2024-08-13 10:47:33 +02:00
Mads Buvik Sandvei
cd7017e0e4 use string_view 2024-08-12 21:39:29 +02:00
Mads Buvik Sandvei
9811eb7d32 docs typo 2024-08-12 21:29:46 +02:00
Mads Buvik Sandvei
7f0f2373ea Use sol::optional for optional table instead of function overloading. 2024-08-12 21:24:50 +02:00
AnyOldName3
4ae239a0ee sv translation from Lysol 2024-08-12 13:18:52 +00: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
psi29a
4938525f75 Merge branch 'github_windows_ci_tests' into 'master'
Run unit tests and benchmarks in windows CI job on github

See merge request OpenMW/openmw!4313
2024-08-11 09:05:58 +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
psi29a
a2805de0bc Merge branch 'fix_integration_tests' into 'master'
Increase Lua memory limit for integration tests

See merge request OpenMW/openmw!4312
2024-08-10 11:24:57 +00:00