Alexei Kotov
caf5859fbe
Revert "Merge branch 'sceneleak' into 'master'"
...
This reverts merge request !3715
2024-01-08 20:04:20 +00:00
Evil Eye
97dee00263
Merge branch 'remove_klass' into 'master'
...
Replace 'klass' by meaningful names
See merge request OpenMW/openmw!3745
2024-01-08 16:50:40 +00:00
Evil Eye
64673ea21f
Merge branch 'editor_colour_settings' into 'master'
...
Use settings values to declare colour settings (#6876 )
See merge request OpenMW/openmw!3747
2024-01-08 16:48:18 +00:00
jvoisin
57066bcac1
Merge branch 'more_cleanup' into 'master'
...
Code cleanup
See merge request OpenMW/openmw!3746
2024-01-08 11:35:24 +00:00
psi29a
1bccd8483f
Merge branch 'cs-icon-fix' into 'master'
...
Add OpenMW-CS RC file to app rather than static lib
See merge request OpenMW/openmw!3740
2024-01-08 08:00:06 +00:00
psi29a
7019405278
Merge branch 'rainloop' into 'master'
...
Support playing ambient and rain weather SFX at the same time (bug #7761 )
Closes #7761
See merge request OpenMW/openmw!3738
2024-01-08 07:59:55 +00:00
elsid
cc0b00a0d2
Use settings values to declare colour settings
2024-01-07 17:32:50 +01:00
Andrei Kortunov
084fc80efd
Use string_view for readonly string properties
2024-01-07 19:21:45 +04:00
Andrei Kortunov
8879d89e4a
Replace 'klass' by meaningful names
2024-01-07 19:12:49 +04:00
Andrei Kortunov
4f65b7167a
Do not copy vector for every door marker
2024-01-07 18:53:07 +04:00
Andrei Kortunov
828c40c710
Do not copy due to auto misuse
2024-01-07 18:52:10 +04:00
psi29a
eedb96863e
Merge branch 'editor_enum_settings' into 'master'
...
Use settings values to declare enum settings (#6876 )
See merge request OpenMW/openmw!3724
2024-01-07 10:14:07 +00:00
Alexei Kotov
ed31a0354a
Support playing ambient and rain weather SFX at the same time (bug #7761 )
2024-01-07 04:56:36 +03:00
Alexei Kotov
c1c774e11d
Update the spells window when constant effects are added/removed (bug #7475 )
2024-01-07 04:55:29 +03:00
Alexei Kotov
961c53f1c4
Merge branch 'clickcrash' into 'master'
...
Don't crash when clicking the logo video
See merge request OpenMW/openmw!3736
2024-01-07 01:21:56 +00:00
Alexei Kotov
dfc29974d0
Merge branch 'water_walking_cost' into 'master'
...
Use walking speed for swimming actor with water walking for pathfinding (#7758 )
Closes #7758
See merge request OpenMW/openmw!3732
2024-01-07 01:19:43 +00:00
Alexei Kotov
8fff7215f4
Merge branch 'i-dont-have-a-type' into 'master'
...
Selection Groups Cleanup
Closes #7759
See merge request OpenMW/openmw!3731
2024-01-07 01:18:26 +00:00
AnyOldName3
6d37618301
Add OpenMW-CS RC file to app rather than static lib
...
Static libraries on Windows can't have embedded resources, so this mean the icon for the CS wasn't used.
This could have also been resolved by explicitly requesting the library type as OBJECT rather than letting it default to STATIC (as object libraries aren't a thing on-disk and are just an abstraction in CMake so you can use the same object files in different targets), but this seemed less invasive.
I also made it Win32-only as a Windows .rc file is meaningless on Unix, but it shouldn't be MSVC-only as MinGW can consume them.
2024-01-06 16:56:52 +00:00
Evil Eye
72c382aca6
Don't crash when clicking the logo video
2024-01-06 14:23:08 +01:00
psi29a
c3c8fa1e61
Merge branch 'sceneleak' into 'master'
...
Set paged refs' base node to null (#6335 )
Closes #6335
See merge request OpenMW/openmw!3715
2024-01-06 11:07:07 +00:00
Dave Corley
c563219b61
Cleanup(CS): Pass const ref when applicable for selection groups
2024-01-05 19:39:53 -06:00
Dave Corley
3ff1bae372
Cleanup(CS): More consistent names for selection group configs
2024-01-05 19:39:53 -06:00
Dave Corley
c93b6dca0a
Fix(CS): Add record type to selection groups to fix #7759
2024-01-05 19:39:53 -06:00
elsid
903299ce50
Avoid recomputing navigator flags when getting area costs
2024-01-06 02:39:42 +01:00
elsid
594bd6e136
Use walking speed for swimming actor with water walking for pathfinding
...
This will make them find shorter paths nearby shores.
2024-01-06 02:39:40 +01:00
jvoisin
689efa6d69
Merge branch 'mapnotes' into 'master'
...
Shorten global map marker notes like vanilla (bug #7619 )
Closes #7619
See merge request OpenMW/openmw!3719
2024-01-05 13:05:56 +00:00
jvoisin
5837f97b99
Merge branch 'nonexclusivesettings' into 'master'
...
Downgrade Settings GUI mode to a modal (bug #6758 )
Closes #6758
See merge request OpenMW/openmw!3720
2024-01-05 13:04:20 +00:00
Alexei Kotov
19a7d50a3f
Merge branch 'error_codes' into 'master'
...
Use error messages instead of unhandled exceptions
See merge request OpenMW/openmw!3723
2024-01-04 20:35:37 +00:00
Alexei Kotov
c5a3b516d6
Merge branch 'init_variables' into 'master'
...
Add missing initialization
See merge request OpenMW/openmw!3722
2024-01-04 20:31:55 +00:00
elsid
72fa4924dc
Use settings values to declare enum settings
2024-01-03 22:55:00 +01:00
Andrei Kortunov
7ffb2bc3c4
Use error messages instead of unhandled exceptions
2024-01-03 21:48:25 +04:00
Andrei Kortunov
8d3efd27ba
Add missing initialization
2024-01-03 19:25:33 +04:00
Alexei Kotov
febfccb356
Merge branch 'move_class_text' into 'master'
...
Avoid redundant string copies
See merge request OpenMW/openmw!3718
2024-01-03 15:24:22 +00:00
Alexei Kotov
b132fd4373
Merge branch 'lua_action_fixes' into 'master'
...
Lua Action fixes
See merge request OpenMW/openmw!3717
2024-01-03 15:19:18 +00:00
Alexei Kotov
7310418984
Downgrade Settings GUI mode to a modal (bug #6758 )
2024-01-02 22:32:52 +03:00
Alexei Kotov
19a6fd4e1b
Merge branch 'display_esm_version' into 'master'
...
Improve format version in content selector
See merge request OpenMW/openmw!3709
2024-01-02 17:32:21 +00:00
Alexei Kotov
14942d7541
Shorten global map marker notes like vanilla (bug #7619 )
2024-01-02 18:50:32 +03:00
Andrei Kortunov
fb16871c80
Avoid redundant string copies
2024-01-02 18:30:35 +04:00
uramer
e9b48e35c0
Coverity defects
2024-01-02 13:54:02 +01:00
Alexei Kotov
2ff2e3c2ef
Merge branch 'raceless' into 'master'
...
Replace missing NPC races and default animations
Closes #6754
See merge request OpenMW/openmw!3703
2024-01-02 12:37:03 +00:00
Alexei Kotov
2fbdde34c6
Set paged refs' base node to null ( #6335 )
2024-01-02 02:31:47 +03:00
jvoisin
29c20cdb41
Merge branch 'fix_universal_id' into 'master'
...
Add missing UniversalId::mClass initialization
See merge request OpenMW/openmw!3707
2024-01-01 23:05:57 +00:00
Andrei Kortunov
93e50cc7aa
Improve format version in content selector
2024-01-01 18:16:58 +04:00
Evil Eye
ef4e5b45e3
Don't add custom anim source if it's a default animation but keep the skeleton
2024-01-01 15:06:32 +01:00
Evil Eye
03c791e61a
Move animation handling to NpcAnimation
2024-01-01 13:58:55 +01:00
Evil Eye
84c15344ee
Address feedback
2024-01-01 13:07:43 +01:00
Evil Eye
4636ab3f3e
Update cmakelists
2024-01-01 13:07:43 +01:00
Evil Eye
5bd5c84018
Replace missing NPC races and default animations
2024-01-01 13:07:43 +01:00
elsid
94409ce172
Add missing UniversalId::mClass initialization
2024-01-01 01:12:19 +01:00
Alexei Kotov
78459314bf
Merge branch 'impartialplayerbelike' into 'master'
...
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us
Closes #7645
See merge request OpenMW/openmw!3650
2023-12-31 17:33:08 +00:00
