Andrew Lanzone
|
80dd2ea6da
|
Merge branch 'master' of https://gitlab.com/enoznal/openmw
|
2025-07-26 22:53:23 -07:00 |
|
Andrew Lanzone
|
8a2888fa00
|
Replace many includes with forward declarations
|
2025-07-26 22:53:03 -07:00 |
|
Andrew Lanzone
|
94b460389b
|
Replace many includes with forward declarations
|
2025-07-26 22:48:35 -07:00 |
|
Andrew Lanzone
|
b961007345
|
Fix unsigned type warning/error on Windows
|
2025-07-26 09:41:26 -07:00 |
|
Andrew Lanzone
|
ab03e01127
|
Remove dedicated 'Unequip' button and just us 'A'
|
2025-07-26 01:35:25 -07:00 |
|
Andrew Lanzone
|
defd1edb6f
|
Fix clang error and unsigned bug
|
2025-07-26 00:59:43 -07:00 |
|
Andy Lanzone
|
c015599356
|
Merge branch openmw:master into master
|
2025-07-26 00:17:39 -07:00 |
|
Andrew Lanzone
|
fb19a0da91
|
Fix inventory menu getting messed up when resizing game window
|
2025-07-26 00:16:41 -07:00 |
|
Andrew Lanzone
|
5b5ed21f20
|
Split journal's onControllerButtonEvent into a few functions
|
2025-07-25 22:53:39 -07:00 |
|
Andrew Lanzone
|
b9ae89e032
|
Split onControllerButtonEvent into two; loop through ingredient slots
|
2025-07-25 21:46:00 -07:00 |
|
Alexei Kotov
|
730a62effc
|
Merge branch 'warn-baby-warn' into 'master'
Fix MSVC warnings
Closes #7882
See merge request OpenMW/openmw!4804
|
2025-07-25 21:45:34 +03:00 |
|
psi29a
|
a599825bf8
|
Merge branch 'everyonelikeschameleons' into 'master'
Prevent hostile actors from engaging combat against actors with 75 chameleon
See merge request OpenMW/openmw!4806
|
2025-07-25 08:02:32 +00:00 |
|
psi29a
|
714c128947
|
Merge branch 'compositemipmaps' into 'master'
Apply filtering settings to composite maps
See merge request OpenMW/openmw!4805
|
2025-07-25 07:12:07 +00:00 |
|
psi29a
|
45e08f62a1
|
Merge branch 'smolpiranha' into 'master'
Take skin transform and skeleton root into account
Closes #4437
See merge request OpenMW/openmw!4471
|
2025-07-25 07:09:55 +00:00 |
|
Alexei Kotov
|
d595d9f3b8
|
Merge branch 'maccitest' into 'master'
Mac CI updates
See merge request OpenMW/openmw!4789
|
2025-07-24 18:58:49 +03:00 |
|
Evil Eye
|
f52d9ad977
|
Prevent hostile actors from engaging combat against actors with 75 chameleon
|
2025-07-24 17:02:42 +02:00 |
|
Evil Eye
|
e3c9e6fe2b
|
Set a root for BS skins as well
|
2025-07-24 08:46:21 +02:00 |
|
Evil Eye
|
8d7218c118
|
Take skin transform and skeleton root into account
|
2025-07-24 08:40:20 +02:00 |
|
Alexei Kotov
|
ad996393f1
|
Apply filtering settings to composite maps
|
2025-07-24 08:41:43 +03:00 |
|
AnyOldName3
|
437f22ed72
|
Typo fix
|
2025-07-24 00:37:28 +01:00 |
|
AnyOldName3
|
092d9a4c62
|
Remove dumb comment
|
2025-07-24 00:35:22 +01:00 |
|
AnyOldName3
|
f8a96fae24
|
Some formatting changes I missed
|
2025-07-24 00:26:47 +01:00 |
|
AnyOldName3
|
be54521cfa
|
Fix loads of warnings
These weren't detected due to https://gitlab.com/OpenMW/openmw/-/issues/7882, but now they are, so they can be fixed.
|
2025-07-24 00:20:05 +01:00 |
|
AnyOldName3
|
52b785f726
|
Use updated Windows dependencies
The main changes are changing an OSG option that was disabling most of our warnings, and MSVC2019 switching to a custom vcpkg triplet.
|
2025-07-23 23:18:03 +01:00 |
|
Evil Eye
|
acfe9b6785
|
Merge branch 'karamunsing' into 'master'
Don't deselect item when usage is denied
Closes #7693
See merge request OpenMW/openmw!4788
|
2025-07-23 18:43:41 +00:00 |
|
psi29a
|
d1b03734b3
|
Merge branch 'master' into 'master'
Save user settings when closing windows
Closes #8077
See merge request OpenMW/openmw!4367
|
2025-07-23 09:32:04 +00:00 |
|
Jared Davenport
|
324bdf8f7a
|
Save user settings when closing windows
|
2025-07-23 09:32:04 +00:00 |
|
psi29a
|
d401dd2441
|
Merge branch 'ContainerCapacityCheck' into 'master'
Fix precision issue with container capacity check
Closes #8606
See merge request OpenMW/openmw!4776
|
2025-07-23 09:31:38 +00:00 |
|
Aussiemon
|
044c556f0e
|
Fix precision issue with container capacity check
|
2025-07-23 09:31:38 +00:00 |
|
AnyOldName3
|
125bbdc118
|
Merge branch 'long-specular' into 'master'
Elongated specular highlight for water
See merge request OpenMW/openmw!4726
|
2025-07-22 13:04:03 +00:00 |
|
psi29a
|
b2cc549585
|
Merge branch 'theemperorwantedyoutohavethisinvaliditerator' into 'master'
Prevent iterator invalidation during actor traversal
Closes #4885
See merge request OpenMW/openmw!4445
|
2025-07-22 07:38:20 +00:00 |
|
psi29a
|
2b1cd1deb8
|
Merge branch 'getpcrunning' into 'master'
Deduplicate GetPCRunning logic
See merge request OpenMW/openmw!4800
|
2025-07-22 07:37:35 +00:00 |
|
Alexei Kotov
|
93cde36b09
|
Deduplicate GetPCRunning logic
|
2025-07-21 19:09:24 +03:00 |
|
Evil Eye
|
30cfb42ed1
|
Fix rebase fallout
|
2025-07-21 17:57:51 +02:00 |
|
psi29a
|
c30964feb2
|
Merge branch 'namespace_naming' into 'master'
Fix and enforce namespace naming (#8424)
See merge request OpenMW/openmw!4648
|
2025-07-21 10:30:47 +00:00 |
|
elsid
|
28851411a3
|
Fix and enforce namespace naming
|
2025-07-20 21:19:16 +02:00 |
|
AnyOldName3
|
9845f76583
|
Merge branch 'nonessentialjobs' into 'master'
Don't run some non-essential jobs on upstream branch pushes
See merge request OpenMW/openmw!4797
|
2025-07-20 16:59:04 +00:00 |
|
Alexei Kotov
|
2b4b532745
|
Merge branch 'charmdispofix' into 'master'
Fix permanent disposition loss on exit conversation
Closes #8557
See merge request OpenMW/openmw!4796
|
2025-07-20 19:05:24 +03:00 |
|
Aussiemon
|
01fa3cc4e6
|
Subtract Charm from permanent disposition clamp range
|
2025-07-20 19:05:24 +03:00 |
|
Andy Lanzone
|
6114a01ad4
|
Merge branch openmw:master into master
|
2025-07-19 18:10:08 -07:00 |
|
Andrew Lanzone
|
ef50578a62
|
Move controller button overlay padding into layout file
|
2025-07-19 18:09:00 -07:00 |
|
Andrew Lanzone
|
b0bdd68e7c
|
Update a comment
|
2025-07-19 17:12:33 -07:00 |
|
Andrew Lanzone
|
29f1c7c68f
|
Remove some hardcoded menu sizes for inventory mode
|
2025-07-19 17:12:09 -07:00 |
|
Andrew Lanzone
|
f8d9149e4f
|
Use enum and array for cleaner management of controller button overlay
|
2025-07-19 16:31:25 -07:00 |
|
Andrew Lanzone
|
c2ad1df030
|
Update Swedish translation for controller tooltips option
|
2025-07-19 14:03:26 -07:00 |
|
Alexei Kotov
|
10602a0412
|
Don't run some non-essential jobs on upstream branch pushes
|
2025-07-19 12:08:48 +03:00 |
|
Evil Eye
|
8bf9b205b7
|
Merge branch 'supporteddirections' into 'master'
Cache computed supported movement directions
See merge request OpenMW/openmw!4709
|
2025-07-19 08:59:18 +00:00 |
|
Evil Eye
|
39cc893639
|
Unbreak swimdeath fallback
|
2025-07-19 09:38:44 +02:00 |
|
Evil Eye
|
1dfa2629f0
|
Remove more redundant checks
|
2025-07-19 09:24:24 +02:00 |
|
Evil Eye
|
35eed68269
|
Move null checks to address feedback
|
2025-07-19 09:24:23 +02:00 |
|