Andrew Lanzone
a73b803592
Fix crash when spell buying window is empty
2025-07-18 01:05:48 -07:00
Andrew Lanzone
0abbf91477
Disable double-clicking on window titles in the inventory menu
2025-07-17 23:07:54 -07:00
Andrew Lanzone
eba063ac23
Merge branch 'master' of https://gitlab.com/OpenMW/openmw
2025-07-17 08:14:28 -07:00
psi29a
3b42874797
Merge branch 'defendingthelight' into 'master'
...
Only autoequip the shield in updateEquippedLight (#8404 )
Closes #8404
See merge request OpenMW/openmw!4763
2025-07-17 14:23:57 +00:00
psi29a
0006cb22e2
Merge branch 'FillJournalConsoleCommand' into 'master'
...
Implement FillJournal script instruction
Closes #8509
See merge request OpenMW/openmw!4676
2025-07-17 14:22:53 +00:00
psi29a
eb67d1a1fb
Merge branch 'activescripts' into 'master'
...
Mark scripts on newly scripted, active objects as active
See merge request OpenMW/openmw!4785
2025-07-17 14:21:45 +00:00
psi29a
e1847d2670
Merge branch 'master' into 'master'
...
Bump libsdl to 2.0.20
See merge request OpenMW/openmw!4779
2025-07-17 14:20:13 +00:00
Andy Lanzone
f45053ad25
Bump libsdl to 2.0.20
2025-07-17 14:20:13 +00:00
Evil Eye
6dadf5de75
Merge branch 'quittingpeacefully' into 'master'
...
Move Quitting peacefully message to a more appropriate place
See merge request OpenMW/openmw!4769
2025-07-16 14:40:29 +00:00
psi29a
3899260eea
Merge branch 'herbalismsound' into 'master'
...
Don't harvest if player activation is blocked (#8612 )
Closes #8612
See merge request OpenMW/openmw!4773
2025-07-16 09:05:32 +00:00
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
Andrew Lanzone
f50c275133
Ensure mouse really moved before unhiding cursor in controller menu
2025-07-16 00:25:45 -07:00
Andrew Lanzone
4adb9bd8ac
Unhide the cursor if it was hidden to show a controller tooltip
2025-07-15 02:02:49 -07:00
Andrew Lanzone
cf24063226
Replace more C-style casts with C++ style
2025-07-15 01:33:52 -07:00
Andy Lanzone
a3a1b6d11f
Merge branch openmw:master into master
2025-07-14 17:48:36 -07:00
Andrew Lanzone
9e2927f734
Use the localized strings from Interface l10n module where possible
2025-07-14 17:45:03 -07:00
Andrew Lanzone
af6634ee57
Remove spurious debug log line
2025-07-14 17:27:20 -07:00
Andrew Lanzone
b8381f6e62
Replace C-style cast with C++ cast.
2025-07-14 17:25:57 -07: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
Andrew Lanzone
1b240c7dd6
Clean up controller logic to match item transfer logic
2025-07-13 15:24:16 -07:00
Andrew Lanzone
a894481fd7
Clean up controller logic to match item transfer logic
2025-07-13 15:12:33 -07:00
Andrew Lanzone
6a02e6a4bc
Merge branch 'master' of https://gitlab.com/OpenMW/openmw
2025-07-13 14:55:27 -07: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
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
