mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 11:23:52 +00:00
Code Issues Releases Wiki Activity
28476 commits 108 branches 66 tags 133 MiB
Commit graph

28476 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
jvoisin
12bace3552 Silence a minor git warning 
No need to pollute the CI log output.
 2022-06-16 21:45:50 +02: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
psi29a
81e1d72c64 Merge branch 'idleisthepriority' into 'master' 
Fix fallback for missing swim/sneak idle animations

See merge request OpenMW/openmw!2013
 2022-06-14 07:55:13 +00:00
Alexei Kotov
35db7b8319 Fix fallback for missing swim/sneak idle animations 2022-06-14 01:12:05 +03:00
AnyOldName3
f04ea4a7a8 See if 1h time limit for Windows has been removed 
https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27771 has been closed and GitLab's published an update since
 2022-06-13 22:08:58 +00:00
psi29a
471c111fa2 Merge branch 'yourclonesareveryimpressive' into 'master' 
Make the character controller less miserable, round 3: code duplication and knockout interruption

See merge request OpenMW/openmw!2008
 2022-06-13 19:51:52 +00:00
psi29a
1a23f7efb8 Merge branch 'disable_sast' into 'master' 
Get rid of Gitlab SAST

See merge request OpenMW/openmw!2011
 2022-06-13 19:20:31 +00:00
jvoisin
9067db523b Get rid of Gitlab SAST 
It's completely broken currently, beside
being useless: grepping C++ code to find problem
isn't SAST, it's noise.
 2022-06-13 20:10:25 +02:00
psi29a
5c8ca4c7b9 Merge branch 'cameradefaults' into 'master' 
Disable all the non-vanilla Lua camera settings by default

See merge request OpenMW/openmw!2009
 2022-06-13 17:38:01 +00:00
Alexei Kotov
54896e4883 Disable all the non-vanilla Lua camera settings by default 2022-06-13 18:23:46 +03:00
Alexei Kotov
253de65d13 Fix knockout animation interruption/looping 2022-06-13 17:53:38 +03:00
Alexei Kotov
b8018024a6 Avoid passing weapon short group to refreshXAnims 2022-06-13 17:53:38 +03:00
Alexei Kotov
0a38c3ab78 Reset current animation states in a consistent way 2022-06-13 17:53:38 +03:00
Alexei Kotov
dd42a69ca5 Consolidate refreshIdleAnims 2022-06-13 17:53:38 +03:00
Alexei Kotov
2c3d385672 Consolidate refreshHitRecoilAnims 2022-06-13 17:53:38 +03:00
Alexei Kotov
a105ba14e4 Consolidate refreshJumpAnims 2022-06-13 12:59:18 +03:00
Alexei Kotov
ab46337c41 Rewrite handleTextKey using substring views 2022-06-13 12:28:12 +03:00
Alexei Kotov
9e6b7fed1a Consolidate refreshMovementAnims() 2022-06-13 12:13:10 +03:00
psi29a
7a390a359f Merge branch 'macos_for_all' into 'master' 
macos for all!

See merge request OpenMW/openmw!2007
 2022-06-12 19:04:34 +00:00
psi29a
e9567e5b3d macos for all! 2022-06-12 19:03:50 +00:00
psi29a
c8eb246198 Merge branch 'no_update_useless_ugly_nodes' into 'master' 
Only update active children

See merge request OpenMW/openmw!2001
 2022-06-12 18:47:56 +00:00
psi29a
eac1d8599a Merge branch 'lua_record_paths' into 'master' 
Correct VFS paths in Lua records

See merge request OpenMW/openmw!1853
 2022-06-12 18:45:24 +00:00
psi29a
b7918282ad Merge branch 'minor_simpl_sortfilteritemodel' into 'master' 
Minor simplifications in sortfilteritemmodel.cpp

See merge request OpenMW/openmw!1975
 2022-06-12 18:43:50 +00:00
psi29a
33c5b192c9 Merge branch 'crossovercharacter' into 'master' 
Make the character controller less miserable, round 2: state mappings

See merge request OpenMW/openmw!2003
 2022-06-12 18:37:13 +00:00
jvoisin
8d56e79877 Minor simplifications in sortfilteritemmodel.cpp 
- Change an if-else-if-else… spaghetti into a switch-case
- Replace a linear search in a dynamically constructed
  vector with a switch-case. Thanks elsid for the idea!
 2022-06-12 18:00:43 +02:00
psi29a
bf8cc36645 Merge branch 'camera_settings' into 'master' 
In-game camera settings

Closes #6715

See merge request OpenMW/openmw!1924
 2022-06-12 12:47:11 +00:00
psi29a
3b95797473 Merge branch 'Project5791-master-patch-42764' into 'master' 
Update CI/build_googletest.sh

See merge request OpenMW/openmw!2005
 2022-06-12 12:38:22 +00:00
Project579
d3d9e66ffd Update CI/build_googletest.sh 
googletest v1.11.0 is required for building with C++20.
 2022-06-12 12:07:40 +00:00