1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 23:39:41 +00:00
Commit graph

21702 commits

Author SHA1 Message Date
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
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
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
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
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
elsid
70061329a1
Return Path::Normalized from RecursiveDirectoryIterator 2024-01-24 22:19:03 +01:00
Evil Eye
54429cd23b Parse special characters that have been put back as names too 2024-01-24 18:31:04 +01:00
jvoisin
9616b03e7f Merge branch 'savegame_error' into 'master'
Fix error message about savegame format

See merge request OpenMW/openmw!3796
2024-01-23 21:00:39 +00:00
jvoisin
ec6ac8058b Merge branch 'vfs_normalized_path' into 'master'
Add type for normalized VFS path and use for VFS::Manager file map key

See merge request OpenMW/openmw!3781
2024-01-23 20:42:48 +00:00
psi29a
76ad680549 Merge branch 'tools' into 'master'
Use move semantics for tools

See merge request OpenMW/openmw!3795
2024-01-22 12:18:36 +00:00
Andrei Kortunov
a6ca726c3a Fix error message about savegame format 2024-01-21 21:02:59 +04:00
Andrei Kortunov
737d3b499b Use move semantics for tools 2024-01-21 20:20:37 +04:00
Andrei Kortunov
e01e2f1ae0 Fix magic effects in the editor 2024-01-21 17:50:45 +04:00
Andrei Kortunov
251d01304f Use move semantics for osg::ref_ptr 2024-01-21 13:48:33 +04:00
psi29a
a41259cca8 Merge branch 'tooltips_fix' into 'master'
Fix tooltips in the main menu

See merge request OpenMW/openmw!3789
2024-01-20 15:53:40 +00:00
Evil Eye
467220e6d7 Base GetColliding script functions on collisions detected by the movement solver 2024-01-20 16:50:51 +01:00
psi29a
6b35ee68e1 Merge branch 'holdstill' into 'master'
Make scripted animations shut down pathfinding (bug #5065)

Closes #5065

See merge request OpenMW/openmw!3711
2024-01-20 11:57:36 +00:00
psi29a
c23cd8e544 Merge branch 'umlautontherocks' into 'master'
Convert strings in nif files to utf8

Closes #7780

See merge request OpenMW/openmw!3783
2024-01-20 11:56:59 +00:00
Mads Buvik Sandvei
1f416d7c8a Lua: Creature skill bindings 2024-01-20 11:56:36 +00:00
Andrei Kortunov
b37aee21e3 Fix tooltips in the main menu 2024-01-19 15:16:46 +04:00
psi29a
6ead5f9321 Merge branch 'touch_record' into 'master'
Fix Touch command

See merge request OpenMW/openmw!3778
2024-01-19 08:32:03 +00:00
psi29a
7c14bac7c2 Merge branch 'load_save_composites' into 'master'
Write AiSequence and Script data field by field via decompose function

See merge request OpenMW/openmw!3770
2024-01-19 08:31:43 +00:00
psi29a
c84386aa4b Merge branch 'fix_navigator_update' into 'master'
Fix navmesh update on player changing tile

See merge request OpenMW/openmw!3756
2024-01-19 08:30:22 +00:00
psi29a
6b9fd12ab7 Merge branch 'fix_ubsan_warnings' into 'master'
Fix ubsan warnings

See merge request OpenMW/openmw!3772
2024-01-19 08:29:23 +00:00
psi29a
639b7b0b17 Merge branch 'light_settings' into 'master'
Enhance light settings tweaking

See merge request OpenMW/openmw!3782
2024-01-19 08:28:23 +00:00
psi29a
6ced0ab397 Merge branch 'sundirection' into 'master'
Fix exterior sun direction/position (bug #4898)

Closes #4898

See merge request OpenMW/openmw!3733
2024-01-19 08:27:50 +00:00
Evil Eye
fba4055877 Move return comments to a new line 2024-01-18 22:32:46 +01:00
Cody Glassman
3cdb9496c4 dont clear empty FBOs, fix doc example 2024-01-18 07:15:35 -08:00
elsid
35d9b18b4c
Add type for normalized VFS path and use for VFS::Manager file map key
This will reduce the number of path normalizations while more places will use
this type. In some cases it also will reduce number of temporary allocations for
new strings.

For now make conversion from and to std::string_view implicit to allow gradual
migration to this type.
2024-01-18 00:03:06 +01:00
Evil Eye
68c280a493 Merge branch 'streammusic_fade' into 'master'
Add a table with fadeOut argument for streamMusic

See merge request OpenMW/openmw!3774
2024-01-17 19:26:07 +00:00
Evil Eye
0f6133b040 Merge branch 'move_editor' into 'master'
Move local variables in the editor

See merge request OpenMW/openmw!3771
2024-01-17 17:21:05 +00:00
Evil Eye
48db113149 Address feedback 2024-01-17 18:10:42 +01:00