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

15785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
12726cf58c Merge branch 'weblate-translation' into 'master' 
Update translation files (Weblate)

See merge request veloren/veloren!4503
 2024-06-16 22:11:44 +00:00
Otto Richter
7cca60031b Update translation files (Weblate) 2024-06-16 22:11:44 +00:00
flo
e4cd939eb8 Merge branch 'adjust_large_bird_routes' into 'master' 
adjust_large_bird_routes

See merge request veloren/veloren!4492
 2024-06-11 22:02:37 +00:00
flo
998a8a8273 adjust_large_bird_routes 2024-06-11 22:02:37 +00:00
Marcel
8589e8f9f6 Merge branch 'sam/fix-pr-typo' into 'master' 
Fix typo

See merge request veloren/veloren!4500
 2024-06-09 16:04:22 +00:00
Sam
a4485d9914 Fix typo 2024-06-08 17:56:13 -04:00
Samuel Keiffer
5c0299ef82 Merge branch 'sam/migration-fix-fix' into 'master' 
Actual migration fix

See merge request veloren/veloren!4498
 2024-06-07 21:04:14 +00:00
Sam
d2a85ba014 Touch file 2024-06-07 15:51:15 -04:00
Sam
a58530a38f Actually fixed 2024-06-07 15:48:04 -04:00
Samuel Keiffer
71e406f488 Merge branch 'sam/fix-migration' into 'master' 
Fixed migration

See merge request veloren/veloren!4497
 2024-06-07 03:48:59 +00:00
Sam
361c3f1400 Fixed migration 2024-06-06 20:13:32 -04:00
Isse
c205a1fae2 Merge branch 'isse/fix-give' into 'master' 
Don't crash with the give_item command with wrong item path

See merge request veloren/veloren!4495
 2024-06-06 17:28:01 +00:00
Marcel
0bb07662e2 Merge branch 'xMAC94x/update_hyper' into 'master' 
Update hyper/axum and dependent crates.

See merge request veloren/veloren!4491
 2024-06-06 16:01:30 +00:00
Isse
9c51b1258a
Don't crash with give command 2024-06-06 17:31:52 +02:00
Sam
4ef1be08ec Character animation restructuring 2024-06-05 22:31:17 -04:00
Samuel Keiffer
bee04f84d4 Merge branch 'horblegorble/interim-hammer-tweaks' into 'master' 
interim hammer tweaks - m2 poise, vigorous bash combo

See merge request veloren/veloren!4493
 2024-06-05 23:51:25 +00:00
horblegorble
5eea891812 nerf retaliate damage 2024-06-06 02:28:33 +10:00
horblegorble
d14c185a78 wallop angle increase; damage and scaling decreases for judgement and thunderclap 2024-06-05 19:00:43 +10:00
horblegorble
bfef917693 interim hammer tweaks - m2 poise, vigorous bash combo 2024-06-05 15:09:41 +10:00
Samuel Keiffer
1f0e014daa Merge branch 'james/recipes' into 'master' 
Unlockable recipes

See merge request veloren/veloren!3837
 2024-06-04 21:06:52 +00:00
Marcel Märtens
0f84c5d6f0 remove CryptProvider code again, it seems to be nolonger possible when axum uses hyper-rustls with native-tokio and ring feature active 2024-06-04 14:43:25 +02:00
Marcel Märtens
75f2e0800a Update hyper/axum and dependent crates. 
note this removes an old rustls, due to the new one we require to initialize our CryptoProvider.
also removed a very verbose trace.
 2024-06-04 14:31:36 +02:00
Sam
d1b54b7da4 Changelog 2024-06-03 21:24:41 -04:00
Sam
b6d08a8d24 Fixed migration 2024-06-03 21:24:16 -04:00
Sam
d7f5c013ad Remove ItemVisualKey 2024-06-03 21:24:16 -04:00
Sam
c2604ef527 Added test for each recipe being reachable. Made new recipes reachable. 2024-06-03 21:24:16 -04:00
James Melkonian
b40a14ae62 Initial recipe component work 
Insert RecipeBook into ECS

Add recipe command

Fully functional recipes

Recipe items

Update item_image_manifest.ron

scroll item image/drop model

Colored recipe vox models

Reset recipes command

Move RecipeBook into Inventory

Persistence for recipe book

Recipe book migration

Recipe items can now be dynamically generated from the recipe book

Removed recipe items and recipe item generation bin

Fix rebase

Made recipes available in world

Fix rebase

Default recipes to manifest

Recipes now have prices in economy.

Changed recipes to go into kind before reaching item visual manifests.

Default recipes automatically added to recipe book on character load.

Loot table rebalancing

Addressed balance feedback

MR review feedback

Recipes are now unlocked in groups

Modular weapon component recipes now require learning recipes

Metal weapon recipes now also teach how to craft their requisite ingots

Added test for all recipes being valid
 2024-06-03 21:24:15 -04:00
Marcel
9036baa479 Merge branch 'neura/kiddo-update' into 'master' 
Update kiddo from 0.2 to 4.2.0

See merge request veloren/veloren!4471
 2024-06-03 23:12:54 +00:00
Youser Nayme
7edbb4449e Update kiddo from 0.2 to 4.2.0 2024-06-03 23:12:53 +00:00
flo
69003aaebe Merge branch 'worldboss_aggro_fix' into 'master' 
worldboss_aggro_fix

See merge request veloren/veloren!4490
 2024-06-03 06:52:13 +00:00
flo
8863ea53c4 worldboss_aggro_fix 2024-06-03 06:52:13 +00:00
crabman
a168ea8dcd Merge branch 'crab/macos-artifact-fix' into 'master' 
Take artifacts from the correct profile on macos builds

See merge request veloren/veloren!4489
 2024-05-31 10:15:21 +00:00
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