bca00c7fcf
Merge branch 'xMAC94x/fix_scripts' into 'master'
...
now fix tarpaulin target cleanup, hopefully
See merge request veloren/veloren!2648
2021-07-19 10:14:52 +00:00
464960e95f
now fix tarpaulin target cleanup, hopefully
2021-07-19 10:39:22 +02:00
32bfb15a3a
Merge branch 'imbris/fix-nan' into 'master'
...
Fix check before calculating entity pushback, was causing a NaN and probably other bugs
See merge request veloren/veloren!2647
2021-07-19 07:35:14 +00:00
ceb800f187
Fix check before calculating entity pushback, was causing a NaN and probably other bugs
2021-07-19 01:31:40 -04:00
fc9777179f
Merge branch 'snowram/mounts-animations' into 'master'
...
Improve mount animation
See merge request veloren/veloren!2313
2021-07-18 20:05:04 +00:00
29dd58cf64
Reduce duplicate storage fetching since it has overhead
2021-07-18 15:09:37 -04:00
600034ec4d
Use mountee_offset for not yet animated mounting transforms (ie those that aren't quadruped_medium)
2021-07-18 15:09:36 -04:00
e2fc167e0c
Setup animation mount points for quadruped medium, update offsets in
...
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
2021-07-18 15:09:36 -04:00
5cf9602de9
Extract scaling from all the animations
2021-07-18 15:09:36 -04:00
cd103251c4
Add Body as a parameter to compute_matrices and start to pull whole body scaling out of the animation files
2021-07-18 15:09:34 -04:00
00b92096c9
Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs
2021-07-18 15:04:02 -04:00
4a7bdfd4a5
Adds a liveness check for mounting
2021-07-18 15:04:02 -04:00
00b029d338
Make the mounter animations dependant of the mountee animation
2021-07-18 15:03:57 -04:00
88b9a2b376
Merge branch 'xMAC94x/fix_tarpaulin' into 'master'
...
choose correct path for tarpaulin
See merge request veloren/veloren!2642
2021-07-18 18:10:57 +00:00
497f253c1c
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--unnested_or_patterns)]'-error-supressions' into 'master'
...
Resolve all approved error supressions
See merge request veloren/veloren!2637
2021-07-18 17:11:47 +00:00
214e6c1d42
Resolve all approved error supressions
2021-07-18 17:11:46 +00:00
013faa8c6a
set CI to also check a MR if it only modifies shell scripts
2021-07-18 18:53:52 +02:00
c6d9fbd147
choose correct path for tarpaulin
2021-07-18 18:52:08 +02:00
42d6e4b118
Merge branch 'juliancoffee/overworld_assetization' into 'master'
...
Wildlife assetization
See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00:00
a4fd0ff84c
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_pattern_matching)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
See merge request veloren/veloren!2622
2021-07-18 12:26:44 +00:00
d0e7ef9c92
Merge branch 'zesterer/small-fixes' into 'master'
...
Fixed handling of orientation changes for airships
See merge request veloren/veloren!2640
2021-07-18 08:29:50 +00:00
c60b02223b
Merge branch 'revert-eb08b6a1' into 'master'
...
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant
See merge request veloren/veloren!2639
2021-07-18 08:00:43 +00:00
ced9c563d0
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--needless_return)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::needless_return)]' error supressions
See merge request veloren/veloren!2632
2021-07-18 02:00:03 +00:00
36a777aa6b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--len_zero)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::len_zero)]' error supressions
See merge request veloren/veloren!2633
2021-07-18 01:24:28 +00:00
364f978b9b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--op_ref)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::op_ref)]' error supressions
See merge request veloren/veloren!2635
2021-07-18 00:59:25 +00:00
1c5ce83b66
Merge branch 'zesterer/better-sunsets' into 'master'
...
More sunset variation for higher graphics modes
See merge request veloren/veloren!2630
2021-07-18 00:59:22 +00:00
fa439fb08d
Re-address approx_constant lint without using fractional constants and
...
re-add a few blank lines
2021-07-17 20:41:09 -04:00
5989a25ef2
Fixed handling of orientation changes for airships
2021-07-18 01:13:36 +01:00
6c73216f35
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--logic_bug)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::logic_bug)]' error supressions
See merge request veloren/veloren!2624
2021-07-17 23:46:28 +00:00
7c60b9577c
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
afe639d4ce
Merge branch 'xMAC94x/incremental_fix' into 'master'
...
Revert "no longer incremental builds in CI"
See merge request veloren/veloren!2634
2021-07-17 21:08:22 +00:00
ef1b175b17
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--print_literal)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::print_literal)]' error supressions
See merge request veloren/veloren!2627
2021-07-17 20:29:35 +00:00
7efe2559cf
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--clone_on_copy)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions
See merge request veloren/veloren!2623
2021-07-17 20:00:29 +00:00
d94f360a0f
Resolve all '#[allow(clippy::op_ref)]' error supressions
2021-07-17 21:53:33 +02:00
6de161a68f
Revert "no longer incremental builds in CI"
...
This reverts commit b3983c5451
2021-07-17 21:53:32 +02:00
28b7911e19
Resolve all '#[allow(clippy::len_zero)]' error supressions
2021-07-17 21:49:37 +02:00
33e57a46b3
Resolve all '#[allow(clippy::needless_return)]' error supressions
2021-07-17 21:47:17 +02:00
23c35cfca8
Merge branch 'aweinstock/hats' into 'master'
...
Basic implementation of hat visuals.
See merge request veloren/veloren!2485
2021-07-17 19:42:26 +00:00
bfad3523fc
Merge branch 'xMAC94x/update_ci_cache' into 'master'
...
update cache image
See merge request veloren/veloren!2629
2021-07-17 18:29:00 +00:00
339862ea1b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_clone)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
See merge request veloren/veloren!2621
2021-07-17 18:04:02 +00:00
092210df2f
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
2021-07-17 18:04:01 +00:00
689574e9a0
More sunset variation for higher graphics modes
2021-07-17 19:00:12 +01:00
9258308ce7
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_conversion)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::useless_conversion)]' error supressions
See merge request veloren/veloren!2620
2021-07-17 16:50:32 +00:00
a757fe3d2f
update cache image
2021-07-17 18:23:58 +02:00
b9927fe30f
Resolve all '#[allow(clippy::print_literal)]' error supressions
2021-07-17 17:32:00 +02:00
134857c42c
Resolve all '#[allow(clippy::logic_bug)]' error supressions
2021-07-17 17:27:44 +02:00
c806c1e766
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions
2021-07-17 17:26:23 +02:00
8049b74e38
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
2021-07-17 17:12:29 +02:00
5b591c4d95
Resolve all '#[allow(clippy::useless_conversion)]' error supressions
2021-07-17 16:55:11 +02:00
eae24f96a0
Merge branch 'xMAC94x/fix_scripts' into 'master'
...
fix scripts that ended with &&
See merge request veloren/veloren!2614
2021-07-17 14:35:58 +00:00
