f11b6a09d6
now fix tarpaulin target cleanup, hopefully
2021-07-19 10:39:22 +02:00
e11be27738
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
d2b8a5a169
Fix check before calculating entity pushback, was causing a NaN and probably other bugs
2021-07-19 01:31:40 -04:00
cee4dccb44
Merge branch 'snowram/mounts-animations' into 'master'
...
Improve mount animation
See merge request veloren/veloren!2313
2021-07-18 20:05:04 +00:00
c16c83063f
Reduce duplicate storage fetching since it has overhead
2021-07-18 15:09:37 -04:00
830b0f8fc1
Use mountee_offset for not yet animated mounting transforms (ie those that aren't quadruped_medium)
2021-07-18 15:09:36 -04:00
3e6fd0ee1d
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
32915f89a8
Extract scaling from all the animations
2021-07-18 15:09:36 -04:00
6a15501b27
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
b2bf83e200
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
fafb344404
Adds a liveness check for mounting
2021-07-18 15:04:02 -04:00
09cbb90f61
Make the mounter animations dependant of the mountee animation
2021-07-18 15:03:57 -04:00
efdb9bef6c
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
133db1a6bf
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
b15f426ee5
Resolve all approved error supressions
2021-07-18 17:11:46 +00:00
67cc5f07a2
set CI to also check a MR if it only modifies shell scripts
2021-07-18 18:53:52 +02:00
2b6519baa2
choose correct path for tarpaulin
2021-07-18 18:52:08 +02:00
37147e2a83
Merge branch 'juliancoffee/overworld_assetization' into 'master'
...
Wildlife assetization
See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00:00
ec342a2338
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
1501f0467e
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
251c201604
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
6004a10a1a
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
6e36c8b65c
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
8e34635aa0
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
2e6fcd1f37
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
30119a6afc
Re-address approx_constant lint without using fractional constants and
...
re-add a few blank lines
2021-07-17 20:41:09 -04:00
eade248e1f
Fixed handling of orientation changes for airships
2021-07-18 01:13:36 +01:00
ecdd95ee49
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
9c72333741
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
8270baffe5
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
aac3a3a5f7
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
d44702ef20
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
29e034fa5e
Resolve all '#[allow(clippy::op_ref)]' error supressions
2021-07-17 21:53:33 +02:00
eeafdfed3a
Revert "no longer incremental builds in CI"
...
This reverts commit b3983c5451
2021-07-17 21:53:32 +02:00
6480cbd784
Resolve all '#[allow(clippy::len_zero)]' error supressions
2021-07-17 21:49:37 +02:00
dd84c320a3
Resolve all '#[allow(clippy::needless_return)]' error supressions
2021-07-17 21:47:17 +02:00
7686023430
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
2c764c663a
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
e6696e1b50
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
121d87d87a
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
2021-07-17 18:04:01 +00:00
5bdea9249c
More sunset variation for higher graphics modes
2021-07-17 19:00:12 +01:00
bff44ec03f
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
5c50ba2716
update cache image
2021-07-17 18:23:58 +02:00
353c4411c7
Resolve all '#[allow(clippy::print_literal)]' error supressions
2021-07-17 17:32:00 +02:00
52b4192dbd
Resolve all '#[allow(clippy::logic_bug)]' error supressions
2021-07-17 17:27:44 +02:00
beed7b81f9
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions
2021-07-17 17:26:23 +02:00
9c6cdbba71
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
2021-07-17 17:12:29 +02:00
a98edaace9
Resolve all '#[allow(clippy::useless_conversion)]' error supressions
2021-07-17 16:55:11 +02:00
8d18c2be1f
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
021d5c60de
Add test for duplicates in EntityConfig::meta
...
+ make tests cleaner
2021-07-17 15:37:31 +03:00
