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

21188 commits

Author SHA1 Message Date
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
elsid
68de5690ef
Use settings values for Navigator settings 2023-10-01 11:10:04 +02:00
elsid
b3c8a15af1
Parse navmesh render mode on reading settings 2023-10-01 11:09:59 +02:00
psi29a
08ff69f199 Merge branch 'menu_fix' into 'master'
Update canvas size every frame when it is visible

See merge request OpenMW/openmw!3463
2023-09-29 11:25:09 +00:00
Andrei Kortunov
1ac0a3b25b Update canvas size every frame when it is visible (bug 7603) 2023-09-29 13:34:04 +04:00
psi29a
df1063be5d Merge branch 'thedichotomyof4' into 'master'
ESM4 upd8s: Fours and Worlds

Closes #7445

See merge request OpenMW/openmw!3454
2023-09-29 08:16:30 +00:00
Petr Mikheev
02de5e82d8 Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled. 2023-09-28 23:09:09 +02:00
psi29a
3ea14e904d Merge branch 'actors_range' into 'master'
Handle actors processing range in Lua

See merge request OpenMW/openmw!3458
2023-09-28 08:33:46 +00:00
psi29a
6c39e3f817 Merge branch 'draft' into 'master'
Treat teleportation out of the draft cell as object creation

Closes #7588 and #7453

See merge request OpenMW/openmw!3455
2023-09-28 08:33:10 +00:00
psi29a
f9bba096db Merge branch 'fix_editor_model' into 'master'
Avoid using settings in components to get actor model (#7596)

Closes #7596

See merge request OpenMW/openmw!3460
2023-09-28 08:32:52 +00:00
psi29a
bae8d585fe Merge branch 'lua/capacity_encum_bindings' into 'master'
Add more lua bindings for encumbrance and capacity

See merge request OpenMW/openmw!3462
2023-09-28 08:32:38 +00:00
glassmancody.info
9aa992eede add more lua bindings for encumbrance and capacity 2023-09-27 17:19:08 -07:00
Evil Eye
7594d94024 Prevent re-adding local scripts 2023-09-27 22:24:28 +02:00
Evil Eye
f6626e36cf Unbreak respawns and fix #7588 2023-09-27 22:07:55 +02:00
Evil Eye
33b57d9134 Use moveToCell and init mwscript 2023-09-27 21:23:07 +02:00
elsid
1d94527a19
Avoid using settings in components to get actor model
Settings::Values are initialized only for engine. Accessing them from other
binaries leads to a crash.
2023-09-27 21:00:46 +02:00
Andrei Kortunov
40c8783790 Handle actors processing range in Lua 2023-09-27 15:14:32 +04:00
psi29a
e090bc234b Merge branch 'simulation_fix' into 'master'
Decouple rendering simulation time from Lua simulation time (bug 7576)

Closes #7576

See merge request OpenMW/openmw!3457
2023-09-27 07:30:36 +00:00
Zackhasacat
cde2b49313 Fix recordDraft isScroll for types.book in lua 2023-09-27 07:30:27 +00:00
Andrei Kortunov
442c032373 Decouple rendering simulation time from Lua simulation time (bug 7576) 2023-09-26 14:39:38 +04:00
Evil Eye
641f34a3c9 Treat teleportation out of the draft cell as object creation 2023-09-25 21:01:32 +02:00
Alexei Kotov
8d655054f1 esmtool: Print human-readable ESM4 file format version 2023-09-25 21:40:14 +03:00
Alexei Kotov
9f8f2dd925 Use parent worldspace terrain when requested 2023-09-25 21:40:14 +03:00
Alexei Kotov
7e360df6c0 Place ESM4::Flora instances to the scene 2023-09-24 10:25:44 +03:00
psi29a
67075990bd Merge branch 'deprecations' into 'master'
Remove numeric magic school ids and deprecate the enum

See merge request OpenMW/openmw!3440
2023-09-23 11:59:22 +00:00
psi29a
6d32caa2d6 Merge branch 'somethinginparticlular' into 'master'
Read even more NIF records

See merge request OpenMW/openmw!3442
2023-09-23 11:59:06 +00:00
Alexei Kotov
c800152ca2 Diminish error marker prominence
Don't render ESM4 actors or SpeedTree objects
2023-09-22 01:01:19 +03:00
psi29a
84019e7998 Merge branch 'mobiusdoublereacharound' into 'master'
Rewrite melee hit target selection (bug #3438)

Closes #3438

See merge request OpenMW/openmw!3274
2023-09-21 20:31:18 +00:00
Evil Eye
90ca8a2f4e Remove ATTRIBUTE, SKILL, and SCHOOL enums 2023-09-21 19:34:13 +02:00
Evil Eye
6ed5cbb7d0 Remove numeric magic school ids and deprecate the enum 2023-09-20 19:51:29 +02:00
Alexei Kotov
440851ff48 Rewrite melee hit target selection (bug #3438) 2023-09-19 22:31:45 +03:00
Petr Mikheev
38f56cfcdd Fix #7453: wrong position of dynamically placed CreatureLevList 2023-09-19 11:22:58 +02:00
Petr Mikheev
95906a34b3 Fix #6146 (actor:setEquipment doesn't trigger mwscripts) 2023-09-19 10:59:20 +02:00
psi29a
38d0ece366 Merge branch 'titlefix' into 'master'
Repeat title music only in main menu

See merge request OpenMW/openmw!3436
2023-09-19 08:37:44 +00:00
psi29a
3ae189dda1 Merge branch 'nifcouriersix' into 'master'
Modernize NIF loader, part 6

See merge request OpenMW/openmw!3435
2023-09-19 08:37:23 +00:00
psi29a
1a5b63412a Merge branch 'fix-lua-layers' into 'master'
Fix Lua UI Layer bindings

See merge request OpenMW/openmw!3433
2023-09-18 08:37:29 +00:00
psi29a
1c8198242e Merge branch 'toggleai' into 'master'
Add a way to toggle AI to Lua debug package

See merge request OpenMW/openmw!3429
2023-09-18 08:37:19 +00:00
psi29a
eb688b603d Merge branch 'refnum_ref' into 'master'
Replace `const ESM::RefNum&` -> `ESM::RefNum`

See merge request OpenMW/openmw!3432
2023-09-18 08:35:45 +00:00
Andrei Kortunov
3ef9b850d7 Repeat title music only in main menu 2023-09-18 10:45:08 +04:00
Alexei Kotov
1b93e646b8 Rename Property->NiProperty 2023-09-18 06:44:44 +03:00
Alexei Kotov
1e3da5516a Fix BA2 handling in niftest 2023-09-17 19:30:30 +03:00
Alexei Kotov
9ae1077808 Update NIF property loading, first pass
Revise all FO3+ shader properties (attempt reading FO4, FO76 and Starfield properties)
Use constants for most instances of property flags
Drop invalid usage of non-existent double-sided flag for BSShader
Make formatting more consistent, drop unnecessary comments
2023-09-17 19:22:16 +03:00
psi29a
18b6eba709 Merge branch 'reloadlua' into 'master'
safe reloadlua on top of !3362

See merge request OpenMW/openmw!3412
2023-09-17 11:28:01 +00:00
Alexei Kotov
eb8242946a Improve node record consistency with NifTools 2023-09-16 19:17:40 +03:00
Alexei Kotov
bff9231c3b Refactor NiGeometry/BSTriShape
Don't pass invalid geometry data links to the loaders
2023-09-16 19:17:40 +03:00
uramer
cda5f12630 Fix Lua UI Layer bindings 2023-09-16 13:45:19 +02:00
Alexei Kotov
deb051639e Refactor NiBoundingVolume 2023-09-15 21:11:12 +03:00
Petr Mikheev
c67b866a11 Replace const ESM::RefNum& -> ESM::RefNum 2023-09-15 19:38:09 +02:00
Petr Mikheev
72b8ff82ff !3362 with safe reloadlua 2023-09-15 19:10:33 +02:00
Andrei Kortunov
56ea3e3879 Add a way to toggle AI to Lua debug package 2023-09-15 18:49:46 +04:00
psi29a
551f424c80 Merge branch 'silent_warning' into 'master'
Silent coverity warning

See merge request OpenMW/openmw!3423
2023-09-15 12:57:08 +00:00
Petr Mikheev
4fa8756791 Silent coverity warning 2023-09-15 11:05:40 +02:00
psi29a
12159d95f3 Merge branch 'music' into 'master'
Rework music system

See merge request OpenMW/openmw!3372
2023-09-15 07:11:31 +00:00
psi29a
ed022a6c14 Merge branch 'fix_use' into 'master'
Fix regression added in  !3354: Set `force` to false when applying UseItem from inventory.

See merge request OpenMW/openmw!3422
2023-09-15 07:03:34 +00:00
psi29a
59f8034442 Merge branch 'sizedreads' into 'master'
Replace more sized reads

See merge request OpenMW/openmw!3425
2023-09-15 07:03:18 +00:00
psi29a
64e4a33400 Merge branch 'nif' into 'master'
Modernize NIF loader, part 4

See merge request OpenMW/openmw!3427
2023-09-15 07:02:38 +00:00
Andrei Kortunov
db72a91180 Add a way to check if sound system is enabled 2023-09-14 13:02:20 +04:00
Andrei Kortunov
ebb75008f8 Do not use playlist for title music 2023-09-14 09:17:59 +04:00
Alexei Kotov
0fe095303f Rename Controller->NiTimeController, update NiTimeController and related code 2023-09-14 03:12:10 +03:00
Alexei Kotov
05d8975ed1 Revise various NIF controller records
Mostly those that don't require external changes
2023-09-14 01:44:41 +03:00
Evil Eye
b59739a529 Replace more sized reads 2023-09-13 21:51:42 +02:00
Andrei Kortunov
655c4442bc Implement isMusicPlaying 2023-09-13 17:48:49 +04:00
Bret Curtis
a285408212 small coverity fix 2023-09-13 12:28:38 +02:00
Andrei Kortunov
cbb4c1bb9a Fix music during a new game start 2023-09-13 09:11:07 +04:00
Andrei Kortunov
e25e867d77 Remove 'music' package 2023-09-13 09:11:07 +04:00
Andrei Kortunov
18fe6a8ae7 Remove default argument 2023-09-13 09:11:07 +04:00
Andrei Kortunov
e1cae5a029 Rework music system 2023-09-13 09:11:07 +04:00