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
11,668 Commits 151 Branches 18 Tags 2.1 GiB
96c770dbb1
Commit Graph

2829 Commits

Author SHA1 Message Date
Imbris
73244893cc Merge branch 'update-it_IT' into 'master' 
Updated the italian translation

See merge request veloren/veloren!3359
 2022-05-19 03:51:44 +00:00
Sam
aeca67443b Simplified item key (assets) 2022-05-18 16:28:10 -04:00
Sam
ba0846d6c7 Addressed more feedback 2022-05-16 15:11:46 -04:00
UncomfySilence
ac124b67a0 minor loot table tweaks and removal of yellow weapon components from caves 2022-05-16 15:11:45 -04:00
Sam
cbf5336343 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets). 2022-05-16 15:11:45 -04:00
Sam
ad48b634ab Address feedback (assets) 2022-05-16 15:11:44 -04:00
Sam
254b7964e1 Balance tweaks (assets) 2022-05-16 15:11:43 -04:00
Sam
d6ac9c43d7 More feedback addressed (assets). 2022-05-16 15:11:41 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
brunt
d46cdf60b5 renamed hilt voxels, adjusted secondary components in item image manifests [ci_skip] 2022-05-16 15:11:39 -04:00
Sam
9b078c3383 Addressed playtest feedback (assets). 2022-05-16 15:11:38 -04:00
brunt
fc28449703 rotate voxels and sceptre positioning [ci_skip] 2022-05-16 15:11:37 -04:00
UncomfySilence
1c626da66b loot tables and adding models 2022-05-16 15:11:36 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00
Sam
3f2f0a7715 Fixed item drop manifest for secondary components. 2022-05-16 15:11:36 -04:00
Sam
efc0189548 Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (assets). 2022-05-16 15:11:34 -04:00
Sam
49ff094286 Addressed most review comments (assets). 2022-05-16 15:11:33 -04:00
brunt
5ab9c0f1ad sceptre positioning [ci_skip] 2022-05-16 15:11:32 -04:00
Sam
6ccc0b82f0 Models for sceptres and secondary components 2022-05-16 15:11:32 -04:00
Monty Marz
c3f92622c1 bg icons 2022-05-16 15:11:29 -04:00
Bryant Deters
af1a44264a add melee weapons to item_drop_manifest [ci skip] 2022-05-16 15:11:29 -04:00
Bryant Deters
4edd041056 add staffs to item_drop_manifest [ci skip] 2022-05-16 15:11:29 -04:00
Bryant Deters
1ce474adbb modular bow offset tweaks [ci skip] 2022-05-16 15:11:28 -04:00
Bryant Deters
f767e81133 modular staff offsets [ci skip] 2022-05-16 15:11:28 -04:00
Sam
e8c97f7a00 Staff models 2022-05-16 15:11:27 -04:00
Bryant Deters
f1940128bf modular bow offset adjustments [ci skip] 2022-05-16 15:11:27 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Snowram
f6343ff4f9 Modular bows offsets 2022-05-16 15:11:24 -04:00
Sam
558e2aefb7 Bow models 2022-05-16 15:11:23 -04:00
Sam
eec0ba18a9 Fixed eldwood recipes returning frostwood components. 2022-05-16 15:11:22 -04:00
Sam
d436362a8d Consolidated crafting UI for the primnary component of modular weapons. 2022-05-16 15:11:21 -04:00
Snowram
74a3f4a7dc Modular 1h weapons offsets 2022-05-16 15:11:21 -04:00
Sam
3702952f99 Added recipes for each material kind. 2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e Added method of differing names for 1h and 2h variants of a modular wepaon. 
Added all 1h melee weapon models.
 2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d Ui 2022-05-16 15:11:18 -04:00
Sam
1c0154487a Rebase fixes. 2022-05-16 15:11:18 -04:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
5c28e3cb25 Items with components can now have their name modified by the components. Also addressed more review. ONLY ASSETS 2022-05-16 15:11:16 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -04:00
Sam
d7f5b907ff Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS 2022-05-16 15:11:14 -04:00
Sam
eecc1b42c3 Fixed regex mistake in changing name of item assets. 2022-05-16 15:11:13 -04:00
Sam
62632318fe Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. ONLY ASSETS 2022-05-16 15:11:12 -04:00
Sam
b048179c0a Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS. 2022-05-16 15:11:11 -04:00
Sam
03ab68eb60 Added models for sword blade, axe head, and hammer head components. 2022-05-16 15:11:09 -04:00
Sam
2aad3f3961 Switched to item list as an input for modular components so that allowed items could be centralized. 2022-05-16 15:11:08 -04:00
Snowram
b01e816c0d Modular axes and hammers offsets 2022-05-16 15:11:08 -04:00
Snowram
e693b3132d Modular swords offsets 2022-05-16 15:11:07 -04:00
Sam
ac306bbec0 Added weapon models for 2h axe, hammer, and sword. 2022-05-16 15:11:07 -04:00
Sam
5acb8cf74e Rebase conflcits handled. 2022-05-16 15:11:05 -04:00
Sam
33feee787b Removed stuff no longer needed after new method of crafting modular weapons. 2022-05-16 15:11:05 -04:00