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

9277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
juliancoffee
a1bc725654 (uk_UA) update mining skills translation 2021-07-23 23:07:15 +03:00
juliancoffee
226dcb9f1a (uk_UA) update healing aura skill translation 2021-07-23 22:44:14 +03:00
juliancoffee
5516e91cfe (uk_UA) update bow skills translation 2021-07-23 22:18:49 +03:00
Samuel Keiffer
85b9f70469 Merge branch 'knightresspaladin/fix-circle-charge' into 'master' 
Fixed CircleCharge and buffed Rugged Hide droppers

See merge request veloren/veloren!2613
 2021-07-23 14:56:36 +00:00
Marcel
e9f6ae6b37 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
aac6a35d86 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
baf19b4d60 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
7d93d907f6 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
juliancoffee
a03992a236 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
cab565403c 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
5e21430204 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
09eff33562 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
7ce9a3e284 Removed exhausted check from BasicAura and reformat max call 2021-07-21 20:20:27 -07:00
Knightress Paladin
c48a7c0072 Used integer types to store combo values 2021-07-21 16:46:26 -07:00
Knightress Paladin
578cacc194 Relocated BasicAura's combo reading to its static data 2021-07-21 16:46:26 -07:00
Knightress Paladin
9be690770a Added check to prevent heal aura from being negative 2021-07-21 16:46:26 -07:00
Knightress Paladin
ce31ac9fd1 Added exhaustion check to BasicAura to try to prevent repeated casts 2021-07-21 16:46:26 -07:00
Knightress Paladin
68725a0131 Added check for 0 combo in healing aura strength equation 2021-07-21 16:46:26 -07:00
Marcel
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
schnippl0r
9e3b2a20d0 Moved GameInput to own module and made use of strum's EnumIter and AsRefStr. 2021-07-21 13:23:45 +02:00
Marcel
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
Marcel Märtens
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
Joshua Barretto
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
schnippl0r
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
Marcel
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
schnippl0r
342de16d2e Added en and de_DE translations for gameinput.greet. 2021-07-20 21:59:18 +02:00
Marcel
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
Marcel
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
Dr. Dystopia
9abd066e53 Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Imbris
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
Imbris
6e6f73c971 Remove unused setting for whether to create a log file 2021-07-19 10:26:55 -04:00
Imbris
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
Marcel
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
Marcel Märtens
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

We didnt had that problem in veloren repo until now.
 2021-07-19 13:33:19 +02:00
Marcel
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
Marcel Märtens
f11b6a09d6 now fix tarpaulin target cleanup, hopefully 2021-07-19 10:39:22 +02:00
Marcel
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
Knightress Paladin
7766aeb9eb Made Ngoubou rarer to spawn 2021-07-18 23:21:41 -07:00
Knightress Paladin
a97546dbff Removed aimbot from ChargeMelee and cleaned up variable typing 2021-07-18 23:12:55 -07:00
Knightress Paladin
081c6e5362 Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07:00
Imbris
d2b8a5a169 Fix check before calculating entity pushback, was causing a NaN and probably other bugs 2021-07-19 01:31:40 -04:00
juliancoffee
6f0aeecfca Deduplicate setting equipment tooltips 2021-07-19 03:12:36 +03:00
Imbris
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
Imbris
c16c83063f Reduce duplicate storage fetching since it has overhead 2021-07-18 15:09:37 -04:00
Imbris
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
Imbris
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
Imbris
32915f89a8 Extract scaling from all the animations 2021-07-18 15:09:36 -04:00
Imbris
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
Imbris
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
Snowram
fafb344404 Adds a liveness check for mounting 2021-07-18 15:04:02 -04:00