psi29a
10296752bc
Merge branch 'dont_eat_the_delicious_cards' into 'master'
...
Prevent consumption of ingredients that don't have a first effect
Closes #7163
See merge request OpenMW/openmw!2746
2023-02-18 17:10:50 +00:00
Petr Mikheev
0c3237ad78
Fix #7223
2023-02-18 16:24:10 +01:00
Evil Eye
f5c5ebc1dc
Prevent consumption of ingredients that don't have a first effect
2023-02-18 15:30:02 +01:00
psi29a
0ed1310417
Merge branch 'fix_fog_state_load' into 'master'
...
Fix loading fog state
See merge request OpenMW/openmw!2743
2023-02-18 07:27:05 +00:00
psi29a
ba9e6f3180
Merge branch 'empty_ref_id' into 'master'
...
Replace ESM::RefId::sEmpty by default constructed RefId where possible
See merge request OpenMW/openmw!2744
2023-02-18 07:26:47 +00:00
elsid
b5ec584be2
Replace ESM::RefId::sEmpty by default constructed RefId where possible
...
Static const is only required to provide a reference or a pointer when it is not
possible with default constructed temporary.
2023-02-18 01:07:15 +01:00
psi29a
9487312fb8
Merge branch 'optimize_navmesh_related_mechanics' into 'master'
...
Optimize navmesh related mechanics
See merge request OpenMW/openmw!2742
2023-02-17 22:58:12 +00:00
elsid
8a62a4fe4d
Support dump for ESM3 CSTA record in esmtool
2023-02-17 23:51:22 +01:00
elsid
959de6f4c1
Avoid UB on empty fog data record
2023-02-17 23:42:49 +01:00
elsid
28f7a89530
Reuse dtNavMeshQuery
...
To avoid redundant allocations.
2023-02-17 15:05:25 +01:00
elsid
540ee5399c
Do expensive navmesh calls on timer
...
Reducing the number of them on each frame.
2023-02-17 15:05:24 +01:00
psi29a
d846a9fc15
Merge branch 'cs_optimize_saving' into 'master'
...
Fix editor saving performance
See merge request OpenMW/openmw!2741
2023-02-17 13:30:20 +00:00
psi29a
2fee5bdb73
Merge branch 'cs_ref_id' into 'master'
...
Use ESM::RefId as index key in collections
See merge request OpenMW/openmw!2740
2023-02-17 13:30:02 +00:00
elsid
e618026c69
Use ESM::RefId as index key in collections
2023-02-17 11:08:46 +01:00
elsid
b2299ef914
Optimize saving in editor
2023-02-17 11:05:25 +01:00
elsid
8383fa3547
Log time spent on document operations in editor
2023-02-17 00:23:02 +01:00
psi29a
18d488d968
Merge branch 'ref_id_class' into 'master'
...
Convert RefId to class
See merge request OpenMW/openmw!2739
2023-02-15 23:41:58 +00:00
psi29a
c3e5527081
Merge branch 'cs_info_collection' into 'master'
...
Simplify InfoCollection
See merge request OpenMW/openmw!2738
2023-02-15 23:23:20 +00:00
elsid
996153f78d
Convert RefId to class
2023-02-15 23:20:44 +01:00
elsid
b6a2fd8fc1
Simplify InfoCollection
...
There was additional logic to create topic infos index by topic id to make
getTopicInfos and removeDialogueInfos functions faster. In practice it makes
loading slower.
Move infos index by topic to CSMWorld::Data and use only on loading.
2023-02-15 23:10:35 +01:00
elsid
de24cdc12c
Log content files loading time by editor
2023-02-15 21:29:13 +01:00
jvoisin
8a6a3c7121
Merge branch 'fix_7210' into 'master'
...
Fix #7210
Closes #7210
See merge request OpenMW/openmw!2737
2023-02-15 11:37:57 +00:00
Petr Mikheev
b71eac3e76
Fix #7210
2023-02-15 10:31:10 +01:00
psi29a
a0cea6569b
Merge branch 'took_an_arrow_to_the_disposition_cap' into 'master'
...
Cap temporary disposition gain and compute permanent changes accordingly
Closes #7224
See merge request OpenMW/openmw!2734
2023-02-14 21:16:21 +00:00
Petr Mikheev
eceeb15ee5
Fix bug in lua_ui/content.lua: getmetatable(ui.content{}) shouldn't return a global mutable table
2023-02-14 21:08:19 +01:00
Petr Mikheev
65885d994f
Don't expose LuaUtil::Callback to lua
2023-02-14 21:08:19 +01:00
Evil Eye
0aa4235096
Cap temporary disposition gain and compute permanent changes accordingly
2023-02-14 20:08:11 +01:00
Petr Mikheev
71ba7b88e2
Move asyncpackage from apps/openmw/mwlua to components/lua
2023-02-14 20:03:32 +01:00
psi29a
9673f5b932
Merge branch 'esm_ref_id_functions' into 'master'
...
Add functions to read and write ESM::RefId and use them
See merge request OpenMW/openmw!2732
2023-02-14 08:09:51 +00:00
elsid
6d261d38dd
Add functions to read and write ESM::RefId and use them
...
To be later changed with another implementation.
2023-02-13 22:07:58 +01:00
psi29a
bf0da418f9
Merge branch 'feet_stay_wet' into 'master'
...
Use the teleported Ptr to determine if water walking should be canceled
Closes #7227
See merge request OpenMW/openmw!2731
2023-02-13 17:51:42 +00:00
Evil Eye
8cabc1bf3b
Use the teleported Ptr to determine if water walking should be canceled
2023-02-13 16:38:39 +01:00
psi29a
380331ad9b
Merge branch 'esm3_variable_string_size' into 'master'
...
Support variable size strings in ESM3
See merge request OpenMW/openmw!2728
2023-02-13 10:59:10 +00:00
elsid
80e6d6cbe3
Support variable size strings in ESM3
2023-02-13 10:18:32 +01:00
elsid
beb017e699
Do not truncate too long strings on writing ESM
2023-02-13 10:18:32 +01:00
elsid
c0c723bb1b
Add const to read only function
2023-02-13 10:18:32 +01:00
psi29a
7914618175
Merge branch 'add_missing_include' into 'master'
...
Add missing include
See merge request OpenMW/openmw!2730
2023-02-13 09:11:04 +00:00
elsid
12d36fb1d7
Add missing include
2023-02-13 10:02:30 +01:00
psi29a
17cb06bb6c
Merge branch 'terrain' into 'master'
...
Discard terrain base layer alpha in non-shader rendering path (bug #6657 )
Closes #6657
See merge request OpenMW/openmw!2729
2023-02-13 08:14:25 +00:00
Alexei Kotov
0ba179c332
Discard terrain base layer alpha in non-shader rendering path (bug #6657 )
2023-02-13 03:43:59 +03:00
psi29a
f124c2c5f9
Merge branch 'fix_physics_locking' into 'master'
...
Use shared locks in physics system when using multithreaded bullet (#7218 )
See merge request OpenMW/openmw!2726
2023-02-12 17:00:44 +00:00
elsid
076e772e3d
Use shared locks in physics system when using multithreaded bullet
2023-02-12 14:51:46 +01:00
psi29a
bfb6bab33b
Merge branch 'luaclothingbinds' into 'master'
...
Lua API for Clothing records
See merge request OpenMW/openmw!2723
2023-02-12 09:47:53 +00:00
psi29a
02d1271bc3
Merge branch 'weirdcommitname' into 'master'
...
Assault victims are always aware of the committed crime (bug #7064 )
Closes #7064
See merge request OpenMW/openmw!2725
2023-02-12 09:47:17 +00:00
Alexei Kotov
09716c644e
Assault victims are always aware of the committed crime (bug #7064 )
2023-02-12 03:59:20 +03:00
Kindi
1d35a83452
Update types.lua
2023-02-12 00:26:45 +00:00
psi29a
02651cd96c
Merge branch 'texturefx' into 'master'
...
Propagate dynamic effects to node's immediate children (bug #6550 )
Closes #6550
See merge request OpenMW/openmw!2721
2023-02-11 21:42:30 +00:00
psi29a
f1b8de8cfc
Merge branch 'esm_signed_left' into 'master'
...
Use signed type for left record and files size in ESM3 reader context
See merge request OpenMW/openmw!2722
2023-02-11 21:39:30 +00:00
psi29a
cb0b5c8eb5
Merge branch 'nolighting' into 'master'
...
Use falloff start and stop opacity in NoLighting shader
See merge request OpenMW/openmw!2724
2023-02-11 21:38:34 +00:00
Alexei Kotov
0142caacf7
Use falloff start and stop opacity in NoLighting shader
2023-02-11 23:19:26 +03:00