3652 Commits

Author SHA1 Message Date
Dr. Dystopia
d5e2fcca0f Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions 2021-07-24 20:14:26 +02:00
Dr. Dystopia
9156470ed3 Resolve unused '#[allow(clippy::same_item_push)]' error supressions 2021-07-24 20:08:08 +02:00
schnippl0r
1ba8b8c4d3 Moved GameInput to own module and made use of strum's EnumIter and AsRefStr. 2021-07-21 13:23:45 +02:00
schnippl0r
5f606768d7 Fixed wrong filename of logfile in Voxygen's panic message.
Moved the '<date>' component of the logfile name to the
end of the filename string, as RollingFileAppender::new()
appends the date to the provided file name prefix.

Please see
https://docs.rs/tracing-appender/0.1.2/tracing_appender/rolling/struct.RollingFileAppender.html#method.new
2021-07-21 03:33:13 +02:00
Marcel
8200bf4650 Merge branch 'juliancoffee/deduplicate_bag_hud' into 'master'
Deduplicate setting equipment tooltips

See merge request veloren/veloren!2644
2021-07-20 14:01:29 +00:00
Dr. Dystopia
9218c3bc3b Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Imbris
e647fbabdd Remove unused setting for whether to create a log file 2021-07-19 10:26:55 -04:00
Imbris
5957e23828 Revamp voxygen settings so that the config directory is externally specified, remove persistence of the selected logs folder, remove unused old meta.rs file from voxygen 2021-07-19 10:26:47 -04:00
juliancoffee
3f7c49a726 Deduplicate setting equipment tooltips 2021-07-19 03:12:36 +03:00
Imbris
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
Imbris
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
Imbris
5cf9602de9 Extract scaling from all the animations 2021-07-18 15:09:36 -04:00
Imbris
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
Imbris
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
Snowram
00b029d338 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Jonathan Berglin
214e6c1d42 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Imbris
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
Imbris
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
Marcel
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
Marcel
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
Imbris
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
Imbris
7c60b9577c Revert "Merge branch..."
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
Dr. Dystopia
d94f360a0f Resolve all '#[allow(clippy::op_ref)]' error supressions 2021-07-17 21:53:33 +02:00
Dr. Dystopia
28b7911e19 Resolve all '#[allow(clippy::len_zero)]' error supressions 2021-07-17 21:49:37 +02:00
Dr. Dystopia
33e57a46b3 Resolve all '#[allow(clippy::needless_return)]' error supressions 2021-07-17 21:47:17 +02:00
Joshua Barretto
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
Jonathan Berglin
092210df2f Resolve all '#[allow(clippy::redundant_clone)]' error supressions 2021-07-17 18:04:01 +00:00
Dr. Dystopia
8049b74e38 Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-17 17:12:29 +02:00
Forest Anderson
83692ae1b7 Merge branch 'aylana/asp-sfx' into 'master'
Princess-Lana - Add asp sound effects for the game

See merge request veloren/veloren!2611
2021-07-17 01:49:20 +00:00
Avi Weinstock
78ae2d76dc Add per-species head offsets. 2021-07-16 19:22:28 -04:00
Avi Weinstock
17c2459a01 Basic implementation of hat visuals. 2021-07-16 18:49:40 -04:00
Samuel Keiffer
651b775932 Merge branch 'knightresspaladin/healing-aura' into 'master'
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
Monty Marz
1443b3e78d icon 2021-07-16 18:39:14 +02:00
Aylana
513085da30 Add asp sound effects 2021-07-15 20:15:36 +02:00
Jonathan Berglin
51aa54ba8d Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Marcel
8ae3a81c62 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_format)]'-error-supressions' into 'master'
Resolve all '#[allow(clippy::useless_format)]' error supressions

See merge request veloren/veloren!2609
2021-07-15 13:03:02 +00:00
Dr. Dystopia
66fd06f53c Resolve all '#[allow(clippy::or_fun_call))]' error supressions 2021-07-15 13:49:59 +02:00
Dr. Dystopia
7c1d35c02e Resolve all '#[allow(clippy::useless_format)]' error supressions 2021-07-15 13:46:53 +02:00
Dr. Dystopia
61afb82e99 Resolve all '#[allow(clippy::unused_unit)]' error supressions 2021-07-14 21:42:29 +02:00
Sam
dc31b9fd1e Particles for healing aura 2021-07-13 20:54:43 -05:00
Monty Marz
afcb3eb1e7 char selection frames, adjustments 2021-07-13 13:31:01 +02:00
Marcel Märtens
63d790bb45 add biome and site info to F3 debug menu 2021-07-12 18:44:54 +02:00
Marcel Märtens
2cb27be0c6 clippy fixes in tests 2021-07-12 13:35:26 +02:00
Marcel Märtens
e2cd431908 fmt after applying clippy fixes after toolchain update 2021-07-12 12:09:27 +02:00
Marcel Märtens
7153e8879d fix clippy warnings 2021-07-12 12:09:09 +02:00
Samuel Keiffer
37f544efbe Merge branch 'sam/buff-stat' into 'master'
Added buff strength stat to weapons.

See merge request veloren/veloren!2586
2021-07-11 19:06:13 +00:00
ubruntu
bac0ba468f Replace "Player 1" with an NPC name when trading with an NPC 2021-07-11 18:27:34 +00:00
Sam
192078c6fb Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
Samuel Keiffer
c5a709943d Merge branch 'sam/rename-poise-stat' into 'master'
Renamed poise_strength to effect_power to allow it to be used more generally...

See merge request veloren/veloren!2589
2021-07-11 15:13:00 +00:00
Dr. Dystopia
355df0c898 Replace deprecated constant in 'loot_scroller' 2021-07-11 13:13:36 +02:00