Andrew Lanzone
8e76a0ab06
Merge branch 'master' of https://gitlab.com/OpenMW/openmw
2025-08-04 16:44:12 -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
psi29a
cc2ec85244
Merge branch 'tex' into 'master'
...
ESM4 landscape texturing
See merge request OpenMW/openmw!4799
2025-08-03 19:56:34 +00: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
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
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
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
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
