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

23356 commits

Author SHA1 Message Date
psi29a
a7a47f3ea9 Merge branch 'silencekey' into 'master'
Don't play down sound while loading quick keys

See merge request OpenMW/openmw!4783
2025-07-16 09:04:49 +00:00
Evil Eye
931555c7ff Remove int conversions from pathfinding 2025-07-15 21:57:12 +02:00
Evil Eye
6f9b813bd1 Mark scripts on newly scripted, active objects as active 2025-07-14 22:39:19 +02:00
Alexei Kotov
a12a0916ed Merge branch 'too-many-markers' into 'master'
FEAT(CS): Replace selection markers with a real one (#8139)

Closes #8139

See merge request OpenMW/openmw!4349
2025-07-14 23:18:46 +03:00
Dave Corley
9dd028b260 FEAT(CS): Replace selection markers with a real one (#8139) 2025-07-14 23:18:45 +03:00
AnyOldName3
4f60284a35 Merge branch 'first' into 'master'
Prepend new characters so they're first on the list

See merge request OpenMW/openmw!4778
2025-07-14 17:49:59 +00:00
Evil Eye
682f00bcff Don't play down sound while loading quick keys 2025-07-13 18:36:30 +02:00
Aussiemon
445cf1742d ptr.getCellRef().getRefId() 2025-07-13 10:20:58 -06:00
Alexei Kotov
4f95ca4196 Merge branch 'talk-to-me-about-something-else' into 'master'
FEAT: AddTopic in Lua, close #8334

Closes #8334

See merge request OpenMW/openmw!4529
2025-07-13 12:35:41 +03:00
Alexei Kotov
79c689784b Merge branch 'quick_item_transfer' into 'master'
Support quick item transfer (#2522)

Closes #2522

See merge request OpenMW/openmw!4659
2025-07-13 12:33:56 +03:00
Aussiemon
bb1214ed69 factionId instead of faction->mName 2025-07-13 02:48:37 -06:00
Aussiemon
11947286d9 Reuse factionId 2025-07-13 02:36:59 -06:00
Aussiemon
87e41425bb Unnecessary ptrClass 2025-07-13 02:36:16 -06:00
Aussiemon
cef1807536 Use RefId instead of name 2025-07-13 02:30:55 -06:00
Aussiemon
61ebb4b259 Redo debug warnings in interpreter 2025-07-13 02:07:49 -06:00
Dave Corley
ced135bc87 CLEANUP: No, record ids should totally be quoted 2025-07-12 19:37:15 -07:00
Dave Corley
943cd765e7 CLEANUP: Update for MR Comments 2025-07-12 19:37:15 -07:00
Dave Corley
8ec4fcbf30 CLEANUP: Actually check the record in question is a topic when using addTopic 2025-07-12 19:37:15 -07:00
Dave Corley
05b12ac879 CLEANUP: Use more appropriate object types & functions in addTopic binding 2025-07-12 19:37:15 -07:00
Dave Corley
4150f5fad6 FEAT: AddTopic in Lua, close #8334 2025-07-12 19:37:15 -07:00
Alexei Kotov
2504550c6f Merge branch 'fasterwait' into 'master'
More closely match rest/wait progress speed to vanilla

See merge request OpenMW/openmw!4772
2025-07-12 21:55:58 +03:00
Evil Eye
6dd10f1666 Prepend new characters so they're first on the list 2025-07-12 19:32:32 +02:00
Kuyondo
def31cfb05 cleanup 2025-07-12 22:44:28 +08:00
Kuyondo
d2c78ee88c move member var to implementation 2025-07-12 22:14:47 +08:00
Alexei Kotov
403b5d19e0 Merge branch 'KwarmaQueenCombat' into 'master'
Prevent immobile creatures' combat actions, but allow combat

Closes #7871

See merge request OpenMW/openmw!4632
2025-07-12 15:29:32 +03:00
elsid
463de2d791
Instantly transfer items if alt key is pressed
Support player's inventory, container and companion windows with
dropping and picking up items from the world.

Add ItemTransfer class to handle transfers similar to DragAndDrop. When
a container window is opened the view is added to the set of targets and
removed when closed. If ALT is pressed instead of starting dragging an
item perform a transfer. If there is 1 target which is not a source move
item there. If there is no target drop item into the world using
WorldItemModel.

Special case is picking up an item. Don't start dragging, just update
the player's inventory view because the item is already there.
2025-07-12 13:34:59 +02:00
elsid
a4af037293
Remove ContainerWindow::onTakeItem 2025-07-12 12:31:15 +02:00
elsid
bcfe06d85a
Use std::size_t for items count 2025-07-12 12:31:14 +02:00
Alexei Kotov
4e5e8e7889 Merge branch '1kiawayan-7649' into 'master'
Don't play vfx and sound on resisted magic

Closes #7649

See merge request OpenMW/openmw!4766
2025-07-12 12:38:51 +03:00
Alexei Kotov
e9081fec9f Merge branch 'refactorshowvars' into 'master'
Improve showVars

See merge request OpenMW/openmw!4747
2025-07-12 12:37:05 +03:00
Alexei Kotov
3e711c30db Merge branch 'maluu-apa-bosku' into 'master'
Play down sound when equip fails

Closes #7371

See merge request OpenMW/openmw!4248
2025-07-12 11:52:26 +03:00
Kuyondo
77c30a68c9 more similar to vanilla 2025-07-12 12:04:38 +08:00
Alexei Kotov
fe7970421f Don't harvest if player activation is blocked (#8612) 2025-07-11 11:47:20 +03:00
psi29a
f5de0d1c40 Merge branch 'quickkeysmenu' into 'master'
Quick keys menu fixes (#8359)

Closes #8359

See merge request OpenMW/openmw!4546
2025-07-11 07:41:55 +00:00
Kuyondo
25d9c80067 Don't play vfx and sound on fully resisted debuffs 2025-07-11 03:10:49 +08:00
Alexei Kotov
b958dc7297 Merge branch 'launcher_resolutions' into 'master'
Do not allow to select a screen resolution in the Windowed Fullscreen mode in the launcher

See merge request OpenMW/openmw!4765
2025-07-10 15:44:35 +03:00
Andrei Kortunov
dca83c2500 Add resolution hints to launcher 2025-07-10 10:24:39 +04:00
Cody Glassman
064b8d3f9b use more explicit null check 2025-07-09 11:49:38 -07:00
Alexei Kotov
f3420bd1bd Move Quitting peacefully message to a more appropriate place 2025-07-09 10:55:17 +03:00
Cody Glassman
759739ecca generate mipmaps after we draw, not before 2025-07-08 15:53:18 -07:00
Andrei Kortunov
a68107712c Do not allow to select a screen resolution in the Windowed Fullscreen mode in the launcher 2025-07-08 22:33:35 +04:00
Alexei Kotov
0892357230 Only autoequip the shield in updateEquippedLight (#8404) 2025-07-08 20:32:20 +03:00
psi29a
e9a9659abc Merge branch 'autoequip' into 'master'
Unify creature/NPC armor autoequip

See merge request OpenMW/openmw!4753
2025-07-08 10:35:17 +00:00
psi29a
3135e2e479 Merge branch 'smexypants' into 'master'
Make ExtraSpell undress less

See merge request OpenMW/openmw!4752
2025-07-08 10:34:32 +00:00
psi29a
c691c72cec Merge branch 'esm4sound' into 'master'
Initial support of ESM4 sounds

See merge request OpenMW/openmw!3784
2025-07-08 10:32:24 +00:00
Alexei Kotov
c0276b6890 Merge branch 'cpputil2lua' into 'master'
Move some util to lua

See merge request OpenMW/openmw!4750
2025-07-08 12:45:14 +03:00
Petr Mikheev
10dba7cda7 Initial support of ESM4 sounds; play opening sound of ESM4 doors. 2025-07-08 11:14:13 +02:00
Kuyondo
ede768532c cleanup 2 2025-07-08 03:48:40 +08:00
Evil Eye
0c4af81a69 Fix tests 2025-07-07 16:48:24 +02:00
Kuyondo
36604777f2 tests 2 2025-07-07 20:14:38 +08:00
Kuyondo
3f352b2470 tests 2025-07-07 19:28:12 +08:00
psi29a
83a37fecea Merge branch 'l10n_format' into 'master'
Treat formatting string arguments as UTF-8 string

Closes #8385

See merge request OpenMW/openmw!4751
2025-07-07 09:28:43 +00:00
Kuyondo
e4f0723a90 cleanup 2025-07-07 17:01:18 +08:00
Kuyondo
40e9b2d707 play down sound when equip fails 2025-07-07 17:01:18 +08:00
Alexei Kotov
2ce697a366 Merge branch 'errno' into 'master'
Print a more verbose message when we failed to write savegame

See merge request OpenMW/openmw!4749
2025-07-07 10:35:12 +03:00
Aussiemon
67795543a2 Revert "Fix unneeded runtime errors"
This reverts commit d207c2251f.
2025-07-06 20:51:53 -06:00
Kindi
c4a4c435f1 refactor opshowvars 2025-07-07 04:38:25 +08:00
Alexei Kotov
abbbeefdbd Merge branch 'harvest' into 'master'
Do not recreate animation object when harvesting a plant

See merge request OpenMW/openmw!4744
2025-07-06 22:24:20 +03:00
Alexei Kotov
a109052296 Merge branch 'no_water_blend' into 'master'
Fix disappearing normals with refraction disabled (#8490)

Closes #8490

See merge request OpenMW/openmw!4746
2025-07-06 22:12:59 +03:00
Aussiemon
555721141d Skip quest names (vanilla improvement) 2025-07-06 12:16:17 -06:00
Aussiemon
d207c2251f Fix unneeded runtime errors 2025-07-06 12:16:17 -06:00
Aussiemon
0e1ed078e9 Clang format 2025-07-06 12:16:17 -06:00
Aussiemon
73a3033e0f Get the dialogue manager once 2025-07-06 12:16:17 -06:00
Aussiemon
30140d9548 Get the journal only once 2025-07-06 12:16:17 -06:00
Aussiemon
565b199380 Clang format 2025-07-06 12:16:17 -06:00
Aussiemon
83903455f9 Address review comments 2025-07-06 12:16:17 -06:00
Aussiemon
4b98520266 Revert shared addJournalEntry 2025-07-06 12:16:17 -06:00
Aussiemon
34194f9c08 Add topics as known topics in addition to journal topics 2025-07-06 12:16:17 -06:00
Aussiemon
2e1f3d5d2c Clang format 2025-07-06 12:16:17 -06:00
Aussiemon
6c70c403be Implement FillJournal console command 2025-07-06 12:16:17 -06:00
Aussiemon
2db36c49b5 Move early out to better place 2025-07-06 11:51:44 -06:00
Aussiemon
09ed5bb234 Allow immobile actors to initiate combat when attacked 2025-07-06 11:51:44 -06:00
Aussiemon
3df695df4a Found better place for early return 2025-07-06 11:51:44 -06:00
Aussiemon
23dc226dff Revert autoformat changes 2025-07-06 11:51:44 -06:00
Aussiemon
a77a8904e5 Immobile creatures should enter combat, but not act 2025-07-06 11:51:44 -06:00
Aussiemon
266702e729 Remove obsolete combat block for immobile creatures and autoformat 2025-07-06 11:51:44 -06:00
Alexei Kotov
df5625a1e3 Unify creature/NPC armor autoequip 2025-07-06 13:58:25 +03:00
psi29a
c232ad55b4 Merge branch 'updateinventory' into 'master'
Update inventory window when item is added or removed into container by script

Closes #8431

See merge request OpenMW/openmw!4609
2025-07-06 10:20:52 +00:00
psi29a
3405d5017e Merge branch 'birthsigntooltip' into 'master'
Revise birthsign tooltip layout (#6792)

Closes #6792

See merge request OpenMW/openmw!4558
2025-07-06 10:18:52 +00:00
psi29a
a5e23f5fd3 Merge branch 'portedesetoiles' into 'master'
Fix path handling for files in BSAs

Closes #8598 and #8599

See merge request OpenMW/openmw!4655
2025-07-06 10:17:55 +00:00
Evil Eye
3574cd552c Make ExtraSpell undress less 2025-07-06 12:10:49 +02:00
Andrei Kortunov
d455ff5f5e Treat formatting string arguments as UTF-8 string 2025-07-06 13:35:27 +04:00
Andrei Kortunov
779840deea Print a more verbose message when we failed to write savegame 2025-07-06 11:27:03 +04:00
Alexei Kotov
9b8a383e8d Merge branch 'sinalau-bakas' into 'master'
Respawning npc respawns in origin cell

See merge request OpenMW/openmw!4695
2025-07-06 07:06:47 +03:00
Cody Glassman
390589795c postprocessing - set mipmaps levels for rendertargets when requested 2025-07-05 08:53:54 -07:00
Cody Glassman
30a852bb88 disable blending in second color attachment on water node 2025-07-05 08:32:21 -07:00
Andrei Kortunov
2db9b91c10 Do not recreate animation object when harvesting a plant 2025-07-05 17:11:17 +04:00
Alexei Kotov
a6503233a6 Merge branch 'windowvisiblelua' into 'master'
lua - add binding to check window visibility

Closes #8355

See merge request OpenMW/openmw!4543
2025-07-05 09:57:50 +03:00
Alexei Kotov
38efdd2fd8 Revert "Merge branch 'master' into 'master'"
This reverts merge request !4710
2025-07-05 01:00:26 +03:00
Alexei Kotov
4bf43665c4 Revise birthsign tooltip layout (#6792)
Make all description bits distinct widgets to allow proper padding
Use spaces instead of line breaks to separate spells
Enable word-wrapping for description text
Make the tooltip wider and increase padding
2025-07-04 20:03:55 +00:00
Andrew Lanzone
28f3b4a530 Remove unused argument from lambda to fix compiler warning 2025-07-04 12:49:54 -07:00
Andrew Lanzone
04d73cf195 Revert clang formatting suggestion because it breaks the pipeline 2025-07-04 12:02:17 -07:00
Andrew Lanzone
ce0ae47478 Expose controller menus setting to Lua 2025-07-04 11:53:36 -07:00
Andrew Lanzone
64284063b3 Merge branch 'master' of https://gitlab.com/OpenMW/openmw 2025-07-04 11:52:31 -07:00
psi29a
1a08565a20 Merge branch 'destinationunknown' into 'master'
Don't add non-existent cell travel destinations (#8349)

Closes #8349

See merge request OpenMW/openmw!4540
2025-07-04 11:06:33 +00:00
psi29a
d0af16c5db Merge branch 'travelprice' into 'master'
Rescale the base travel cost by the number of followers (#8446)

Closes #8446

See merge request OpenMW/openmw!4626
2025-07-04 11:05:56 +00:00
psi29a
b2228de0b7 Merge branch 'pinnedinventory' into 'master'
Restore 0.45.0 pin button visibility conditions (#8437)

Closes #8437

See merge request OpenMW/openmw!4612
2025-07-04 11:05:40 +00:00
psi29a
3d75dec73d Merge branch 'waterwalkingtcl' into 'master'
Don't enable water collision when collision is disabled (#8414)

Closes #8414

See merge request OpenMW/openmw!4600
2025-07-04 11:04:12 +00:00
psi29a
94507567da Merge branch 'conspiracyofsilence' into 'master'
Make powers immune to silence (#8371)

Closes #8371

See merge request OpenMW/openmw!4557
2025-07-04 11:03:40 +00:00
psi29a
9013ed16f0 Merge branch 'reststates' into 'master'
Inform the player about both resting hindrances (#8408)

Closes #8408

See merge request OpenMW/openmw!4598
2025-07-04 11:03:28 +00:00