1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Commit graph

28631 commits

Author SHA1 Message Date
jvoisin
8d56e79877 Minor simplifications in sortfilteritemmodel.cpp
- Change an if-else-if-else… spaghetti into a switch-case
- Replace a linear search in a dynamically constructed
  vector with a switch-case. Thanks elsid for the idea!
2022-06-12 18:00:43 +02:00
psi29a
bf8cc36645 Merge branch 'camera_settings' into 'master'
In-game camera settings

Closes #6715

See merge request OpenMW/openmw!1924
2022-06-12 12:47:11 +00:00
psi29a
3b95797473 Merge branch 'Project5791-master-patch-42764' into 'master'
Update CI/build_googletest.sh

See merge request OpenMW/openmw!2005
2022-06-12 12:38:22 +00:00
Project579
d3d9e66ffd Update CI/build_googletest.sh
googletest v1.11.0 is required for building with C++20.
2022-06-12 12:07:40 +00:00
uramer
bf905fce4c Don't use WindowManager outside of UI, correct paths for new record types 2022-06-12 13:07:50 +02:00
uramer
fd7965d77f Use correctMeshPath instead of string constants 2022-06-12 11:30:29 +02:00
uramer
1fb136a417 Correct icon and mesh paths in Lua records 2022-06-12 11:30:29 +02:00
psi29a
c8fc1afb45 Merge branch 'CPP20' into 'master'
Update to C++20 and see if our CI can handle it.

See merge request OpenMW/openmw!1695
2022-06-12 08:00:11 +00:00
psi29a
bb0dad7c08 Update to C++20 and see if our CI can handle it. 2022-06-12 08:00:11 +00:00
Alexei Kotov
c2e637d661 Mark setAttackingOrSpell as const 2022-06-12 03:02:23 +03:00
Alexei Kotov
47f574e14b Move death state mapping out of playDeath/playRandomDeath 2022-06-12 02:58:04 +03:00
Alexei Kotov
b4e87abfe1 Clean up run-to-walk state conversion 2022-06-12 02:52:49 +03:00
Alexei Kotov
31d636ea20 Map movement animation groups with a switch 2022-06-12 02:49:13 +03:00
Petr Mikheev
73eda27e7f Update l10n/OMWCamera/en.yaml 2022-06-12 01:00:41 +02:00
Petr Mikheev
5f0a7c2b16 Fix jumping when using move360 with a controller 2022-06-12 00:09:13 +02:00
Petr Mikheev
1ca0a3a555 Addition camera features: move360, pov_auto_switch, slow_view_change 2022-06-12 00:09:13 +02:00
Petr Mikheev
3fb470dcce Increase the size of the settings menu; reduce the size of Lua settings "number" in order to make camera settings look good with the default size of the settings menu. 2022-06-12 00:09:13 +02:00
Petr Mikheev
65efd6f1c2 Remove from settings.cfg camera settings that are controlled from Lua 2022-06-12 00:06:39 +02:00
Petr Mikheev
c548708a27 Remove Lua package openmw.settings 2022-06-12 00:06:39 +02:00
Petr Mikheev
860d5899c4 Control camera settings in-game 2022-06-12 00:06:39 +02:00
Petr Mikheev
f47e64b0f8 Merge branch 'autosize_singleline_edit' into 'master'
Lua UI: Enable autoSize for single line text edit

See merge request OpenMW/openmw!2002
2022-06-11 22:04:28 +00:00
uramer
6d2dcaea50 Lua UI: Enable autoSize for single line text edit 2022-06-11 22:24:20 +02:00
psi29a
f8a6001e87 Merge branch 'outofcharacter' into 'master'
Make CharacterController less miserable, round 1

See merge request OpenMW/openmw!1999
2022-06-11 18:50:06 +00:00
psi29a
9c1970dce4 Merge branch 'lua_esm' into 'master'
Advanced Lua scripts configuration in omwaddon

See merge request OpenMW/openmw!1947
2022-06-11 18:48:23 +00:00
psi29a
28746b5d18 Merge branch 'rotateproperlydummkopf' into 'master'
Always update the current matrix in KeyframeController (#6811)

Closes #6811

See merge request OpenMW/openmw!2000
2022-06-11 18:43:32 +00:00
glassmancody.info
d7425cc016 change update visitor to only traverse active children in scenegraph 2022-06-11 00:09:33 -07:00
Alexei Kotov
dd758f8fd1 Always update the current matrix in KeyframeController 2022-06-11 05:56:28 +03:00
Alexei Kotov
45e6add5f5 Optimize clearAnimQueue(true) 2022-06-11 04:54:50 +03:00
Alexei Kotov
d4d4304f1e Fix walk animation fallback replace call 2022-06-11 04:54:50 +03:00
Alexei Kotov
93068d71ea Use std::string_view whenever reasonable in CharacterController
C++ Core Guidelines SL.str.2
2022-06-11 04:54:50 +03:00
Alexei Kotov
97d4206a3d Improve CharacterController const-correctness
C++ Core Guidelines Con. 2
2022-06-11 02:08:43 +03:00
Alexei Kotov
788de7edcb Initialize most of CharacterController in-class
See C++ Core Guidelines C.48
2022-06-11 00:40:14 +03:00
psi29a
38ca20fa77 Merge branch 'vector-magic-effects-2' into 'master'
Fix effects not being removed from scene graph

See merge request OpenMW/openmw!1997
2022-06-10 21:05:32 +00:00
ζeh Matt
9559feaa90
Fix effects not being removed from scene graph 2022-06-10 22:59:23 +03:00
psi29a
f53bc7807a Merge branch 'sast' into 'master'
Run sast jobs in parallel with build jobs

See merge request OpenMW/openmw!1994
2022-06-10 13:05:10 +00:00
elsid
92b9e9269d
Run sast jobs in parallel with build jobs 2022-06-10 02:44:29 +02:00
psi29a
436db8c0e5 Merge branch 'ffmpeg5' into 'master'
fix hang with ffmpeg5 (ffmpeg_decoder: signal EOF/errors on readPacket)

Closes #6631

See merge request OpenMW/openmw!1941
2022-06-09 20:45:50 +00:00
psi29a
d7641ce943 Merge branch 'keyframe' into 'master'
Encapsulate NIF transformations, round 2 (#6709)

Closes #6709

See merge request OpenMW/openmw!1989
2022-06-09 20:44:55 +00:00
psi29a
f7345622c8 Merge branch 'vector-magic-effects' into 'master'
Use vector for EffectManager effects

See merge request OpenMW/openmw!1993
2022-06-09 20:43:53 +00:00
Matt
4d74f8137c Use vector for EffectManager effects 2022-06-09 20:43:53 +00:00
psi29a
ee89eccb06 Merge branch 'reload_l10n' into 'master'
Console command `reloadlua` also reloads l10n used by Lua scripts

See merge request OpenMW/openmw!1984
2022-06-09 12:17:38 +00:00
psi29a
6764d781a0 Merge branch 'fix/shrink_builds' into 'master'
reduce the number of builds, by a lot

See merge request OpenMW/openmw!1992
2022-06-08 19:05:14 +00:00
psi29a
63413fba3a reduce the number of builds, by a lot 2022-06-08 19:05:13 +00:00
psi29a
b58976255f Merge branch 'task/remove_unneeded_macos_runner' into 'master'
remove macos11 build as it uses 6x times more CI minutes; expensive

See merge request OpenMW/openmw!1991
2022-06-08 14:06:28 +00:00
psi29a
5d88b39574 Merge branch 'fix/macos' into 'master'
make use of std::filesystem::absolute as ::system_complete was dropped from spec

See merge request OpenMW/openmw!1990
2022-06-08 14:04:16 +00:00
Bret Curtis
a6b9ce9a7a remove macos11 build as it uses 6x times more CI minutes; expensive 2022-06-08 15:43:57 +02:00
Bret Curtis
339169b60a make use of std::filesystem::absolute as ::system_complete was dropped from spec 2022-06-08 15:35:35 +02:00
psi29a
f687827f98 Merge branch 'compile-times' into 'master'
Improve compile time a bit

See merge request OpenMW/openmw!1985
2022-06-08 12:07:30 +00:00
Petr Mikheev
1650dacfca Merge branch 'keep_settings_page' into 'master'
Keep the scripts settings page open

See merge request OpenMW/openmw!1987
2022-06-08 10:31:34 +00:00
Alexei Kotov
21f6e2e419 Encapsulate NIF transformations, round 2 (task #6709) 2022-06-08 07:05:35 +03:00