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,274 Commits 151 Branches 18 Tags 2.1 GiB
d5e2fcca0f
Commit Graph

9274 Commits

This Branch
This Branch
All Branches
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
Dr. Dystopia
dd13f5298d Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions 2021-07-24 20:04:52 +02:00
Dr. Dystopia
0a926009e5 Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions 2021-07-24 20:01:11 +02:00
Marcel
574fc9df90 Merge branch 'xMAC94x/job_metrics' into 'master' 
implement slowjob metrics to measuere time in queue and execution time

See merge request veloren/veloren!2654
 2021-07-22 19:17:30 +00:00
Joshua Barretto
c26c3e8653 Merge branch 'juliancoffee/fix_zombie_birds' into 'master' 
Wake birds up

See merge request veloren/veloren!2661
 2021-07-22 19:14:26 +00:00
Marcel Märtens
e7cba8341b remove an unused queue_created in the Queue, might be added in the future again for more metrics. Also use core than std in one place 2021-07-22 20:57:16 +02:00
Marcel Märtens
1912617e84 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
juliancoffee
b288e0f7ea Wake birds up 
* give large rtsim birds their default main tool which allows them to
use AI tactics
* force entities to fly on critical failing velocities to avoid suicide
 2021-07-22 18:00:22 +03:00
Marcel
7c37e35661 Merge branch 'xMAC94x/ci_hardening' into 'master' 
execute jobs only if all previous jobs in previous stages succeded, e.g. in...

See merge request veloren/veloren!2660
 2021-07-22 11:06:30 +00:00
Marcel Märtens
365e23992e execute jobs only if all previous jobs in previous stages succeded, e.g. in case of error in windows job dont push the linux docker container or change the tag yet 2021-07-22 12:05:43 +02:00
Samuel Keiffer
42b78a5206 Merge branch 'knightresspaladin/fix-death-by-heal' into 'master' 
Fix Bug Causing Healing Aura to Occasionally Kill Its User

See merge request veloren/veloren!2646
 2021-07-22 04:36:56 +00:00
Knightress Paladin
9f86189d86 Removed exhausted check from BasicAura and reformat max call 2021-07-21 20:20:27 -07:00
Knightress Paladin
974ab07e82 Used integer types to store combo values 2021-07-21 16:46:26 -07:00
Knightress Paladin
9abe3691af Relocated BasicAura's combo reading to its static data 2021-07-21 16:46:26 -07:00
Knightress Paladin
18edd19240 Added check to prevent heal aura from being negative 2021-07-21 16:46:26 -07:00
Knightress Paladin
05a2efee52 Added exhaustion check to BasicAura to try to prevent repeated casts 2021-07-21 16:46:26 -07:00
Knightress Paladin
3b217e59aa Added check for 0 combo in healing aura strength equation 2021-07-21 16:46:26 -07:00
Marcel
912fdca177 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
schnippl0r
1ba8b8c4d3 Moved GameInput to own module and made use of strum's EnumIter and AsRefStr. 2021-07-21 13:23:45 +02:00
Marcel
11de0db8df Merge branch 'xMAC94x/tag-nightly' into 'master' 
veloren nightly tag

See merge request veloren/veloren!2656
 2021-07-21 07:33:29 +00:00
Marcel Märtens
5000803966 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
Joshua Barretto
4aa659a4bc 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
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
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