1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-05 12:04:30 +00:00
Commit graph

23135 commits

Author SHA1 Message Date
Andrew Lanzone
44fb923d7b Keep active quest focused in same journal session 2025-07-03 12:00:55 -07:00
Andrew Lanzone
7cc25d8916 Dialog window improvements: use LB/RB to move up/down by 5; if only one dialog choice, autoselect it. 2025-07-02 22:00:40 -07:00
Andrew Lanzone
3767b60512 Fix L1 and R1 buttons not disappearing 2025-07-02 21:35:26 -07:00
Andrew Lanzone
e2e8a02a26 Merge branch 'master' of https://gitlab.com/OpenMW/openmw 2025-07-01 12:22:35 -10:00
psi29a
9228f90f46 Merge branch 'RecalcSpellBuyCost' into 'master'
Calculate spell cost when building spell-buying window

Closes #8459

See merge request OpenMW/openmw!4640
2025-07-01 21:38:01 +00:00
psi29a
aa652a20f0 Merge branch 'StackValueAffectsFightTerm' into 'master'
Make item value affect theft observer's fight willingness

Closes #8500

See merge request OpenMW/openmw!4673
2025-07-01 21:37:28 +00:00
Aussiemon
5ba0b3ab52 Make item value affect theft observer's fight willingness 2025-07-01 21:37:27 +00:00
psi29a
149587dda4 Merge branch 'scaledselection' into 'master'
Editor: Account for pixel ratio in instance mode mouse coordinates conversion (#6573)

Closes #6573

See merge request OpenMW/openmw!4587
2025-07-01 21:34:40 +00:00
psi29a
583af381a6 Merge branch 'baseresistance' into 'master'
Ignore resistances for base diseases

Closes #8485

See merge request OpenMW/openmw!4662
2025-07-01 21:32:55 +00:00
psi29a
32f13816f8 Merge branch 'equippedSpellIterationFix' into 'master'
Skip duplicate enchantments on Spell Cycle action

Closes #6039

See merge request OpenMW/openmw!4668
2025-07-01 21:32:20 +00:00
Aussiemon
0a9c3ce96f Skip duplicate enchantments on Spell Cycle action 2025-07-01 21:32:20 +00:00
psi29a
48bc9e5dd2 Merge branch 'updatespellwindowquickkey' into 'master'
Update spell window after selecting spell using quickkey #8436

See merge request OpenMW/openmw!4611
2025-07-01 21:29:30 +00:00
psi29a
47aa0b27ff Merge branch 'FixDoublePickpocketBounty' into 'master'
Prevent second bounty for "closed pickpocket window" when steal is already detected

Closes #8519

See merge request OpenMW/openmw!4694
2025-07-01 21:29:06 +00:00
psi29a
ceac11d6df Merge branch 'sillyphysics' into 'master'
Stop postponing physics for objects that _don't_ have physics

Closes #8432

See merge request OpenMW/openmw!4658
2025-07-01 21:28:48 +00:00
psi29a
aa3e991352 Merge branch 'showmap' into 'master'
Require a non-empty argument in ShowMap (#8466)

Closes #8466

See merge request OpenMW/openmw!4649
2025-07-01 21:28:02 +00:00
psi29a
917b08e05d Merge branch 'MoonPhaseAndVisibilityFixes' into 'master'
Match vanilla moon phases and visibility times

Closes #8375

See merge request OpenMW/openmw!4616
2025-07-01 21:25:36 +00:00
Aussiemon
5ef947e14f Match vanilla moon phases and visibility times 2025-07-01 21:25:36 +00:00
psi29a
a29f4b3ba0 Merge branch 'enchantmentprice' into 'master'
Use the final effect cost to calculate enchantment price (#8340)

Closes #8340

See merge request OpenMW/openmw!4530
2025-07-01 21:23:58 +00:00
psi29a
59eb7b9888 Merge branch 'cattlethief' into 'master'
Fix AI issues with Command spells

Closes #5331

See merge request OpenMW/openmw!4599
2025-07-01 21:18:09 +00:00
psi29a
0a44112dcc Merge branch 'charactername' into 'master'
Revise saved game dialog save info layout (#8313)

Closes #8313

See merge request OpenMW/openmw!4545
2025-07-01 21:17:21 +00:00
psi29a
0d308eae3e Merge branch 'spell____prices' into 'master'
Spell buying window layout tweaks

See merge request OpenMW/openmw!4571
2025-07-01 21:07:03 +00:00
psi29a
48e386bf90 Merge branch 'merchantrepairrepaired' into 'master'
Merchant repair menu layout tweaks

See merge request OpenMW/openmw!4588
2025-07-01 21:06:00 +00:00
psi29a
c9f6bdb6e0 Merge branch '__travel_____' into 'master'
Fix Travel window header alignment

See merge request OpenMW/openmw!4569
2025-07-01 21:04:20 +00:00
psi29a
33ca7da731 Merge branch 'balmora__________-__________-69gp' into 'master'
Remove excessive spacing between travel destination and price

See merge request OpenMW/openmw!4568
2025-07-01 21:01:26 +00:00
psi29a
50f8bc721d Merge branch 'stupidfilters' into 'master'
Bring dialogue filters in line with Morrowind.exe

Closes #8318

See merge request OpenMW/openmw!4525
2025-07-01 20:52:37 +00:00
psi29a
2ffc44c31f Merge branch 'filenameexceptions' into 'master'
Remove file name naming convention check exceptions (#7249)

Closes #7249

See merge request OpenMW/openmw!4551
2025-07-01 20:45:33 +00:00
psi29a
2b0e5c3cc1 Merge branch 'enchantment_exclamationmark' into 'master'
Allow GetSpellEffects to detect enchantments by id

Closes #3769

See merge request OpenMW/openmw!4521
2025-07-01 20:40:08 +00:00
psi29a
ac7b3e9de9 Merge branch 'itshappening' into 'master'
Bump us up to 0.50.0

See merge request OpenMW/openmw!4502
2025-07-01 20:23:24 +00:00
psi29a
675146bd8b Merge branch 'sellmesweetlittlecrashes' into 'master'
Clear the window manager before destroying singletons

Closes #8576

See merge request OpenMW/openmw!4727
2025-07-01 11:41:15 +00:00
Evil Eye
2ff497c3e5 Use string_view in CSMPrefs::ShortcutManager 2025-06-29 12:49:22 +02:00
Evil Eye
cbb50c001b Destroy the script manager after the window manager 2025-06-28 11:25:19 +02:00
Andrew Lanzone
88b43cabec Reset controller focus when reopening container and quest menus 2025-06-22 14:47:54 -07:00
Andrew Lanzone
5777a3cc3f Update controller buttons shown for companion window 2025-06-22 14:44:32 -07:00
Evil Eye
a524b3c9b0 Merge branch 'clangcast' into 'master'
Export symbols for openmw binary under Clang (#8039)

Closes #8039

See merge request OpenMW/openmw!4722
2025-06-22 06:17:25 +00:00
Andrew Lanzone
fb5fa6ce18 Fix controller tooltip disappearing because of spurious controller input 2025-06-21 22:04:35 -07:00
Andrew Lanzone
c41f034a23 Scroll the list of topics in controller mode 2025-06-21 21:34:11 -07:00
Alexei Kotov
3ff7dedfd1 Revert "Merge branch 'landscape-data-bindings' into 'master'"
This reverts merge request !4500
2025-06-21 19:03:11 +03:00
Cody Glassman
0589b57a47 Merge branch 'landscape-data-bindings' into 'master'
Landscape height and texture bindings for Lua (Revised)

See merge request OpenMW/openmw!4500
2025-06-21 08:49:38 -07:00
Andrew Lanzone
9380233ab7 Merge branch 'master' of https://gitlab.com/enoznal/openmw 2025-06-20 23:39:03 -07:00
Andrew Lanzone
143c14c556 Merge branch openmw:master into master 2025-06-21 06:38:19 +00:00
Andrew Lanzone
190680a3a9 Replace semi-janky rstick controller bindings with dpad 2025-06-20 23:37:53 -07:00
Andrew Lanzone
2905ed5fb1 Fix controller selection of nested dialog choices 2025-06-20 22:41:39 -07:00
Sebastian Fieber
1ac407f32b fix rebase error 2025-06-19 22:17:26 +02:00
Sebastian Fieber
3207f3a387 clang-format 2025-06-19 22:17:26 +02:00
Sebastian Fieber
732fb4affe inline fillLandData and return empty table instead of throwing 2025-06-19 22:17:26 +02:00
Sebastian Fieber
3e0685e4a6 don't double sample + only allow default worldspace 2025-06-19 22:17:26 +02:00
Sebastian Fieber
effb3de2a7 const 2025-06-19 22:17:26 +02:00
Sebastian Fieber
76e2c77517 check for lcell also 2025-06-19 22:17:26 +02:00
Sebastian Fieber
4ede868ed2 fix typo 2025-06-19 22:17:26 +02:00
Sebastian Fieber
8de0ccc82c remove redundant code 2025-06-19 22:17:26 +02:00