mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 18:53:52 +00:00
Code Issues Releases Wiki Activity
30224 commits 108 branches 66 tags 133 MiB
Commit graph

30224 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Evil Eye
0aa4235096 Cap temporary disposition gain and compute permanent changes accordingly 2023-02-14 20:08:11 +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
Kindi
4734504e2c Lua binding for Clothing 2023-02-12 00:19:08 +08:00
elsid
1e9e7b7607
Add tests to save and load some ESM3 records 2023-02-11 16:20:10 +01:00
elsid
2e64155c0f
Use signed type for left record and files size in ESM3 reader context 
Otherwise reading some of the records like ESM::CellRef without a subrecord
after could lead to underflow of ESM_Context::leftRec which makes
ESM::ESMReader::hasMoreSubs to return true and load hangs for a while trying to
read the same subrecord many times.

Fix ESM::Variant tests since it's now required to have a record for any ESM
data. Add 16 (size of record header) to all expected data sizes.
 2023-02-11 16:09:14 +01:00
Alexei Kotov
9deed5c03e Propagate dynamic effects to node's immediate children (bug #6550) 2023-02-11 17:37:25 +03:00
elsid
a5ec108cfb
Add missing space 2023-02-11 15:14:02 +01:00
elsid
4f683d1ee9
Throw exception on failed write 2023-02-11 15:14:02 +01:00
psi29a
5f1da29881 Merge branch 'bsapriority' into 'master' 
Files::Collections: prefer files from highest priority folders (bug #7092)

Closes #7092

See merge request OpenMW/openmw!2716
 2023-02-11 10:50:55 +00:00
psi29a
f87b9e7bcb Merge branch 'postprocesshud' into 'master' 
Improve post-process HUD search field usability (#7198)

Closes #7198

See merge request OpenMW/openmw!2717
 2023-02-11 10:50:04 +00:00
psi29a
8040d7a72a Merge branch 'hopechess' into 'master' 
Unequip the weapon only after finishing the attack (bug #4610)

Closes #4610

See merge request OpenMW/openmw!2719
 2023-02-11 10:49:08 +00:00
Evil Eye
f76f0f263e Merge branch 'region51' into 'master' 
Reimplement region for TES3 cells

See merge request OpenMW/openmw!2720
 2023-02-11 10:43:00 +00:00
psi29a
83894bae8a Merge branch 'nif' into 'master' 
Add NiTriBasedGeomData abstraction, bring NiVertexColorProperty to modern standards

See merge request OpenMW/openmw!2714
 2023-02-11 10:33:08 +00:00
Alexei Kotov
0485b23b5f Reimplement region for TES3 cells 2023-02-11 09:36:15 +03:00
Alexei Kotov
0f7822fff8 Unequip the weapon only after finishing the attack (bug #4610) 2023-02-11 09:00:20 +03:00
Alexei Kotov
1df5fd341b Don't override post-processing HUD search field focus 2023-02-11 03:04:39 +03:00
Alexei Kotov
3b8001d55d Make post-processing HUD search case-insensitive 2023-02-11 02:56:15 +03:00
Alexei Kotov
536370c76d Files::Collections: prefer files from highest priority folders 2023-02-11 01:25:00 +03:00
Alexei Kotov
99aa90f90c Rewrite NiVertexColorProperty 2023-02-11 00:58:13 +03:00
psi29a
a31d381611 Merge branch 'esm_format_version' into 'master' 
Name all custom ESM format versions and add tests

See merge request OpenMW/openmw!2712
 2023-02-10 20:43:06 +00:00
Alexei Kotov
d39127cc3d Add NiTriBasedGeomData abstraction 2023-02-10 23:06:56 +03:00