mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 20:45:34 +00:00
Code Issues Releases Wiki Activity
29134 commits 108 branches 66 tags 134 MiB
Commit graph

29134 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
6622e9df5b Merge branch 'fix_physics_locking_48' into 'openmw-48' 
Use shared locks in physics system when using multithreaded bullet (#7218) (0.48)

See merge request OpenMW/openmw!2727
 2023-02-12 17:00:10 +00:00
elsid
09199ea006
Use shared locks in physics system when using multithreaded bullet 2023-02-12 15:02:41 +01:00
psi29a
e0a25e02f0 Merge branch 'postprocesshud48' into 'openmw-48' 
Improve post-process HUD search field usability (0.48.0)

See merge request OpenMW/openmw!2718
 2023-02-11 10:50:20 +00:00
Alexei Kotov
3ab719f5a6 Improve post-process HUD search field usability (0.48.0) 2023-02-11 03:12:17 +03:00
psi29a
1dc71a133e Merge branch 'ingredientbindings48' into 'openmw-48' 
Fix Lua ingredient bindings (0.48.0)

See merge request OpenMW/openmw!2707
 2023-02-10 07:45:11 +00:00
Alexei Kotov
15df41f459 Fix Lua ingredient bindings 2023-02-10 02:56:20 +03:00
psi29a
3dd8fd2ef9 Merge branch 'handle_bad_navmeshtool_message_magic_48' into 'openmw-48' 
Stop updating navmeshtool progress on first bad message (0.48)

See merge request OpenMW/openmw!2660
 2023-02-02 09:38:27 +00:00
psi29a
7211779889 Merge branch 'fix_gpu_osg_stats' into 'master' 
Delay OSG stats reporting for 3 frames

See merge request OpenMW/openmw!2677

(cherry picked from commit 9c92a8ab57)

96ea1903 Delay OSG stats reporting for 3 frames
 2023-02-01 22:49:34 +00:00
psi29a
41b5ddf010 Merge branch 'lost_archives48' into 'openmw-48' 
Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d

See merge request OpenMW/openmw!2673
 2023-02-01 16:42:52 +00:00
Evil Eye
b24ea17301 Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d 2023-02-01 16:36:37 +01:00
psi29a
4c5d03c5e5 Merge branch 'changelogforanilayer' into 'openmw-48' 
Changelog for osga-animation layering

See merge request OpenMW/openmw!2666
 2023-01-30 13:25:48 +00:00
unelsson
8d5edacffd Changelog for osga-animation layering 2023-01-30 00:53:47 +02:00
psi29a
f3f65c87d6 Merge branch 'docs_fix' into 'openmw-48' 
Remove accidental copy-paste in global.doclua

See merge request OpenMW/openmw!2653
 2023-01-29 11:28:19 +00:00
elsid
f23866be90
Stop updating navmeshtool progress on first bad message 2023-01-27 19:12:57 +01:00
uramer
a3a5a227ad Remove accidental copy-paste in global.doclua 2023-01-27 18:31:04 +01:00
psi29a
37152b4917 Merge branch 'no_teleporting_before_you_eat_your_veggies48' into 'openmw-48' 
!2631 for 0.48

See merge request OpenMW/openmw!2633
 2023-01-21 22:42:29 +00:00
Evil Eye
c1b9a91877 Delay teleportation till the menu is closed 2023-01-19 20:11:35 +01:00
psi29a
e30d5a5a35 Merge branch 'safely_on_the_other_side_of_the_door_48' into 'openmw-48' 
!2619 for 0.48

See merge request OpenMW/openmw!2622
 2023-01-15 21:04:53 +00:00
Evil Eye
bb36155a54 End combat when the target is outside the active grid 2023-01-15 19:54:54 +01:00
psi29a
e6b6f2ced6 Merge branch 'cuphead48' into 'openmw-48' 
Regression fixes for animation-less knockout [0.48]

See merge request OpenMW/openmw!2590
 2023-01-07 22:19:06 +00:00
Alexei Kotov
d327e92d7f Don't cancel animation-less knockout 2023-01-07 23:05:03 +03:00
psi29a
eebaf2b61e Merge branch 'fix_hour_modulo_48' into 'openmw-48' 
Fix hour modulo expression (#7121) for 0.48

See merge request OpenMW/openmw!2560
 2022-12-29 23:26:26 +00:00
Alexei Kotov
98997d893f Merge branch 'bug-fix-7116-openmw48' into 'openmw-48' 
Connect zoom in/out only when the option is allowed

See merge request OpenMW/openmw!2559
 2022-12-29 22:14:20 +00:00
elsid
9c34ef8720
Fix hour modulo expression 
Round result of std::fmod(hours, 24) to the nearest float below 24 on double to
float conversion when it is not. Add special type and conversion function along
with tests to be used in all places where such conversion happens.

To avoid producing hours equal to 24 due to double to float precision loss.
 2022-12-29 22:09:56 +01:00
Cédric Mocquillon
30e2ea2951 Connect zoom in/out only when the option is allowed 2022-12-29 21:29:39 +01:00
psi29a
01be3d16b2 Merge branch 'classless48' into 'openmw-48' 
!2552 for 0.48

See merge request OpenMW/openmw!2554
 2022-12-27 13:16:22 +00:00
Evil Eye
7d97ca6cd5 Don't call getClass on an empty Ptr 2022-12-27 10:09:45 +01:00
psi29a
5b56fe8d0d Merge branch 'drippy-48' into 'openmw-48' 
!2537 for 0.48

See merge request OpenMW/openmw!2545
 2022-12-19 23:28:47 +00:00
Evil Eye
08a6d9e2cf Ignore non-3D agents in the navigator 2022-12-19 23:11:34 +01:00
psi29a
678898b8f6 Merge branch 'keep_calm_and_get_hit_48' into 'openmw-48' 
!2522 for 0.48

See merge request OpenMW/openmw!2538
 2022-12-19 12:46:54 +00:00
psi29a
b40ac6dce5 Merge branch 'give-up-on-thinking-up-a-way-to-determine-this-automatically-per-object-openmw-48' into 'openmw-48' 
Add a setting to control coverage adjustment (!2536 cherry-pick)

See merge request OpenMW/openmw!2539
 2022-12-13 14:37:36 +00:00
AnyOldName3
33e39a0360 Add a setting to control coverage adjustment 
With it on, which was always the case before this setting was added,
vanilla content and poorly-made mods will look acceptable, but well-made
mods will have alpha-tested meshes appear to grow and potentially gain a
weird outline as they get further away.

With it off, which replicates the 0.46 behaviour, well-made mods will
look really good, but vanilla content and poorly-made mods will have
alpha-tested meshes shrink as they get further away.

It's been bugging me that this was forced on since 0.47 released, and
I'd hoped to figure out a solution for automatic detection at some point
before 0.48 branched off, but I didn't, so now this is what we're
getting to have Tamriel Rebuilt look right.
 2022-12-09 19:01:42 +00:00
Evil Eye
5188d2a7f9 Update reference 2022-12-09 17:21:07 +01:00
Evil Eye
92761f0527 Add option to restore non-MCP Calm spell behaviour 2022-12-09 17:21:04 +01:00
psi29a
fff497c205 Merge branch 'lua_gc_48' into 'openmw-48' 
[0.48] Run Lua GC in every frame

See merge request OpenMW/openmw!2531
 2022-12-07 10:53:36 +00:00
Petr Mikheev
734f09abe6 Run Lua GC in every frame 2022-12-04 22:27:44 +01:00
psi29a
9bbc4a54c1 Merge branch 'dial_early_48' into 'openmw-48' 
!2524 for 0.48

See merge request OpenMW/openmw!2525
 2022-11-28 08:06:06 +00:00
Evil Eye
3b8b5aee39 Add an early out to dialogue loading to match Morrowind.exe behaviour 2022-11-27 22:40:31 +01:00
Andrei Kortunov
3e70fc2577 Add missing translations 2022-11-20 11:58:09 +04:00
Andrei Kortunov
babd9ee24b Improve postprocess HUD layout 2022-11-18 11:48:00 +04:00
psi29a
e1e7f3e135 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

(cherry picked from commit c2b495a187)

6025943f Add missing content=builtin.omwscripts if openmw is started via openmw-cs (fixes #7056)
 2022-11-07 13:03:18 +00:00
psi29a
be89953368 Merge branch 'fix_settings_reloadlua' into 'master' 
Clear storage of setting groups on reloadlua

See merge request OpenMW/openmw!2497

(cherry picked from commit 523fabe1e8)

17891600 Clear storage of setting groups on reloadlua
 2022-11-07 11:46:18 +00:00
psi29a
30b1b2f911 Merge branch 'fix_7005' into 'master' 
Fix Lua settings UI not working after a save (#7005)

See merge request OpenMW/openmw!2495

(cherry picked from commit 084396f29e)

589d7e82 Fix Lua settings UI not working after a save (#7005)
 2022-11-04 09:14:59 +00:00
psi29a
2580cbfe67 Merge branch 'time_stamp_48' into 'openmw-48' 
Support negative days in TimeStamp for 0.48 (#6981)

See merge request OpenMW/openmw!2493
 2022-11-02 21:51:39 +00:00
elsid
4f360e6374
Support negative days in TimeStamp 
As vanilla engine does.
 2022-11-02 20:28:23 +01:00
psi29a
a5b1ce77ea Merge branch 'flying_position48' into 'openmw-48' 
Only force adjust the player and NPCs teleported out of the active grid

See merge request OpenMW/openmw!2489
 2022-10-31 20:20:25 +00:00
Evil Eye
df5eac88b8 Only force adjust the player and NPCs teleported out of the active grid 2022-10-31 12:56:05 +01:00
psi29a
e0c2131cd7 Merge branch 'bound48' into 'openmw-48' 
Allow bound effects to be recast if they're attached to a recastable effect 0.48

See merge request OpenMW/openmw!2487
 2022-10-30 18:36:26 +00:00
Evil Eye
2881a30e9e Allow bound effects to be recast if they're attached to a recastable effect 2022-10-30 14:31:41 +01:00
psi29a
ddc90bc778 Merge branch 'async_crashes_48' into 'openmw-48' 
Pull fixes for async Lua into 0.48

See merge request OpenMW/openmw!2482
 2022-10-24 06:51:58 +00:00