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
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
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
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
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
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
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
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
