1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-07-20 16:14:07 +00:00
Commit graph

23322 commits

Author SHA1 Message Date
Dave Corley
bc3c3bbc9c FIX: tooltips lose some of the relevant information if not stored as a QString 2025-01-12 10:07:40 -07:00
Mehdi Yousfi-Monod
ffedd62ea1 Lua: Allow creating arrows and bolt records (#8300) 2025-01-12 18:00:19 +01:00
AnyOldName3
a4bc99db7a Install tools left out on Windows 2025-01-11 19:36:24 +00:00
Alexei Kotov
383876a516 Handle weird post-processing chains gracefully (#8295) 2025-01-11 17:03:59 +03:00
Alexei Kotov
dd44b2668c Be prepared if someone feels like breaking getDeviceName 2025-01-09 18:34:29 +03:00
Alexei Kotov
d4f4b3c304 Fix default audio device switch for PulseAudio backend (#7731) 2025-01-08 07:34:15 +03:00
Evil Eye
40cba7962c Bump us up to 0.50.0 2025-01-06 16:43:54 +01:00
Alexei Kotov
4eb5b24af5 Fix localized checkbox toggling behavior 2025-01-06 09:43:44 +03:00
psi29a
52d1493500 Merge branch 'suntzuquote' into 'master'
Add an option to match sunlight to the sun (#8032)

Closes #8032

See merge request OpenMW/openmw!4490
2025-01-05 20:08:28 +00:00
AnyOldName3
25c19d584f Merge branch 'effectlighting' into 'master'
Apply white ambient lighting to free magic VFX

See merge request OpenMW/openmw!4496
2025-01-05 01:22:28 +00:00
psi29a
9f90349a09 Merge branch 'cheaterrats' into 'master'
Don't stagger creatures in the middle of an attack (#8275)

Closes #8275

See merge request OpenMW/openmw!4499
2025-01-04 18:27:59 +00:00
Alexei Kotov
9b09ce53ef Don't stagger creatures in the middle of an attack (#8275) 2025-01-04 19:24:47 +03:00
psi29a
c33aaa5487 Merge branch 'disabilitybenefits' into 'master'
Allow disabling objects that have no placed instances (#4289)

Closes #4289

See merge request OpenMW/openmw!4498
2025-01-04 14:19:18 +00:00
Alexei Kotov
96a05cc72f Merge branch 'fix_vfs_lines_crash' into 'master'
Fix Lua vfs :lines() crash

See merge request OpenMW/openmw!4488
2025-01-03 14:21:59 +00:00
Evil Eye
c9ffd978ec Hoist the FileHandle check and add more tests 2025-01-02 15:55:19 +01:00
Alexei Kotov
24f1feb67a Allow disabling objects that have no placed instances (#4289) 2025-01-02 14:57:16 +03:00
psi29a
24361426c8 Merge branch 'getBoneByName_searchRoot' into 'master'
make ActorAnimation::getBoneByName take a searchRoot param

See merge request OpenMW/openmw!4491
2024-12-31 18:50:02 +00:00
Sebastian Fieber
e77db9f2ba make ActorAnimation::getBoneByName take a searchRoot param 2024-12-31 18:50:02 +00:00
Alexei Kotov
d0918ed1f2 Apply ambient lighting to free magic VFX 2024-12-31 17:37:30 +03:00
Alexei Kotov
d476c8cf57 Merge branch 'add_overwriteLighting_toggle_to_addVfx' into 'master'
add overwriteLighting a toggle option for addVfx

See merge request OpenMW/openmw!4492
2024-12-31 01:57:09 +00:00
Sebastian Fieber
5cb6da4b02 add overwriteLighting a toggle option for addVfx 2024-12-31 01:57:09 +00:00
Alexei Kotov
b29949d5a7 Merge branch 'nongeneratedactor' into 'master'
Revert conversion of actor id to generated refid

See merge request OpenMW/openmw!4493
2024-12-30 17:50:54 +00:00
Evil Eye
3fae6b8064 Revert conversion of actor id to generated refid 2024-12-28 23:59:22 +01:00
Alexei Kotov
aa277c0934 Add an option to match sunlight to the sun (#8032) 2024-12-28 18:29:35 +03:00
Alexei Kotov
efdea0fb42 Stick focused object tooltip to slightly above its top (#4710) 2024-12-23 19:02:12 +03:00
uramer
6d8753e5a8 Fix crash if someone evil calls the .lines method on a non-file 2024-12-21 16:49:11 +01:00
uramer
5f745f4074 Reference the FileHandle Lua object from lines closure tro prevent garbage collection 2024-12-21 16:43:21 +01:00
Alexei Kotov
69c4a68187 Merge branch 'fix_test_2' into 'master'
Reduce precision for random point distance comparison (#8260)

See merge request OpenMW/openmw!4486
2024-12-21 15:23:28 +00:00
elsid
a00909d139
Reduce precision for random point distance comparison 2024-12-20 14:00:49 +01:00
Evil Eye
73612b0e9c Only load FoW if it exists 2024-12-20 00:39:41 +01:00
elsid
054d5ec1d6
Reduce precision for random point position comparison 2024-12-18 22:28:55 +01:00
jvoisin
95764a9e0a Merge branch 'rollingredienteffect' into 'master'
Fix non-player ingredient casting

See merge request OpenMW/openmw!4480
2024-12-16 16:36:35 +00:00
Alexei Kotov
81f2402e66 Lua: Expose capacity for creatures as well 2024-12-15 03:20:34 +03:00
Alexei Kotov
14c6ecd889 Fix non-player ingredient casting
Always use the first effect
Don't show a message
2024-12-14 15:39:58 +03:00
psi29a
51579a8c5d Merge branch 'dependenceday' into 'master'
Fix validating ESM3 file dependencies (#8252)

Closes #8252

See merge request OpenMW/openmw!4476
2024-12-08 10:10:40 +00:00
elsid
cb654a0149
Use navigator in world destructor only when initialized
If world initialization fails, mNavigator may be nullptr.
2024-12-07 14:31:54 +01:00
Alexei Kotov
11761c5a1d Fix validating ESM3 file dependencies (#8252) 2024-12-07 09:15:04 +03:00
Evil Eye
fb02ba174d Remove period and slash from keyboard navigation and inject tabs when using a controller 2024-12-05 17:23:58 +01:00
Alexei Kotov
b285e2f85f Merge branch 'fix_findpath_use_after_free' into 'master'
Fix findPath returning a raw vector

Closes #8238

See merge request OpenMW/openmw!4470
2024-12-03 09:24:45 +00:00
uramer
1675c74036 Fix findPath returning a raw vector 2024-12-02 21:22:29 +01:00
Alexei Kotov
23a46a1bf9 Merge branch 'vfs_normalized_path_22' into 'master'
Use normalized path for KeyframeManager::get (#8138)

See merge request OpenMW/openmw!4463
2024-12-01 21:45:01 +00:00
Dave Corley
82d68ec9cf FIX: Correct data directory iteration order in CS 2024-11-28 18:19:12 -06:00
psi29a
064e3c7c2e Merge branch 'useniftestinstead' into 'master'
Remove write nif debug log setting

See merge request OpenMW/openmw!4468
2024-11-28 18:05:22 +00:00
psi29a
7b992f98e7 Merge branch 'poisoncrank' into 'master'
Save interior fog bounds center to preserve rotation when expanding them

Closes #7013

See merge request OpenMW/openmw!4466
2024-11-27 08:18:29 +00:00
Alexei Kotov
95c38bacc7 Remove write nif debug log setting 2024-11-26 21:31:25 +03:00
Evil Eye
4b93278045 Pad the interior grid 2024-11-25 16:49:59 +01:00
jvoisin
b555c980da Merge branch 'deepasapuddle' into 'master'
Change the default depth test mode from less-than to less-than-or-equal-to (#7040)

Closes #7040

See merge request OpenMW/openmw!4464
2024-11-25 01:41:17 +00:00
Evil Eye
0469ecd3c6 Reserve mFogTextures 2024-11-24 20:45:29 +01:00
Evil Eye
d57d5d9247 Save interior fog bounds center to preserve rotation when expanding them 2024-11-24 11:49:33 +01:00
Alexei Kotov
9351a0e542 Merge branch 'callbackhell' into 'master'
Use the actual callback function instead of mocking it

Closes #8183

See merge request OpenMW/openmw!4452
2024-11-24 00:24:34 +00:00
psi29a
97522c22ae Merge branch 'attackanimationsareforfalsegods' into 'master'
Improve vanilla consistency of weapon animations for non-bipeds (#8223, #8237)

Closes #8237 and #8223

See merge request OpenMW/openmw!4462
2024-11-23 19:31:29 +00:00
psi29a
cb8e2809ac Merge branch 'help-i-dropped-it-into-oblivion' into 'master'
Task #8141: Merge instance drop modes

See merge request OpenMW/openmw!4350
2024-11-23 19:31:00 +00:00
psi29a
fe15803239 Merge branch 'coc' into 'master'
Use a grid based on computed bounds for interiors

See merge request OpenMW/openmw!4459
2024-11-23 19:29:22 +00:00
Alexei Kotov
5433ecf861 Change default depth test mode to <= (#7040) 2024-11-23 08:32:25 +03:00
Dave Corley
1e6ed3eb70 CLEANUP: Define the tooltip text as constexpr 2024-11-22 14:32:35 -06:00
Dave Corley
44d5939572 FEAT(InstanceMode): Add a tooltip for InstanceMode in the same style as that of PathgridMode 2024-11-22 04:24:33 -06:00
Dave Corley
fb9b191027 CLEANUP(instancemode): Always drop everything the same way 2024-11-22 04:24:30 -06:00
Dave Corley
0fea0868ed CLEANUP(values.hpp): Unbind camera speed mode (later rebind to wheel?) 2024-11-22 04:23:55 -06:00
psi29a
cf3badb8a4 Merge branch 'data_files_menu' into 'master'
Implement a context menu for data directories page

Closes #8130

See merge request OpenMW/openmw!4458
2024-11-21 11:52:16 +00:00
elsid
a550a8af36
Use normalized path for KeyframeManager::get 2024-11-20 21:29:36 +01:00
Andrei Kortunov
bd59247270 Avoid trailing line breaks 2024-11-20 09:04:22 +04:00
Alexei Kotov
17203c5071 Merge branch 'forceunequip' into 'master'
Force stop weapon animation before unequipping

Closes #8230

See merge request OpenMW/openmw!4460
2024-11-19 22:49:40 +00:00
Andrei Kortunov
f0543c5500 Implement a context menu for data directories page (feature 8130) 2024-11-19 14:58:31 +04:00
Alexei Kotov
b57f4881a9 Improve vanilla consistency of weapon animations for non-bipeds (#8223, #8237)
Disable spellcast equip/unequip
Prioritize movement animations over weapon animations
2024-11-19 05:18:59 +03:00
elsid
6cd76fb8a7
Use normalized path for Class::getCorrectedModel 2024-11-18 21:21:34 +01:00
elsid
630e815f66
Forbid to use toNormalized for normalized path 2024-11-18 21:21:33 +01:00
Evil Eye
d3db436c2e Force stop weapon animation before unequipping 2024-11-18 20:07:14 +01:00
Evil Eye
c31c43bed5 Adjust canvas size when switching cells 2024-11-18 17:11:05 +01:00
AnyOldName3
4a911a647d Merge branch 'activewetshoes' into 'master'
Preserve node level data variance when merging objects in the active grid

Closes #8231

See merge request OpenMW/openmw!4456
2024-11-18 14:12:52 +00:00
Evil Eye
fc3a1833ee Use a grid based on computed bounds for interiors
Combine the cell radius (mCellDistance) and diameter (mNumCells)
members into an offset IntRect (mGrid.) The grid is centered on the
player's current cell in exteriors (with each grid square mapping to a
cell.) In interiors, the grid is centered on the cell's computed bounds.
The number of squares remains based on view distance in exteriors, but
can now stretch to encompass arbitrarily large interiors, mostly preventing
the player from walking off the map grid (interiors exceeding their
computed bounds during gameplay still cause issues.)
2024-11-17 21:14:14 +01:00
Evil Eye
326544ade5 Pack LocalMapBase members 2024-11-17 13:47:55 +01:00
psi29a
79dbbceb10 Merge branch 'vfs_normalized_path_20' into 'master'
Use normalized path for correctMeshPath and getLODMeshName (#8138)

See merge request OpenMW/openmw!4455
2024-11-17 12:30:15 +00:00
elsid
22817dd6a1
Use normalized path for correctMeshPath 2024-11-16 12:49:11 +01:00
Evil Eye
0a07b1eb3a Preserve node level data variance when merging objects in the active grid 2024-11-16 11:56:01 +01:00
elsid
36198e9413
Use normalized path for getLODMeshName 2024-11-15 01:05:36 +01:00
Andrei Kortunov
2522fe9517 Remove dead code 2024-11-14 22:16:05 +04:00
Evil Eye
d6e300ba25 Make GetHealthGetRatio return 1 for actors with a max health of 0 2024-11-12 21:29:18 +01:00
Evil Eye
5dbe86e9ee Use the actual callback function instead of mocking it 2024-11-12 17:22:45 +01:00
Pi03k
306982cdd1 Move from qt_wrap_ui to AUTOUIC for opencs
Set opencs target properties in appropriate section
Use forward declaration for Ui::FileDialog

(#7348)
2024-11-10 20:38:14 +01:00
pi03k
18080a83d6 Move from qt_wrap_ui to AUTOUIC for launcher and wizard
(#7348)
2024-11-10 20:38:14 +01:00
psi29a
ac7b54af80 Merge branch 'refnumremapping' into 'master'
Use the right deserializer for unloaded scripts

See merge request OpenMW/openmw!4449
2024-11-10 16:13:07 +00:00
psi29a
f5c457c474 Merge branch 'pageswithattitude' into 'master'
Apply rotation when computing the bounding box of a paged reference

See merge request OpenMW/openmw!4447
2024-11-09 20:14:53 +00:00
Evil Eye
6572122acc Use the right deserializer for unloaded scripts 2024-11-09 13:05:39 +01:00
Alexei Kotov
32a6ed6f49 Merge branch 'creaturesstronk' into 'master'
Allow creatures' strength to be edited

See merge request OpenMW/openmw!4448
2024-11-08 20:18:24 +00:00
psi29a
d356fea5b6 Merge branch 'whycantitalkthedoorintoopening' into 'master'
Let AI open moved doors (#7548)

Closes #7548

See merge request OpenMW/openmw!4435
2024-11-07 17:55:40 +00:00
Evil Eye
7bd2f73fe5 Allow creatures' strength to be edited 2024-11-07 17:12:00 +01:00
Evil Eye
79bd6309a5 Apply rotation when computing the bounding box of a paged reference 2024-11-07 16:53:03 +01:00
elsid
afa769408a
Use normalized path for correctActorModelPath 2024-11-03 13:50:17 +01:00
psi29a
3e804042c4 Merge branch 'soitsthesametypeofstandasstarplatinum' into 'master'
Update spell window effect icons if the world is unpaused

See merge request OpenMW/openmw!4439
2024-11-01 13:53:05 +00:00
psi29a
6c52d92832 Merge branch 'ducksinarow' into 'master'
Improve memory alignment of CreatureStats to reduce memory usage

See merge request OpenMW/openmw!4433
2024-11-01 10:23:25 +00:00
psi29a
362eec43be Merge branch 'noblacklisting' into 'master'
Exterminate script blacklisting (#8214)

Closes #8214

See merge request OpenMW/openmw!4440
2024-11-01 10:22:26 +00:00
psi29a
62079499c1 Merge branch 'nowaterculling' into 'master'
Allow opting out of water culling (#7318)

Closes #7318

See merge request OpenMW/openmw!4441
2024-11-01 10:21:45 +00:00
Alexei Kotov
5d37cb3b74 Exterminate script blacklisting (#8214) 2024-10-31 14:59:55 +03:00
Alexei Kotov
4f521a94d7 Allow opting out of water culling (#7318) 2024-10-31 14:54:05 +03:00
Alexei Kotov
fdafdaf599 Update spell icons if the world is unpaused 2024-10-31 11:22:49 +03:00
Alexei Kotov
476abb83d8 Don't enable groundcover for non-default worldspaces (#7692) 2024-10-30 21:23:29 +03:00
psi29a
34b6a9d402 Merge branch 'howdidabdufindthis' into 'master'
Don't assign vertical movement for inert characters out of water (#7968)

Closes #7968

See merge request OpenMW/openmw!4432
2024-10-30 14:21:34 +00:00
jvoisin
540eee9c97 Merge branch 'draganddropdead' into 'master'
Don't update displayed armor rating when there's no player pointer (#8211)

Closes #8211

See merge request OpenMW/openmw!4430
2024-10-30 12:14:15 +00:00
Alexei Kotov
4fdfd6ae91 Let AI open moved doors (#7548) 2024-10-30 12:41:36 +03:00
Evil Eye
ee16dbd2e2 Improve memory alignment of CreatureStats to reduce memory usage 2024-10-29 19:52:12 +01:00
Evil Eye
4c11dcdd7d Merge branch 'display_fix' into 'master'
Improve screen detection for editor's widgets

Closes #8146

See merge request OpenMW/openmw!4364
2024-10-29 16:51:37 +00:00
Alexei Kotov
84aebccbb0 Don't assign vertical movement for inert characters out of water (#7968) 2024-10-29 14:33:05 +03:00
Alexei Kotov
636e5ed08b Don't update displayed armor rating when there's no player pointer (#8211) 2024-10-29 10:44:28 +03:00
psi29a
64fdf72c4c Merge branch 'mfwnotext' into 'master'
Fix #8202 (probably)

Closes #8202

See merge request OpenMW/openmw!4422
2024-10-28 16:19:49 +00:00
psi29a
1dc1bfe543 Merge branch 'launcherimportdefaults' into 'master'
Save/load INI importer flags in the launcher (#8189)

Closes #8189

See merge request OpenMW/openmw!4429
2024-10-28 16:19:28 +00:00
Evil Eye
b288448893 Merge branch 'ulfricstormcloakjarlofwindhelm' into 'master'
Revise storm wind effect on velocity (bug #8206)

Closes #8206

See merge request OpenMW/openmw!4426
2024-10-28 15:33:46 +00:00
Alexei Kotov
a239724316 Revise storm wind effect on velocity (bug #8206) 2024-10-28 13:10:16 +03:00
Alexei Kotov
e78d3e8ac6 Add a lower cap to launcher viewing distance spinbox (#8208) 2024-10-28 13:04:16 +03:00
psi29a
891bb67ac5 Merge branch 'fatiguecrit' into 'master'
Only play critical hit sound for health damage (#8207)

Closes #8207

See merge request OpenMW/openmw!4427
2024-10-28 09:53:58 +00:00
Alexei Kotov
eea916a43d Save/load INI importer flags in the launcher (#8189) 2024-10-27 21:30:23 +03:00
Evil Eye
7bbb1bf05d Merge branch 'loosey-goosey' into 'master'
Store original representation of paths in content lists. Also compare against existing content lists in a more forgiving way.

See merge request OpenMW/openmw!4424
2024-10-27 12:31:41 +00:00
Alexei Kotov
71f6341f30 Only play critical hit sound for health damage (#8207) 2024-10-27 08:17:33 +03:00
Evil Eye
a8710b7b42 Don't modify base records from Lua 2024-10-25 16:35:23 +02:00
psi29a
a11e683a40 Merge branch 'content-lists-could-provide-duplicate-fallback-archives' into 'master'
Gracefully handle content lists that specify duplicate BSAs

Closes #8200

See merge request OpenMW/openmw!4421
2024-10-25 11:08:41 +00:00
AnyOldName3
7640b6bcf4 Typo 2024-10-25 00:32:12 +00:00
AnyOldName3
c2b383ea92 Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.

The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.

To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.

The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.

To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2024-10-25 00:49:59 +01:00
psi29a
cd2f261ff5 Merge branch 'case-insensitive-bsa-name' into 'master'
Make the launcher ignore case in bsa names

Closes #8201

See merge request OpenMW/openmw!4418
2024-10-23 22:23:27 +00:00
Alexei Kotov
13cca461f2 Maybe fix #8202 2024-10-23 22:23:28 +03:00
AnyOldName3
0537b53d21 Gracefully handle content lists that specify duplicate BSAs
Previously, if fed bad data, or a content list predated a BSA being moved to a non-user config file, or possibly in other situations (but not any of the obvious ones as those had other guards), the `selectedArchives` list could be longer than the number of archives available due to duplicate entries.

This ensures they're handled like entries specifying no-longer-present archives, and just skips the duplicates.
The same would happen elsewhere in similar situations, but those code paths aren't always taken.
2024-10-22 22:40:16 +01:00
Evil Eye
9395624e5f Write SoundGens after their creatures 2024-10-22 21:25:52 +02:00
Alexei Kotov
1fcbcd5bfa Merge branch 'journalFirst' into 'master'
FIX: Serialize journal records first when saving plugins

See merge request OpenMW/openmw!4405
2024-10-22 01:37:02 +00:00
Evil Eye
ea52a5f4bd Clarify that topics should be written after journals 2024-10-21 19:57:18 +02:00
AnyOldName3
7556ab6f90 Make the launcher ignore case in bsa names 2024-10-21 18:07:13 +01:00
psi29a
cdf7bd74d5 Merge branch 'passivestorage' into 'master'
Activate global storage when setting up the player

See merge request OpenMW/openmw!4413
2024-10-21 11:01:26 +00:00
psi29a
941a6dcf89 Merge branch 'crime-interface' into 'master'
add OFFENSE_TYPE and commitCrime to lua

Closes #8109

See merge request OpenMW/openmw!4319
2024-10-20 09:37:27 +00:00
Calandiel Elende
9248e37156 add OFFENSE_TYPE and commitCrime to lua 2024-10-20 09:37:27 +00:00
psi29a
9325c80244 Merge branch 'userdataplz' into 'master'
Set SavedDataDeserializer on LocalScripts creation

See merge request OpenMW/openmw!4409
2024-10-20 09:36:13 +00:00
psi29a
083381526f Merge branch 'mourningnote' into 'master'
Play region sounds in quasi exteriors

See merge request OpenMW/openmw!4411
2024-10-20 09:35:27 +00:00
psi29a
c60e0539cc Merge branch 'dead_code' into 'master'
Remove dead code

See merge request OpenMW/openmw!4412
2024-10-20 09:34:49 +00:00
psi29a
26af518d67 Merge branch 'vfs_normalized_path_18' into 'master'
Use normalized path in PhysicsSystem (#8138)

See merge request OpenMW/openmw!4410
2024-10-20 09:34:37 +00:00
psi29a
8b3e8676bf Merge branch 'noxt' into 'master'
Remove old dependency on Xt which shouldn't be needed anymore

See merge request OpenMW/openmw!4407
2024-10-20 09:34:16 +00:00
Evil Eye
cee373aea8 Don't trigger onStateChanged until the game is in a running state 2024-10-20 10:50:18 +02:00
Evil Eye
e1046dc715 Tell the LuaManager the game has started before the player can be teleported 2024-10-19 19:15:23 +02:00
Andrei Kortunov
192807609d Remove dead code 2024-10-19 15:03:29 +04:00
Evil Eye
361586d85e Play region sounds in quasi exteriors 2024-10-19 10:43:50 +02:00
Evil Eye
a2fb575678 Set SavedDataDeserializer on LocalScripts creation 2024-10-18 18:25:43 +02:00
elsid
d2ab366233
Use normalized path in PhysicsSystem 2024-10-18 13:45:29 +02:00
Alexey Sokolov
be15db4dfb Remove old dependency on Xt which shouldn't be needed anymore 2024-10-16 14:28:34 +01:00
Andrei Kortunov
aab2f4a5bb Do not disable controllers for melee weapons sheathes (bug 8191) 2024-10-16 17:13:33 +04:00
Dave Corley
dbb29b2391 FIX: Serialize journal records first when saving plugins 2024-10-16 02:01:58 -07:00
Petr Mikheev
bac0018a09 Merge branch 'unloadedcontainers' into 'master'
Fix Lua memory usage

See merge request OpenMW/openmw!4363
2024-10-15 21:18:13 +00:00
Evil Eye
68ebefc2dd Fix Lua memory usage 2024-10-15 21:18:13 +00:00
psi29a
34e32b7392 Merge branch 'thewickedmarkerofthewest' into 'master'
Emulate vanilla closest marker preference (#8187)

Closes #8187

See merge request OpenMW/openmw!4401
2024-10-15 07:43:00 +00:00
psi29a
3e3ff00c72 Merge branch 'dialoguestuff' into 'master'
Improve TESCS dialogue compatibility

Closes #8181

See merge request OpenMW/openmw!4396
2024-10-15 07:42:47 +00:00
Alexei Kotov
77d2f18f83 Emulate vanilla closest marker preference (#8187) 2024-10-14 02:59:56 +03:00
elsid
d1ccb4b804
Use normalized path for groundcover 2024-10-13 13:27:23 +02:00
psi29a
974c0ce158 Merge branch 'vfs_normalized_path_16' into 'master'
Use normalized path in multiple places and fix additional animation sources loading (#8138)

See merge request OpenMW/openmw!4398
2024-10-07 20:02:54 +00:00
psi29a
ef708c9cf0 Merge branch 'consistentcaptioncapitalization' into 'master'
Make OpenMW-CS preferences and OMWMusic lines more stylistically consistent

See merge request OpenMW/openmw!4394
2024-10-07 20:01:27 +00:00
AnyOldName3
6c8055134d Merge branch 'seaofnodesmorelike' into 'master'
Use more sensible types in pathgridutil

Closes #8172

See merge request OpenMW/openmw!4395
2024-10-07 12:23:27 +00:00
elsid
5532bc61c1
Support additional animation sources not only for 2 letter extensions
If extension is not 2 letters length (e.g. not .kf), replacing last 3 last
charaters leads to weird results like:
"meshes/basicplayer.dae" -> "animations/basicplayer./"

According to the doc this should be "animations/basicplayer/".
2024-10-06 16:33:59 +02:00
elsid
a6e075499b
Use normalize path in Animation::addAnimSource to change extension 2024-10-06 16:33:39 +02:00
elsid
7e7cf51ade
Use normalized path in NpcAnimation 2024-10-06 11:32:53 +02:00
elsid
52ab136dd6
Remove redundant reference for ESM::RefId variables 2024-10-06 11:32:53 +02:00
Evil Eye
ffe164b28d Add a test and address feedback 2024-10-06 11:32:24 +02:00
elsid
0665de4c09
Use normalized path for model in ProjectileManager 2024-10-06 11:26:06 +02:00
trav
3d2dd9201d Merge branch openmw:master into handtohand-tooltip 2024-10-05 17:24:17 +00:00
Evil Eye
c9ef03fdd1 Change INFO id generation to not exceed 31 characters 2024-10-03 22:24:08 +02:00
Evil Eye
df757b9e4d Count DIAL and INFO records in the HEDR 2024-10-03 22:23:37 +02:00
Evil Eye
6644a7f27b Use more sensible types in pathgridutil 2024-10-02 21:10:51 +02:00
Alexei Kotov
4dd11d91f3 Editor: Make setting captions stylistically consistent, improve grammar 2024-10-02 19:30:37 +03:00
psi29a
f27030a87c Merge branch 'uipointers' into 'master'
Prevent stale pointers in UI widgets

See merge request OpenMW/openmw!4393
2024-10-02 10:31:19 +00:00
Alexei Kotov
56e200f8ac Merge branch 'ripply-doll' into 'master'
Fix inventory doll when non-compute-shader ripples are used with FFP

See merge request OpenMW/openmw!4390
2024-10-02 08:43:41 +00:00
jvoisin
1bc130332e Merge branch 'catfight' into 'master'
Restore female/beast-specific first person animations (#8179)

Closes #8179

See merge request OpenMW/openmw!4392
2024-09-30 11:21:51 +00:00
Evil Eye
481e63ffa7 Prevent stale pointers in UI widgets 2024-09-29 22:36:31 +02:00
Alexei Kotov
963b7ec742 Unify first/third-person animation choice logic (#8179)
Re-enable first-person female/beast-specific animations
Use dehardcoded argonian swim animation path
2024-09-28 13:30:04 +03:00
Andrei Kortunov
8dc16f0a17 Improve screen detection for editor's widgets 2024-09-28 10:19:30 +04:00
elsid
63e984ba24
Use normalized path in BulletShapeManager 2024-09-27 23:33:58 +02:00
elsid
7a5c478e34
Use normalized path in PreloadItem 2024-09-27 23:33:57 +02:00
elsid
1d98b5c66b
Remove redundant toNormalized 2024-09-27 23:33:57 +02:00
psi29a
cb009db4bb Merge branch 'topicHighlighting' into 'master'
Topic Highlighting Mouse Over Fix

See merge request OpenMW/openmw!4113
2024-09-27 06:36:17 +00:00
psi29a
d1059aee8c Merge branch 'test_ptr' into 'master'
Add tests for MWWorld::Ptr

See merge request OpenMW/openmw!4344
2024-09-26 07:36:23 +00:00
AnyOldName3
bd8386459a Fix inventory doll when ripple fragment shader path is used
Basically don't abuse OSG as badly. We need to let it know we've bound a shader program so it doesn't assume the FFP is still used, but it doesn't have a built-in way to apply the uniforms when doing so, so we need to do it manually.
2024-09-25 16:14:19 +01:00
AnyOldName3
e7a31373c9 Partially fix inventory doll when non-compute-shader ripples are used with FFP 2024-09-25 01:50:31 +01:00
elsid
b6c1e33da6 Merge branch 'hammerthingstilltheybreak' into 'master'
Don't let the player repair items that are better than new

Closes #8171

See merge request OpenMW/openmw!4381
2024-09-22 18:23:12 +00:00
Evil Eye
772a0b3711 Merge branch 'vfs_normalized_path_14' into 'master'
Use normalized path in multiple places (#8138)

See merge request OpenMW/openmw!4383
2024-09-22 16:38:55 +00:00
Evil Eye
9de501a62c Merge branch 'local_static_init' into 'master'
Properly initialize local static pointers and collections

See merge request OpenMW/openmw!4386
2024-09-22 16:38:49 +00:00
Evil Eye
2546ce2b16 Don't allow items that are better than new to be repaired 2024-09-22 18:24:21 +02:00
AnyOldName3
f817ff01b4 Merge branch 'labelsforeveryone' into 'master'
Editor: Improve Models settings category layout

See merge request OpenMW/openmw!4384
2024-09-21 14:04:36 +00:00
elsid
cd6e49796e
Properly initialize local static pointers and collections
Static variables should be initalized once instead of initializing them with
nullptr and then doing actual initialization behind if condition. Otherwise a
race condition may happen leading to undefined behaviour.
2024-09-21 13:52:43 +02:00
trav5
16a691187c Tooltip for 'Factor Strength into Hand-to-Hand Combat'
Added the game launcher tooltip message for the setting
enabling the factoring of player strength into hand to
hand combat damage
2024-09-21 00:08:59 +02:00
jvoisin
e05b1fabd8 Merge branch 'compile-time' into 'master'
Remove duplicate compile items

See merge request OpenMW/openmw!4380
2024-09-20 13:30:45 +00:00
Jared Davenport
30a37b3fda Remove duplicate compile items 2024-09-20 13:30:44 +00:00
Alexei Kotov
0b1465446d Editor: Improve Models category layout
Increase minimum input field width and give proper labels to string settings
2024-09-20 05:12:38 +03:00
Alexei Kotov
e369ab941e Fix word-wrapping for dialogue topics with changed skin 2024-09-19 04:54:12 +03:00
jvoisin
879c23b4cb Merge branch 'enchantedimsure' into 'master'
Deselect magic item before selecting a spell

Closes #8162

See merge request OpenMW/openmw!4379
2024-09-19 01:50:36 +00:00
elsid
2ef5a8486d
Use normalized path in ObjectPaging::createChunk 2024-09-19 01:05:10 +02:00
elsid
7e453d491a
Remove redundant toNormalized 2024-09-19 00:53:27 +02:00
elsid
5f2582fe68
Use normalized path in SceneManager::checkLoaded 2024-09-19 00:51:17 +02:00
elsid
3475a166e5
Use normalized path for World::spawnEffect 2024-09-19 00:31:16 +02:00
elsid
320d376b95
Remove unused virtual specifier 2024-09-19 00:17:44 +02:00
elsid
8ba4ff9946
Remove redundant bool argument from ActorAnimation::attachMesh 2024-09-19 00:13:41 +02:00
elsid
d7e99f988b
Use normalized path in ActorAnimation::attachMesh 2024-09-19 00:07:36 +02:00
elsid
f1533c215d
Use normalized path in ActorAnimation::attach 2024-09-19 00:03:18 +02:00
Evil Eye
74d699c502 Merge branch 'vfs_normalized_path_13' into 'master'
Use normalized path in ImageManager (#8138)

See merge request OpenMW/openmw!4377
2024-09-18 18:47:27 +00:00
Evil Eye
d9c16328dd Deselect magic item before selecting a spell 2024-09-17 21:16:41 +02:00
elsid
1fd6ac6438
Use normalized path in ImageManager 2024-09-17 00:49:57 +02:00
Alexei Kotov
70187bb5ac niftest: parse BTO, BTR, RDT and PSA files 2024-09-16 23:50:36 +03:00
elsid
b4f77e8bd7
Store Lua script path as VFS normalized 2024-09-15 13:53:20 +02:00
psi29a
96ec3a8125 Merge branch 'testthevfs' into 'master'
Fix vfs bindings and add tests

Closes #8157

See merge request OpenMW/openmw!4371
2024-09-15 08:44:44 +00:00
Evil Eye
2978b32f51 Fix vfs bindings 2024-09-14 10:10:26 +02:00
elsid
d8189a5aa1
Use normalized path in SceneManager 2024-09-13 14:21:49 +02:00
psi29a
b32f68fcd2 Merge branch 'vfs_normalized_path_10' into 'master'
Use normalized path in LuaState (#8138)

See merge request OpenMW/openmw!4365
2024-09-13 08:17:46 +00:00
Dave Corley
2ea9d6ba20 FIX(windowmanagerimp): Don't remove a ui mode twice 2024-09-11 13:37:00 -07:00
AnyOldName3
0f74e0cca8 Merge branch 'add_frame_number' into 'master'
Add frame number to available postprocess uniforms

See merge request OpenMW/openmw!4355
2024-09-10 16:58:27 +00:00
Cody Glassman
b346a4a858 Add frame number to available postprocess uniforms 2024-09-10 16:58:27 +00:00
psi29a
f3dd6d0a42 Merge branch 'whatstatethisstate' into 'master'
Remove references to temporaries and this_state in properties

Closes #8152

See merge request OpenMW/openmw!4360
2024-09-10 06:58:16 +00:00
elsid
32ec92e71c
Use normalized path in LuaState 2024-09-08 11:53:57 +02:00
Cody Glassman
f849b0c90f update render targets during update instead of draw thread -- fixes a bug with <1 size ratios 2024-09-06 09:52:56 -07:00
Evil Eye
a32e006e1c Remove references to temporaries and this_state in properties 2024-09-06 16:57:36 +02:00
psi29a
1e94f53146 Merge branch 'is_starter_spell' into 'master'
Expose starter spells

See merge request OpenMW/openmw!4352
2024-09-06 07:25:09 +00:00
psi29a
8992a9fb8c Merge branch 'master' into 'master'
Navmeshtool as a Library

See merge request OpenMW/openmw!4354
2024-09-06 07:23:22 +00:00
psi29a
46cbee2f21 Merge branch 'input_bindings' into 'master'
Fix input bindings handling (#8115)

Closes #8115

See merge request OpenMW/openmw!4332
2024-09-05 14:52:54 +00:00
Ole Volbracht
e920325073 Build navmeshtool as a library 2024-09-05 16:30:11 +02:00
psi29a
4c28731f6a Merge branch 'optionallightfadeout' into 'master'
Make light attenuation fade optional

See merge request OpenMW/openmw!4267
2024-09-05 07:29:48 +00:00
psi29a
e1875d459a Merge branch 'boost-config-required' into 'master'
Modernise Boost CMake stuff

Closes #8100

See merge request OpenMW/openmw!4307
2024-09-04 19:04:57 +00:00
psi29a
b3677d07fd Merge branch 'pcallallthethings' into 'master'
Wrap all memory allocating Lua functions in protected calls

Closes #8099

See merge request OpenMW/openmw!4336
2024-09-04 07:22:26 +00:00
psi29a
da0e2e7f57 Merge branch 'fix_warning' into 'master'
Fix clang warning: -Wunused-but-set-variable

See merge request OpenMW/openmw!4353
2024-09-03 16:13:12 +00:00
psi29a
89976a9424 Merge branch 'vfs_normalized_path_9' into 'master'
Use normalized path for models settings (#8138)

See merge request OpenMW/openmw!4348
2024-09-02 07:26:53 +00:00
Mehdi Yousfi-Monod
767d7bfecd fixed indent 2024-09-01 15:36:53 +02:00
Mehdi Yousfi-Monod
cb2a8c74dd FEAT: Expose starter spells 2024-09-01 15:26:58 +02:00
elsid
262b31cf08
Fix clang warning: -Wunused-but-set-variable
apps/openmw/mwmechanics/spellcasting.cpp:45:13: warning: variable 'index' set but not used [-Wunused-but-set-variable]
   45 |         int index = -1;
      |             ^
2024-09-01 15:04:18 +02:00
elsid
9e36b3fc0b
Use normalized path for models settings 2024-08-30 20:50:59 +02:00
elsid
e01861140e
Add tests for MWWorld::Ptr 2024-08-30 20:46:56 +02:00
elsid
1cdbbef7ee
Use blank CellRef as default
Default constructed CellRef has some fields uninitialized.
2024-08-30 20:46:56 +02:00
elsid
d998faec1b
Deregister only registered LiveCellRefBase 2024-08-30 20:46:56 +02:00
elsid
4565152b3d
Define LiveCellRefBase functions inside MWWorld namespace block 2024-08-30 20:46:56 +02:00
elsid
ca8869042b
Move LiveCellRef where possible 2024-08-30 20:46:55 +02:00
Andrei Kortunov
b620b9b239 Do not make redundant copies 2024-08-30 17:27:40 +04:00
psi29a
f456978cc3 Merge branch 'blueshift' into 'master'
Launcher: Support extended selection for directories

See merge request OpenMW/openmw!4346
2024-08-30 10:23:08 +00:00
Alexei Kotov
176dec45a7 Make light attenuation fade optional
This also makes Force Per Pixel Lighting caption shorter to provide more space for the new button
2024-08-30 10:03:37 +03:00
Alexei Kotov
073e4639bf Launcher: Support extended selection for directories 2024-08-29 04:18:07 +03:00
Alexei Kotov
f393c40cbd Launcher: Fix Insert Above behavior when the directory is added automatically 2024-08-29 03:54:26 +03:00
Evil Eye
5711a395af Merge branch 'bolt-is-not-a-static' into 'master'
[Lua] rename boltStatic to bolt in magic effect record bindings.

See merge request OpenMW/openmw!4342
2024-08-27 15:57:32 +00:00
psi29a
24a0e42594 Merge branch 'fargothsayshello' into 'master'
Don't turn to face the player to say hello if there is no hello response

Closes #8132

See merge request OpenMW/openmw!4339
2024-08-27 15:38:25 +00:00
Mads Buvik Sandvei
f7f282fc48 bolt is not a static 2024-08-26 13:28:29 +02:00
Dave Corley
daf82d40b9 FIX(CSVRender::Object): Clamp scale edits in render window too 2024-08-25 10:23:04 -07:00
Evil Eye
1f5c314022 Don't turn to face the player to say hello if there is no hello response 2024-08-25 11:48:14 +02:00
psi29a
50465a3cf2 Merge branch 'alternatingrowcolors' into 'master'
Launcher: Alternate row colors in directory and archive list

See merge request OpenMW/openmw!4338
2024-08-25 07:42:43 +00:00
Evil Eye
032d506aa7 Fix components_tests 2024-08-24 09:10:23 +02:00
Evil Eye
4529af9b7f Fix the tests 2024-08-23 22:40:39 +02:00
AnyOldName3
387b63909b Remove vestigial Boost libraries
Boost::zlib is basically part of Boost::iostreams, and depending on how you configure Boost, it can either be a separate library or get embedded into iostreams.
With the third-party-but-linked-on-Boost's-website package we've been using for years, it's a separate library.
Before https://gitlab.com/OpenMW/openmw/-/merge_requests/4307, we needed to explicitly link with it as CMake wasn't handling transitive dependencies for us.
With vcpkg, it's embedded, and doesn't have its own CMake config, so we couldn't explicitly link with it even if we wanted to.

Now CMake *is* handling transitive dependencies for us, we don't even need to think about this library.
It's all automatic.

Boost::locale, on the other hand, used to be something we used directly (I think for doing UTF-16/UTF-8 conversions when dealing with Windows paths).
However, it isn't anymore, and we just didn't purge it from our CMake when we should have.
It can go.
2024-08-23 14:06:13 +01:00
AnyOldName3
26be98966f Modernise Boost CMake stuff
Resolves https://gitlab.com/OpenMW/openmw/-/issues/8100

Also removes some old crud.
Hopefully the old crud is all:
* Handled automatically by CMake now we're using the modern approach.
* A hack-fix for a problem caused by not using the modern approach.
* Massively outdated so no longer necessary.

If it turns out this makes CI fail, I'll tweak things as necessary.

Changes that might not be wanted include:
* Getting rid of our BOOST_STATIC CMake option. In cases where the CMake config doesn't make the one correct choice from the build environment (i.e. because there's a choice) the CMake config exposes the option already.
  However, we were forcing this on for Windows, so that might matter.
  It seems to default to static on my machine even though I thought I read something suggesting otherwise, so we'll see how things go with that.
  If we eventually put CMake in charge of installing dependency DLLs this will be a moot point as we won't need to care.
* Bumping the minimum version of Boost to 1.70.0, as that's the first with working CMake config.
  It's from 2019, so plausibly there are distros too scared to use a library from five years ago as it can't legally drink in the US (although it could in limited quantities with parental supervision in the UK, as long as it's just something inconsequential like a single sip of beer).
2024-08-23 14:06:13 +01:00
Alexei Kotov
3a9e6de6fd Alternate row colors in directory and archive list 2024-08-23 14:28:26 +03:00
Alexei Kotov
951c440c8b Don't apply normal weapon resistance twice for NPCs (#8124) 2024-08-23 13:41:14 +03:00
Evil Eye
c9783344a0 Wrap all memory allocating Lua functions in protected calls 2024-08-22 22:22:28 +02:00
elsid
ca2bacd47a
Revert "Ability to unbind controls in settings menu"
This reverts commit 0836680e36.

To prevent crashes on empty input bindings config.
2024-08-21 00:14:22 +02:00
elsid
6a5bc9f992
Save and rename input bindings file
To reduce the chance of corrupting the file.
2024-08-20 23:59:44 +02:00
psi29a
527fa053c5 Merge branch 'actions_patchup' into 'master'
Lua Actions patchup

See merge request OpenMW/openmw!4311
2024-08-18 10:02:03 +00:00
uramer
2460b5f4ef Merge branch 'swizzle_bop_boom_bazingle_v2' into 'master'
lua - add swizzling to vector types

See merge request OpenMW/openmw!4304
2024-08-16 13:22:22 +00:00
psi29a
dc9c68f61b Merge branch 'fix_android_openmw' into 'master'
Keep separation between openmw and openmw-lib on Android

See merge request OpenMW/openmw!4221
2024-08-14 19:18:32 +00:00
psi29a
73ee8ccc4e Merge branch 'rewrite-vfx' into 'master'
[Lua] Rewrite addvfx and spawnvfx

See merge request OpenMW/openmw!4314
2024-08-13 12:27:12 +00:00
Mads Buvik Sandvei
cd7017e0e4 use string_view 2024-08-12 21:39:29 +02:00
Mads Buvik Sandvei
7f0f2373ea Use sol::optional for optional table instead of function overloading. 2024-08-12 21:24:50 +02:00
psi29a
c8c09b1905 Merge branch 'thirstytherana' into 'master'
Prevent spell priority skyrocketing in useless cases

Closes #8102

See merge request OpenMW/openmw!4310
2024-08-12 08:35:41 +00:00
psi29a
9234b5707f Merge branch 'breaklilacor' into 'master'
Allow GetEffect to detect 0 magnitude spells

Closes #8097

See merge request OpenMW/openmw!4297
2024-08-11 09:06:32 +00:00
Mads Buvik Sandvei
09f6daf155 Rewrite addvfx and spawnvfx to take a model path instead of a static. Mode vfx from core to world. Add event handlers for AddVfx and SpawnVfx. 2024-08-10 14:56:35 +02:00
elsid
a376d20c30
Fix tests on windows 2024-08-09 16:58:10 +02:00
psi29a
761957d28c Merge branch 'less_strict_test' into 'master'
Make test for navmeshdb limit less strict

See merge request OpenMW/openmw!4306
2024-08-08 08:07:40 +00:00
uramer
ab628ea12a Fix memory safety of actions/triggers iteration 2024-08-08 00:09:08 +02:00
Sam Hellawell
ae0660db0a Use nodeMask... lets ignore the previous attempt 2024-08-08 00:08:48 +02:00
Sam Hellawell
de4d97826a Fix: castRenderingRay doesnt hit terrain 2024-08-08 00:08:48 +02:00
Evil Eye
45c7e45905 Prevent spell priority skyrocketing in useless cases 2024-08-07 22:49:23 +02:00
psi29a
e7fc20d279 Merge branch 'fix/render-raycast-doesnt-hit-terrain' into 'master'
Fix: castRenderingRay doesnt hit terrain

Closes #7912

See merge request OpenMW/openmw!4286
2024-08-07 13:17:07 +00:00
elsid
b56de5bcf9
Make test for navmeshdb limit less strict
To avoid rare test failures when tiles are added into the database in different
order.
2024-08-07 00:01:50 +02:00
elsid
20e3eeddde
Fix libavformat version check
2a68d945cd
added const version of a callback functions but didn't enable them. They were
guarded by a version check:

2a68d945cd/libavformat/version_major.h (L48)

So for anything LIBAVFORMAT_VERSION_MAJOR < 61 they are not enabled therefore
they are enabled for everything >= 61.0.100.

See https://github.com/elsid/openmw/actions/runs/10255993574/job/28374152796 as
example of failure when building with 60.16.100.
2024-08-05 23:52:30 +02:00
Evil Eye
fe50b1a22b Allow GetEffect to detect 0 magnitude spells 2024-08-05 20:01:38 +02:00
psi29a
5d57ad7e85 Merge branch 'fix-ffmpeg-latest-version' into 'master'
Support compiling with FFMpeg 5 and greater

See merge request OpenMW/openmw!4281
2024-08-05 15:28:11 +00:00
Cody Glassman
a53d002262 lua - add swizzling to vector types 2024-08-05 06:53:59 -07:00
elsid
ec02e2ba1d Revert "Merge branch 'swizzle_bop_boom_bazingle' into 'master'"
This reverts merge request !4288
2024-08-05 09:08:17 +00:00
Cody Glassman
9951fd8a1a support 0/1 constant swizzles 2024-08-04 11:56:34 -07:00
Cody Glassman
7186b8febc generate all swizzle bindings at API initialization 2024-08-04 11:56:34 -07:00
Cody Glassman
19c0cebb27 lua - add swizzling to vector types 2024-08-04 11:56:34 -07:00
psi29a
6cc2b8de27 Merge branch 'distortion_clear' into 'master'
distortion - make sure color mask is enabled for clear to have an effect (#8082)

See merge request OpenMW/openmw!4294
2024-08-04 08:48:40 +00:00
psi29a
8d290dd581 Merge branch 'launcher' into 'master'
Don't check subdirectories of valid content directories (#8085)

Closes #8085

See merge request OpenMW/openmw!4279
2024-08-03 22:42:05 +00:00
Sam Hellawell
61cb5b4da6 Support compiling with ffmpeg 5 and greater 2024-08-03 21:05:00 +01:00
Jared Davenport
6946d22505 fix sourcetype 2024-08-03 16:54:08 +00:00
Cody Glassman
24452e2c3a distortion - make sure color mask is enabled for clear to have an effect 2024-08-02 11:33:46 -07:00
psi29a
e8fcdae99e Merge branch 'no-more-oversized-demons' into 'master'
Don't apply scale in RotateController

See merge request OpenMW/openmw!4284
2024-08-01 17:38:46 +00:00
psi29a
488a05d14c Merge branch 'lua-add-is-fleeing' into 'master'
lua - add isFleeing() to AI interface

See merge request OpenMW/openmw!4256
2024-08-01 09:55:50 +00:00
psi29a
028ac2354e Merge branch 'controller_tab_type' into 'master'
Allow shoulder buttons to work in menus when text input is active

See merge request OpenMW/openmw!4010
2024-08-01 09:55:15 +00:00
Sebastian Fieber
234476bdae lua - add isFleeing() to lua AI interface 2024-07-31 20:29:33 +02:00
Dave Corley
a4f1e7d918 FIX(rotatecontroller): Actually accounting for scale breaks biped creatures 2024-07-31 05:02:52 -05:00
Sam Hellawell
1b3509d0ad Use nodeMask... lets ignore the previous attempt 2024-07-31 00:30:06 +01:00
Sam Hellawell
dd77c81557 Fix: castRenderingRay doesnt hit terrain 2024-07-30 23:21:10 +01:00
psi29a
30a844ae71 Merge branch 'how-do-you-ambulate' into 'master'
FEAT(types): Expose creature flags

See merge request OpenMW/openmw!4280
2024-07-29 08:07:36 +00:00
psi29a
765d55208f Merge branch 'axis-lock' into 'master'
Feat(CS): Add shortcuts for axis locking, submode selection, switching camera, and fix render arrows

See merge request OpenMW/openmw!3675
2024-07-29 08:04:48 +00:00
Dave Corley
42060be65c FEAT: Add essential and respawning flags for both NPC and Creature types 2024-07-28 17:14:09 -05:00
Dave Corley
ef9d5270a1 FEAT(types): Expose creature flags 2024-07-28 17:14:05 -05:00
elsid
5c92b18875
Avoid using string_view on a temporary 2024-07-28 23:11:15 +02:00
psi29a
fc2f30dc4a Merge branch 'anim-api-cleanup' into 'master'
Anim api cleanup (close #8081)

Closes #8081

See merge request OpenMW/openmw!4274
2024-07-28 09:17:05 +00:00
Cody Glassman
77eeb5bd92 Merge branch 'master' into 'master'
HALF_FLOAT  and normals changes

See merge request OpenMW/openmw!4240
2024-07-27 15:21:45 +00:00
Jared Davenport
349931b5cd HALF_FLOAT and normals changes 2024-07-27 15:21:44 +00:00
psi29a
2967383636 Merge branch 'dialoguesubview' into 'master'
Do not store references to disposed objects

Closes #8046

See merge request OpenMW/openmw!4272
2024-07-27 09:38:17 +00:00
psi29a
79a9f8c23c Merge branch 'thedreughtookmyenchantmentsandarentgivingthemback' into 'master'
Rebuild ESMStore indices before loading any cell or player state

See merge request OpenMW/openmw!4278
2024-07-27 09:37:44 +00:00
psi29a
f4e5d67476 Merge branch 'ridethestorm' into 'master'
Handle GetItemCount on references without a container store gracefully

See merge request OpenMW/openmw!4277
2024-07-27 09:35:58 +00:00
Alexei Kotov
8a7035020a Don't check subdirectories of valid content subdirectories (#8085) 2024-07-26 21:49:51 +03:00
Andrei Kortunov
21db4219de Use QPersistentModelIndex to react to model changes 2024-07-26 09:57:35 +04:00
Evil Eye
5c4deb3f88 Prevent older binaries from incorrectly loading newer saves 2024-07-25 22:37:44 +02:00
Evil Eye
68be9a9544 Rebuild ESMStore indices before loading any cell or player state 2024-07-25 22:22:23 +02:00
Evil Eye
63e1b0ee9d Handle GetItemCount on references without a container store gracefully 2024-07-25 18:34:53 +02:00
Alexei Kotov
03091f8ce0 Make Coverity happy about animation blending 2024-07-25 02:28:07 +03:00
Anton Uramer
a5d1db2afd Use new Context helpers for UI bindings 2024-07-24 09:28:51 +02:00
Anton Uramer
6851e6e56a Context helpers for caching packages, split up core bindings into multiple caches, remove getRealFrameDuration in global context 2024-07-24 09:28:50 +02:00
Dave Corley
9f8ebc7973 FIX: Correct keybind conflict with move submode and drop to terrain 2024-07-23 13:59:31 -05:00
Dave Corley
55ccec7ecc FIX: Update settings declarations to newer standards 2024-07-23 13:59:31 -05:00
Dave Corley
5afdcddefa Consistency fix in keybind names, simplify instancemode and remove some
dead code
2024-07-23 13:59:21 -05:00
Dave Corley
78c41d3eee Feat(instancemode.cpp): Implement keybinds for axis locking & switching submodes
Cleanup(instancemode): Make the axis shortcut using std::string instead
of format
2024-07-23 13:58:43 -05:00
Dave Corley
98750a122d Feat(worldspacewidget.cpp): store the camera mode tool & implement the
shortcut to cycle camera modes
2024-07-23 13:56:19 -05:00
Dave Corley
2e581c4d70 Feat(CS): Add shortcuts for axis locking, submode selection, and camera cycling 2024-07-23 13:56:14 -05:00
Dave Corley
86f33cb6fe CLEANUP(animationbindings): Lowercase all input groupnames 2024-07-23 11:39:06 -05:00
Dave Corley
6eee6e9468 CLEANUP(animationbindings): camelCase all the things 2024-07-23 05:58:32 -05:00
uramer
80ced23a69 Lua Context: Replace exclusive bools with type enum 2024-07-23 10:39:58 +02:00
Andrei Kortunov
355dd0bccf Do not store references to disposed objects 2024-07-23 10:27:23 +04:00
psi29a
6065dfda2d Merge branch 'gaspthemenuisawerewolf' into 'master'
Update the menu video from a separate thread and respect window resizes

Closes #8063

See merge request OpenMW/openmw!4250
2024-07-22 22:11:17 +00:00
Alexei Kotov
1f4ab3b668 Merge branch 'animationblending' into 'master'
Animation blending implementation. Flexible and moddable through .yaml blending config files.

See merge request OpenMW/openmw!3497
2024-07-22 13:16:06 +00:00
psi29a
89e8514e00 Merge branch 'qvariant_usertype' into 'master'
Improve QVariant usage

See merge request OpenMW/openmw!4261
2024-07-22 07:21:45 +00:00
psi29a
f2aa30f7a5 Merge branch 'fix_nan_get_angles' into 'master'
Avoid getting nan in conversion to euler angles (#7772)

Closes #7772

See merge request OpenMW/openmw!4258
2024-07-22 07:21:29 +00:00
psi29a
376e8a6e1f Merge branch 'bounding_box' into 'master'
lua - use loaded node when possible when calculating bounding box (#7580)

Closes #7580

See merge request OpenMW/openmw!4073
2024-07-21 09:31:22 +00:00
elsid
ad428bd23b
Add unit tests for conversion to euler angles 2024-07-21 01:26:51 +02:00
Sam Hellawell
b9a7bdc0c7 Dont use NormalizedView for yamlpath, use changeExtension, add setting to tests script 2024-07-20 20:15:17 +01:00
Andrei Kortunov
54271b872c Improve QVariant usage 2024-07-20 14:32:56 +04:00
Sam Hellawell
a7a105dfdd Copy by ref, fix unable to find rules warning garbage 2024-07-20 03:10:05 +01:00
Sam Hellawell
78e365f382 Add OpenMW-CS Terrain Equalize tool 2024-07-20 02:30:46 +01:00
Cody Glassman
8105c62a02 handle potentially empty ptrs 2024-07-19 16:10:36 -07:00
Sam Hellawell
4bd078a6db Return offset/angle by reference 2024-07-19 01:29:24 +01:00
Sam Hellawell
ecb5616b36 Use std::sin/std::cos, clarify floating point types, update comment 2024-07-19 01:29:15 +01:00
Sam Hellawell
380d357d02 Fix compilation after master merge 2024-07-19 00:06:01 +01:00
Sam Hellawell
0bcd872561 Clang format 2024-07-19 00:05:35 +01:00
Sam Hellawell
ddbd87e2a1 Fix blending with additional offsets (sneaking issue) 2024-07-19 00:05:31 +01:00
Sam Hellawell
9beb380c7d Remove M_PI, documenation cleanup 2024-07-19 00:05:16 +01:00
Sam Hellawell
5deacb82ff Use M_PI as osg::PIf is not constant 2024-07-19 00:05:16 +01:00
Sam Hellawell
1317434ac0 CI fix 2024-07-19 00:05:03 +01:00
Sam Hellawell
bce97f49b4 spring function clarification 2024-07-19 00:04:16 +01:00
Sam Hellawell
014cba807b Refactor easings, serialize per-line items, constexpr path 2024-07-19 00:04:16 +01:00
Sam Hellawell
72c95a51df Default mEasingFn in constructor 2024-07-19 00:04:16 +01:00
Sam Hellawell
eb290bebbb Refactor AnimBlendControllers 2024-07-19 00:04:16 +01:00
Sam Hellawell
4040bd9231 FIx GCC debug build error 2024-07-19 00:04:16 +01:00
Sam Hellawell
b1b2cceec6 Update translation capitalization 2024-07-19 00:04:16 +01:00
Sam Hellawell
00a7d0281f Cleanup, refactor, rename AnimBlendControllerBase -> AnimBlendController 2024-07-19 00:04:16 +01:00
Sam Hellawell
42406ed0af Use META_Object, ignore for serialize 2024-07-19 00:04:16 +01:00
Sam Hellawell
13e1df3bf0 Grammar cleanup, code cleanup, reduce logging, revert mRotation change 2024-07-19 00:04:16 +01:00
Sam Hellawell
22229dd674 Cleanup, use string_view comparison 2024-07-19 00:04:16 +01:00
Sam Hellawell
07e6ebdea1 Update english translation, add ruski translation 2024-07-19 00:04:16 +01:00
Max Yari
136be62146 Launcher checkbox
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-07-19 00:04:15 +01:00
Max Yari
55ffb6d7d2 Animation blending implementation for NIF and osgAnimation through YAML files
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-07-19 00:04:15 +01:00
psi29a
2c8d657ecb Merge branch 'luaopensesame' into 'master'
Lua door opening api

See merge request OpenMW/openmw!4251
2024-07-15 07:09:44 +00:00
MaxYari
1abe28e797 Lua door opening api 2024-07-15 07:09:44 +00:00
psi29a
3ffd6a7ae9 Merge branch 'tests_log' into 'master'
Support custom log level in tests

See merge request OpenMW/openmw!4179
2024-07-15 07:07:18 +00:00
psi29a
cc28396617 Merge branch 'evictthosewindows' into 'master'
Force windows to exit when popping their GUI mode through Lua

Closes #7834

See merge request OpenMW/openmw!4185
2024-07-15 07:07:02 +00:00
elsid
a5d9bb08e0
Support custom log level in tests 2024-07-13 11:15:34 +02:00
elsid
1bdc01273e
Move "debugging" function into Debug namespace 2024-07-13 11:15:33 +02:00
elsid
6d43aedec8
Use Lua modules in tests from the source directory 2024-07-13 11:14:55 +02:00
elsid
73d48720ef
Do not change output names for targets
Changing them does not solve any problem but only creates some.
2024-07-13 10:35:16 +02:00
elsid
b3abc436dd
Keep separation between openmw and openmw-lib on Android
They are not set up properly so CMake configuration fails because of not found
openmw-lib target since it's not defined for Android.
2024-07-13 10:35:12 +02:00
Evil Eye
de59d79388 Update the menu video from a separate thread and respect window resizes 2024-07-11 16:53:11 +02:00
Dave Corley
4cc956fdd7 TEST: Add a test to ensure invalid box extents are not assigned 2024-07-11 04:06:06 -05:00
psi29a
e9343da7a8 Merge branch 'themawithungers' into 'master'
Don't trigger onNewExterior while loading saves

See merge request OpenMW/openmw!4206
2024-07-11 09:03:01 +00:00
psi29a
1c71f12d4e Merge branch 'hopskipanimjump' into 'master'
Keep running scripts until the menu pauses the game

Closes #8056

See merge request OpenMW/openmw!4243
2024-07-09 21:33:37 +00:00
psi29a
ecb64eab8e Merge branch 'juststrummingmylute' into 'master'
Attempt to select an AI action directly instead of waiting for the next frame

Closes #7973

See merge request OpenMW/openmw!4244
2024-07-09 21:32:32 +00:00
psi29a
7d0fca1bf5 Merge branch 'noscript' into 'master'
Make mwscript return nil for records that don't have a script

See merge request OpenMW/openmw!4236
2024-07-09 07:47:24 +00:00
Evil Eye
134c099df9 Attempt to select an AI action directly instead of waiting for the next frame 2024-07-08 19:59:50 +02:00
Evil Eye
299ee1a6b1 Keep running scripts until the menu pauses the game 2024-07-08 17:07:52 +02:00
psi29a
3a5ed998e7 Merge branch 'timeplayed' into 'master'
Remove time played setting

See merge request OpenMW/openmw!4235
2024-07-08 07:29:29 +00:00
Evil Eye
ee653eb2b8 Make mwscript return nil for records that don't have a script 2024-07-07 13:58:34 +02:00
psi29a
061f10bef7 Merge branch 'enchantmentproptorecord' into 'master'
Return nil for absent values in record properties (enchant)

See merge request OpenMW/openmw!4228
2024-07-06 21:33:55 +00:00
psi29a
e8c422697f Merge branch 'first_person_mesh_distortion' into 'master'
Fix distortion breaking in first person meshes

See merge request OpenMW/openmw!4231
2024-07-06 07:46:35 +00:00
Kindi
bf9f5dc2ef dont return empty string for absent value 2024-07-06 00:40:06 +08:00
Kindi
045e6d8c4f move enchant charge and soul to itemdata 2024-07-05 23:33:55 +08:00
psi29a
ef0bb02def Merge branch 'master' into 'master'
An ability to specify attack type in controls.use value

See merge request OpenMW/openmw!4187
2024-07-05 08:12:17 +00:00
psi29a
804b589a68 Merge branch 'qt_follow_up' into 'master'
Cleanup changes in Qt applications

See merge request OpenMW/openmw!4225
2024-07-05 08:11:42 +00:00
Alexei Kotov
888abc0097 Remove time played setting 2024-07-05 07:13:45 +03:00
Cody Glassman
4d7e9bae73 ensure distortion is only rendered once 2024-07-04 21:07:40 -07:00
Andrei Kortunov
dc7407a34c Use signed variables to match an API 2024-07-04 09:54:48 +04:00
Dave Corley
fc65643224 FIX: Actually set the transform so first person camera works again 2024-07-03 23:02:20 -05:00
Cody Glassman
45cb3eb081 lua - use loaded node when possible when calculating bounding box 2024-07-03 13:29:01 -07:00
psi29a
81e59bb4aa Merge branch 'i-didnt-want-to-grow-up-to-be-this-big' into 'master'
FIX: Incorrect scaling applied when creatures rotate (close #6665)

Closes #6665

See merge request OpenMW/openmw!4219
2024-07-02 07:07:31 +00:00
Andrei Kortunov
a9108a743d Do not make redundant copy 2024-07-01 20:50:25 +04:00
psi29a
3ebeaaa3bb Merge branch 'saymyname' into 'master'
Don't use getRefIdString to get a fallback object name for non-string ids

Closes #8043

See merge request OpenMW/openmw!4217
2024-07-01 07:44:57 +00:00
psi29a
045bccb3e9 Merge branch 'copycompiler' into 'master'
Avoid a few copies in mwscript

See merge request OpenMW/openmw!4215
2024-07-01 07:43:53 +00:00
psi29a
024d1c5971 Merge branch 'interpreter_code_duplicates' into 'master'
Exit with fatal error on duplicated instruction code

See merge request OpenMW/openmw!4214
2024-07-01 07:42:50 +00:00
Evil Eye
ff72a26ef2 Don't use getRefIdString to get a fallback object name for non-string ids 2024-06-30 11:27:39 +02:00
Dave Corley
fcc58f6db3 CLEANUP(rotatecontroller): Deduplicate rotate/scale checks into the main
callback function
2024-06-29 23:15:18 -05:00
Dave Corley
cac5ae34a5 CLEANUP(character.cpp): Replace usages of biped function with isBiped var 2024-06-29 22:53:38 -05:00
Dave Corley
33cd654bf5 FIX(character.cpp): Don't allow turn to movement direction to apply to non-bipeds 2024-06-29 22:53:15 -05:00
Dave Corley
c95c7503a8 FIX(rotatecontroller): Account for parent node scale when rotating objects 2024-06-29 22:52:48 -05:00
psi29a
b1de8ed720 Merge branch 'profilersort' into 'master'
Reorder F3 profiler stats according to timeline

Closes #8005

See merge request OpenMW/openmw!4196
2024-06-29 09:21:48 +00:00
psi29a
4da35c7e7f Merge branch 'free_range_containers' into 'master'
FEAT: Add organic/respawning flags to containers (Close #8038)

Closes #8038

See merge request OpenMW/openmw!4205
2024-06-29 09:21:12 +00:00
psi29a
11d405dcdf Merge branch 'buyfrommebestprices' into 'master'
Add a showInDialogue parameter to ui.showMessage and use it for level up messages

Closes #8041

See merge request OpenMW/openmw!4209
2024-06-29 09:20:27 +00:00
Evil Eye
ad7fb3d13f Avoid a few copies in mwscript 2024-06-29 10:31:49 +02:00
elsid
89bb04e8fd
Exit with fatal error on duplicated instruction code
Instead of causing SIGABRT which is more confusing.
2024-06-28 22:24:24 +02:00
Dave Corley
77fa41b8c6 CLEANUP(container): Make organic/respawning field names more consistent 2024-06-28 09:26:35 -05:00
Dave Corley
fccf75377d FEAT: Add organic/respawning flags to containers 2024-06-28 09:21:44 -05:00
Max Yari
1497dae4fa Better mUse out-of-range handling 2024-06-28 10:00:04 +02:00
Andrei Kortunov
5390634e22 Add a missing null pointer check 2024-06-27 21:10:38 +04:00
Evil Eye
91bcd0a556 Add a showInDialogue parameter to ui.showMessage and use it for level up messages 2024-06-27 17:16:49 +02:00
Max Yari
3eadb84142 Fixed wrong mUse wrapping 2024-06-26 01:25:25 +02:00
psi29a
6754b8d941 Revert "Merge branch 'were_engineers_not_salt_miners' into 'master'"
This reverts merge request !4178
2024-06-25 20:58:31 +00:00
psi29a
8471cfb576 Merge branch 'localpairs' into 'master'
Allow mwscript variable iteration

See merge request OpenMW/openmw!4180
2024-06-25 07:20:14 +00:00
psi29a
64dd6e36d1 Merge branch 'openmw-cs-error-verify-refnums' into 'master'
OpenMW-CS verify duplicate RefNums

See merge request OpenMW/openmw!4012
2024-06-24 18:03:59 +00:00
cykoder
57e7bf3748 OpenMW-CS verify duplicate RefNums 2024-06-24 18:03:59 +00:00
psi29a
11c2cf0780 Merge branch 'esm_script' into 'master'
Make loading and saving ESM3 script record more robust

See merge request OpenMW/openmw!4195
2024-06-24 17:59:20 +00:00
Evil Eye
152073a42e Don't trigger onNewExterior while loading saves 2024-06-24 12:47:24 +02:00
psi29a
57adb93075 Merge branch 'coverity' into 'master'
Coverity fixes

See merge request OpenMW/openmw!4198
2024-06-24 07:10:28 +00:00
psi29a
b8d861ca16 Merge branch 'unscriptedrealitytv' into 'master'
Don't try to show unallocated or uninitialized profiling data

See merge request OpenMW/openmw!4188
2024-06-24 07:09:43 +00:00
psi29a
456ac2a85b Merge branch 'were_engineers_not_salt_miners' into 'master'
FEAT: Lua Engine Handler for MWScript `startscript` functionality

See merge request OpenMW/openmw!4178
2024-06-24 07:09:24 +00:00
Dave Corley
1a79e79f57 FEAT: Lua Engine Handler for MWScript startscript functionality 2024-06-24 07:09:23 +00:00
psi29a
d3c3d0cf44 Merge branch 'indexthemoon' into 'master'
Move Lua index helpers to components and make owner.factionRank match other ranks

See merge request OpenMW/openmw!4186
2024-06-24 07:06:24 +00:00
Max Yari
13918e3b70 AttackType -> ATTACK_TYPE 2024-06-24 01:15:43 +02:00
Evil Eye
5cf809f39b Merge branch 'ocd' into 'master'
Assorted nitpicks

See merge request OpenMW/openmw!4194
2024-06-23 07:10:07 +00:00
psi29a
7888a11c36 Merge branch 'lushemptyplants' into 'master'
Don't display the harvested plant if graphic herbalism is off

See merge request OpenMW/openmw!4193
2024-06-22 16:35:59 +00:00
Alexei Kotov
b0671c76d8 Throw on setting tags that can't provide the setting name 2024-06-22 14:34:09 +03:00
Alexei Kotov
43b381f592 Loop by const ref in activeSpells.add 2024-06-22 12:08:40 +03:00
psi29a
0013a44b71 Merge branch 'datadisplaydelegate' into 'master'
React to scale or color changes in editor tables

See merge request OpenMW/openmw!4098
2024-06-22 09:03:19 +00:00
holorat
cd4b7db02d Reorder profiler stats according to timeline 2024-06-22 00:27:49 +03:00
Max Yari
b01b76b81e Introduced attacktype enum, fixed lua docs 2024-06-21 23:18:48 +02:00
Max Yari
2ef0568dda Changed lua enum name, tweaked docs 2024-06-21 23:18:48 +02:00
Max Yari
7d659ae64c Added lua enum for attacktypes 2024-06-21 23:18:48 +02:00
Max Yari
22d9906978 An ability to specify attack type in controls.use value 2024-06-21 23:18:48 +02:00
elsid
5c3ae3d94c
Make loading and saving script record more robust
* Check the header presence before using it.
* Write the header based on the actual content.
2024-06-21 20:37:37 +02:00
Alexei Kotov
c6156011c8 Remove unnecessary lines in actor bindings 2024-06-21 20:22:26 +03:00
Alexei Kotov
479d4931d7 Handle negative MaxNumberRipples more sensibly 2024-06-21 20:16:43 +03:00
elsid
447c4bb6a0
Extend ESM3 Script record tests 2024-06-21 18:01:34 +02:00
elsid
4571a8b88a
Remove unused SCHD type 2024-06-21 15:39:17 +02:00
Evil Eye
2edbabd3d7 Don't display the harvested plant if graphic herbalism is off 2024-06-21 12:15:11 +02:00
Evil Eye
46c8133a72 Don't try to show unallocated or uninitialized profiling data 2024-06-20 19:36:30 +02:00
psi29a
3a686dd8af Merge branch 'lua_travel_dest_2' into 'master'
Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered

See merge request OpenMW/openmw!3592
2024-06-19 21:38:27 +00:00
Zackhasacat
533ce499e0 Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered 2024-06-19 21:38:27 +00:00
Evil Eye
6aa52c09da Shuffle code around 2024-06-19 16:47:58 +02:00
Evil Eye
d6fc0744c7 Move Lua index helpers to components and make owner.factiooRank match other ranks 2024-06-18 21:32:16 +02:00
Evil Eye
989686500c Force windows to exit when popping their GUI mode through Lua 2024-06-18 20:02:39 +02:00
Evil Eye
0f20e47e0e Add unit tests 2024-06-18 17:43:48 +02:00
Evil Eye
2adaf33fa2 Allow mwscript variable iteration 2024-06-18 17:43:48 +02:00
Kindi
ecb07c9bc7 add mwscript.isRunning 2024-06-17 08:05:52 +08:00
Alexei Kotov
39a231233c Fully reset the player's cell reference when the player is reset (#8021) 2024-06-15 11:49:12 +03:00
psi29a
218e19d8f7 Merge branch 'mapshenanigans' into 'master'
Fix local map issues

Closes #8004

See merge request OpenMW/openmw!4174
2024-06-15 08:42:36 +00:00
psi29a
05a70b29c5 Merge branch 'rangingareas' into 'master'
Don't apply area of effect for potions and improve range handling

Closes #8018

See merge request OpenMW/openmw!4172
2024-06-15 08:42:11 +00:00
psi29a
98ba2120b6 Merge branch 'zerotohero' into 'master'
Use -1 as the plugin index for LandTextures

See merge request OpenMW/openmw!4121
2024-06-14 07:22:27 +00:00
psi29a
6caac886ea Merge branch 'equalopportunity' into 'master'
Support light fade settings in legacy lighting method, remove launcher lighting settings that support runtime changes

See merge request OpenMW/openmw!4168
2024-06-14 07:21:19 +00:00
Evil Eye
5a54cd9406 Fix local map issues 2024-06-13 23:03:57 +02:00
Evil Eye
a934902f12 Don't apply area of effect for potions and improve range handling 2024-06-13 18:00:44 +02:00
Dave Corley
b7deb7e9bc Feat(CS): Make LMB the primary interaction 2024-06-12 19:36:55 -05:00
Alexei Kotov
d226b72592 Throw on invalid bone group indices in getActiveGroup 2024-06-12 23:26:16 +03:00
Alexei Kotov
6ad914919b Remove launcher lighting settings that support runtime changes
Also update lighting method descriptions
2024-06-12 22:44:12 +03:00
Evil Eye
fbc6629d40 Rework land texture handling 2024-06-12 17:09:28 +02:00
Alexei Kotov
5c6fbc332f Fix endif conditions in cmake 2024-06-12 15:43:04 +03:00
Alexei Kotov
65a9f78943 Fix flags used in terrain saving/loading tests 2024-06-12 12:50:20 +03:00
psi29a
c1d74763ed Merge branch 'i-have-no-land-and-i-must-scream' into 'master'
Fix(CS): Add landscape flag if it doesn't exist at all and improve landscape QOL

Closes #7707

See merge request OpenMW/openmw!3617
2024-06-11 11:10:33 +00:00
psi29a
61772fa234 Merge branch 'verifiers' into 'master'
Complain about fishy local variable names, improve editor effect list handling

See merge request OpenMW/openmw!4160
2024-06-11 11:10:19 +00:00
psi29a
0a7f4e5149 Merge branch 'unit_tests' into 'master'
Split openmw_test_suite into openmw and components tests

See merge request OpenMW/openmw!4166
2024-06-11 11:09:43 +00:00
elsid
1e98cc6c3b
Move EXPECT_ERROR macro to a separate header
To include it only where it's required.
2024-06-10 23:12:15 +02:00
elsid
7d1cd11ba9
Split openmw_test_suite into openmw and components tests
To avoid duplicated compilation for openmw translation units. Link openmw-lib to
openmw-tests instead.
2024-06-10 23:12:14 +02:00
elsid
9b0362fba8
Split openmw into binary and library
To make it possible to create a new binary for the tests by linking this
library to it.

Rename openmw-lib into openmw to have libopenmw.a on Linux. Do not rename it on
Windows to avoid conflict with automatically generated lib for exe due to
__declspec(dllexport) presence.
2024-06-10 23:11:34 +02:00
elsid
2e0e0f53b6
Add --coverage to openmw-cs 2024-06-10 23:04:01 +02:00
Evil Eye
965bc20bab Set mPluginIndex to -1 for textures defined in this plugin 2024-06-10 21:39:10 +02:00
Evil Eye
ed5bedb9db Use record state to determine if a LandTexture record was defined in the current plugin 2024-06-10 21:39:10 +02:00
psi29a
cbf0471d8a Merge branch 'launch_button' into 'master'
Set minimum width for Launch OpenMW button

See merge request OpenMW/openmw!4162
2024-06-10 13:51:13 +00:00
psi29a
3ef4180464 Merge branch 'soulless' into 'master'
Properly copy items between containers

See merge request OpenMW/openmw!4139
2024-06-10 13:49:51 +00:00
psi29a
56183ba982 Merge branch 'ingameppl' into 'master'
Move force per-pixel lighting setting to the in-game settings

See merge request OpenMW/openmw!4137
2024-06-10 13:49:14 +00:00
Dave Corley
659874cb65 FEAT: Update land flag representation in ESMTool 2024-06-10 02:03:02 -05:00
Dave Corley
145f9c1154 CLEANUP(CS): Do heightData check in actual implementation, revert
accidental change to land condition order
2024-06-10 02:02:31 -05:00
Dave Corley
86316fa7ab Fix(cell.cpp): Don't try to update land for interiors 2024-06-10 02:02:31 -05:00
Dave Corley
10eb807e72 Fix(Cell.hpp): Correct include path for document 2024-06-10 02:02:31 -05:00
Dave Corley
0a8fee59dd Don't store member variables from document & use simpler and safer
inputs to cell constructor. Explicitly tell the constructor whether land
should be loaded or not
2024-06-10 02:02:31 -05:00
Dave Corley
47044e1dc0 Cleanup(CS): re-add const for land collection 2024-06-10 02:02:31 -05:00
Dave Corley
89bce6f678 Fix(CS): Enum name in accordance with current standards 2024-06-10 02:02:31 -05:00
Dave Corley
6f2ae4a33b Cleanup(CS): Improve readability and clean up some implementations 2024-06-10 02:02:31 -05:00
Dave Corley
ad135e3b95 Fix(cell.cpp): Change commands.hpp to absolute include path 2024-06-10 02:02:31 -05:00
Dave Corley
d8187e40b2 Feat(CS): Create LAND record using the undo stack 2024-06-10 02:02:31 -05:00
Dave Corley
731302ecff Feat(CS): Add undo stack as a member of CSVRender::Cell 2024-06-10 02:02:31 -05:00
Dave Corley
f565730a9a Fix(cell.cpp): never try to update land for interiors 2024-06-10 01:58:34 -05:00
Dave Corley
dd7a2f22d1 Cleanup(CSVRender::Cell:updateLand): Early exit when landscape should
not be loaded
2024-06-10 01:58:34 -05:00
Dave Corley
78fd135764 Fix(CS): Remove unreachable code as land data will always be present 2024-06-10 01:58:34 -05:00
Dave Corley
3e7335ddc7 Fix(CS): Initialize landscape when opening an existing cell without VHGT 2024-06-10 01:58:34 -05:00
Dave Corley
2541b74fc6 Fix(CS): Apply land flags when appropriate edits are made 2024-06-10 01:58:34 -05:00
elsid
6ba42314df
Fix Ptr::toString 2024-06-09 04:08:18 +02:00
Andrei Kortunov
fb3687e62a Set minimum width for Launch OpenMW button 2024-06-08 17:20:54 +04:00
Alexei Kotov
dd0ff13ba9 Reset attribute/skill arguments in IngredEffectRefIdAdapter if needed 2024-06-08 13:50:40 +03:00
Alexei Kotov
3051e0834a Accept invalid effect IDs and ranges in EffectsListAdapter 2024-06-08 13:49:39 +03:00
psi29a
9087de1596 Merge branch 'esm3_land' into 'master'
Add unit tests for saving and loading ESM3 Land

See merge request OpenMW/openmw!4159
2024-06-08 10:47:58 +00:00
Alexei Kotov
252ee7f8c4 Deduplicate effect list verification
Drop Potion-specific range check, it's irrelevant
2024-06-08 06:31:18 +03:00
Alexei Kotov
ba20ba2c6c Editor: Warn if a magic effect's max magnitude is zero 2024-06-08 06:31:18 +03:00
Alexei Kotov
2fdbd6287d Editor: Verify magic effects for enchantments, ingredients and potions
Use constants for known magic effect/skill/attribute range
2024-06-08 06:31:17 +03:00
Kagernac
7d403089ec Cleaner implementation
Retrieved the Colours straight from Settings

Made tagname clearer in openmw_list.skin.xml

Fixed minor formatting issue in validate.cpp, textcolours.cpp

Updated skin variables to be const and string_view
2024-06-07 18:38:32 -07:00
psi29a
176e6490c5 Merge branch 'stufftheminasack' into 'master'
Drop 360-degree screenshot support (#7720)

Closes #7720

See merge request OpenMW/openmw!4158
2024-06-07 20:50:43 +00:00
psi29a
a80f5c109c Merge branch 'ltexerasure' into 'master'
Fix LTEX overriding and allow deletion

See merge request OpenMW/openmw!4152
2024-06-07 08:05:56 +00:00
elsid
044748725c
Add unit tests for saving and loading ESM3 Land 2024-06-07 00:22:24 +02:00
psi29a
24d8accee7 Merge branch 'lua_base_disposition_fns' into 'master'
lua - Add [get,set,mod]BaseDisposition functions to npc type

See merge request OpenMW/openmw!4142
2024-06-06 21:44:55 +00:00
Mads Buvik Sandvei
e063fa5b23 rename template_ to templatePtr 2024-06-06 16:51:51 +02:00
Alexei Kotov
93d1c6d7e0 Drop 360-degree screenshot support (#7720) 2024-06-06 14:46:01 +03:00
Mads Buvik Sandvei
90b415a8dd comments by elsid 2024-06-06 11:20:14 +02:00
Alexei Kotov
593d4ff714 Move per-pixel lighting to the in-game settings 2024-06-06 05:19:33 +03:00
psi29a
ee5ccaa760 Merge branch 'setangleaxis' into 'master'
Fix SetAngle alternative axis order

See merge request OpenMW/openmw!4155
2024-06-05 21:00:15 +00:00
Evil Eye
330f5de78d Rename ot mStatic 2024-06-05 21:48:07 +02:00
Sebastian Fieber
ed26708e4d more dry + restrict mutation of disposition to global and on self 2024-06-05 18:09:54 +02:00
Alexei Kotov
32ca57c9ad Merge branch 'unify_operation_bars' into 'master'
Unify operation progress bar appearance

See merge request OpenMW/openmw!4154
2024-06-05 11:31:27 +00:00
Kagernac
3e6ccfce1f Took @Capostrophic's suggestion about leveraging a new tag format
Removed the color settings from Textcolours, they are unneccessary

Removed the Fallback workaround as a dedicated else condition was created with the new tag "fontcolouroptional". This code section has no involvement in Fallback

openmw_list.skin.xml was updated to reflect this new tag

settings.cfg was updated with the updated variable names
2024-06-04 23:14:44 -07:00
psi29a
8f3625b6a8 Merge branch 'cleanup_object_paging' into 'master'
Cleanup object paging

See merge request OpenMW/openmw!4149
2024-06-04 20:39:37 +00:00
jvoisin
c7f3277744 Merge branch 'waterfiltering' into 'master'
Apply filtering settings to water normal map

See merge request OpenMW/openmw!4151
2024-06-04 16:37:52 +00:00
Alexei Kotov
4a394a391b Fix SetAngle alternative axis order 2024-06-04 18:44:55 +03:00
Andrei Kortunov
eac2082e82 Unify operation progress bar appearance 2024-06-04 11:07:08 +04:00
Alexei Kotov
56b31d87e3 Merge branch 'soundfixes' into 'master'
Follow-up work for Lua-based music

See merge request OpenMW/openmw!4146
2024-06-03 22:03:04 +00:00
Evil Eye
ca6baed366 Fix LTEX overriding and allow deletion 2024-06-03 16:42:27 +02:00
Alexei Kotov
c7e98fdb45 Apply filtering settings to water normal map 2024-06-03 11:12:29 +03:00
elsid
2169e22e93
Move key when inserting item to mLODNameCache 2024-06-02 13:16:22 +02:00
elsid
6e3fd34790
Calculate floor and ceil of bounds once 2024-06-02 13:16:22 +02:00
elsid
3790e97184
Clarify scope and constness of the variables 2024-06-02 13:16:22 +02:00
elsid
d9d8802f3a
Move node when inserting into a nodes map 2024-06-02 13:16:22 +02:00
elsid
aecdf04705
Use custom struct for CellRef used by object paging
ESM::CellRef is too heavy. There is no need to have all the data from there.
2024-06-02 13:16:21 +02:00
elsid
0040409a4d
Move collectESM3References to unnamed namespace 2024-06-02 13:16:21 +02:00
elsid
524af5b723
Move symbols not defined in header to unnamed namespace 2024-06-02 13:16:20 +02:00
Andrei Kortunov
7b5146e824 Do not allow Lua's "stopMusic" to interrupt MWScript's music 2024-06-02 13:18:06 +04:00
Andrei Kortunov
402e725d87 Reset music type to Normal when we are done to scripted music 2024-06-02 09:44:41 +04:00
Andrei Kortunov
e762ae9703 Move current music from MechanicsManager to SoundManager 2024-06-02 09:29:28 +04:00
psi29a
05815b3952 Merge branch 'settingswindow' into 'master'
Hide the settings window when any main menu button is pressed

See merge request OpenMW/openmw!4136
2024-06-01 15:31:56 +00:00
Mads Buvik Sandvei
a1b695a8d5 De-duplicate ManualRef constructor 2024-05-31 23:10:54 +02:00
Sebastian Fieber
da4531faa0 rename modBaseDisposition to modifyBaseDisposition 2024-05-31 19:39:02 +02:00
Sebastian Fieber
f683adeb14 Add [get,set,mod]BaseDisposition functions to npc type 2024-05-30 00:08:11 +02:00
Mads Buvik Sandvei
ae4bf04798 Fix soul gems losing their souls when splitting stacks between containers. 2024-05-28 23:35:44 +02:00
elsid
6218afa484
Cleanup object paging includes 2024-05-28 22:21:15 +02:00
elsid
b5a75ba96c
Use std::vector to collect ChunkIds to be removed
Cache does not have duplicated entries.
2024-05-28 22:21:15 +02:00
elsid
b64069156d
Convert position on construction 2024-05-28 22:21:15 +02:00
elsid
33ef7fc8ca
Make ClearCacheFunctor a class and rename to clarify the purpose 2024-05-28 22:21:14 +02:00
psi29a
e7c9574d31 Merge branch 'savetheslot' into 'master'
Convert constant effect equipment slots to refnums

Closes #7998

See merge request OpenMW/openmw!4130
2024-05-28 11:09:36 +00:00
psi29a
8cf6fde8b6 Merge branch 'fix_debug_render' into 'master'
Fix debug render for recast mesh and navmesh

See merge request OpenMW/openmw!4127
2024-05-28 07:38:00 +00:00
psi29a
af4adf41d0 Merge branch 'saveyourvanityforsomeonewhocares' into 'master'
Toggle the vanity camera off before toggling to the saved camera mode

Closes #7960

See merge request OpenMW/openmw!4135
2024-05-28 07:37:44 +00:00
psi29a
4ae29b0042 Merge branch 'log_exceptions' into 'master'
Log caught exceptions

See merge request OpenMW/openmw!4131
2024-05-28 07:36:30 +00:00
Alexei Kotov
340783e3a1 Merge branch 'modernprometheus' into 'master'
Make torches held by creatures emit light

Closes #8002

See merge request OpenMW/openmw!4134
2024-05-27 18:19:58 +00:00
Andrei Kortunov
204267d211 React to scale or color changes in editor tables 2024-05-27 18:38:33 +04:00
Alexei Kotov
131bb510e4 Merge branch 'operation_fixes' into 'master'
Improve operations widget formatting, part 2

See merge request OpenMW/openmw!4119
2024-05-27 01:07:07 +00:00
Alexei Kotov
7274d825a3 Hide the settings window when any main menu button is pressed 2024-05-26 23:49:52 +03:00
Evil Eye
9027af426b Toggle the vanity camera off before toggling to the saved camera mode 2024-05-26 11:35:13 +02:00
Evil Eye
a7026ae3e9 Make torches held by creatures emit light 2024-05-26 09:52:50 +02:00
elsid
71369be796
Log caught exceptions 2024-05-26 02:52:11 +02:00
Andrei Kortunov
2749d2a6cb Revert "Make sure that Open button becomes focused after enabling"
This reverts commit d5bbd75828.
2024-05-25 23:43:19 +04:00
Evil Eye
11e8e1eeb5 Include creatures 2024-05-25 09:58:46 +02:00
psi29a
62930cb8db Merge branch 'fix_archives_selection' into 'master'
Fix archive selection when switching profiles (#7956)

See merge request OpenMW/openmw!4118
2024-05-24 23:06:55 +00:00
Yury Stepovikov
80d2b289e7 Fix archive selection when switching profiles (#7956) 2024-05-24 23:06:55 +00:00
psi29a
6e0606b55b Merge branch 'paralysisagainagain' into 'master'
Make paralysis cancel camera mode changes (#7997)

Closes #7997

See merge request OpenMW/openmw!4122
2024-05-24 23:06:35 +00:00
psi29a
c8567e96fd Merge branch 'itsover32767' into 'master'
Use more appropriate types in terrain storage

See merge request OpenMW/openmw!4125
2024-05-24 21:56:20 +00:00
psi29a
157a5a4489 Merge branch 'l10n' into 'master'
Many localization fixes

See merge request OpenMW/openmw!4108
2024-05-24 17:46:47 +00:00
Evil Eye
cdfd305ac3 Convert constant effect equipment slots to refnums 2024-05-24 16:59:48 +02:00
elsid
d6af9305ae
Exclude debug rendering from toggleworld 2024-05-24 01:08:15 +02:00
elsid
4b8897e33e
Use state sets without transparency support for recast mesh and agents paths 2024-05-24 00:05:10 +02:00
elsid
98d530d8cb
Share state sets for recast mesh tiles and actors paths 2024-05-24 00:05:09 +02:00
Evil Eye
6a10311ae5 Use more appropriate types in terrain storage 2024-05-23 18:48:54 +02:00
psi29a
d15be7a685 Merge branch 'fix-nearest-gui-options' into 'master'
Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI

See merge request OpenMW/openmw!4114
2024-05-23 10:07:42 +00:00
psi29a
db27543ea1 Merge branch 'uniform_choice' into 'master'
Add choice widget type to postprocessing uniforms

See merge request OpenMW/openmw!3969
2024-05-23 10:06:22 +00:00
psi29a
b0aa19dc07 Merge branch 'msvc_crash_fix' into 'master'
Avoid MSVC crash in Visual Studio 17.10.0

See merge request OpenMW/openmw!4116
2024-05-23 10:05:52 +00:00
Alexei Kotov
ae7861abe4 Move paralysis god mode checks to CreatureStats 2024-05-23 11:48:59 +03:00
Kagernac
f9577d904c This commit introduces six new color settings for dialogue topic keywords
referencing settings.cfg and settings-default.cfg. These settings work similarly
to the color references found in openmw.cfg and Morrowind.ini.

Changes include:

Removal of deprecated settings:
color topic specific
color topic exhausted
Addition of six new color settings to settings.cfg and settings-default.cfg
Updated description in settings-default.cfg to reflect the new color format
2024-05-22 20:25:58 -07:00