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

29694 commits

Author SHA1 Message Date
AnyOldName3
66e5415895 Log screenshot capture 2022-11-22 19:26:28 +00:00
psi29a
e78886e4cc Merge branch 'collada_dom' into 'master'
Set collada_dom version before finding the package

See merge request OpenMW/openmw!2517
2022-11-22 16:16:14 +00:00
psi29a
2490e78a24 Merge branch 'FixCrashOnExit' into 'master'
Fix crash on exit

See merge request OpenMW/openmw!2520
2022-11-21 20:29:00 +00:00
psi29a
cc70062278 Merge branch 'the-sound-of-music-documentation' into 'master'
User documentation on how music and sound effects work in OpenMW.

See merge request OpenMW/openmw!2518
2022-11-21 08:49:50 +00:00
psi29a
abdc3f9664 Merge branch 'swe-transl-nov-2022' into 'master'
Some more Swedish translations

See merge request OpenMW/openmw!2519
2022-11-21 08:47:17 +00:00
Joakim Berg
e3619e40fe Some Swedish translations 2022-11-21 08:45:35 +00:00
Cédric Mocquillon
dde8ee0611 Delay the deletion of esm versions after the deletion of the scene as it is used in one of its workers (the objectpaging one) 2022-11-20 20:48:48 +01:00
Matjaž Lamut
aed9ae75d1 User documentation on how music and sound effects work in OpenMW. Includes a list of hard-coded stuff and available user-defined options. 2022-11-20 19:41:50 +00:00
elsid
fdb731a6d0
Set collada_dom version before finding the package
The package cmake config uses wrong variables for minor and major versions. They
should be collada_dom_VERSION_MINOR and collada_dom_VERSION_MAJOR but they are
COLLADA_DOM_VERSION_MINOR and COLLADA_DOM_VERSION_MAJOR. CMake variables are
case sensitive so used variables are just empty strings. Set them manually as a
workaround.
2022-11-20 14:22:05 +01:00
psi29a
4fb318ce57 Merge branch 'post_ui' into 'master'
Add missing translations

See merge request OpenMW/openmw!2515
2022-11-20 09:22:23 +00:00
Andrei Kortunov
282f4cf9c3 Add missing translations 2022-11-20 11:54:59 +04:00
psi29a
97e54c6294 Merge branch 'link_deps' into 'master'
Add link dependencies to libosgSim and collada-dom

See merge request OpenMW/openmw!2514
2022-11-18 22:00:09 +00:00
elsid
89884fae0b
Add link dependencies to libosgSim and collada-dom 2022-11-14 12:04:58 +01:00
psi29a
ff142b6009 Merge branch 'model-typo-fix' into 'master'
Fix name of example barrel's specular texture in documentation

See merge request OpenMW/openmw!2510
2022-11-13 08:35:33 +00:00
Matjaž Lamut
01422463b6 Fix the wrong name of the specular texture in the document that shows how to export a model from Blender to OpenMW 2022-11-12 21:51:53 +00:00
AnyOldName3
08361a6682 Merge branch 'LOD-support-to-Object-Paging' into 'master'
Add LOD support to Object Paging

See merge request OpenMW/openmw!2459
2022-11-12 15:25:57 +00:00
Cédric Mocquillon
9aee876687 Update changelog 2022-11-11 20:59:25 +01:00
Cédric Mocquillon
7142bb4ce7 Select only one level of LOD outside the active grid
Do not create group when not needed
2022-11-11 20:56:46 +01:00
psi29a
518bd03547 Merge branch 'post_ui' into 'master'
Improve postprocess HUD layout

See merge request OpenMW/openmw!2505
2022-11-10 22:36:04 +00:00
psi29a
4520a8c659 Merge branch 'weareboundtogetheryouandi' into 'master'
Remove the correct bound item when the effect expires

See merge request OpenMW/openmw!2507
2022-11-10 22:32:21 +00:00
Andrei Kortunov
da5b442fcf Improve postprocess HUD layout 2022-11-10 08:31:21 +04:00
Alexei Kotov
1d31c5eb6f Remove the correct bound item when the effect expires 2022-11-10 01:18:46 +03:00
psi29a
d29d68f1ba Merge branch 'allycache' into 'master'
Always consider an actor their own ally (bug #6313)

Closes #4229 and #6313

See merge request OpenMW/openmw!2504
2022-11-09 21:01:57 +00:00
Cédric Mocquillon
4140e4ea05 Remove LOD which could never be displayed in a chunk 2022-11-09 21:57:48 +01:00
psi29a
577c9ad5fb Merge branch 'deprecated' into 'master'
Replace gmtime with safer equivalents

See merge request OpenMW/openmw!2503
2022-11-09 09:20:07 +00:00
Alexei Kotov
5d11238723 Always consider an actor their own ally (bug #6313) 2022-11-08 20:13:20 +03:00
psi29a
7669a43495 Merge branch 'dialogue_result_scripts' into 'master'
Reimplement --script-all-dialogue to be more useful to modders

See merge request OpenMW/openmw!2494
2022-11-08 15:46:16 +00:00
psi29a
fa50890633 Merge branch 'sm-snap-to-reference' into 'master'
Open-CS: Snap to Reference

See merge request OpenMW/openmw!2484
2022-11-08 15:30:26 +00:00
psi29a
5e3c347bf7 Merge branch 'emitbrown' into 'master'
Make idle emitters emit ripples every 1.5 seconds (bug #5883)

Closes #5883

See merge request OpenMW/openmw!2501
2022-11-08 15:29:40 +00:00
Alexei Kotov
914fba229d Replace gmtime with safer equivalents 2022-11-08 16:38:40 +03:00
psi29a
fa820434b6 Merge branch 'navmesh_warnings' into 'master'
Update used static Recast library to avoid warnings with GCC

See merge request OpenMW/openmw!2502
2022-11-08 11:47:15 +00:00
Alexei Kotov
a5adb73900 Make idle emitters emit ripples every 1.5 seconds (bug #5883) 2022-11-08 12:48:24 +03:00
psi29a
3ca17e5183 Merge branch 'landofwindandshade' into 'master'
Handle landing in the frame the jump is over (bug #5849)

Closes #5849

See merge request OpenMW/openmw!2499
2022-11-08 08:25:31 +00:00
psi29a
7496217986 Merge branch 'block' into 'master'
Blocking animation and sound fixes (bug #6645)

Closes #6645

See merge request OpenMW/openmw!2500
2022-11-08 08:25:11 +00:00
Andrei Kortunov
13c304a995 Update used static Recast library to avoid warnings with GCC 2022-11-08 12:18:56 +04:00
Alexei Kotov
1db9247c45 Restart player block animation during blocking if necessary 2022-11-07 22:09:56 +03:00
Alexei Kotov
180963488f Play shield hit sound when the hit is blocked (bug #6645) 2022-11-07 22:02:30 +03:00
Alexei Kotov
9b8399c353 Handle landing in the frame the jump is over (bug #5849) 2022-11-07 19:06:01 +03:00
psi29a
a2053a625e Merge branch 'esm_four_cc' into 'master'
Move fourCC to a separate file

See merge request OpenMW/openmw!2491
2022-11-07 13:12:20 +00:00
psi29a
523fabe1e8 Merge branch 'fix_settings_reloadlua' into 'master'
Clear storage of setting groups on reloadlua

See merge request OpenMW/openmw!2497
2022-11-07 11:46:06 +00:00
psi29a
c2b495a187 Merge branch 'fix_7056' into 'master'
Add missing content=builtin.omwscripts if openmw is started via openmw-cs

Closes #7056

See merge request OpenMW/openmw!2496
2022-11-07 11:44:35 +00:00
uramer
1789160057 Clear storage of setting groups on reloadlua 2022-11-06 19:36:58 +01:00
elsid
baa39c06bb
Move fourCC to a separate file 2022-11-06 15:35:16 +01:00
Petr Mikheev
6025943fed Add missing content=builtin.omwscripts if openmw is started via openmw-cs (fixes #7056) 2022-11-05 16:30:44 +01:00
Max Henzerling
897cdc62d8 Add snap to reference 2022-11-04 15:04:42 -07:00
Evil Eye
f61083d02c Replace switch statements 2022-11-04 12:20:37 +01:00
psi29a
084396f29e Merge branch 'fix_7005' into 'master'
Fix Lua settings UI not working after a save (#7005)

See merge request OpenMW/openmw!2495
2022-11-04 09:14:48 +00:00
Petr Mikheev
589d7e821d Fix Lua settings UI not working after a save (#7005) 2022-11-03 22:13:39 +01:00
Evil Eye
29a46b0fc0 Reimplement --script-all-dialogue to be more useful to modders 2022-11-03 20:54:44 +01:00
psi29a
6960fc9304 Merge branch 'opencs_iwyu' into 'master'
Run IWYU on the opencs

See merge request OpenMW/openmw!2481
2022-11-02 21:41:53 +00:00