65ff2fb193
Merge branch 'schnippl0r/refactor_gameinput_to_submodule_and_use_strum' into 'master'
...
Moved GameInput to own module and made use of strum's EnumIter and AsRefStr.
See merge request veloren/veloren!2658
2021-07-21 12:44:09 +00:00
9e3b2a20d0
Moved GameInput to own module and made use of strum's EnumIter and AsRefStr.
2021-07-21 13:23:45 +02:00
2fa05460ef
Merge branch 'xMAC94x/tag-nightly' into 'master'
...
veloren nightly tag
See merge request veloren/veloren!2656
2021-07-21 07:33:29 +00:00
8285b1d6e0
create a nightly tag that always point to the released nightly version of veloren in the respective schedule so that others can consume it
2021-07-21 08:43:48 +02:00
c31d123884
Merge branch 'schnippl0r/wrong_filename_of_logfile_in_panic_message' into 'master'
...
Fixed wrong filename of logfile in Voxygen's panic message.
Closes #1248
See merge request veloren/veloren!2657
2021-07-21 02:46:51 +00:00
d1a1e29cd6
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
6bc5f6a170
Merge branch 'schnippl0r/add_missing_english_and_german_translations_for_gameinput.greet' into 'master'
...
Added en and de_DE translations for gameinput.greet.
See merge request veloren/veloren!2655
2021-07-20 21:34:41 +00:00
342de16d2e
Added en and de_DE translations for gameinput.greet.
2021-07-20 21:59:18 +02:00
5f38fb3c5b
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
fcee3ceedd
Merge branch 'Apply-same-member-order-as-in-trait' into 'master'
...
Apply same member order as in trait
See merge request veloren/veloren!2651
2021-07-20 13:41:58 +00:00
9abd066e53
Apply same member order as in trait
2021-07-20 09:43:52 +02:00
b8b27cb5f7
Merge branch 'imbris/voxygen-settings-improvements' into 'master'
...
Cleanup things in voxygen settings, making the directory externally specified, removing unused and planned to be removed things
Closes #853
See merge request veloren/veloren!2645
2021-07-19 15:06:52 +00:00
6e6f73c971
Remove unused setting for whether to create a log file
2021-07-19 10:26:55 -04:00
518ec1f54f
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
9c9dd83b2e
Merge branch 'xMAC94x/fix_docker_upload' into 'master'
...
quickfix to avoid kaniko stopping with
See merge request veloren/veloren!2650
2021-07-19 13:07:32 +00:00
9227390531
quickfix to avoid kaniko stopping with
...
"kaniko should only be run inside of a container, run with the --force flag if you are sure you want to continue" error
applied as described here https://github.com/GoogleContainerTools/kaniko/issues/1542
its also done in veloren-docker-cli: c8aa8ac857
2021-07-19 13:33:19 +02:00
9766b3e897
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
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
7766aeb9eb
Made Ngoubou rarer to spawn
2021-07-18 23:21:41 -07:00
a97546dbff
Removed aimbot from ChargeMelee and cleaned up variable typing
2021-07-18 23:12:55 -07:00
081c6e5362
Fixed CircleCharge and buffed Rugged Hide droppers
2021-07-18 23:12:55 -07:00
d2b8a5a169
Fix check before calculating entity pushback, was causing a NaN and probably other bugs
2021-07-19 01:31:40 -04:00
6f0aeecfca
Deduplicate setting equipment tooltips
2021-07-19 03:12:36 +03: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
