Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,250 Commits 151 Branches 18 Tags 2.1 GiB
c5ea28b7a4
Commit Graph

9250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
c5ea28b7a4 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
schnippl0r
35c3fdce67 Added en and de_DE translations for gameinput.greet. 2021-07-20 21:59:18 +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
Marcel
146d4018a7 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
Dr. Dystopia
9218c3bc3b Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Imbris
d31c71c327 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
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
Marcel
146670725d 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
Marcel Märtens
c3ec385ddb 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

We didnt had that problem in veloren repo until now.
 2021-07-19 13:33:19 +02:00
Marcel
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
Marcel Märtens
464960e95f now fix tarpaulin target cleanup, hopefully 2021-07-19 10:39:22 +02:00
Marcel
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
Imbris
ceb800f187 Fix check before calculating entity pushback, was causing a NaN and probably other bugs 2021-07-19 01:31:40 -04:00
juliancoffee
3f7c49a726 Deduplicate setting equipment tooltips 2021-07-19 03:12:36 +03:00
Imbris
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
Imbris
29dd58cf64 Reduce duplicate storage fetching since it has overhead 2021-07-18 15:09:37 -04: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
4a7bdfd4a5 Adds a liveness check for mounting 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
Marcel
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
Marcel
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
Jonathan Berglin
214e6c1d42 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Marcel Märtens
013faa8c6a set CI to also check a MR if it only modifies shell scripts 2021-07-18 18:53:52 +02:00
Marcel Märtens
c6d9fbd147 choose correct path for tarpaulin 2021-07-18 18:52:08 +02:00
Samuel Keiffer
42d6e4b118 Merge branch 'juliancoffee/overworld_assetization' into 'master' 
Wildlife assetization

See merge request veloren/veloren!2591
 2021-07-18 13:43:32 +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
Joshua Barretto
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
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
Marcel
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
Joshua Barretto
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
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
Joshua Barretto
5989a25ef2 Fixed handling of orientation changes for airships 2021-07-18 01:13:36 +01:00
Marcel
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
Imbris
7c60b9577c Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
Imbris
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
Marcel
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
Imbris
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
Dr. Dystopia
d94f360a0f Resolve all '#[allow(clippy::op_ref)]' error supressions 2021-07-17 21:53:33 +02:00
Marcel Märtens
6de161a68f Revert "no longer incremental builds in CI" 
This reverts commit b3983c5451.
 2021-07-17 21:53:32 +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
Marcel
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