11966 Commits

This Branch

This Branch

All Branches

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
Imbris	50c34e56ce	Merge branch 'chucksys/chat-opacity-text' into 'master' ... Add chat window opacity value alongside slider See merge request veloren/veloren!3377	2022-05-19 03:48:20 +00:00
Samuel Keiffer	3f60629c54	Merge branch 'sam/item-key-rework' into 'master' ... Simplified item key Closes #1549 See merge request veloren/veloren!3382	2022-05-19 03:48:17 +00:00
Sam	bbe22d6807	Fixed bins (no assets)	2022-05-18 16:44:09 -04:00
Sam	aeca67443b	Simplified item key (assets)	2022-05-18 16:28:10 -04:00
Sam	534c7dc8b9	Simplified item key (no assets)	2022-05-18 16:28:06 -04:00
Samuel Keiffer	c3377547c3	Merge branch 'modular-weapons' into 'master' ... Modular weapons Closes #1255 See merge request veloren/veloren!2708	2022-05-18 00:42:03 +00:00
Sam	94d05b4ddf	Changelog	2022-05-17 19:57:16 -04:00
Sam	ed9bb7adae	Added comments to persistence code	2022-05-17 19:05:43 -04:00
Sam	46fe8604b7	Added search filtering to modular entries in crafting UI	2022-05-16 15:11:46 -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	72f38068e0	Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets).	2022-05-16 15:11:44 -04:00
Sam	ad48b634ab	Address feedback (assets)	2022-05-16 15:11:44 -04:00
Sam	066b8ef9fd	Address feedback (no assets)	2022-05-16 15:11:43 -04:00
Sam	254b7964e1	Balance tweaks (assets)	2022-05-16 15:11:43 -04:00
Sam	bcf36d08b0	Add removed items to migration.	2022-05-16 15:11:43 -04:00
Sam	54a6c31c63	Slight optimization to persistence	2022-05-16 15:11:42 -04:00
Sam	85c2a85817	Addressed review comments	2022-05-16 15:11:42 -04:00
Sam	d6ac9c43d7	More feedback addressed (assets).	2022-05-16 15:11:41 -04:00
Sam	00276acbdb	More feedback addressed (no assets).	2022-05-16 15:11:41 -04:00
Sam	5d0ba6e2b8	Addressed round 3 of feedback (no 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
Sam	c0dd748bc7	Addressed second round of balance feedback (no 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	95c3fdffa1	Addressed playtest feedback (no assets).	2022-05-16 15:11:39 -04:00
Sam	9b078c3383	Addressed playtest feedback (assets).	2022-05-16 15:11:38 -04:00
Sam	f47cbeb022	Addressed review comments	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
Sam	de8f98446e	Fixed errors in csv import, csv export, and recipe graphviz bins	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	1b85258838	Crafting slots now properly check component recipe book to see if an input is valid.	2022-05-16 15:11:35 -04:00
Sam	e9f36b9486	Propagated errors in persistence when accessing mutable parent item for modular componnets.	2022-05-16 15:11:35 -04:00
Sam	64d07d02c4	Changed item definition id to better handle modular items.	2022-05-16 15:11:34 -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	37442b638c	Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets).	2022-05-16 15:11:33 -04:00
Sam	49ff094286	Addressed most review comments (assets).	2022-05-16 15:11:33 -04:00
Sam	afd2c8730f	Addressed most review comments (no assets).	2022-05-16 15:11:32 -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
Bryant Deters	777fcdf477	closing crafting menu clears crafting components in modular recipe [ci_skip]	2022-05-16 15:11:31 -04:00
Bryant Deters	cabde522b0	cleanup commented line [ci_skip]	2022-05-16 15:11:31 -04:00
Bryant Deters	0d4b05b256	text margin fix, removed some mutable variables, can_perform for modulars accounts for crafting sprites [ci skip]	2022-05-16 15:11:30 -04:00
Sam	f6bf8206ab	Use new icons from Pfau	2022-05-16 15:11:30 -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