11616 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Snowram	f6343ff4f9	Modular bows offsets	2022-05-16 15:11:24 -04:00
Sam	e69aa8c4ee	Fixed items with components having incorrect hashes	2022-05-16 15:11:24 -04:00
Sam	558e2aefb7	Bow models	2022-05-16 15:11:23 -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	eec0ba18a9	Fixed eldwood recipes returning frostwood components.	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
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	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	aeac0f5ad6	Modular inputs now have tooltips.	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
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	360e12be22	UI can display a preview of the modular weapon output.	2022-05-16 15:11:17 -04:00
Sam	8fc0138e84	Initial crafting UI for modular weapons.	2022-05-16 15:11:17 -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	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	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	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	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	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	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
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