36675 Commits

Author SHA1 Message Date
AnyOldName3
998c738ed0 Add some options from the Windows script to the MacOS script
Hopefully, they might even work, too.

Also move ccache installation to the CI script as it's not mandatory to use ccache for local builds.
2025-09-06 01:29:44 +01:00
AnyOldName3
98bb4af0cb Use correct shebang
[[ doesn't work in real sh, only in more advanced shells pretending to be sh.
2025-09-06 01:07:02 +01:00
AnyOldName3
0a2c929a76 Don't meddle with people's git settings
I can't see any reason for this to have been necessary in CI in the first place as we do CI runs for commits on a branch, not for a detached head.
Despite that, I've left it in the Linux and Android scripts as we don't suggest anyone runs those on their own machines.
2025-09-06 00:56:46 +01:00
AnyOldName3
ff60b741a7 Move architecture-independent tool installation to common script 2025-09-06 00:51:52 +01:00
AnyOldName3
c70a7cd15b Eliminate single-line ccache scripts
They used to be necessary because they selected CMake of the same architecture as the build target, but now we use native ccache, they don't do anything meaningful.

Make things consistent with other platforms and just call ccache directly in the CI script.
2025-09-05 01:01:41 +01:00
AnyOldName3
6cdcbd957a And the same with CMake 2025-09-05 00:56:36 +01:00
AnyOldName3
a4be773e9c Native ccache won't work if we insist on an architecture 2025-09-05 00:56:36 +01:00
AnyOldName3
3bf68d44b7 Try using native CMake and CCache
In principle, CMake should be able to cross-compile just fine and CCache shouldn't care.
Maybe homebrew meddles with the default configuration and this will break things, though.
We shall see.
2025-09-05 00:55:52 +01:00
AnyOldName3
9fe8f3b03c Attempt to use Qt not necessarily from brew
The homebrew package should add qmake to the path, and qmake knows where Qt is.
If this works for brew, it should work for not-brew, too.

This *might* give a trailing /lib on the path CMake sees, but CMake implicitly tries adding a /lib suffix to paths in CMAKE_PREFIX_PATH, so this shouldn't make a difference to anything.
2025-09-05 00:55:52 +01:00
AnyOldName3
f155b0199e Undo part of !4759
https://gitlab.com/OpenMW/openmw/-/merge_requests/4759#note_2606465930 was marked as resolved without really being resolved, so bypassed normal review and was merged prematurely.

We tell developers to run these scripts on their machines, so it's rude to install things we don't have to over the top of an existing installation.
If the existing installation was via brew via the default sources, then it's clever enough not to break things, but if it's using custom sources or the install is outside of brew, it'll either break or overwrite what's there.

The three tools we've historically checked before overwriting all have an upstream MacOS distribution that isn't through brew, so it's decently likely that they exist, and we've never agreed to drop support for them.

I went a little further than the original code:
* I added a check before overwriting brew itself.
  I don't know whether the install script would notice this anyway.
* I added a check to ensure it's specifically Qt 6.x that's already installed as we dropped support for Qt 5.
* I added the checks back to both scripts even though !4759 only removed them from one.
  There only used to be one script, and when it was split, the checks only made it to one copy.

I could have gone further by adding checks for other tools before we install them, but we didn't have these in the past and I couldn't be bothered.

Try ARCHPREFERENCE environment variable

Go back to using subshell

ARCHPREFERENCE won't retroactively relaunch the current shell.

Also use /usr/local/bin/brew as the x86_64 version we just installed isn't added to the path by default.

Fresh shell for brew installer?

escape things better

This commit message was very nearly just emoji or a rant about sh-compatible shells.

what is going on?

Nested quotes?
2025-09-05 00:55:52 +01:00
Alexei Kotov
1dbd5fd571
Merge branch 'macos-ci-fixes' into 'master'
MacOS CI fixes and cleanup

See merge request OpenMW/openmw!4913
2025-09-04 23:44:13 +03:00
Alexei Kotov
4252098919
Merge branch 'gamepadactionl10n' into 'master'
Translate gamepad actions, part 2

See merge request OpenMW/openmw!4907
2025-09-04 23:41:28 +03:00
Alexei Kotov
9af71e9575 Merge branch 'unpublished' into 'master'
Don't publish release tag prereleases automatically

See merge request OpenMW/openmw!4911
2025-09-03 19:13:55 +03:00
Alexei Kotov
975e8d7412 Merge branch 'derefkarstaag' into 'master'
Don't dereference a potential end iterator

See merge request OpenMW/openmw!4912
2025-09-03 19:13:23 +03:00
Sarah Sunday
68d0dff890 [CI] Check for cmake for arm, move s3cmd out of arch specific flow 2025-09-02 19:54:38 -05:00
Sarah Sunday
180287dd80 [CI] Do not use ccache executable path, just ref directly 2025-09-02 19:54:38 -05:00
Sarah Sunday
5dfb4994b0 [CI] Rename/fix mac ccache file 2025-09-02 19:54:38 -05:00
Evil Eye
55287a6efe Merge branch 'clang_tidy_19' into 'master'
Use clang-tidy 19

See merge request OpenMW/openmw!4901
2025-09-02 18:46:48 +00:00
Evil Eye
63eebac784 Merge branch 'castStatic' into 'master'
Fix Lua example

See merge request OpenMW/openmw!4910
2025-09-02 18:46:44 +00:00
Evil Eye
3ec0812b91 Don't reference a potential end iterator 2025-09-02 17:39:35 +02:00
Alexei Kotov
a36fbc93b2 Don't publish release tag prereleases automatically 2025-09-02 09:40:59 +03:00
Evil Eye
d0f7152839 Fix Lua example 2025-09-01 22:28:13 +02:00
Alexei Kotov
2e18809ed9 Merge branch 'apply_xtra_data_after_drawable_properties' into 'master'
Distortion effect related fixes

See merge request OpenMW/openmw!4904
2025-09-01 21:57:31 +03:00
Alexei Kotov
253ac42520 Use newly exposed UI action lines in more menus 2025-09-01 18:00:54 +03:00
Alexei Kotov
ea3240ce03 Merge branch 'vfs_normalized_path_23' into 'master'
Use normalized path in Lua vfs bindings (#8138)

See merge request OpenMW/openmw!4903
2025-09-01 15:06:27 +03:00
Alexei Kotov
77f36dcdac Merge branch 'gamepadactionl10n' into 'master'
Translate gamepad actions, part 1

See merge request OpenMW/openmw!4888
2025-09-01 15:06:02 +03:00
Cody Glassman
f9f61b8189 make sure distortion respects alpha correctly 2025-08-31 12:02:11 -07:00
Cody Glassman
f2a82701b4 make sure we apply extra data statesets at right time 2025-08-31 11:16:54 -07:00
psi29a
92b7ed5964 Merge branch 'waste-of-time' into 'master'
Disable expensive post-cull bounds calculations that never help very much

See merge request OpenMW/openmw!4894
2025-08-31 18:01:51 +00:00
psi29a
0abbc9060d Merge branch 'parallax' into 'master'
Don't overcorrect parallax Y

See merge request OpenMW/openmw!4892
2025-08-31 18:00:42 +00:00
psi29a
1d08d3b900 Merge branch 'itemusage' into 'master'
Drop objects that cannot be equipped after Lua lets us equip them (#8675)

Closes #8675

See merge request OpenMW/openmw!4870
2025-08-31 18:00:29 +00:00
psi29a
0ab79c4370 Merge branch 'formatcomponents' into 'master'
Remove StringUtils::format from components

See merge request OpenMW/openmw!4880
2025-08-31 17:59:35 +00:00
psi29a
b0a27fd041 Merge branch 'encumbrance' into 'master'
Properly detect overencumbrance for zero capacity again

See merge request OpenMW/openmw!4883
2025-08-31 17:59:24 +00:00
Alexei Kotov
c8eb28331a Merge branch 'changelogsync' into 'master'
Sync changelog

See merge request OpenMW/openmw!4897
2025-08-31 05:54:13 +03:00
elsid
f9907058e2
Use clang-tidy 19 2025-08-30 15:23:23 +02:00
Evil Eye
e520f5f4d0 Sync changelog for 0.50.0 2025-08-30 11:04:27 +02:00
Evil Eye
a0863290be Merge branch 'rm_small_tu' into 'master'
Remove small translation units

See merge request OpenMW/openmw!4895
2025-08-30 07:45:30 +00:00
elsid
1348065be3
Use normalized path in Lua vfs bindings 2025-08-29 22:47:00 +02:00
Nelsson Huotari
5b01ca99f8 Merge branch 'smoothheightcrashesagain' into 'master'
Editor: Fix crash if the smoothed terrain vertex belongs to an unloaded cell (#8686)

Closes #8686

See merge request OpenMW/openmw!4891
2025-08-29 20:06:34 +00:00
Alexei Kotov
4c1fdb8dec Update Swedish Interface lines again 2025-08-29 12:50:14 +03:00
elsid
dea69b229c
Remove small translation units
Remove .cpp files with small amount of code which don't have additional
includes compared to corresponding .hpp files. This reduces the total
size of preprocessed code of the project and should reduce compilation
time.
2025-08-29 00:41:47 +02:00
Alexei Kotov
641e1fa3a2 Update Polish Interface lines 2025-08-28 16:41:33 +03:00
Alexei Kotov
a89a6cfd5c Update Swedish Interface lines 2025-08-28 16:41:33 +03:00
Alexei Kotov
60d31e978a Merge branch 'parameter_naming' into 'master'
Fix and enforce parameter naming (#8424)

See merge request OpenMW/openmw!4890
2025-08-28 14:10:44 +03:00
Alexei Kotov
15b9d70cbe Merge branch 'fargoths_lost_weather_ring' into 'master'
Make most weather bindings read/write

See merge request OpenMW/openmw!4866
2025-08-28 03:22:34 +03:00
Cody Glassman
bfc25a3194 Make most weather bindings read/write 2025-08-28 03:22:33 +03:00
AnyOldName3
48e5358587 Disable expensive post-cull bounds calculations that never help very much 2025-08-27 23:57:07 +01:00
Alexei Kotov
35cc6e6daf Editor: Fix crash if the smoothed terrain vertex belongs to an unloaded cell (#8686) 2025-08-27 16:30:56 +03:00
elsid
0f36b7fc97
Fix and enforce parameter naming 2025-08-27 12:45:09 +02:00
Alexei Kotov
f339998a78 Update German Interface translations 2025-08-27 04:40:15 +03:00