Petr Mikheev
3bf18c601c
Better fog
2022-06-21 02:21:20 +02:00
jvoisin
11bced737f
Merge branch 'make_mac_great_again_part_3' into 'master'
...
MacOS: add one include back
See merge request OpenMW/openmw!2038
2022-06-20 16:02:26 +00:00
Bret Curtis
37a440a0ee
add one include back
2022-06-20 16:26:52 +02:00
psi29a
aeed99ca2c
Merge branch 'clean_qt_headers' into 'master'
...
Clean up Qt includes
See merge request OpenMW/openmw!2027
2022-06-20 14:05:33 +00:00
Petr Mikheev
e466a812d8
Merge branch 'lua_consume' into 'master'
...
Refactor consuming mechanics, improve Lua onConsume handler
See merge request OpenMW/openmw!1848
2022-06-20 12:12:50 +00:00
psi29a
a768068db9
Merge branch 'make_way_for_street_sweeper' into 'master'
...
[Postprocessing] Small cleanup
See merge request OpenMW/openmw!2037
2022-06-20 06:58:40 +00:00
Cody Glassman
66aa546e97
[Postprocessing] Small cleanup
2022-06-20 06:58:40 +00:00
Alexei Kotov
e5e6645575
Merge branch 'more_romantic_disable' into 'master'
...
Enable collision for postponed objects when any object is disabled
Closes #6648
See merge request OpenMW/openmw!2035
2022-06-19 21:42:30 +00:00
jvoisin
4bca91198e
Merge branch 'launcherviewdistance' into 'master'
...
Make launcher viewing distance setup more precise
See merge request OpenMW/openmw!2034
2022-06-19 20:51:18 +00:00
Evil Eye
aa2fab8db5
Enable collision for postponed objects when any object is disabled
2022-06-19 20:16:31 +02:00
Alexei Kotov
a8e409deef
Make launcher viewing distance setup more precise
2022-06-19 20:20:12 +03:00
uramer
36a1e18b6f
Increment Lua API revision
2022-06-19 17:31:53 +02:00
uramer
c1f8d7c20a
Make comment style consistently inconsistent
2022-06-19 17:31:18 +02:00
psi29a
e40461a8e3
Merge branch 'niboundingvolume' into 'master'
...
Correct NiBoundingVolume loading (#6710 )
Closes #6710
See merge request OpenMW/openmw!2029
2022-06-19 11:35:15 +00:00
psi29a
2a789de8d3
Merge branch 'hacky-windows-unicode-fixes' into 'master'
...
Hacky windows unicode fixes
See merge request OpenMW/openmw!2024
2022-06-19 11:30:23 +00:00
psi29a
aa5535c9dc
Merge branch 'sneakyidles' into 'master'
...
Fix idle swim/sneak animation fallback again
Closes #6816
See merge request OpenMW/openmw!2031
2022-06-19 11:21:21 +00:00
psi29a
d7c9caf13c
Merge branch 'settings_string_view' into 'master'
...
Use std::string_view to access settings
See merge request OpenMW/openmw!2032
2022-06-19 10:54:06 +00:00
Alexei Kotov
3baf346200
Use numeric_limits for indefinite idle looping
2022-06-19 08:58:12 +03:00
AnyOldName3
c3d23b4948
Extra hack to make this build on Ubuntu with old CMake
2022-06-18 22:43:12 +01:00
elsid
e03e0db55d
Use std::string_view to access settings
...
There is no more need to copy std::string into a pair when need to call
std::map::find.
Remove unused resetPendingChange function.
2022-06-18 17:54:24 +02:00
uramer
3761e7b24e
Pass a 0-count object to onConsume instead of the record id
2022-06-18 11:13:54 +02:00
uramer
c3c48f21d7
Consolidate item consumption code
2022-06-18 11:13:54 +02:00
Alexei Kotov
183378e34a
Fix idle swim/sneak animation fallback again
2022-06-18 03:24:45 +03:00
Alexei Kotov
e6f7a2f1ef
Correct NiBoundingVolume loading
2022-06-17 14:35:33 +03:00
jvoisin
8b9ed57348
Clean up Qt includes
2022-06-17 11:56:54 +02:00
jvoisin
fad49a1bd8
Merge branch 'recombine-windows-jobs-maybe' into 'master'
...
See if 1h time limit for Windows has been removed
See merge request OpenMW/openmw!2012
2022-06-17 09:56:00 +00:00
jvoisin
5065e4e571
Merge branch '1234knockout' into 'master'
...
Avoid clearing the current weapon animation group if it's still going to be in use
See merge request OpenMW/openmw!2025
2022-06-17 09:53:13 +00:00
Alexei Kotov
0b38e165f7
Avoid clearing the current weapon animation group if it's still going to be in use
2022-06-17 09:53:13 +00:00
AnyOldName3
cee6988093
Merge branch 'touchsomegrass' into 'master'
...
Reject models that don't have grass\ prefix from groundcover cache (bug #6672 )
Closes #6672
See merge request OpenMW/openmw!2026
2022-06-16 22:37:33 +00:00
Alexei Kotov
a5d8286cf2
Reject models that don't have grass\ prefix from groundcover cache
2022-06-16 16:26:25 +03:00
AnyOldName3
bdcac26d8c
Fix regressions from https://gitlab.com/OpenMW/openmw/-/merge_requests/1917
2022-06-16 00:30:11 +01:00
AnyOldName3
6a5ad4ca43
Fix regression from https://gitlab.com/OpenMW/openmw/-/merge_requests/1776
2022-06-16 00:28:41 +01:00
AnyOldName3
706f6ed788
Ensure we don't clobber the download link while we're using RelWithDebInfo dev builds
2022-06-15 21:39:24 +00:00
psi29a
28c97c22b9
Merge branch 'msvc_flags' into 'master'
...
Avoid D9025 warning by not adding /W3 by default using CMP0092 policy
See merge request OpenMW/openmw!2021
2022-06-15 19:41:27 +00:00
psi29a
34791773b6
Merge branch 'bump_boost_179' into 'master'
...
Updating Boost on windows to 1.79 to support C++20
See merge request OpenMW/openmw!2022
2022-06-15 16:00:20 +00:00
psi29a
2586beed72
Updating Boost on windows to 1.79 to support C++20
2022-06-15 14:55:42 +00:00
psi29a
67e764a44a
Merge branch 'severecharacterdisorder' into 'master'
...
Make the character controller less miserable, round 4: juicy stuff (bug #5592 )
Closes #5592
See merge request OpenMW/openmw!2014
2022-06-15 11:42:17 +00:00
psi29a
92f2e74ead
Merge branch 'fix_actors_paths_rendering' into 'master'
...
Use proper agent height and radius when render actor path
See merge request OpenMW/openmw!2019
2022-06-15 11:41:10 +00:00
elsid
a40ec4edd6
Avoid D9025 warning by not adding /W3 by default using CMP0092 policy
...
See https://gitlab.kitware.com/cmake/cmake/-/issues/18317
Set policies before declaring the project otherwise they might not take effect.
Specifically CMP0092 does not have effect added after project.
2022-06-15 11:00:26 +02:00
elsid
fdd84265b3
Use proper agent height and radius when render actor path
...
That are based on half extents used to find path over navmesh which is different
for interior and exterior cells.
Use common functions to get agent height and radius for actor path rendering and
navmesh generation.
2022-06-15 01:11:11 +02:00
AnyOldName3
467fda0110
Properly combine jobs
2022-06-14 20:43:49 +00:00
Alexei Kotov
2b019864b7
Remove more legacy states
2022-06-14 13:47:16 +03:00
Alexei Kotov
30ef7ad81b
Properly cancel the landing animation during movement
2022-06-14 12:50:30 +03:00
Alexei Kotov
c2ac52c82a
Remove dead code
2022-06-14 12:50:30 +03:00
Alexei Kotov
456277ba6a
Update changelog
2022-06-14 12:50:30 +03:00
Alexei Kotov
61d382dc9f
Set the initial IdleState to CharState_None
2022-06-14 12:50:30 +03:00
Alexei Kotov
4ce08664e9
Fix swim spellcasting stance turning fallback
2022-06-14 12:50:30 +03:00
Alexei Kotov
5dfce6205a
Reset the idle animation after a movement animation ends
...
Fix non-biped actor idle reset
2022-06-14 12:50:30 +03:00
Alexei Kotov
1a646374b0
Always reset the idle animation after the landing animation ends
2022-06-14 12:50:30 +03:00
Alexei Kotov
69a1d8ac86
Restart idle instantly only after the hit state ends
2022-06-14 12:50:30 +03:00
