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

21154 commits

Author SHA1 Message Date
Alexei Kotov
ee5ca066fd Allow talking with fleeing creatures (bug #7631) 2023-10-22 16:18:52 +03:00
psi29a
a08ca11c34 Merge branch 'boundingboxing' into 'master'
BulletNifLoader: Replicate node bounds handling more closely

See merge request OpenMW/openmw!3505
2023-10-22 08:52:23 +00:00
psi29a
631a3954b1 Merge branch 'notsocharmingnow' into 'master'
Don't apply Charm to creatures (bug #7630)

Closes #7630

See merge request OpenMW/openmw!3507
2023-10-22 08:52:04 +00:00
Alexei Kotov
d0ffe6e2f9 Don't apply Charm to creatures (bug #7630) 2023-10-21 07:10:16 +03:00
Alexei Kotov
9405e5cb3c BulletNifLoader: Replicate node bounds handling more closely 2023-10-19 03:11:55 +03:00
Cody Glassman
5fc46b166a track debug window size and dimensions between sessions 2023-10-18 09:04:57 -07:00
psi29a
ed2e969802 Fix build 2023-10-17 20:10:19 +00:00
psi29a
798ff7062b Merge branch 'bullet' into 'master'
BulletNifLoader updates

See merge request OpenMW/openmw!3498
2023-10-17 07:40:45 +00:00
psi29a
9259f5c056 Merge branch 'merryweather' into 'master'
Replace more sized reads and change weather loading

See merge request OpenMW/openmw!3496
2023-10-16 20:06:59 +00:00
psi29a
97d9f9c4f3 Merge branch 'dont-lose-your-head' into 'master'
Add missing headers to components/CMakeLists.txt

See merge request OpenMW/openmw!3499
2023-10-16 20:06:47 +00:00
elsid
7ac402390a
Use settings values for Water settings 2023-10-15 23:24:46 +02:00
AnyOldName3
2ed584428c Add missing headers to components/CMakeLists.txt
Otherwise, they won't show up as part of the project in IDEs.
2023-10-15 15:44:24 +01:00
Alexei Kotov
8db631c6b6 Update BSXFlags test 2023-10-15 15:32:59 +03:00
psi29a
febfa353e0 Merge branch 'save_metadata' into 'master'
Add additional fields to save metadata

See merge request OpenMW/openmw!3493
2023-10-15 11:42:02 +00:00
psi29a
03fa273394 Merge branch 'settings_values_sound' into 'master'
Use settings values for Sound settings (#6876)

See merge request OpenMW/openmw!3494
2023-10-15 11:41:30 +00:00
Evil Eye
fbafa13b3d Appease the compiler 2023-10-14 17:01:55 +02:00
Evil Eye
514723a4e6 Use fixed size ints for Region and use an array for weather odds 2023-10-14 16:36:45 +02:00
Evil Eye
2ebd544dfb Fix #7624 2023-10-14 14:18:50 +02:00
Andrei Kortunov
fc74cc49dd Add additional fields to save metadata (feature 7618) 2023-10-14 09:53:44 +04:00
elsid
a84e412a37
Use settings values for Sound settings 2023-10-13 12:58:58 +02:00
psi29a
fe5dbb7a25 Merge branch 'bsatool' into 'master'
Fix creating archives in bsatool

See merge request OpenMW/openmw!3484
2023-10-13 07:34:51 +00:00
psi29a
de11bbc008 Merge branch 'settings_values_shaders' into 'master'
Use settings values for Shaders settings (#6876)

See merge request OpenMW/openmw!3489
2023-10-13 07:34:43 +00:00
uramer
99461fd9b2 Merge branch 'control_switch' into 'master'
[Lua] Add CONTROL_SWITCH functions to `types.Player` and deprecate them in `openmw.input`

See merge request OpenMW/openmw!3487
2023-10-13 07:00:34 +00:00
elsid
08902371b4
Use settings values for Shaders settings 2023-10-12 20:43:53 +02:00
Alexei Kotov
4b4c46fa70 Merge branch 'settings_values_saves' into 'master'
Use settings values for Saves settings (#6876)

See merge request OpenMW/openmw!3486
2023-10-11 21:35:48 +00:00
Alexei Kotov
8c58ec9c32 Merge branch 'esm4actors' into 'master'
Show ESM4 NPCs

See merge request OpenMW/openmw!3312
2023-10-11 21:33:14 +00:00
elsid
1038a68fbf
Use settings values for Saves settings 2023-10-10 20:39:52 +02:00
psi29a
01ee448c61 Merge branch 'settings_values_navigator' into 'master'
Use settings values for Navigator settings (#6876)

See merge request OpenMW/openmw!3468
2023-10-10 03:24:33 +00:00
Petr Mikheev
15306c7d49 [Lua] Add CONTROL_SWITCH functions to types.Player and deprecate them in openmw.input 2023-10-10 01:15:09 +02:00
psi29a
fb9fc91710 Merge branch 'settings_values_post_processing' into 'master'
Use settings values for Post Processing settings (#6876)

See merge request OpenMW/openmw!3480
2023-10-09 11:35:53 +00:00
psi29a
9534130906 Merge branch 'settings_values_physics' into 'master'
Use settings values for Physics settings (#6876)

See merge request OpenMW/openmw!3481
2023-10-09 11:35:43 +00:00
psi29a
ab631fcd70 Merge branch 'whosabaddoggo' into 'master'
Handle AllowWerewolfForceGreeting variable (bug #7609)

Closes #7609

See merge request OpenMW/openmw!3476
2023-10-09 11:35:16 +00:00
Alexei Kotov
1bd388faf3 Fix creating archives in bsatool 2023-10-09 07:07:53 +03:00
elsid
4a7886816e
Use settings values for Physics settings 2023-10-08 12:19:02 +02:00
elsid
7b4b8763ff
Use settings values for Post Processing settings 2023-10-08 11:58:16 +02:00
psi29a
575f43876b Merge branch 'fixedpath' into 'master'
Replace more sized reads and change path grid loading

See merge request OpenMW/openmw!3475
2023-10-08 02:18:43 +00:00
Petr Mikheev
3882a5f25a update 2023-10-07 17:21:25 +02:00
Petr Mikheev
b4552d47f6 Don't use ESM4 mHeadFeamleParts; switch from manually adding "meshes\\" to correctMeshPath 2023-10-07 17:21:25 +02:00
Petr Mikheev
1acac873cf Use "setObjectRoot" in esm4npcanimation.cpp 2023-10-07 17:21:25 +02:00
Petr Mikheev
4beed29404 Changes required during review 2023-10-07 17:21:25 +02:00
Petr Mikheev
2900351777 Render ESM4 NPCs 2023-10-07 17:21:25 +02:00
psi29a
d43493dd4c Merge branch 'idlestorm' into 'master'
Avoid redundant animation resets in updateIdleStormState

See merge request OpenMW/openmw!3473
2023-10-07 01:41:36 +00:00
Alexei Kotov
cecb2b71ea Handle AllowWerewolfForceGreeting variable (bug #7609) 2023-10-06 23:17:32 +03:00
Evil Eye
b99f58613e Remove signed/unsigned conversions in pathgrid loading code and use meaningful member names 2023-10-06 16:46:09 +02:00
psi29a
2c81220cf7 Merge branch 'book' into 'master'
Reading ESM4 books

See merge request OpenMW/openmw!3471
2023-10-05 17:24:50 +00:00
Alexei Kotov
79bda2e694 Avoid redundant animation resets in updateIdleStormState 2023-10-04 22:26:52 +03:00
psi29a
d9f8757f33 Merge branch 'goblinsnacks' into 'master'
Allow creatures to use potions

Closes #7604

See merge request OpenMW/openmw!3469
2023-10-04 03:46:51 +00:00
Petr Mikheev
6161953106 Allow reading ESM4 books 2023-10-03 10:55:12 +02:00
Alexei Kotov
b6d2fa5f9d Merge branch 'initially_disabled' into 'master'
Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled

See merge request OpenMW/openmw!3461
2023-10-02 18:28:29 +00:00
Evil Eye
0814ef5697 Allow creatures to use potions 2023-10-01 11:22:20 +02:00