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
psi29a
ef3f52d6a4
Merge branch 'coverity' into 'master'
...
Fix coverity builds
See merge request OpenMW/openmw!4826
2025-08-04 06:55:06 +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
c71448359b
Merge branch '32bitfixes' into 'master'
...
fix 32bit builds. closes #8625
Closes #8625
See merge request OpenMW/openmw!4791
2025-08-03 21:00:52 +00: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
Evil Eye
485517cf64
Use std::hash
2025-08-03 20:52:22 +02:00
zlice
0d7efaa2e3
fix 32bit builds
2025-08-03 20:52:22 +02:00
unknown
3bf62235ba
Restore rules
2025-08-03 20:05:36 +02:00
unknown
b6b4e4f102
Use a URL that doesn't require the pipeline to succeed
2025-08-03 18:36:30 +02:00
unknown
7569273b33
Expose cov-int.tar.gz as an artifact and upload its URL
2025-08-03 17:06:47 +02: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
psi29a
fa290956c8
Merge branch 'spellgc' into 'master'
...
Add Player Gold Counter to Spell Creation Window(Updated)
See merge request OpenMW/openmw!4737
2025-08-03 10:51:25 +00:00
Evil Eye
ccb4ca49ca
Merge branch 'fix_lua_examples' into 'master'
...
Fix lua doc example errors and typos
See merge request OpenMW/openmw!4823
2025-08-03 08:56:50 +00:00
SkyHasACat
c276f850dc
One more fix
2025-08-02 22:49:58 -07:00
SkyHasACat
286c4d9101
a word
2025-08-02 21:40:09 -07:00
SkyHasACat
2abed374f9
Fix missing link
2025-08-02 19:00:12 -07:00
SkyHasACat
7c4ed3c11d
Fixing XML?
2025-08-02 15:19:49 -07: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
eeca0b13b0
Add missing files to components/detournavigator list
2025-08-02 12:45:03 +02:00
elsid
a2bc1569e0
Remove unused includes
2025-08-02 12:45:03 +02:00
Evil Eye
550b0c985f
Include file
2025-08-02 10:56:50 +02:00
Evil Eye
05f0b4cdbd
Use the default clang version in Coverity
2025-08-02 10:50:43 +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
Evil Eye
dbd92e6844
Merge branch 'spacetraining' into 'master'
...
Training menu fixes (#8584 )
Closes #8584
See merge request OpenMW/openmw!4758
2025-08-02 07:04:02 +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
6464e2a11b
remove N
2025-08-01 16:11:32 -07:00
SkyHasACat
5e64015aa9
Fix typo, remove change
2025-08-01 15:57:31 -07:00
epochwon
05d67ef412
swedish lines
2025-08-01 14:47:54 -04:00
Petr Mikheev
0b5c8271e0
ESM4 landscape textures
2025-08-01 18:45:24 +02:00
SkyHasACat
929a65126a
Fix docs
2025-08-01 08:25:02 -07: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
Skyhasacat
04f42f12e1
Merge branch 'onUpdate' into 'master'
...
Run onUpdate when the game is paused
Closes #8012
See merge request OpenMW/openmw!4487
2025-08-01 02:11:21 +00: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
