elsid
35f5c8cd15
Add missing includes
2024-05-10 23:27:21 +02:00
psi29a
99ac6c40e5
Merge branch 'wizard_update' into 'master'
...
UI fixes for Wizard
See merge request OpenMW/openmw!4069
2024-05-09 08:45:29 +00:00
Alexei Kotov
b9069835b2
Merge branch 'scriptedit' into 'master'
...
Improve appearance of script editor in the OpenMW-CS
See merge request OpenMW/openmw!4076
2024-05-07 13:22:58 +00:00
Alexei Kotov
c95bb4ce59
Merge branch 'split_esm_headers' into 'master'
...
Split ESM headers
See merge request OpenMW/openmw!4071
2024-05-07 11:57:32 +00:00
Andrei Kortunov
b56c255be2
Improve appearance of script editor in the OpenMW-CS
2024-05-06 12:22:30 +04:00
psi29a
2e971ec2e3
Merge branch 'appropriateammunition' into 'master'
...
Adjust Russian appropriate ammunition setting label/description
See merge request OpenMW/openmw!4062
2024-05-05 20:19:45 +00:00
elsid
f83d388391
Iterate over smaller container when removing blacklisted refs
2024-05-04 13:22:32 +02:00
elsid
a920ca9070
Report loading screens to osg stats
2024-05-04 13:22:32 +02:00
Alexei Kotov
95cef34477
Bump the minimum launcher width to 775
2024-05-04 11:15:57 +03:00
Hristos N. Triantafillou
63a27bbf99
Expose Wander option values to the Lua API ( #7916 )
2024-05-03 09:40:30 +00:00
elsid
01166b1f26
Split ESM headers
2024-05-03 01:55:20 +02:00
Andrei Kortunov
9252879f0f
UI fixes for Wizard
2024-05-01 08:56:35 +04:00
psi29a
a57c350c08
Merge branch 'paint_svg' into 'master'
...
Change SVG icons color in the editor
See merge request OpenMW/openmw!4060
2024-04-30 08:19:51 +00:00
psi29a
bb89717886
Merge branch 'droppinglikeflies' into 'master'
...
Fix Drop behavior for creatures that don't have an inventory
See merge request OpenMW/openmw!4063
2024-04-30 08:18:22 +00:00
elsid
404940b6e0
Make sure proper number of cells is preloaded
...
Limit the number of exterior cells around a cell to be preloded based on current
and max cache size not just max cache size. Avoid doing break from inner loop
only.
Log when truncation happens but only once during process lifetime to warn a user.
2024-04-29 02:03:32 +02:00
elsid
2220868fa9
Preload surrounding exterior cells for the teleport door destination
...
When player teleports to the exterior cell, multiple cells are loaded not only
the target so better to have them preloaded too.
2024-04-29 01:02:49 +02:00
Alexei Kotov
cc4b2e5c58
Fix Drop behavior for creatures that don't have an inventory
2024-04-28 20:07:37 +03:00
psi29a
5b25435260
Merge branch 'fix_osg_stats_report' into 'master'
...
Report osg stats for frames with loading screens (#7737 )
Closes #7737
See merge request OpenMW/openmw!4053
2024-04-28 14:16:41 +00:00
psi29a
1e1fd28136
Merge branch 'fix_anim_state' into 'master'
...
Fix AnimState initialization
See merge request OpenMW/openmw!4061
2024-04-28 13:14:44 +00:00
psi29a
24fca82f2c
Merge branch 'faction_relations' into 'master'
...
Take in account faction reaction changes
See merge request OpenMW/openmw!4015
2024-04-28 13:05:13 +00:00
jvoisin
3e63b507d4
Merge branch 'fix_physics_crash' into 'master'
...
Fix crash in physics worker on removing object (#7950 )
Closes #7950
See merge request OpenMW/openmw!4057
2024-04-28 00:25:43 +00:00
elsid
9d2f132aa7
Fix AnimState initialization
...
Remove redundant user defined constructor and destructor, make sure all members
are properly initialized including mTime (new float does not initialize the
float).
2024-04-27 14:47:23 +02:00
elsid
41d5d3bf09
Report osg stats for all frames showing loading screens
2024-04-27 12:37:39 +02:00
Andrei Kortunov
070327a259
Change SVG color in the editor
2024-04-27 09:57:47 +04:00
elsid
5261f0c5cf
Modify PhysicsTaskScheduler::mCollisionObjects under lock
...
addCollisionObject is called from the main thread and removeCollisionObject is
usually called from the main thread and rarely from one of the physics worker
threads. This usually happens on cell unloading when object is already removed
from the scene but there is active simulation for it. Which possible because
it's a shared pointer.
There is getUserPointer function which only reads from the container but it's
called only when there is no active simulation so no lock is required.
2024-04-26 16:17:40 +02:00
elsid
acf1e51a28
Call getUserPointer only for not nullptr collision object
...
nullptr can't have user pointer anyway so it saves a lookup in the
unordered_map.
2024-04-26 15:32:27 +02:00
psi29a
ec8675ba6f
Merge branch 'scalable_launcher' into 'master'
...
Improve launcher appearance
See merge request OpenMW/openmw!4051
2024-04-25 08:46:29 +00:00
psi29a
3980bb15cc
Merge branch 'lua_controller_cursor' into 'master'
...
Add lua bindings for controller cursor mode
See merge request OpenMW/openmw!3623
2024-04-25 08:45:57 +00:00
elsid
b4976354a5
Use correct frame and stats for lua worker
...
When a loading screen appears during the frame processing, the frame number
returned by the viewer is incremented and the stats reporting goes into the
wrong frame. Pass frame number and stats object from the main thread to avoid
this.
2024-04-24 21:53:59 +02:00
psi29a
5f926bd129
Merge branch 'scalable_wizard' into 'master'
...
Use scalable icons for wizard
See merge request OpenMW/openmw!4050
2024-04-24 13:20:36 +00:00
psi29a
a20f456a5c
Merge branch 'mudcrabcanhazsoulgem' into 'master'
...
Allow running soulgem instructions on all actors (#7943 )
Closes #7943
See merge request OpenMW/openmw!4048
2024-04-24 13:20:09 +00:00
psi29a
a628c658a9
Merge branch 'lessgoofymaterialptr' into 'master'
...
Simplify material file pointer acrobatics
See merge request OpenMW/openmw!4049
2024-04-24 08:39:52 +00:00
Andrei Kortunov
5e8dc9cc03
Fix stub icon color
2024-04-24 11:14:50 +04:00
psi29a
6d0df9f686
Merge branch 'window_clamp' into 'master'
...
Do not take in account UI scaling factor twice
See merge request OpenMW/openmw!4046
2024-04-23 10:28:51 +00:00
Andrei Kortunov
d97838def1
Improve launcher appearance
2024-04-23 12:28:37 +04:00
Andrei Kortunov
0873eb6e62
Use scalable icons for wizard
2024-04-23 11:49:33 +04:00
psi29a
02cdeb6252
Merge branch 'scalable_editor' into 'master'
...
Treat editor icons as scalable
See merge request OpenMW/openmw!4042
2024-04-23 07:04:59 +00:00
psi29a
9662586947
Merge branch 'editor-crash' into 'master'
...
Clamp widgets coordinates to avoid editor crashes
See merge request OpenMW/openmw!4043
2024-04-23 07:04:09 +00:00
Alexei Kotov
78eda530ac
Simplify material file pointer acrobatics
2024-04-23 00:34:38 +03:00
Alexei Kotov
1c1df996be
Allow running soulgem instructions on all actors ( #7943 )
2024-04-23 00:02:06 +03:00
Andrei Kortunov
d10b0d503b
Do not take in account UI scaling factor twice
2024-04-22 13:36:34 +04:00
psi29a
023c0f7a46
Merge branch 'vfs_normalized_path_6' into 'master'
...
Use normalized path for music related functions
See merge request OpenMW/openmw!4038
2024-04-22 07:02:14 +00:00
Andrei Kortunov
1bb48bcef7
Treat editor icons as scalable
2024-04-21 20:56:06 +04:00
Andrei Kortunov
1909ec121b
Take in account faction reaction changes
2024-04-21 18:00:26 +04:00
Andrei Kortunov
2264d067fc
Clamp widgets coordinates to avoid crashes
2024-04-21 17:15:33 +04:00
elsid
a863899eb1
Use normalized path for SoundManager::streamMusic
2024-04-20 21:14:09 +02:00
Alexei Kotov
6f9206428d
Don't ignore material files in NifLoader tests
2024-04-20 19:43:42 +03:00
Alexei Kotov
4e3d45db1b
Deduplicate file handling in niftest
2024-04-20 19:43:42 +03:00
Alexei Kotov
1d65aaee71
Formatting
2024-04-20 19:43:42 +03:00
Alexei Kotov
1a961f3021
Extremely early handling for BGSM/BGEM files
2024-04-20 19:43:41 +03:00