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
15,703 Commits 151 Branches 18 Tags 2.1 GiB
8d07447b47
Commit Graph

15703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
crabman
8d07447b47
Take artifacts from the correct profile on macos builds 2024-05-31 08:46:44 +00:00
crabman
e9b766d146 Merge branch 'crab/ci-image-update' into 'master' 
update ci cache

See merge request veloren/veloren!4488
 2024-05-30 20:06:35 +00:00
crabman
0375dcd936
update ci cache 2024-05-30 17:47:05 +00:00
crabman
2bae443c60 Merge branch 'weblate-translation' into 'master' 
Weblate translations

See merge request veloren/veloren!4487
 2024-05-30 12:46:16 +00:00
crabman
8b366fbef6 Merge branch 'crab/macos-build-fix' into 'master' 
attempt fixing build on macos x86

See merge request veloren/veloren!4486
 2024-05-30 11:49:42 +00:00
Codeberg Translate
df248dc2b8
Translated using Weblate (Portuguese) 
Currently translated at 6.2% (2 of 32 strings)

Added translation using Weblate (Vietnamese)

Translated using Weblate (Swedish)

Currently translated at 100.0% (10 of 10 strings)

Added translation using Weblate (Ukrainian)

Added translation using Weblate (Ukrainian)

Added translation using Weblate (Polish)

Added translation using Weblate (Polish)

Translated using Weblate (Portuguese)

Currently translated at 10.0% (2 of 20 strings)

Translated using Weblate (Portuguese)

Currently translated at 13.8% (10 of 72 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (2 of 2 strings)

Translated using Weblate (Portuguese)

Currently translated at 8.8% (6 of 68 strings)

Translated using Weblate (Swedish)

Currently translated at 59.8% (61 of 102 strings)

Translated using Weblate (Swedish)

Currently translated at 42.1% (139 of 330 strings)

Translated using Weblate (German)

Currently translated at 16.8% (48 of 285 strings)

Translated using Weblate (Swedish)

Currently translated at 39.6% (100 of 252 strings)

Translated using Weblate (Swedish)

Currently translated at 43.5% (17 of 39 strings)

Translated using Weblate (Swedish)

Currently translated at 58.8% (60 of 102 strings)

Translated using Weblate (Swedish)

Currently translated at 54.5% (18 of 33 strings)

Translated using Weblate (Swedish)

Currently translated at 18.5% (53 of 285 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (9 of 9 strings)

Translated using Weblate (German)

Currently translated at 97.0% (99 of 102 strings)

Translated using Weblate (Swedish)

Currently translated at 96.1% (75 of 78 strings)

Translated using Weblate (Swedish)

Currently translated at 96.9% (32 of 33 strings)

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Dateusz <Dateusz@users.noreply.translate.codeberg.org>
Co-authored-by: Karaya <Karaya@users.noreply.translate.codeberg.org>
Co-authored-by: Positron832 <Positron832@users.noreply.translate.codeberg.org>
Co-authored-by: PurpleDev <PurpleDev@users.noreply.translate.codeberg.org>
Co-authored-by: Thiagod86 <Thiagod86@users.noreply.translate.codeberg.org>
Co-authored-by: Trung Do <onlyesterday@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: loglizzy <loglizzy@users.noreply.translate.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor-other/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/crafting/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/crafting/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/key/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-modular/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-primary/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-body/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-gameinput/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-char_window/pt/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-chat/pt/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/pt/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-trade/pt/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/pt/
Translation: Veloren/armor
Translation: Veloren/armor-other
Translation: Veloren/crafting
Translation: Veloren/key
Translation: Veloren/potion
Translation: Veloren/voxygen-body
Translation: Veloren/voxygen-gameinput
Translation: Veloren/voxygen-hud-char_window
Translation: Veloren/voxygen-hud-chat
Translation: Veloren/voxygen-hud-misc
Translation: Veloren/voxygen-hud-trade
Translation: Veloren/voxygen-main
Translation: Veloren/weapon
Translation: Veloren/weapon-modular
Translation: Veloren/weapon-primary
 2024-05-30 11:14:21 +00:00
crabman
16050b2f63 Merge branch 'sylv256/gnarling-speed' into 'master' 
Fix Gnarling Speed

See merge request veloren/veloren!4481
 2024-05-30 10:41:55 +00:00
Sylv
44a56be25b Fix Gnarling Speed 2024-05-30 10:41:55 +00:00
crabman
94d67d2b44
attempt fixing build on macos x86 2024-05-30 09:55:44 +00:00
crabman
6d33fcad24 Merge branch 'uniior/chests2' into 'master' 
Revisited treasure chest models

See merge request veloren/veloren!4476
 2024-05-30 09:36:40 +00:00
Samuel Keiffer
c065b689ac Merge branch 'sam/buff-split-stats' into 'master' 
Damage and poise reduction stats now track split modifiers

See merge request veloren/veloren!4484
 2024-05-29 15:52:55 +00:00
Samuel Keiffer
79d97cdc22 Merge branch 'sam/diminishing-cc' into 'master' 
Diminishing returns for certain crowd control debuffs

See merge request veloren/veloren!4482
 2024-05-29 15:50:09 +00:00
Marcel
eeaa52f63e Merge branch 'xMAC94x/rustls_pemfile_update' into 'master' 
update rustls_pemfile

See merge request veloren/veloren!4479
 2024-05-29 08:32:21 +00:00
Marcel
82939a9971 Merge branch 'sam/projectile-rework' into 'master' 
Rewrote projectile constructor

See merge request veloren/veloren!4457
 2024-05-29 08:13:49 +00:00
Samuel Keiffer
4c35ef95f7 Merge branch 'crab/pickupitem-amount-overflow' into 'master' 
Fix overflow in PickupItem::amount

See merge request veloren/veloren!4477
 2024-05-29 01:53:59 +00:00
Samuel Keiffer
eeb68797e7 Merge branch 'new_sahagin' into 'master' 
new_sahagin

See merge request veloren/veloren!4467
 2024-05-29 00:01:46 +00:00
flo
ee608d3c25 new_sahagin 2024-05-29 00:01:46 +00:00
Samuel Keiffer
8ed78a8bb6 Merge branch 'sam/finisher-consistency' into 'master' 
All finisher abilities now consume all combo

See merge request veloren/veloren!4483
 2024-05-28 23:58:48 +00:00
Sam
7a7e6391b4 Rewrote projectile constructor 2024-05-28 19:54:36 -04:00
flo
d920facfb2 Merge branch 'dagon_anticheese' into 'master' 
dagon_anticheese

See merge request veloren/veloren!4478
 2024-05-28 19:13:49 +00:00
flo
5c575484f2 dagon_anticheese 2024-05-28 19:13:49 +00:00
crabman
7dd2072ced
Fix overflow in PickupItem::amount and set persistence stack_size to i64 2024-05-28 19:06:11 +00:00
crabman
a2ea012f43
upgrade rustls 2024-05-28 12:56:18 +00:00
Sam
8b24ca68a8 Damage and poise reduction stats now track split modifiers 2024-05-27 22:06:12 -04:00
Sam
e160435684 Changed all finisher abilities to consume all combo so that it is consistent across sword/axe/hammer 2024-05-27 21:38:13 -04:00
Sam
07220dfee8 Diminishing returns for certain crowd control debuffs 2024-05-27 20:25:12 -04:00
Samuel Keiffer
9264c10289 Merge branch 'srpapinha/parried-debuff-rework' into 'master' 
Parried debuff rework

See merge request veloren/veloren!4416
 2024-05-27 22:01:28 +00:00
Papinha
f17c5661ea Parried debuff rework 2024-05-27 22:01:28 +00:00
uniior
90f7246e28 Updated coin model 2024-05-26 11:05:19 -04:00
Marcel
601712cf77 Merge branch 'changelog-fix' into 'master' 
Remove changelog misinformation

See merge request veloren/veloren!4480
 2024-05-26 12:25:08 +00:00
Youser Nayme
374c04b6a2
Remove changelog misinformation 2024-05-26 08:01:23 -04:00
Marcel
88b9643b11 Merge branch 'sylv256/prompt-i18n' into 'master' 
Fix #1806: Localize PromptDialog

Closes #1806

See merge request veloren/veloren!4464
 2024-05-24 17:18:41 +00:00
Sylv
c9141f4c6b Fix #1806: Localize PromptDialog 2024-05-24 17:18:41 +00:00
Marcel Märtens
2c138fc0eb update rustls_pemfile 2024-05-24 18:09:26 +02:00
crabman
372c43e538 Merge branch 'xMAC94x/install_macos_rustup' into 'master' 
install missing toolchain on pipelien on macos runners

See merge request veloren/veloren!4312
 2024-05-23 15:50:04 +00:00
crabman
636e1bc2b3
only add aarch64 target on the macos-aarch64 job 2024-05-23 08:21:02 +00:00
Marcel Märtens
331c5b8f98
add target 2024-05-23 08:17:04 +00:00
Marcel Märtens
de1a99d8cb
uninstall old toolchains 2024-05-23 08:17:04 +00:00
Marcel Märtens
73de7859bc
install missing toolchain on pipelien on macos runners 2024-05-23 08:17:04 +00:00
flo
9ea234a17a Merge branch 'neura/cultist-loot' into 'master' 
Rebalance cultist dungeon loot tables and distribution, and improve Mindflayer anticheese

See merge request veloren/veloren!4460
 2024-05-23 06:07:21 +00:00
Youser Nayme
6c79e5dd9a Rebalance cultist dungeon loot tables and distribution, and improve Mindflayer anticheese 2024-05-23 06:07:20 +00:00
uniior
84e8dad14e Revisited treasure chest models 2024-05-21 09:21:55 -04:00
Marcel
cd59c6716f Merge branch 'neura/misc-deps-update' into 'master' 
Minor crate updates

See merge request veloren/veloren!4474
 2024-05-20 18:26:00 +00:00
Youser Nayme
3556eb6ed7
Update rcgen 2024-05-20 13:08:55 -04:00
Youser Nayme
88fe77479b
Update minifb 2024-05-20 13:04:22 -04:00
Youser Nayme
64a79f21f9
Update rstar 2024-05-20 13:04:22 -04:00
Youser Nayme
fbe7db846e
Update treeculler 2024-05-20 13:04:21 -04:00
Youser Nayme
23afb9237f
Update rodio 2024-05-20 13:04:21 -04:00
Youser Nayme
d6f239832a
Update native-dialog 2024-05-20 13:04:21 -04:00
Youser Nayme
2138b5cc8f
Update rusqlite 2024-05-20 13:04:20 -04:00