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

21916 commits

Author SHA1 Message Date
Andrei Kortunov
3971abf5e6 Minor launcher improvements (feature 7843) 2024-02-20 14:02:59 +04:00
psi29a
8c8fffc2c6 Merge branch 'fix_shared_library_build' into 'master'
Build fixes related to shared libraries and position independent code

See merge request OpenMW/openmw!3878
2024-02-20 08:47:14 +00:00
Alexei Kotov
15a42f26a7 Merge branch 'fix_distance_spinbox' into 'master'
Fix viewing distance spinbox in the launcher

Closes #7840

See merge request OpenMW/openmw!3882
2024-02-20 08:38:01 +00:00
Alexei Kotov
592081d3cb Merge branch 'addcarry' into 'master'
Add missing lua function types.Item.isCarriable

See merge request OpenMW/openmw!3879
2024-02-20 08:36:46 +00:00
elsid
c9b4c8632a
Update ripples surface only when there is need to do so
This depends on the difference between FPS which is dynamic and ripples update
frequency which is contant. If FPS > ripples update frequency, some frames do
nothing. If FPS <= ripples update frequency each frame runs shaders once. Update
offset, possitions shader uniforms only when it will be run.
2024-02-20 00:44:39 +01:00
elsid
3b01e209b1
Use proper names for static members 2024-02-19 23:13:12 +01:00
elsid
56e69cf7a2
Make some RipplesSurface members private 2024-02-19 23:13:12 +01:00
elsid
dc5371d157
Remove unused RipplesSurface::State::mOffset 2024-02-19 23:13:11 +01:00
Andrei Kortunov
6f1710dee1 Fix viewing distance spinbox in the launcher (bug 7840) 2024-02-19 16:14:52 +04:00
psi29a
3369184c19 Merge branch 'lesspragmaticpackages' into 'master'
Use decompose to handle AI packages and data

See merge request OpenMW/openmw!3856
2024-02-19 09:59:59 +00:00
Zackhasacat
fed62a8517 Remove unneeded line 2024-02-18 15:58:18 -06:00
Zackhasacat
92242a3d54 Simplify 2024-02-18 13:20:58 -06:00
Zackhasacat
731095831d Add missing function types.Item.isCarriable() 2024-02-18 13:15:56 -06:00
elsid
e9c672b297
Fix build with cmake flag BUILD_SHARED_LIBS=ON
Always build opencs-lib as static library instead of BUILD_SHARED_LIBS deciding
whether it's static or shared library.
2024-02-18 19:35:32 +01:00
elsid
cc9f9b53ba
Convert BsaVersion to enum class 2024-02-18 14:54:51 +01:00
elsid
df077a2524
Simplify and reduce code duplication for BSA archive creation 2024-02-18 14:54:14 +01:00
elsid
da5ab2b2c9
Fix benchmark warning: -Wdeprecated-declarations
/home/elsid/dev/openmw/apps/benchmarks/detournavigator/navmeshtilescache.cpp: In function ‘void {anonymous}::getFromFilledCache(benchmark::State&)’:
/home/elsid/dev/openmw/apps/benchmarks/detournavigator/navmeshtilescache.cpp:186:37: warning: ‘typename std::enable_if<((! std::is_trivially_copyable<_Tp>::value) || (sizeof (Tp) > sizeof (Tp*)))>::type benchmark::DoNotOptimize(const Tp&) [with Tp = DetourNavigator::NavMeshTilesCache::Value; typename std::enable_if<((! std::is_trivially_copyable<_Tp>::value) || (sizeof (Tp) > sizeof (Tp*)))>::type = void]’ is deprecated: The const-ref version of this method can permit undesired compiler optimizations in benchmarks [-Wdeprecated-declarations]
  186 |             benchmark::DoNotOptimize(result);
      |             ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
In file included from /home/elsid/dev/openmw/apps/benchmarks/detournavigator/navmeshtilescache.cpp:1:
/home/elsid/dev/benchmark/build/gcc/release/install/include/benchmark/benchmark.h:507:5: note: declared here
  507 |     DoNotOptimize(Tp const& value) {
      |     ^~~~~~~~~~~~~
2024-02-18 14:25:03 +01:00
Alexei Kotov
41d41780a8 CharacterController: rework movement queueing logic (#7835) 2024-02-18 14:01:10 +03:00
psi29a
f9820e2061 Merge branch 'debugdrawdebugged' into 'master'
Try to uncursify debug primitive drawer (#7767)

Closes #7767

See merge request OpenMW/openmw!3852
2024-02-17 18:56:21 +00:00
psi29a
8545fb920e Merge branch '9-ancestral-tenets' into 'master'
Fix(CS): Scale actors according to their race's stats

Closes #7753

See merge request OpenMW/openmw!3714
2024-02-17 11:57:20 +00:00
jvoisin
0db730825d Merge branch 'drainmaximummagicka' into 'master'
Hide magnitude for Fortify Maximum Magicka when requested as well (#7832)

Closes #7832

See merge request OpenMW/openmw!3868
2024-02-16 23:02:52 +00:00
Alexei Kotov
aae74224e8 Prevent swim upward correction from causing false-positive jumping events (#7833) 2024-02-16 14:28:43 +03:00
Alexei Kotov
7873714103 Restore vertical movement reset for various movement states (#7833)
Note getJump already handles incapacitation states (dead/paralyzed/KO)
2024-02-16 13:37:11 +03:00
Alexei Kotov
6e81927d60 Make extra sure to ignore movement input for scripted animations (#7833) 2024-02-16 13:37:11 +03:00
Dave Corley
54f4c69d37 Cleanup(columnimp): Use std::clamp to limit race scaling 2024-02-15 21:25:29 -06:00
psi29a
1280345296 Merge branch 'copy_qtbase' into 'master'
Copy qtbase translations

See merge request OpenMW/openmw!3840
2024-02-15 09:26:42 +00:00
psi29a
2ae137f709 Merge branch 'lua_element_crash' into 'master'
Fix crash when throwing in index meta methods

Closes #7711

See merge request OpenMW/openmw!3862
2024-02-15 09:15:45 +00:00
Andrei Kortunov
9a7b9572fd Deploy base Qt translations when needed 2024-02-15 09:26:14 +04:00
Dave Corley
54e90b4ac2 Legacy(columnimp): Add TESCS limits for race weight/height scaling 2024-02-14 20:00:22 -06:00
Alexei Kotov
c1b9beb763 Merge branch 'deadanimation' into 'master'
Remove dead code

See merge request OpenMW/openmw!3866
2024-02-15 00:57:59 +00:00
Dave Corley
1b1f0c4971 Switch height/weight in names and make the stats a simple struct instead 2024-02-14 18:01:31 -06:00
Alexei Kotov
a0ba0d781a Hide magnitude for Fortify Maximum Magicka when requested as well (#7832) 2024-02-15 01:50:49 +03:00
Dave Corley
98ad059806 Cleanup(actoradapter): Use more explicit names & vec2 for racial height/weight 2024-02-14 16:42:27 -06:00
Dave Corley
049550d73e Cleanup(Actoradapter.cpp): Create new struct for race stats, use
std::pair instead
2024-02-14 16:42:27 -06:00
Dave Corley
b31664a78f Fix(CS): Scale actors according to their race's stats 2024-02-14 16:42:27 -06:00
uramer
08b7ee8a44 Test LuaUtil::safeGet preventing crash 2024-02-14 09:49:32 +01:00
psi29a
ec1cf46ec7 Merge branch 'lua_keybinds' into 'master'
Lua Implement mouse input engine handlers, improve inputBinding renderer

See merge request OpenMW/openmw!3855
2024-02-14 08:30:38 +00:00
psi29a
29c2042432 Merge branch 'lua_callback_crash' into 'master'
Lua Fix crash when passing a non-callback table to a callback argument

Closes #7827

See merge request OpenMW/openmw!3861
2024-02-14 08:29:58 +00:00
psi29a
fda47a6ebe Merge branch 'flying-fish-straight-to-jail' into 'master'
Groundcover should ignore non-geometry Drawables

Closes #7633

See merge request OpenMW/openmw!3859
2024-02-14 08:29:28 +00:00
Evil Eye
8f88838ff5 Remove dead code 2024-02-13 19:30:32 +01:00
psi29a
744cd50520 Merge branch 'decoupled-audio' into 'master'
Add option to use camera as sound listener

Closes #5944

See merge request OpenMW/openmw!3836
2024-02-13 09:18:18 +00:00
Epoch
6486f3f2cf Add option to use camera as sound listener 2024-02-13 09:18:18 +00:00
psi29a
50ea852928 Merge branch 'STOP_IGNORING_ME_AND_LOOK_ME_IN_THE_EYES' into 'master'
add ignore list to raycasts (#7788)

See merge request OpenMW/openmw!3848
2024-02-13 09:15:49 +00:00
psi29a
9fb28a250c Merge branch 'a2c-grammar' into 'master'
Fix grammar for A2C checkbox

See merge request OpenMW/openmw!3858
2024-02-13 09:15:17 +00:00
psi29a
9e1cdaceff Merge branch 'markers' into 'master'
Fix ESM4 marker model hiding hack

See merge request OpenMW/openmw!3853
2024-02-13 09:13:56 +00:00
uramer
851e291501 Simplify and fix the storage subscribe test 2024-02-13 00:56:14 +01:00
Evil Eye
1523a067c9 Use concepts and aggregate initialization 2024-02-12 17:32:43 +01:00
Cody Glassman
56b31ceaf5 add ignore list to raycasts 2024-02-12 07:52:47 -08:00
psi29a
c889026b71 Merge branch 'cleanup_physics_callbacks' into 'master'
Cleanup physics callbacks

See merge request OpenMW/openmw!3831
2024-02-12 14:16:26 +00:00
psi29a
8d0a670f94 Merge branch 'vfs_normalized_path_2' into 'master'
Use normalized path for file archives indices

See merge request OpenMW/openmw!3830
2024-02-12 14:14:50 +00:00
psi29a
1c2fc59a6f Merge branch 'water' into 'master'
Refraction fog based on water depth

See merge request OpenMW/openmw!3842
2024-02-12 14:13:48 +00:00
psi29a
e9c97b835e Merge branch 'acertainsign' into 'master'
Expose birth signs to Lua

See merge request OpenMW/openmw!3850
2024-02-12 14:11:29 +00:00
psi29a
a060a7297c Merge branch 'dehardcode-skillprogression' into 'master'
Lua: Dehardcode skill and level progression

See merge request OpenMW/openmw!3779
2024-02-12 14:10:51 +00:00
psi29a
d36583bdec Merge branch 'nevercruelorcowardly' into 'master'
Correct activation behavior for actors in combat (#7794)

Closes #7794

See merge request OpenMW/openmw!3822
2024-02-12 14:10:08 +00:00
AnyOldName3
8c591a0b44 Groundcover should ignore non-geometry Drawables
Fix https://gitlab.com/OpenMW/openmw/-/issues/7633

Untested - the issue didn't link to a mod using the mesh and I couldn't be bothered setting one up manually.
2024-02-12 01:16:49 +00:00
AnyOldName3
3149761c85 Fix grammar for A2C checkbox
An alternative would be *Anti-alias alpha testing*.

The original was wrong because anti-alias is a verb acting on alpha testing, but it treated the whole thing as a noun phrase.
2024-02-11 23:49:18 +00:00
uramer
63a1bbb88d Enable Lua mouse engine handlers while in UI 2024-02-11 23:49:26 +01:00
Evil Eye
75d0b6e355 Use decompose to handle AI packages and data 2024-02-11 22:06:58 +01:00
Alexei Kotov
887d09e051 Fix ESM4 marker model hiding hack 2024-02-11 04:02:01 +03:00
uramer
c68dee214e Mouse input engine handlers 2024-02-10 22:56:46 +01:00
Alexei Kotov
3301ebb2cb Merge branch 'localize_screenshot' into 'master'
Localize screenshot messages

See merge request OpenMW/openmw!3843
2024-02-10 13:54:05 +00:00
Alexei Kotov
a54d97669f Merge branch 'imnotyourpalbuddy' into 'master'
Reset friendly hits at the end of combat and don't count hits while in combat

Closes #5755

See merge request OpenMW/openmw!3839
2024-02-09 21:28:04 +00:00
Alexei Kotov
0d1da08493 Set node mask on DebugDrawer
Fixes primitive drawing in exteriors/quasiexteriors
2024-02-09 20:50:33 +03:00
Alexei Kotov
f9498e6ea4 Make DebugDrawer a LightManager child, don't use VAO for lines
Fixes terrain lighting but currently breaks non-line primitive rendering in exteriors
2024-02-09 20:50:33 +03:00
Alexei Kotov
38ab09a52e Try to uncursify DebugDrawer scene representation 2024-02-09 20:49:40 +03:00
Evil Eye
7586acc18b Remove Core from functions that aren't in openmw.core 2024-02-08 16:53:48 +01:00
Andrei Kortunov
525dee00f1 Refraction fog based on water depth (feature 5926) 2024-02-08 18:07:48 +04:00
psi29a
ff7f2217f1 Merge branch 'update_next_tile_id' into 'master'
Update next tile_id when there is a duplicate in navmeshdb

See merge request OpenMW/openmw!3849
2024-02-08 12:13:27 +00:00
elsid
a6657c18cc
Use normalized path for file archives indices 2024-02-08 11:48:59 +01:00
elsid
062d3e9c00
Add NormalizedView for normalized paths 2024-02-08 11:48:57 +01:00
elsid
1689c59546
Add tests for VFS::Path::Normalized 2024-02-08 11:42:28 +01:00
Alexei Kotov
0178c5aaef Remove Open action fallback for Tribunal NPC companions 2024-02-08 12:38:20 +03:00
Andrei Kortunov
6760fa4945 Localize screenshot messages 2024-02-08 12:50:12 +04:00
Alexei Kotov
c5564323e4 Correct activation behavior for actors in combat (#7794)
Stop battle music upon death animation end
2024-02-08 11:47:35 +03:00
Alexei Kotov
6be6f47503 Merge branch 'lua_enchantment_charge_nil' into 'master'
Lua Use nil instead of -1 for default enchantment charge

See merge request OpenMW/openmw!3845
2024-02-08 08:25:15 +00:00
elsid
506824cb9d
Cleanup physics callbacks
* Do not copy with allocations.
* Remove unused DeepestNotMeContactTestResultCallback.
* Avoid using pointers which should not be nullptr.
* Move constructors implementation to headers.
* Move types defined in .cpp are to unnamed namespace.
* Comment unused arguments.
* Avoid C-style casts.
2024-02-07 22:04:34 +01:00
Evil Eye
5715e6428a Merge branch 'lua_separate_owner' into 'master'
Group owner bindings into a table

See merge request OpenMW/openmw!3841
2024-02-07 19:06:18 +00:00
Evil Eye
f114d409c8 Add get and set birth sign 2024-02-07 19:35:26 +01:00
Evil Eye
f7aa9f8d94 Expose birth signs to Lua 2024-02-07 18:08:06 +01:00
elsid
a7da604332
Update next tile_id when there is a duplicate in navmeshdb
Disable writes on failure to update next tile_id to avoid further errors.
2024-02-07 11:28:34 +01:00
psi29a
557e83d502 Merge branch 'more_move' into 'master'
Move action argument

See merge request OpenMW/openmw!3844
2024-02-07 09:18:34 +00:00
uramer
b1773d7e9f Use nil instead of -1 for default enchantment charge 2024-02-06 17:30:48 +01:00
Andrei Kortunov
a8c219f07c Move action argument 2024-02-06 14:18:08 +04:00
psi29a
7793a6d0d9 Merge branch 'modelviewbutnocontroller' into 'master'
Collect string_views when deciding what to preload

See merge request OpenMW/openmw!3816
2024-02-06 09:06:57 +00:00
uramer
6792cf02b2 Group owner bindings into a table 2024-02-05 18:48:53 +01:00
Andrei Kortunov
66b2d428c8 Merge branch 'qt_localization' into 'master'
Localize Launcher and Wizard

See merge request OpenMW/openmw!3571
2024-02-05 15:11:42 +00:00
psi29a
76842c3ba1 Merge branch 'more_move' into 'master'
Address Coverity Scan complaints left

See merge request OpenMW/openmw!3837
2024-02-05 13:22:14 +00:00
jvoisin
cdd73a1a19 Merge branch 'fix_far_away_navmesh_crash' into 'master'
Limit navmesh vertices coordinates values (#6574)

Closes #6574

See merge request OpenMW/openmw!3825
2024-02-05 09:49:24 +00:00
jvoisin
838785d5a3 Merge branch 'sworc' into 'master'
Make StartCombat a no-op for dead targets and don't always play attack lines

Closes #7769 and #5413

See merge request OpenMW/openmw!3803
2024-02-05 09:48:20 +00:00
Alexei Kotov
a5d88d489b Merge branch 'menu_fixes' into 'master'
Follow up fixes for Lua Menu MR !3464

See merge request OpenMW/openmw!3834
2024-02-05 00:41:11 +00:00
Evil Eye
6c2ddc635d Reset friendly hits at the end of combat and don't count hits while in combat 2024-02-04 21:41:03 +01:00
uramer
02accd7a49 Fix statemanager cleanup setting game state to ended by accident 2024-02-04 11:12:12 +01:00
uramer
8c6a1ae8c0 Allow menu scripts to send global events while a game is loaded 2024-02-04 11:12:11 +01:00
Alexei Kotov
62f2f4a011 Merge branch 'clear_lua_actions' into 'master'
Fix quickload causing a crash with certain Lua queued actions

Closes #7801

See merge request OpenMW/openmw!3833
2024-02-04 07:25:39 +00:00
Andrei Kortunov
292879d0fb Address Coverity Scan complaints left 2024-02-04 08:56:25 +04:00
elsid
e6196c782d
Limit navmesh vertices coordinates values
Float values with more than 22 significant fraction bits may cause out of bounds
access in recastnavigation on triangles rasterization. Prevent passing such
values there.
2024-02-03 18:48:42 +01:00
Alexei Kotov
8b47381162 Merge branch 'more_move' into 'master'
Fix some Coverity Scan complaints

See merge request OpenMW/openmw!3829
2024-02-03 17:24:53 +00:00
uramer
a1970857fd Queue quick loads 2024-02-03 15:18:34 +01:00
Zackhasacat
1338e884a9 Merge branch 'menuscripts' into 'master'
Add new Lua context: menu scripts

Closes #7805 and #7648

See merge request OpenMW/openmw!3464
2024-02-02 21:46:22 +00:00
uramer
784459a652 Clean up the cleanup code 2024-02-02 22:07:58 +01:00