36590 Commits

Author SHA1 Message Date
Aussiemon
445cf1742d ptr.getCellRef().getRefId() 2025-07-13 10:20:58 -06:00
Alexei Kotov
b53cb085c9 Merge branch 'revert-9347fe5c' into 'master'
Unimplement TCB interpolation (!4539)

Closes #8621

See merge request OpenMW/openmw!4782
2025-07-13 18:28:32 +03:00
Alexei Kotov
119a87b7f4 Revert "Merge branch 'tbcornottbcwaititstcbactually' into 'master'"
This reverts merge request !4539
2025-07-13 18:02:15 +03:00
Dave Corley
79d86bf2bd FIX: Track the highest local refNum during plugin loading and increment it for each cloned/created reference 2025-07-13 05:12:42 -07:00
Dave Corley
2cb7d6c392 CLEANUP: Remove commented code & use the builtin getNewId function when cloning 2025-07-13 05:11:38 -07:00
Dave Corley
85fdf2011a FIX: Do not attempt to bump refNums during savingStages 2025-07-13 05:10:43 -07:00
Dave Corley
42109fc811 CLEANUP: Remove dead code in cloneRecordImp 2025-07-13 05:10:14 -07: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
Evil Eye
c80b3d26b9 Only check for spelllist/equipment changes in the update loop 2025-07-13 11:18:15 +02:00
Evil Eye
2dbe30ed5c Update effects upon applying them 2025-07-13 10:53:34 +02: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
1abaf706c8 CLEANUP: Bump api revision 2025-07-12 19:37:36 -07: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
Andrew Lanzone
843a6487cc Fix clang warning 2025-07-12 19:04:14 -07:00
Andrew Lanzone
6629a186b1 Controller mode uses LB/RB in journal and spell list to scroll faster 2025-07-12 15:37:48 -07:00
Andrew Lanzone
084e4a3155 Change type of mControllerFocus to size_t when applicable 2025-07-12 15:13:33 -07:00
Andrew Lanzone
622cbd5288 Remove SDL_VERSION_ATLEAST references 2025-07-12 14:17:23 -07:00
Andy Lanzone
3600a5c716 Merge branch openmw:master into master 2025-07-12 14:13:10 -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
f5e66f3e24
Remove unused includes 2025-07-12 12:31:15 +02:00
elsid
eb7af832e4
Remove trailing spaces 2025-07-12 12:31:15 +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
Alexei Kotov
f4ff683905 Merge branch 'terrain_normals_fix' into 'master'
Fix terrain normal map handedness

Closes #8610

See merge request OpenMW/openmw!4775
2025-07-12 11:50:00 +03:00
Kuyondo
77c30a68c9 more similar to vanilla 2025-07-12 12:04:38 +08:00
wareya
869881d227 fix terrain normal map handedness 2025-07-11 12:23:22 -04: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
1ce7110a9e Merge branch 'less-strict-dialogues' into 'master'
FIX: Skip only the current subrecord when reading quest status (Close #8333)

Closes #8333

See merge request OpenMW/openmw!4528
2025-07-10 20:14:53 +03:00
Andrew Lanzone
73ffe7f62b Fix clang formatting issue 2025-07-10 08:56:24 -07:00
Andrew Lanzone
b075428513 Minor fixes based on code review feedback. 2025-07-10 08:46:01 -07:00
Andrew Lanzone
e04f0a8bd6 Move logic for determining Russian index page count to a shared place 2025-07-10 08:45:51 -07:00