1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 14:59:54 +00:00
Commit graph

33215 commits

Author SHA1 Message Date
Andrei Kortunov
225e834b88 Fix some Coverity Scan complaints 2024-02-02 09:28:19 +04:00
Alexei Kotov
2114f84939 Merge branch 'fix_formatting' into 'master'
Fix formatting to make clang-format pass

See merge request OpenMW/openmw!3826
2024-02-01 02:15:51 +00:00
Zackhasacat
c7fcd1c31b Fix formatting 2024-01-31 17:00:33 -06:00
psi29a
6136e3d8fc Merge branch 'csspellarg' into 'master'
Editor: Reset effect arguments when the effect ID changes (#7785)

Closes #7785

See merge request OpenMW/openmw!3802
2024-01-31 10:52:13 +00:00
psi29a
ee8eb9d36e Merge branch 'localizable_errors' into 'master'
Make ContentSelector errors localizable

See merge request OpenMW/openmw!3821
2024-01-31 10:51:54 +00:00
psi29a
5ca8f7a00e Merge branch 'normalizedsun' into 'master'
Actually normalize the sun position exposed to post-processing

See merge request OpenMW/openmw!3820
2024-01-31 10:50:31 +00:00
psi29a
c9489bad9b Merge branch 'cleanup_esm3_readers_cache' into 'master'
Remove stateless encoder from ReadersCache

See merge request OpenMW/openmw!3823
2024-01-31 10:49:53 +00:00
Alexei Kotov
b6b497c76b Merge branch 'esmtool_output' into 'master'
Improve esmtool output

Closes #7669

See merge request OpenMW/openmw!3801
2024-01-30 23:18:59 +00:00
Alexei Kotov
9350222e1a Merge branch 'deserializeinventory' into 'master'
Use deserializeText for find and countOf

See merge request OpenMW/openmw!3817
2024-01-30 04:24:50 +00:00
Alexei Kotov
c86ca0ef01 Merge branch 'cast-fix' into 'master'
Fix bad cast of loop count in animation bindings.

See merge request OpenMW/openmw!3819
2024-01-30 04:18:03 +00:00
psi29a
4ebedaca99 Merge branch 'npc_model_lua' into 'master'
Add model to NPC lua record

See merge request OpenMW/openmw!3818
2024-01-29 11:58:04 +00:00
elsid
f9b69623d3
Remove stateless encoder from ReadersCache
It was added by https://gitlab.com/OpenMW/openmw/-/merge_requests/2804 without a
good reason. There is already encoder available in the used context.
2024-01-29 11:09:29 +01:00
psi29a
be6d063b94 Merge branch 'pointlessinisettings' into 'master'
Support Timescale Clouds and MaxNumberRipples INI settings (#7792, #7795)

Closes #7792 and #7795

See merge request OpenMW/openmw!3812
2024-01-28 22:13:45 +00:00
psi29a
435a4cb9ec Merge branch 'minusputback' into 'master'
Parse special characters that have been put back as names too

See merge request OpenMW/openmw!3804
2024-01-28 22:12:11 +00:00
psi29a
f656d2e380 Merge branch 'shutupverifier' into 'master'
Editor: Silence some verifier warnings

See merge request OpenMW/openmw!3814
2024-01-28 21:42:06 +00:00
psi29a
7450b11402 Merge branch 'vfs_normalized_path_1' into 'master'
Use normalized path for VFS manager and RecursiveDirectoryIterator

See merge request OpenMW/openmw!3806
2024-01-28 21:34:01 +00:00
psi29a
b1a72330a4 Merge branch 'allow_muliselect_in_archives_tab' into 'master'
Allow multiselect in the archives tab (#7606)

Closes #7606

See merge request OpenMW/openmw!3773
2024-01-28 21:33:10 +00:00
Yury Stepovikov
c90ebcc86b Allow multiselect in the archives tab (#7606) 2024-01-28 21:33:10 +00:00
Mads Buvik Sandvei
fbffecfd13 ~0ul -> std::numeric_limits<uint32_t>::max() 2024-01-28 21:02:06 +01:00
Mads Buvik Sandvei
0ed94ead4e Check that count is non-zero before decrementing it. 2024-01-28 17:34:22 +01:00
Mads Buvik Sandvei
24a0a0c3bf size_t -> uint32_t 2024-01-28 16:34:44 +01:00
Mads Buvik Sandvei
993cea7d65 MR Comments 2024-01-28 16:31:01 +01:00
Mads Buvik Sandvei
36e1bdab10 Use a smaller integer type instead of dealing with casting issues. 2024-01-28 14:48:49 +01:00
Alexei Kotov
b83b30f0dc Editor: Reset effect arguments when the effect ID changes (#7785) 2024-01-28 15:37:53 +03:00
Alexei Kotov
bd84200d4e Merge branch 'bumpbump' into 'master'
Base GetColliding script functions on collisions detected by the movement solver

Closes #7053

See merge request OpenMW/openmw!3794
2024-01-28 10:18:02 +00:00
Alexei Kotov
df6e104e6f Merge branch 'tastytastyenchantments' into 'master'
Use the correct id to absorb enchantments

Closes #7796

See merge request OpenMW/openmw!3813
2024-01-28 10:15:55 +00:00
Andrei Kortunov
43307bee28 Make ContentSelector errors localizable 2024-01-28 11:25:46 +04:00
Alexei Kotov
422e455157 Actually normalize the sun position exposed to post-processing 2024-01-28 05:38:12 +03:00
Zackhasacat
4fcacd59aa Add model to NPC lua 2024-01-27 12:02:56 -06:00
Evil Eye
1288ec5cea Use deserializeText for find and countOf 2024-01-27 16:49:20 +01:00
Alexei Kotov
093d86353f Merge branch 'lua_mwscript_nilvar' into 'master'
#7791: Require local variables to exist for lua mwscript local variables

Closes #7791

See merge request OpenMW/openmw!3811
2024-01-27 13:57:26 +00:00
Zackhasacat
cfd67f3ce7 #7791: Require local variables to exist for lua mwscript local variables 2024-01-27 13:57:26 +00:00
Evil Eye
1d1ce2de7b Use the correct id to absorb enchantments 2024-01-27 12:12:39 +01:00
Zackhasacat
ef85ceba2c Merge branch 'animation-bindings' into 'master'
Lua: Animation bindings

See merge request OpenMW/openmw!3257
2024-01-26 21:39:34 +00:00
Mads Buvik Sandvei
a94add741e Lua: Animation bindings 2024-01-26 21:39:33 +00:00
Alexei Kotov
d1e79028e9 Merge branch 'lua-fix-active-spells-pairs-iterator-return' into 'master'
Lua: Fix return value for `Actor.ActiveSpells` iterator

See merge request OpenMW/openmw!3808
2024-01-26 20:38:13 +00:00
Alexei Kotov
30d637f5f6 Merge branch 'lua_water_level' into 'master'
Lua: Add water level to Core.Cell

See merge request OpenMW/openmw!3766
2024-01-26 20:37:04 +00:00
Zackhasacat
daa9c5f0e1 Lua: Add water level to Core.Cell 2024-01-26 20:37:04 +00:00
Evil Eye
aa9a99bde5 Merge branch 'magic_effects_fix' into 'master'
Fix magic effects in the editor

Closes #7481

See merge request OpenMW/openmw!3798
2024-01-26 16:33:51 +00:00
Evil Eye
ed22b91bf2 Merge branch 'kftest' into 'master'
Support parsing KF files in niftest

See merge request OpenMW/openmw!3807
2024-01-26 16:24:55 +00:00
Alexei Kotov
70a0b7ea9c Editor: Drop zero attribute warnings 2024-01-26 19:23:03 +03:00
Evil Eye
f62e4f5707 Merge branch 'more_move' into 'master'
Use std::move() in /apps/openmw

See merge request OpenMW/openmw!3805
2024-01-26 16:21:00 +00:00
Alexei Kotov
48bbf0b637 Editor: Don't complain about body part references in Verify 2024-01-26 19:14:18 +03:00
Alexei Kotov
23e30eaaa5 Support MaxNumberRipples setting (#7795) 2024-01-26 17:18:50 +03:00
Alexei Kotov
2ea4013382 Correct base cloud speed, support Timescale Clouds fallback setting (#7792) 2024-01-26 17:18:50 +03:00
Alexei Kotov
ad64c71753 Correct MaxNumberRipples and Timescale Clouds validation categories 2024-01-26 17:12:58 +03:00
Pharis
3b0d654a3f Return active spell id from pairs 2024-01-25 18:10:10 -06:00
Alexei Kotov
29a40c212f Support parsing KF files in niftest
Mention BA2 support in help messages
2024-01-25 15:53:24 +03:00
Andrei Kortunov
9e55425b71 Use std::move() in /apps/openmw 2024-01-25 09:03:30 +04:00
psi29a
cdf2459ed8 Merge branch 'constpreload' into 'master'
Make cell models preloading a const operation

See merge request OpenMW/openmw!3777
2024-01-24 21:35:05 +00:00