1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-24 07:56:42 +00:00
Commit graph

23710 commits

Author SHA1 Message Date
psi29a
8622dacaea Merge branch '8551-orang-kk' into 'master'
Fix loss of quick key bindings for temporary or missing items

See merge request OpenMW/openmw!4780
2025-08-15 06:49:51 +00:00
psi29a
72bf7673f4 Merge branch 'formattool' into 'master'
Use std::format in esmtool

See merge request OpenMW/openmw!4841
2025-08-14 16:25:09 +00:00
Alexei Kotov
488f73c5da Merge branch 'bmdhacks-skill-controller-crash' into 'master'
fix a crash in skill selection dialog due to uninitialized controller data

See merge request OpenMW/openmw!4843
2025-08-14 16:37:57 +03:00
Alexei Kotov
a049f3c3a8 Merge branch 'bmdhacks-lua-doublepress' into 'master'
Controller Input: Fix Lua dialogs from causing a double-press

See merge request OpenMW/openmw!4844
2025-08-14 15:45:43 +03:00
Evil Eye
450f907166 Adjust documentation and bump API revision 2025-08-14 14:01:15 +02:00
Kuyondo
bc2f948abe add warning if id of quickkey is non-existent 2025-08-14 19:47:21 +08:00
SkyHasACat
50ebf304c7 Formatting 2025-08-14 13:42:52 +02:00
SkyHasACat
1b5450557e Don't hardcode weather ids 2025-08-14 13:42:52 +02:00
SkyHasACat
fe48e2c9ae Fixed properly 2025-08-14 13:42:52 +02:00
SkyHasACat
a418e05869 foward declare? 2025-08-14 13:42:52 +02:00
SkyHasACat
9f2ad18549 Fix formatting 2025-08-14 13:42:51 +02:00
SkyHasACat
475e5522ed Make read only 2025-08-14 13:42:51 +02:00
SkyHasACat
943966d59a Fix more things 2025-08-14 13:42:51 +02:00
SkyHasACat
3d954ed720 Fix review issues 2025-08-14 13:42:51 +02:00
SkyHasACat
046c0a64f2 Revert ID change 2025-08-14 13:42:51 +02:00
SkyHasACat
548fb5fecb Add region sound binding 2025-08-14 13:42:51 +02:00
SkyHasACat
40f26a9495 Use luautil id 2025-08-14 13:42:51 +02:00
SkyHasACat
944985e1ce Fix color 2025-08-14 13:42:51 +02:00
SkyHasACat
0acde006a0 Remove unneeded includes? 2025-08-14 13:42:51 +02:00
SkyHasACat
5e30e45700 formatting 2025-08-14 13:42:51 +02:00
SkyHasACat
d58545ca39 Add region bindings 2025-08-14 13:42:49 +02:00
Evil Eye
cae36d6eec Add remaining default initialisations flagged by Coverity 2025-08-14 13:33:20 +02:00
Kuyondo
e226963d0d clear temporary items 2025-08-14 19:28:03 +08:00
Alexei Kotov
32e463945e Merge branch 'settingscrash' into 'master'
Fix some dangling window pointer use on exit

See merge request OpenMW/openmw!4846
2025-08-14 13:52:56 +03:00
Alexei Kotov
37c4277b92 Also don't process controller menu axis navigation events for hidden menus 2025-08-14 13:47:18 +03:00
Alexei Kotov
30bd014bd7 Some controller focus initialization cleanup 2025-08-14 13:43:46 +03:00
Evil Eye
9db9df95e2 Address more simple Coverity defects 2025-08-14 11:19:13 +02:00
Kuyondo
4749ddf586 save lifetime of temporary quickkey items 2025-08-14 15:32:36 +08:00
Alexei Kotov
cb0316e6be Merge branch 'journal-lua-api' into 'master'
Add Lua API for the player journal text data

Closes #7966

See merge request OpenMW/openmw!4203
2025-08-13 14:58:48 +03:00
Evil Eye
1ffcd3f213 Replace usage of std::distance and std::advance 2025-08-13 11:43:51 +02:00
trav5
cffb045767 Lua journal read access post-review formatting corrected 2025-08-13 11:09:10 +02:00
trav5
6d0f05e97b Lua journal read access post-review class debug names aligned 2025-08-13 11:09:10 +02:00
trav5
596ee3e8fa Lua journal read access post-review std::distance 2025-08-13 11:09:10 +02:00
trav5
7f3bc4884e Add Lua API for the player journal text data
This implements #7966 - adds the Lua API read-only access to the player's stored journal text entries (quest & topics data). See the issue ticket for some details on the proposal.
2025-08-13 11:08:10 +02:00
Evil Eye
d4bc9696e9 Combine format strings 2025-08-13 09:50:13 +02:00
Evil Eye
ace1f7f3d0 Merge branch 'fixkaramunsing' into 'master'
Ensure draganddrop finishes when item is used from it

Closes #8659

See merge request OpenMW/openmw!4847
2025-08-12 21:52:41 +00:00
Evil Eye
33ea16655b Add missing paren and remove unnecessary flushes 2025-08-12 23:38:47 +02:00
Kuyondo
8ea5448112 use find() 2025-08-12 21:24:09 +08:00
Kuyondo
9426a36f5a maintain missing item info in quickkey menu 2025-08-12 21:24:09 +08:00
Evil Eye
4707d7602d Check for nullptr before dereferencing pathgrids 2025-08-12 11:02:10 +02:00
psi29a
f5d866894e Merge branch 'coverityspam' into 'master'
Resolve a number of Coverity defects

See merge request OpenMW/openmw!4835
2025-08-12 07:59:19 +00:00
psi29a
a1d9cbd47c Merge branch 'sounds-page-engoodening' into 'master'
Clean up launcher audio tab formatting

See merge request OpenMW/openmw!4833
2025-08-12 07:50:06 +00:00
psi29a
8f8723e2fc Merge branch 'topurgeornottopurge' into 'master'
Improve parity around spell store based effects

Closes #8309

See merge request OpenMW/openmw!4827
2025-08-12 07:48:41 +00:00
bmdhacks
80a29ab57b bulk initialize controller focus to zero 2025-08-11 17:08:17 -07:00
Kuyondo
41e2282501 fix #8659 2025-08-11 22:16:10 +08:00
Alexei Kotov
2bb1c4810d Fix some dangling window pointer use on exit 2025-08-11 13:52:51 +03:00
epochwon
363a6e0aa0 clean up audio page formatting 2025-08-11 08:13:02 +03:00
bmdhacks
d05bb877fe fix a double-press bug where controller input on Lua dialog boxes was being broadcast down into whatever the last open dialog box was. 2025-08-10 17:27:36 -07:00
bmdhacks
1b34248ef6 fix a crash in skill selection dialog due to uninitialized controller data 2025-08-10 17:05:37 -07:00
Evil Eye
a7ba54c361 Use std::format in esmtool 2025-08-10 12:03:34 +02:00
Bret Curtis
23fb414fd4 use std::string_view instead 2025-08-07 17:18:53 +02:00
Bret Curtis
7ff139e7b1 Fix PPA GCC-15 build failure with ButtonDefinition 2025-08-07 15:45:41 +02:00
psi29a
d46e68a4d5 Merge branch 'unawarenesstraining' into 'master'
Cache awareness rolls for 5 seconds to make sneaking easier

See merge request OpenMW/openmw!4434
2025-08-07 08:13:50 +00:00
elsid
2b88a620f5
Fix build with msvc
openmw\apps\openmw\mwgui\controllerbuttonsoverlay.hpp(75): error C2079: 'MWGui::ControllerButtonsOverlay::mButtons' uses undefined class 'std::array<MWGui::ControllerButtonsOverlay::ButtonWidgets,15>'
2025-08-06 22:19:49 +02:00
Evil Eye
a085036a92 Resolve a number of Coverity defects 2025-08-06 19:52:09 +02:00
Evil Eye
60d5e4d30b Merge branch 'local_variable_naming' into 'master'
Fix and enforce local variable naming (#8424)

See merge request OpenMW/openmw!4832
2025-08-06 17:50:33 +00:00
Alexei Kotov
5ad9010e07 Merge branch 'dont-take-away-my-individuality' into 'master'
FIX: Track the highest local refNum during plugin loading and increment it for each cloned/created reference

Closes #8620

See merge request OpenMW/openmw!4781
2025-08-06 09:53:06 +03:00
Andrew Lanzone
e4cc3adc98 Merge branch 'master' of https://gitlab.com/OpenMW/openmw 2025-08-05 17:32:50 -07:00
Dave Corley
d68b774c10 CLEANUP: Don't handle refnums during saving at all 2025-08-05 14:16:44 -07:00
elsid
d121b606b6
Fix and enforce local variable naming 2025-08-05 21:27:48 +02:00
Evil Eye
4344dc6e00 Don't init custom data when checking container resolution 2025-08-05 19:10:48 +02:00
psi29a
aca6532044 Merge branch 'createnewpeople' into 'master'
Allow creating new NPC records via lua

See merge request OpenMW/openmw!4825
2025-08-05 07:25:07 +00:00
Andrew Lanzone
c293c76bd7 Remove hardcoded row/column values in some controller menus 2025-08-04 19:10:07 -07:00
Andrew Lanzone
8e76a0ab06 Merge branch 'master' of https://gitlab.com/OpenMW/openmw 2025-08-04 16:44:12 -07:00
SkyHasACat
493f70a661 Formatting 2025-08-04 11:10:06 -07:00
SkyHasACat
e74167c7b7 Revert bad change, do actual fix 2025-08-04 11:09:26 -07:00
SkyHasACat
1a886db951 Merge namespace, remove redundant 2025-08-04 10:41:31 -07:00
SkyHasACat
7a5fe778bc Add validation 2025-08-04 10:04:34 -07:00
SkyHasACat
aa545467fd Remove unused 2025-08-04 09:56:58 -07:00
SkyHasACat
4c5118a24b Fix rank 2025-08-04 08:43:37 -07:00
SkyHasACat
2ab87f2d22 Use namespace for servicesoffered 2025-08-04 08:35:13 -07:00
SkyHasACat
b2746a7b4b Fix autocalc, remove thing 2025-08-04 08:27:26 -07:00
Evil Eye
0c4da49c74 Merge branch 'fix_msvc_warnings' into 'master'
Fix msvc warnings

See merge request OpenMW/openmw!4829
2025-08-04 14:56:59 +00:00
Alexei Kotov
aae81264a2 Merge branch 'skibidi-dop-doppler' into 'master'
Doppler, take two

See merge request OpenMW/openmw!4660
2025-08-04 09:24:50 +03:00
SkyHasACat
afb7f1da54 Fix formatting 2025-08-03 21:39:44 -07:00
SkyHasACat
99ae52e94c Add fields to record 2025-08-03 13:42:04 -07:00
psi29a
cc2ec85244 Merge branch 'tex' into 'master'
ESM4 landscape texturing

See merge request OpenMW/openmw!4799
2025-08-03 19:56:34 +00:00
SkyHasACat
a0585949a9 Remove dead code, fix grammer 2025-08-03 12:50:57 -07:00
SkyHasACat
4a2f85cfde Merge remote-tracking branch 'origin/master' into createnewpeople 2025-08-03 12:14:10 -07:00
Evil Eye
c77a849e9e Merge branch 'cleanup_includes' into 'master'
Cleanup includes

See merge request OpenMW/openmw!4828
2025-08-03 19:11:55 +00:00
SkyHasACat
d7a411cc72 Suggested fixes 2025-08-03 11:44:45 -07:00
elsid
555a10f50c
Fix msvc warnings
openmw\apps\opencs\model\world\idcollection.cpp(65): warning C4457: declaration of 'index' hides function parameter

openmw\apps\openmw\mwscript\miscextensions.cpp(627): warning C4456: declaration of 'effect' hides previous local declaration
2025-08-03 14:22:38 +02:00
psi29a
b9a28dab3e Merge branch 'thread_safe_static_init' into 'master'
Do thread safe local static based initialization

See merge request OpenMW/openmw!4822
2025-08-03 10:55:50 +00:00
SkyHasACat
ae9c42e0a0 Merge remote-tracking branch 'origin/master' into spellgc 2025-08-02 15:08:25 -07:00
Andrew Lanzone
7e9d4795ba Fix range check in journal window 2025-08-02 09:11:30 -07:00
Andrew Lanzone
3147aea0ed Better dead zone handling 2025-08-02 09:00:59 -07:00
SkyHasACat
d40a78e8ac Player shennanigans 2025-08-02 06:32:46 -07:00
SkyHasACat
31abd366ff no const 2025-08-02 06:25:14 -07:00
SkyHasACat
7c665643ad Use overload 2025-08-02 06:08:29 -07:00
SkyHasACat
5203f300e2 Requested changes 2025-08-02 05:33:27 -07:00
elsid
e87b95f642
Use forward declaration for context and sol 2025-08-02 12:45:03 +02:00
elsid
a2bc1569e0
Remove unused includes 2025-08-02 12:45:03 +02:00
Evil Eye
5ea3cca83b Remove spell effects on RemoveSpell 2025-08-02 12:16:46 +02:00
Evil Eye
c89f88c4e6 Allow removed abilities to be detected 2025-08-02 12:01:37 +02:00
psi29a
cc68316f72 Merge branch 'lua-jail-skills' into 'master'
Bring jail time skill changes over to lua

Closes #8399

See merge request OpenMW/openmw!4593
2025-08-02 08:39:14 +00:00
Mads Buvik Sandvei
978d8668f4 Bring jail time skill changes over to lua 2025-08-02 08:39:13 +00:00
Alexei Kotov
4c4d6078d8 Training menu fixes (#8584)
Rework the layout
Use "OK" instead of "Cancel" for the OK button
Add gp to the price
Use entry spacing consistent with other service menus
2025-08-02 03:47:22 +03:00
SkyHasACat
1986891e79 different empty line? 2025-08-01 16:51:10 -07:00
SkyHasACat
c139680ce3 Add line 2025-08-01 16:49:19 -07:00
SkyHasACat
f2cfaac4b8 Fix clang 2025-08-01 16:46:25 -07:00
SkyHasACat
1fbbaefb47 Remove unrelated change, doc 2025-08-01 16:45:24 -07:00
SkyHasACat
5209685783 revert some changes 2025-08-01 16:40:30 -07:00
SkyHasACat
64a45f8aeb Change world store insert 2025-08-01 16:30:16 -07:00
SkyHasACat
abb381a163 Fix issues 2025-08-01 16:10:49 -07:00
SkyHasACat
2cd4b643d0 npc stuff 2025-08-01 15:18:55 -07:00
Petr Mikheev
0b5c8271e0 ESM4 landscape textures 2025-08-01 18:45:24 +02:00
elsid
0801e0512d
Do thread safe local static based initialization 2025-08-01 11:48:35 +02:00
psi29a
b160cee0b7 Merge branch 'sonarview' into 'master'
Address string_view conversions flagged by SonarQube

See merge request OpenMW/openmw!4693
2025-08-01 08:06:36 +00:00
psi29a
2a8dc56619 Merge branch 'pedanticmsvc' into 'master'
Resolve unused code warnings when compiling in Debug mode using MSVC

See merge request OpenMW/openmw!4820
2025-08-01 08:06:11 +00:00
Andrew Lanzone
2e5836a748 Remove hardcoded map size 2025-07-31 23:58:00 -07:00
Andrew Lanzone
d49a6a119b Fix clang warnings 2025-07-31 22:27:31 -07:00
Andrew Lanzone
f453ce27a0 Remove uses of std::variant and std::holds_alternative because they're not supported on Ubuntu 2025-07-31 22:22:21 -07:00
Andrew Lanzone
666f154082 Fix clang warnings in Ubuntu 2025-07-31 22:13:56 -07:00
Andrei Kortunov
645eb81133 Run onUpdate when the game is paused 2025-08-01 04:18:03 +03:00
Andy Lanzone
59aba3ae7e Merge branch openmw:master into master 2025-07-31 18:02:10 -07:00
Andrew Lanzone
a134f8d882 Fix clang warning 2025-07-31 18:01:08 -07:00
Andrew Lanzone
5de1ae7b24 Simplify controller button overlay even more 2025-07-31 17:52:35 -07:00
Andrew Lanzone
23e3d0b49a Initialize inventory tabs in a loop 2025-07-31 17:50:14 -07:00
epochwon
b792bc0ee2 fixes + russian line 2025-07-31 11:14:08 -04:00
psi29a
405388b89f Merge branch 'scripteditorplz' into 'master'
Improve multiline script editing

Closes #8579

See merge request OpenMW/openmw!4728
2025-07-31 07:21:06 +00:00
Mads Buvik Sandvei
34eb3d485d [Lua] Partially dehardcode onHit 2025-07-30 20:21:15 +00:00
epochwon
aae21c6f53 Get physics fps delta time from physics system 2025-07-30 14:51:18 -04:00
Evil Eye
bc05628fa8 Resolve unused code warnings when compiling in Debug mode using MSVC 2025-07-30 20:44:59 +02:00
Evil Eye
ee540039a1 Address string_view conversions flagged by SonarQube 2025-07-30 19:37:37 +02:00
Evil Eye
27ee192354 Set default hotkeys for (un)commenting script lines 2025-07-30 16:58:32 +02:00
Evil Eye
aefa0ec1c4 Add multiline (un)indent behaviour to the script editor 2025-07-30 16:58:32 +02:00
epochwon
57280eaf9d Update Doppler description + Russian line 2025-07-30 10:28:41 -04:00
Alexei Kotov
399ec4eccc Merge branch 'qt6' into 'master'
Drop support for Qt5

Closes #8578

See merge request OpenMW/openmw!4742
2025-07-30 13:26:46 +03:00
Andrew Lanzone
582b409f7f Fix right stick from causing mouse to appear in controller mode 2025-07-29 19:29:20 -07:00
Andrew Lanzone
5d5d14a5a6 Fix spurious button presses causing controller tooltip to wiggle 2025-07-29 17:28:52 -07:00
Alexei Kotov
b0e8544d58 Merge branch 'addthoseactivespells' into 'master'
Remove minimum duration from continuous effects and add clarification to the docs

Closes #8641

See merge request OpenMW/openmw!4817
2025-07-29 23:36:39 +03:00
psi29a
b937b0271f Merge branch 'fightthechameleon' into 'master'
Prevent witnesses from ending combat because they didn't get hit

See merge request OpenMW/openmw!4814
2025-07-29 07:43:59 +00:00
Alexei Kotov
45a7040bc7 Merge branch 'fix_tests' into 'master'
Make tests more stable

See merge request OpenMW/openmw!4818
2025-07-29 08:05:58 +03:00
AnyOldName3
7c3fa3c89f Merge branch 'classheader' into 'master'
Some include cleanup

See merge request OpenMW/openmw!4815
2025-07-28 22:35:24 +00:00
elsid
70207750f2
Make tests more stable 2025-07-28 20:23:45 +02:00
Evil Eye
395f6811c9 Remove minimum duration from continuous effects and add clarification to the docs 2025-07-28 18:59:23 +02:00
psi29a
176dab5b3d Merge branch 'nomagnitudeforyou' into 'master'
Don't multiply magnitudes for effects that don't have magnitudes

Closes #8540

See merge request OpenMW/openmw!4810
2025-07-28 15:59:13 +00:00
psi29a
e304ceb449 Merge branch 'fix_init' into 'master'
Do not copy cell store to count refs

See merge request OpenMW/openmw!4813
2025-07-28 15:58:46 +00:00
psi29a
4efc8bf99d Merge branch 'fix_clang_tidy' into 'master'
Fix clang tidy warnings

See merge request OpenMW/openmw!4811
2025-07-28 15:55:53 +00:00
Alexei Kotov
0a8373987d Merge branch 'aiwander' into 'master'
Build checkpoints based path for wandering actors (#8433)

Closes #8433

See merge request OpenMW/openmw!4652
2025-07-28 00:48:17 +03:00
Andrew Lanzone
7b9958247a Null ControllerButtons pointers are supported; they hide the button overlay 2025-07-27 14:08:13 -07:00
Andy Lanzone
31580ffb71 Merge branch openmw:master into master 2025-07-27 13:21:40 -07:00
Andrew Lanzone
dc2ff4bfa2 Rename ControllerButtonStr struct and its internal fields 2025-07-27 13:14:31 -07:00
Alexei Kotov
272e6fabf9 Turn GreetingState into enum class and cut some mechanics manager includes 2025-07-27 23:02:06 +03:00
Andrew Lanzone
9870605aab Update enum defintion for ControllerAction 2025-07-27 12:57:56 -07:00
Andrew Lanzone
2d5ec48892 Fix default return type for getControllerAxisIcon 2025-07-27 12:56:56 -07:00
Evil Eye
f6a6a33c59 Prevent witnesses from ending combat because they didn't get hit 2025-07-27 21:12:52 +02:00
Alexei Kotov
ee501d8d0d Remove some redundant class header includes 2025-07-27 22:02:02 +03:00
elsid
e77ee5c20f
Do not copy cell store to count refs 2025-07-27 18:40:39 +02:00
psi29a
2051d5cbef Merge branch 'master' into 'master'
Fixed Unit Test in `apps/openmw_tests/mwworld/testptr.cpp`

See merge request OpenMW/openmw!4807
2025-07-27 16:33:39 +00:00