13518 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sam	7fab9d192b	Add repair bench to desert and cliff towns.	2023-04-06 10:57:18 -04:00
Sam	038929d66d	New models for ores and repair bench	2023-04-06 10:57:17 -04:00
Monty Marz	29a7520a48	adjusted death message, fixed repair bench text	2023-04-06 10:57:17 -04:00
Sam	a68ef7af30	Tweaks	2023-04-06 10:57:16 -04:00
Sam	132f26dbc0	Addressed review	2023-04-06 10:57:16 -04:00
Sam	79812a7326	Addressed persistence review comments.	2023-04-06 10:57:15 -04:00
Sam	f7765a8471	Added some repair recipes for some missed items.	2023-04-06 10:57:15 -04:00
Sam	92165a8fd8	Repair recipes no longer show ingredients as required when they are not damaged enough to need any	2023-04-06 10:57:14 -04:00
Sam	6a8fc3a423	Tweaked repair recipes	2023-04-06 10:57:14 -04:00
Sam	ff9f755c0c	Changed repair recipe to round down on material costs.	2023-04-06 10:57:13 -04:00
Sam	00710a4eb0	Fixed csv tools	2023-04-06 10:57:13 -04:00
UncomfySilence	3dae7b6d4a	small tweaks to repair recipe and addition of cultist, and uncraftable weapon repairs	2023-04-06 10:57:12 -04:00
Sam	e4ebd17363	Addressed feedback	2023-04-06 10:57:12 -04:00
Sam	807a8bcea0	Changelog	2023-04-06 10:57:08 -04:00
Sam	ca879173be	Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist.	2023-04-06 10:56:55 -04:00
Sam	658de93c59	Repairing UI	2023-04-06 10:56:53 -04:00
Sam	536d88a2c7	Repair costs scale based on how damaged the item is.	2023-04-06 10:54:50 -04:00
UncomfySilence	85ceae3354	repair recipes for armor pieces	2023-04-06 10:54:50 -04:00
Sam	52a62420db	Changed durability persistence to a NonZeroU32	2023-04-06 10:54:49 -04:00
Sam	011b6c3feb	Changed how durability was persisted so that a more general system can be used for future item properties.	2023-04-06 10:54:49 -04:00
Sam	0966753699	Added repair recipes	2023-04-06 10:54:48 -04:00
Sam	c3f5bc13f1	Equipment can now be repaired at sprites in town.	2023-04-06 10:54:48 -04:00
Sam	a555e08d0b	Added durability to item tooltips	2023-04-06 10:54:47 -04:00
Sam	c586db8feb	Item durability is now persisted	2023-04-06 10:54:47 -04:00
Sam	a07e042fa2	Items now lose durability on death	2023-04-06 10:54:46 -04:00
Sam	df13741be9	Durability system in place	2023-04-06 10:54:46 -04:00
Christof Petig	73cd4e5136	Merge branch 'christof/wasmer_update' into 'master' ... update wasmer See merge request veloren/veloren!3857	2023-04-06 07:22:24 +00:00
Christof Petig	49e734fa0b	Merge branch 'christof/multi_model_vox' into 'master' ... Support multiple models in one vox file, e.g. for figures See merge request veloren/veloren!3830	2023-04-06 07:09:20 +00:00
Christof Petig	7ab2bcd4e4	revert unwanted regressions as indicated by imbris	2023-04-06 08:30:49 +02:00
Samuel Keiffer	41e551f32d	Merge branch 'smol_sword_nerf' into 'master' ... Teeny changes to crippling stance abilities See merge request veloren/veloren!3855	2023-04-05 23:17:57 +00:00
Youssef Fahmy	7c85460f18	Teeny changes to crippling stance abilities	2023-04-05 23:17:57 +00:00
Christof Petig	8fac5192cc	update wasmer	2023-04-05 22:19:28 +02:00
Imbris	76bfae38a0	Merge branch 'imbris/update-conrod-copypasta' into 'master' ... Update copypasta version used by conrod See merge request veloren/veloren!3854	2023-04-05 07:19:16 +00:00
Imbris	9dd1b6c785	Switch from ansi-parser to cansi, down to a single version of nom!	2023-04-05 02:38:58 -04:00
Imbris	6ed75fa3aa	Update tynm dependency (had to update nom first)	2023-04-04 22:25:32 -04:00
Joshua Barretto	15ada6f25e	Merge branch 'tony/patch_underwater_fall_damage_bug' into 'master' ... Temporarily patch underwater fall damage bug See merge request veloren/veloren!3853	2023-04-04 22:25:32 +00:00
Christof Petig	e60aace448	realize zesterers proposal	2023-04-05 00:11:26 +02:00
Imbris	8352e4efae	Update copypasta version used by conrod so that we can avoid dependence on old xcb that will fail to compile soon due to dependency on quick-xml 0.22.0 ... See https://gitlab.com/veloren/veloren/-/issues/1815	2023-04-04 18:07:09 -04:00
Christof Petig	f4a87e9f0b	cargo fmt	2023-04-04 23:47:31 +02:00
Christof Petig	8d2b9b9a9c	single file orichalcum armor	2023-04-04 23:46:20 +02:00
Christof Petig	4da41b0dd0	move alchemist set to single file (with reduced hat size)	2023-04-04 23:46:20 +02:00
Christof Petig	e26cbffa0c	correct offsets from animation settings	2023-04-04 23:46:20 +02:00
Christof Petig	5cb974f770	cargo fmt	2023-04-04 23:46:20 +02:00
Christof Petig	76baf491ec	support model indices for humanoids	2023-04-04 23:46:20 +02:00
Christof Petig	fb06bb651b	a single llama file (smaller)	2023-04-04 23:46:20 +02:00
Christof Petig	0b8bc507ac	fix clippy	2023-04-04 23:46:20 +02:00
Christof Petig	9205da2298	cargo fmt	2023-04-04 23:46:20 +02:00
Christof Petig	b1dc85dc0f	llama in one vox file	2023-04-04 23:46:20 +02:00
Christof Petig	9b3bf4c3c8	initial support for multiple models in one vox file	2023-04-04 23:46:20 +02:00
Antonios Barotsis	34cdd2d7f5	fmt	2023-04-04 23:25:11 +02:00