3316 Commits

Author	SHA1	Message	Date
Imbris	ca1a27bd11	Merge branch 'imbris/update-tracy' into 'master' ... Update tracy See merge request veloren/veloren!3400	2022-05-27 02:50:24 +00:00
Joshua Barretto	3b6e6be947	Merge branch 'zesterer/fix-climbing' into 'master' ... Fixed climbing See merge request veloren/veloren!3401	2022-05-26 09:34:10 +00:00
Joshua Barretto	4eb781cdf7	Fixed climbing	2022-05-26 10:08:41 +01:00
Imbris	a366fc4512	Update tracy	2022-05-26 00:04:03 -04:00
N A	d84a26dfd8	Special case taming and mounting.	2022-05-24 02:09:45 +00:00
Corvella	42af9b8e15	Hitbox improvements	2022-05-23 09:18:10 +00:00
Joshua Barretto	d18483756b	Fixed frozen character when wall-run into water horizontally	2022-05-22 19:37:52 +01:00
Sam	bbe22d6807	Fixed bins (no assets)	2022-05-18 16:44:09 -04:00
Sam	534c7dc8b9	Simplified item key (no assets)	2022-05-18 16:28:06 -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	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	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	c0dd748bc7	Addressed second round of balance feedback (no assets).	2022-05-16 15:11:40 -04:00
Sam	95c3fdffa1	Addressed playtest feedback (no assets).	2022-05-16 15:11:39 -04:00
Sam	f47cbeb022	Addressed review comments	2022-05-16 15:11:38 -04:00
Sam	de8f98446e	Fixed errors in csv import, csv export, and recipe graphviz bins	2022-05-16 15:11:37 -04:00
Sam	528b62c59a	Rebase commit	2022-05-16 15:11:36 -04:00
Sam	64d07d02c4	Changed item definition id to better handle modular items.	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	afd2c8730f	Addressed most review comments (no assets).	2022-05-16 15:11:32 -04:00
Sam	816c265662	Rebase stuffs	2022-05-16 15:11:26 -04:00
Sam	fceb48c3ac	Removed vec allocation for component recipe iterators	2022-05-16 15:11:26 -04:00
Sam	a5a517916e	Initial UI including ingredients in crafting modular components	2022-05-16 15:11:25 -04:00
Sam	085b18c07a	Formatting tweaks to tooltips	2022-05-16 15:11:25 -04:00
Bryant Deters	075fee5190	modular component tooltips	2022-05-16 15:11:25 -04:00
Sam	e69aa8c4ee	Fixed items with components having incorrect hashes	2022-05-16 15:11:24 -04:00
Sam	6fa7852a8c	Fixed random generation of modular weapons.	2022-05-16 15:11:23 -04:00
Sam	e86d2ab46a	Fixed rebase	2022-05-16 15:11:22 -04:00
Sam	cb04433c14	Fix rebase	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
Sam	5877334ed3	Tags are now generated for modular items.	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
Sam	af50864643	Fixed issue in updating item config when loading persisted items.	2022-05-16 15:11:18 -04:00
Sam	bf348b7f43	Addressed further review.	2022-05-16 15:11:16 -04:00
Sam	94c19735ca	Fixed broken stuff during rebase.	2022-05-16 15:11:16 -04:00
Sam	81c83c5e83	Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS	2022-05-16 15:11:15 -04:00
Sam	524845b661	Addressed more comments on MR.	2022-05-16 15:11:15 -04:00
Sam	259db56ca6	Addressed more comments in MR review.	2022-05-16 15:11:14 -04:00
Sam	fa9e034757	Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. NO ASSETS	2022-05-16 15:11:13 -04:00
Sam	36da0cf981	Removed inner toolkind from ModularBase::Tool.	2022-05-16 15:11:13 -04:00
Sam	a9e9a70687	Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS	2022-05-16 15:11:11 -04:00
Sam	b048179c0a	Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS.	2022-05-16 15:11:11 -04:00
Sam	08b7bb781f	Changed Item to have ItemBase instead of ItemDef. NO ASSETS.	2022-05-16 15:11:10 -04:00
Sam	5bacf526ad	Began addressing initial review of modular weapons.	2022-05-16 15:11:10 -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
Sam	539c3307a6	Fixed persistence error that would occur when dropping a modular item and then picking up that same item in the same persistence cycle.	2022-05-16 15:11:06 -04:00