psi29a
d22d3a9ea4
Merge branch 'osg_stats_file_error' into 'master'
...
Log error when failed to open stats file
See merge request OpenMW/openmw!2690
2023-02-06 23:41:31 +00:00
psi29a
b90f3f8c14
Merge branch 'simplify_log' into 'master'
...
Remove redundant operator<< overloads from Log
See merge request OpenMW/openmw!2689
2023-02-06 23:10:03 +00:00
psi29a
0922e5145c
Merge branch 'macos_fix_qt56' into 'master'
...
macos qt 5/6 fix
See merge request OpenMW/openmw!2691
2023-02-06 21:29:26 +00:00
Bret Curtis
09f9203baa
fix building and packaging issue with macos and qt plugins, they do not yet support versionless as it is a problem with cmake
2023-02-06 22:17:15 +01:00
elsid
af003d94f8
Log error when failed to open stats file
2023-02-06 21:52:35 +01:00
elsid
627bed09ee
Remove redundant operator<< overloads from Log
2023-02-06 21:18:35 +01:00
psi29a
a0795ba7ae
Merge branch 'launch_fix' into 'master'
...
Fix some non-ASCII path issues
Closes #6817
See merge request OpenMW/openmw!2686
2023-02-06 19:50:30 +00:00
psi29a
91a4c09fa6
Merge branch 'oldtelvanniheart' into 'master'
...
Use correct exterior cell when positioning
See merge request OpenMW/openmw!2688
2023-02-06 19:46:00 +00:00
psi29a
15b3af92df
Merge branch 'macos_lua_fix' into 'master'
...
make sure lua works with macos packages
See merge request OpenMW/openmw!2687
2023-02-06 18:53:19 +00:00
psi29a
4f001d8736
Merge branch 'qt6' into 'master'
...
Add an initial Qt6 support
See merge request OpenMW/openmw!2684
2023-02-06 16:55:20 +00:00
Evil Eye
97c6d25d54
Use correct exterior cell when positioning
2023-02-06 16:36:45 +01:00
Andrei Kortunov
7e2aedf637
Add an initial Qt6 support
2023-02-06 18:38:59 +04:00
Bret Curtis
a708fb4a5c
make sure lua works with macos packages
2023-02-06 14:35:22 +01:00
Andrei Kortunov
8925f854e7
Fix non-ASCII path logging
2023-02-06 15:12:24 +04:00
Andrei Kortunov
5836d27928
Fix ContentSelector usage with non-ASCII paths
2023-02-06 13:36:02 +04:00
psi29a
4032c447e9
Merge branch 'load-ESM4-Cell' into 'master'
...
Can load and coc into an interrior oblivion cell
See merge request OpenMW/openmw!2647
2023-02-06 08:56:23 +00:00
psi29a
ea4fb435c8
Merge branch 'scene_lum' into 'master'
...
po2 scaling for average luminance (#7168 )
Closes #7168
See merge request OpenMW/openmw!2685
2023-02-06 08:55:32 +00:00
glassmancody.info
e778ffee9b
po2 scaling for average luminance
2023-02-05 12:30:38 -08:00
Andrei Kortunov
72efd3a650
Merge branch 'qregexp' into 'master'
...
Replace QRegExp by QRegularExpression
See merge request OpenMW/openmw!2683
2023-02-05 15:05:06 +00:00
elsid
e92ada09af
Replace QRegExp by QRegularExpression
2023-02-05 13:30:26 +01:00
psi29a
aee7716c3a
Merge branch 'launcher_typed_settings' into 'master'
...
Typed launcher settings
See merge request OpenMW/openmw!2650
2023-02-04 23:41:59 +00:00
psi29a
8b0e55dd5f
Merge branch 'remove-water-walking-teleport-underwater' into 'master'
...
teleporting to an underwater marked location will remove water walking spell effects from actor
Closes #7122
See merge request OpenMW/openmw!2656
2023-02-04 23:41:29 +00:00
psi29a
822c6ac6a7
Merge branch 'fix_warnings' into 'master'
...
Enable and fix new warnings
See merge request OpenMW/openmw!2679
2023-02-04 23:40:06 +00:00
psi29a
f67896893d
Merge branch 'editwidgetfixes' into 'master'
...
Minor fixes to editwidget.cpp
See merge request OpenMW/openmw!2680
2023-02-04 23:39:51 +00:00
florent.teppe
084207af64
Avoids a lot a special cases for ESM3 vs ESM4 cells.
2023-02-04 23:25:06 +01:00
James-Deciutiis
273a2ae323
teleporting to an underwater marked location will remove water walking spell effects from actor
...
fix formatting
addressing hasWaterWalking comment
refactor to address remaining comments
clean up formatter changes
adding suggested condition to if statement
move isWaterWalking check into if statement
refactor if block to see if actor needs to have water walking purged
added entry to changelog.md and authors.md
removing redundant check from if statement
Sort previous changelog entry
2023-02-04 11:30:37 -08:00
florent.teppe
f3d5f6345e
Fixed large lambdas that affected readability.
2023-02-04 17:16:42 +01:00
florent.teppe
1caed2de2a
Applies some review comments.
...
Proper visit for ESM::CellVariant
Fixed MWWorldCell constructor
2023-02-04 17:09:54 +01:00
unelsson
fe70285ac1
Fixes
2023-02-04 15:32:17 +02:00
elsid
6f1a434234
Check for more warnings
2023-02-04 00:10:32 +01:00
elsid
f1dbd9b959
Fix -Wduplicated-branches warnings
2023-02-04 00:10:30 +01:00
elsid
c79c14da91
Fix -Wnon-virtual-dtor warnings
2023-02-03 23:00:09 +01:00
elsid
a8a3ff9548
Fix setting OPENMW_CXX_FLAGS
...
Using ${OPENMW_CXX_FLAGS} as variable name means using underlying string value
which is not correct for fixed cases.
2023-02-03 22:59:26 +01:00
psi29a
3f9cae7947
Merge branch 'dragdetails' into 'master'
...
[OpenMW-CS] Generate record filters based on cell content and column header
Closes #7161
See merge request OpenMW/openmw!2617
2023-02-03 09:29:36 +00:00
unelsson
e4809976dd
add changelog
2023-02-02 20:13:06 +02:00
psi29a
537f5b1b8e
Merge branch 'changelog' into 'master'
...
Add changelog entries
See merge request OpenMW/openmw!2669
2023-02-02 09:53:35 +00:00
Andrzej Głuszak
27a5fd6439
Add changelog entries
2023-02-02 09:53:35 +00:00
psi29a
00978ed7a4
Merge branch 'wherefore_art_thou_horatius' into 'master'
...
Fix global variable replacement in dialogue
Closes #7197
See merge request OpenMW/openmw!2675
2023-02-01 23:38:32 +00:00
psi29a
68b3b90255
Merge branch 'ui_content_leak' into 'master'
...
Move implementation of UI Content to Lua (#7155 )
See merge request OpenMW/openmw!2661
2023-02-01 22:51:47 +00:00
psi29a
9c92a8ab57
Merge branch 'fix_gpu_osg_stats' into 'master'
...
Delay OSG stats reporting for 3 frames
See merge request OpenMW/openmw!2677
2023-02-01 22:49:18 +00:00
Evil Eye
8d2b5ed8ee
Combine initializer_lists
2023-02-01 22:27:22 +01:00
psi29a
c28eba53e4
Merge branch 'global_view' into 'master'
...
Don't lowerCase twice when getting globals
See merge request OpenMW/openmw!2676
2023-02-01 21:08:17 +00:00
psi29a
6cf1e8e49c
Merge branch 'lost_archives' into 'master'
...
Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d
See merge request OpenMW/openmw!2674
2023-02-01 21:07:48 +00:00
elsid
96ea1903c5
Delay OSG stats reporting for 3 frames
...
Instead of 2 to make sure GPU draw time taken is always reported.
2023-02-01 22:01:55 +01:00
Evil Eye
d3bc79e9b2
Reduce code duplication
2023-02-01 21:57:50 +01:00
Evil Eye
31b2112e4a
Don't lowerCase twice when getting globals
2023-02-01 18:15:49 +01:00
Evil Eye
32ac7406ab
Fix global variable replacement in dialogue
2023-02-01 17:49:11 +01:00
Evil Eye
571e11cd42
Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d
2023-02-01 17:26:39 +01:00
uramer
e96681151c
Get rid of the LuaUI::Content namespace
2023-02-01 17:18:50 +01:00
uramer
d24c506b0e
Move metatable protection asserts to tests
2023-02-01 16:34:32 +01:00
