mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-07-27 05:14:16 +00:00
Code Issues Releases Wiki Activity
36053 commits 113 branches 73 tags 117 MiB
Commit graph

23280 commits

Author SHA1 Message Date
psi29a
2309aeec70 Merge branch 'suijutsu' into 'master' 
Underwater projectile fixes (#7622, #8303)

Closes #7622 and #8303

See merge request OpenMW/openmw!4567
 2025-07-02 21:42:00 +00:00
psi29a
6f48a6f1bf Merge branch 'docs_me_not_v2' into 'master' 
Docs - begin restructuring docs

See merge request OpenMW/openmw!4720
 2025-07-02 21:37:30 +00:00
Sebastian Fieber
f5e24804ce fix format 2025-07-02 20:45:55 +02:00
Evil Eye
7c1dbdd191 Select a fallback character if possible 2025-07-02 20:42:02 +02:00
Evil Eye
c3a5ad4328 Declare operator in MWState namespace 2025-07-02 20:29:38 +02:00
Evil Eye
d756b02d68 Order characters by last save 2025-07-02 20:29:38 +02:00
Kuyondo
2dc0d8abca use << 2025-07-02 23:51:15 +08:00
Sebastian Fieber
e4439806ed land bindings afterwork 
- fix include order + style
- cellOrName -> cellOrId
- bump lua api revision to 78
- cellOrId is not optional anymore for getHeightAt
 2025-07-02 16:14:03 +02:00
Sebastian Fieber
eb4d3b7224 Reapply "Merge branch 'landscape-data-bindings' into 'master'" 
This reverts commit 3ff7dedfd1.
 2025-07-02 16:09:06 +02:00
psi29a
4520eb077d Merge branch 'lua_pp_order' into 'master' 
lua - add ability to query the currently active shaders

Closes #8285

See merge request OpenMW/openmw!4506
 2025-07-02 09:45:00 +00:00
psi29a
cb0b44e0b2 Merge branch 'bounditems' into 'master' 
Interrupt bound item effect if equipment failed (#8383)

Closes #8383

See merge request OpenMW/openmw!4572
 2025-07-02 09:43:21 +00:00
psi29a
5a292624a5 Merge branch 'add_scripText_to_mwscriptbindings' into 'master' 
lua - add mwscript bindings to core (#8320)

Closes #8320

See merge request OpenMW/openmw!4517
 2025-07-02 09:42:25 +00:00
psi29a
5c60168b16 Merge branch 'ini-importer-tidying' into 'master' 
INI importer tidying

See merge request OpenMW/openmw!4519
 2025-07-02 09:40:58 +00:00
Evil Eye
681a95b89f Merge branch 'fix_keyword_highlighting' into 'master' 
FIX keyword substring highlighting regression

Closes #8265 and #1047

See merge request OpenMW/openmw!4685
 2025-07-02 06:13:26 +00:00
Charles Horn
c948171d5f FIX keyword substring highlighting regression 2025-07-02 06:13:25 +00:00
Alexei Kotov
612411e492 Allow non-actor spell projectiles to fire underwater (#8303) 2025-07-02 08:54:30 +03:00
Alexei Kotov
be13b1d085 Handle instant projectile impact before underwater logic (#7622) 2025-07-02 08:54:30 +03:00
Sebastian Fieber
fa8ba57ab3 add mwscript bindings to core 2025-07-02 00:57:40 +02: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
Cody Glassman
514174ffc4 allow handles to be fetched for non-dynamic shaders 2025-07-01 14:03:41 -07:00
Cody Glassman
feeb15d1ff use table instead of vector in return type 2025-07-01 14:03:41 -07:00
Cody Glassman
450f587844 lua - add ability to query the currently active shaders 2025-07-01 14:02:48 -07: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
Cody Glassman
2619859786 fix invalid deletion for shaders 2025-07-01 13:58:28 -07: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
AnyOldName3
5ab73f5ecb t t t t t t t typo fix 2025-07-01 21:24:45 +01: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
Sebastian Fieber
7c76387ffe no interior cell + make cellOrName mandatory 2025-06-19 22:17:26 +02:00
Sebastian Fieber
5d0986e812 Misc::NotNullPtr<MWWorld::ESMStore> to MWWorld::ESMStore& store 2025-06-19 22:17:26 +02:00
Sebastian Fieber
47453b307a no auto in landbindings.cpp 2025-06-19 22:17:26 +02:00
Sebastian Fieber
f3128f9c7b remove unused include 2025-06-19 22:17:26 +02:00
Sebastian Fieber
8954f45867 fixes for landbindings.cpp 2025-06-19 22:17:26 +02:00
Sebastian Fieber
fc772744d2 don't touch ESMTerrain::Storage 2025-06-19 22:17:26 +02:00
Sebastian Fieber
3d07b63ad8 don't copy store 2025-06-19 22:17:26 +02:00
Sebastian Fieber
940e73a356 landbindings - static to anonymous namespace + use references 2025-06-19 22:17:26 +02:00
Sebastian Fieber
ea02c69186 fix index check + cast to size_t 2025-06-19 22:17:26 +02:00
Sebastian Fieber
4182279f72 deduplication for landbindings.cpp + slight api changes 
- remove textureId from return
- return plugin name instead of plugin id
 2025-06-19 22:17:26 +02:00
Calandiel
901c6b94a6 remove unnecessary land loading 2025-06-19 22:17:26 +02:00
Calandiel
c711179b8f apply changes requested in the code review 2025-06-19 22:17:26 +02:00
Sebastian Fieber
8917103bf3 put land bindings in a table in openmw.core 2025-06-19 22:17:26 +02:00
Calandiel
336275292e reorder includes 2025-06-19 22:17:26 +02:00
Calandiel
3b962e3fd4 reorder includes 2025-06-19 22:17:26 +02:00
Calandiel
22a0dce4a6 reorder includes 2025-06-19 22:17:26 +02:00
Calandiel
fe68a098ea reorder includes 2025-06-19 22:17:26 +02:00
Sebastian Fieber
1521d5195a add bindings for land textures 2025-06-19 22:17:26 +02:00
Calandiel
283be9f4f0 add docs for the new binding 2025-06-19 22:17:26 +02:00
Calandiel
910690c7e5 expose a terrain height getter 2025-06-19 22:17:26 +02:00
Alexei Kotov
5938ba528f Export symbols for openmw binary under Clang (#8039) 2025-06-19 14:43:10 +03:00
Andrew Lanzone
50e5863749 Use shoulder buttons on wait menu, similar to other slider menus 2025-06-18 19:46:22 -07:00
AnyOldName3
f7b8091117 Add missing semicolon 2025-06-19 00:23:52 +01:00
AnyOldName3
acbc0a9b8f Fix launching other binaries when the CWD is not the binary directory 2025-06-19 00:19:14 +01:00
AnyOldName3
2ce4571c3a Handle paths passed on the command line properly 
Fixes https://gitlab.com/OpenMW/openmw/-/issues/8567.

Also maybe horribly breaks lots of things because it removes some insanity from https://gitlab.com/OpenMW/openmw/-/merge_requests/86, which would set the CWD to the local directory just in case any local-relative paths were expressed relatively without the explicit base being the local path.
 2025-06-17 00:26:06 +01:00
Cody Glassman
302d92561d docs - begin restructing docs 2025-06-16 15:36:43 -07:00
Andrew Lanzone
0a03403277 Fix closing dialogue when a choice is active; improve scrolling 2025-06-14 13:42:51 -07:00
Andrew Lanzone
8d545a43d5 Scrolll the list of quests in controller mode 2025-06-14 13:14:32 -07:00
Alexei Kotov
e7305e7c97 Merge branch 'colorfullights' into 'master' 
Use the Color type for Light colours in Lua

Closes #8558

See merge request OpenMW/openmw!4715
 2025-06-14 00:36:45 +03:00
Andrew Lanzone
0502366be9 Merge branch openmw:master into master 2025-06-13 04:44:05 +00:00
Andrew Lanzone
b4ede02cce Move hardcoded strings to i10n 2025-06-12 21:43:01 -07:00
Aussiemon
f085717aef Import ESS kill count / selected spell as RefIDs, handle old INFO records 2025-06-12 23:28:14 +03:00
Evil Eye
be0cbb7277 Use the Color type for Light colours in Lua 2025-06-12 17:17:28 +02:00
Andrew Lanzone
e01b8d372c In controller mode, make focused spell blue to match other menus 2025-06-11 23:16:08 -07:00
Andrew Lanzone
1e3ddee291 Remove default string when creating a potion that won't work 2025-06-10 21:42:51 -07:00
Andrew Lanzone
47b3674bac Update controller focus to use a message box's default focus if available 2025-06-09 22:03:12 -07:00
Andrew Lanzone
57ae097257 Add controller support to the companion window; also fix giving stacks 2025-06-09 19:23:49 -07:00
Andrew Lanzone
f6b06057fa Fix clang warning 2025-06-08 13:51:09 -07:00
Andrew Lanzone
8094761c3e Fix sign-compare warnings 2025-06-08 02:28:42 -07:00
Andrew Lanzone
81720892f9 Fix compiler warnings 2025-06-08 00:10:47 -07:00
Andrew Lanzone
be32cbb413 Fix clang format issues 2025-06-07 22:51:29 -07:00
Andy Lanzone
0ca6bc012c
Merge branch 'OpenMW:master' into master 2025-06-07 20:39:57 -07:00
Andrew Lanzone
ea70f2b5c2 Show tooltips in controller mode on spell menus 2025-06-07 00:35:46 -07:00
psi29a
1c242425b0 Merge branch 'finite_number' into 'master' 
Reduce code duplication for finite number and add tests

See merge request OpenMW/openmw!4707
 2025-06-06 22:14:32 +00:00
Andrew Lanzone
b1989ffdf7 Limit size of inventory menu in controller mode 2025-06-06 00:34:42 -07:00
Andrew Lanzone
b2a5ded929 Fix scrolling list of items to repair or recharge 2025-06-06 00:34:23 -07:00
Andrew Lanzone
dc68f28a40 Disable right stick from panning map if zooming maps is enabled 2025-06-06 00:34:01 -07:00
elsid
267ce1ec9b
Reduce code duplication for finite number 2025-06-06 00:05:07 +02:00
Evil Eye
c05d2d1d38 Restrict openmw.animation to local scripts 2025-06-05 20:15:40 +02:00
Evil Eye
360abd9b90 Render openmw.animation inaccessible in menu scripts 2025-06-05 20:13:36 +02:00
Aussiemon
0d96d71be6 Change World.setGameTimeScale to float 2025-06-04 11:40:53 -06:00
Andrew Lanzone
c35e0d7336 Add menu click sounds to some menus when activated by the controller 2025-06-03 21:57:43 -07:00
Andrew Lanzone
2dfe1ef7b1 Show L1 and R1 buttons next to tabs 2025-06-03 21:23:21 -07:00
Andrew Lanzone
ae676e1d70 Fix not checking bounds in some controller menus 2025-06-03 20:17:53 -07:00
Aussiemon
e2cf80e3a6 Protect more bindings from non-finite numbers 2025-06-03 19:34:10 -06:00
Andrew Lanzone
a824993a60 Fix controller tooltips in magic menu appearing for wrong spell 2025-06-03 08:56:39 -07:00
Andrew Lanzone
a6d03717cb Hide cursor icon when showing controller tooltips 2025-06-03 00:44:45 -07:00
Andrew Lanzone
e50822d1d2 Remember the selected dialog topic when new topics are added to the list 2025-06-02 00:41:09 -07:00
Andrew Lanzone
6da6b9b98f Update controller support for scroll window to use the keybaord for smoother scrolling 2025-06-02 00:17:10 -07:00
Andrew Lanzone
8ae193abe8 Fix issue when selecting an inventory item with the tooltip visible 2025-06-02 00:11:01 -07:00
Andrew Lanzone
21286aa376 Change 'Back' to 'Cancel' in button prompts to match windows 2025-06-01 23:27:49 -07:00
Andy Lanzone
51f9ce890e
Merge branch 'OpenMW:master' into master 2025-06-01 22:57:37 -07:00
Andrew Lanzone
6bb92c0589 Clean up logs 2025-06-01 22:55:21 -07:00
Andrew Lanzone
ea71a0bb4f Make controller selection wrap in inventory or containers 2025-06-01 22:13:58 -07:00
Andrew Lanzone
df237b5f9b Add controller support to quick key menu 2025-06-01 21:34:20 -07:00
Andrew Lanzone
2aa9847b24 Update controller buttons for character creation and level up 2025-06-01 16:27:49 -07:00
Andrew Lanzone
263863f3f2 Fix modals opening above inventory causing it to change size 2025-06-01 16:22:22 -07:00
Alexei Kotov
ecc9e8f5cd Merge branch 'silencedcode' into 'master' 
Remove dead code

See merge request OpenMW/openmw!4699
 2025-06-01 23:23:35 +03:00
psi29a
79a2735e19 Merge branch 'datachanged' into 'master' 
Launcher: Reload cells after a short delay (#8478)

See merge request OpenMW/openmw!4664
 2025-06-01 10:47:23 +00:00
Andrew Lanzone
95ed6b51da Allow navigating journal indices with a controller 2025-06-01 01:49:57 -07:00
Andrew Lanzone
63a533cd51 Add controller support to the level up dialog 2025-05-31 20:23:29 -07:00
Andrew Lanzone
e3a9b71bb9 Add helper function for toggling controller focus on lists 2025-05-31 19:43:28 -07:00
Andrew Lanzone
2dc1d8fed7 Add controller support to merchant repair window 2025-05-31 19:24:27 -07:00
Andrew Lanzone
cbe74cdab4 Add controller support to repair and recharge menus 2025-05-31 18:58:30 -07:00
Andrew Lanzone
d3c7904e64 Rename controller help function in item view 2025-05-31 16:34:07 -07:00
Andrew Lanzone
5276d7bab2 Several tweaks to the inventory menu 2025-05-31 16:02:13 -07:00
Andy Lanzone
6185683ca3
Merge branch 'OpenMW:master' into master 2025-05-31 15:29:25 -07:00
Andrew Lanzone
2d532100eb Add controller supoprt to enchanting menu 2025-05-31 15:28:13 -07:00
Andrew Lanzone
40441a065a Add controller support to alcmhemy menu 2025-05-31 11:58:35 -07:00
Evil Eye
4e8a713819 Remove dead code 2025-05-31 15:26:11 +02:00