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
12,555 Commits 151 Branches 18 Tags 2.1 GiB
b1f45ea241
Commit Graph

12555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
b1f45ea241 Sword triple strike tweaks. 2022-10-19 09:36:20 -04:00
Sam
69bb7d9047 Changelog 2022-10-19 09:34:11 -04:00
UncomfySilence
f21082fa76 minor stat tweaks and cleanup 2022-10-16 14:12:37 +02:00
Sam
8eb89adb61 Fixed unintentional overbuff to speed focused secondary components 2022-10-16 14:06:42 +02:00
UncomfySilence
c432a0b719 rings and necks 2022-10-16 14:06:42 +02:00
Sam
3222fb88b0 Nerfed melee combo melee skills 2022-10-16 14:06:42 +02:00
UncomfySilence
fe87f8c38d induv hat stat changes 2022-10-16 14:06:42 +02:00
Sam
2735d3403c Nerfed other sets 2022-10-16 14:06:41 +02:00
Sam
46daa6bfa9 Armor nerf 2022-10-16 14:06:41 +02:00
Marcel
471b5996c3 Merge branch 'pfau/things' into 'master' 
Add gnarling chieftain mask

See merge request veloren/veloren!3657
 2022-10-15 11:05:21 +00:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
Imbris
0c05fe54d3 Merge branch '4ydx/overflow-fix' into 'master' 
Fix int overflows causing crash when using /goto

See merge request veloren/veloren!3656
 2022-10-13 13:58:03 +00:00
4ydx
4ae332b8d1 Fix int overflows causing crash when using /goto 2022-10-13 13:58:02 +00:00
Joshua Barretto
b677051ef8 Merge branch 'zesterer/perf2' into 'master' 
Various terrain-related performance improvements

See merge request veloren/veloren!3655
 2022-10-12 14:46:13 +00:00
Joshua Barretto
3c54e63592 Various minor optimisations 2022-10-12 13:57:14 +01:00
Joshua Barretto
8800bdbef6 Updated missed changelog entry 2022-10-11 23:57:48 +01:00
Isse
536bb9b71c Merge branch 'zesterer/citadel' into 'master' 
Two new tree types and disabled citadel site.

See merge request veloren/veloren!3652
 2022-10-10 16:19:48 +00:00
Samuel Keiffer
51b679928a Merge branch 'james/recipes' into 'master' 
Add unit test to validate recipe keys

See merge request veloren/veloren!3653
 2022-10-10 05:03:37 +00:00
James Melkonian
99d547c7c6 Add unit test to validate recipe keys 2022-10-09 20:50:09 -07:00
IsseW
2ba5b33868 fmt 2022-10-10 00:15:57 +02:00
IsseW
c8a08b4794 fix warnings 2022-10-09 23:42:38 +02:00
Joshua Barretto
0a6ac5f5f1 sync 2022-10-09 23:25:40 +02:00
Joshua Barretto
68df88a721 Added redwoods 2022-10-09 23:23:43 +02:00
Joshua Barretto
1392a8662f Added dead trees 2022-10-09 23:23:42 +02:00
Joshua Barretto
0b5d043d8e Began work on citadel 2022-10-09 23:23:39 +02:00
Marcel
160cbbf449 Merge branch 'steel_pick_desc' into 'master' 
Removes blue vein reference from Steel Pickaxe description

See merge request veloren/veloren!3491
 2022-10-09 19:50:31 +00:00
Julio Cezar Silva
0d090bb93e Removes blue vein reference from Steel Pickaxe description 2022-10-09 19:50:30 +00:00
Joshua Barretto
dbc7ac9710 Merge branch 'kilpkonn/fix_agent_target_unset_in_trade' into 'master' 
Fix npcs untargeting trade partner while in trade

Closes #1725

See merge request veloren/veloren!3649
 2022-10-07 15:06:40 +00:00
Tavo Annus
fcd7447991 Fix npcs untargeting trade partner while in trade 2022-10-07 15:17:49 +03:00
Marcel
d4f5a18bd0 Merge branch 'tygyh/Swedish-translations' into 'master' 
Update swedish translation

See merge request veloren/veloren!3648
 2022-10-05 09:12:16 +00:00
tygyh
fcc096c599 Update swedish translation 2022-10-05 09:48:18 +02:00
Marcel
6844094389 Merge branch 'kitswas/worldgen-spawn-fixes' into 'master' 
Spawn fix(es)

See merge request veloren/veloren!3579
 2022-10-05 07:07:43 +00:00
Marcel
f07c0b67ee Merge branch 'update_simplified_chinese' into 'master' 
Upgrade Simplified Chinese Translation

See merge request veloren/veloren!3641
 2022-10-04 22:59:41 +00:00
WanCheng Ye
85b345054e Upgrade Simplified Chinese Translation 2022-10-04 22:59:41 +00:00
Marcel
b9c249940c Merge branch 'galaipa/update-eu' into 'master' 
Translate missing Basque strings

See merge request veloren/veloren!3647
 2022-10-04 22:25:23 +00:00
Bingen Galartza
4c4a1bf80b Translate missing Basque strings 2022-10-04 22:25:23 +00:00
Marcel
4b0033ff91 Merge branch 'Nether190/update-pt_BR' into 'master' 
Nether190/update-pt_BR

See merge request veloren/veloren!3632
 2022-10-04 22:10:11 +00:00
Valter Sanches
60c3d80d57 Nether190/update-pt_BR 2022-10-04 22:10:11 +00:00
Marcel
f584a3f0f6 Merge branch 'fix_Latin-American_translation' into 'master' 
correction in the translation Spanish Latin American

See merge request veloren/veloren!3646
 2022-10-04 21:50:03 +00:00
Marcel
e5dfc6261c Merge branch 'ztianyang/lantern' into 'master' 
Crafting recipe for black lantern

See merge request veloren/veloren!3590
 2022-10-02 17:46:38 +00:00
Tianyang Zhang
99bedde100 Crafting recipe for black lantern 2022-10-02 17:46:36 +00:00
Marcel
e61c2eac84 Merge branch 'meyerhenning/fix_german_translation' into 'master' 
Complete German Translation

See merge request veloren/veloren!3645
 2022-10-02 17:45:26 +00:00
Henning Meyer
8581d3da38 Complete German Translation 2022-10-02 17:45:26 +00:00
Juan Pablo Lagos
b716284ef2 correction in the translation Spanish Latin American 2022-10-02 17:09:55 +09:00
Marcel
477098de16 Merge branch 'meyerhenning/fix_german_translation' into 'master' 
German Translation Edits

See merge request veloren/veloren!3644
 2022-10-01 16:53:27 +00:00
Henning Meyer
fee11cc438 German Translation Edits 2022-10-01 16:53:27 +00:00
Marcel
3d8cd6fb04 Merge branch 'juliancoffee/fix-i18n' into 'master' 
Follow-up from i18n-helpers MR

See merge request veloren/veloren!3643
 2022-10-01 16:01:23 +00:00
Marcel
95edd377f1 Merge branch 'trade-pets-food' into 'master' 
Allow pets to be traded with.

See merge request veloren/veloren!3633
 2022-10-01 16:01:21 +00:00
juliancoffee
9dc07a38db Follow-up from i18n-helpers MR 2022-10-01 18:35:36 +03:00
Avi Weinstock
e6576f0cf3 Make the trading AI for pets only accept food. 2022-09-30 15:11:03 -04:00