4952 Commits

Author	SHA1	Message	Date
Samuel Keiffer	162509e1c9	Merge branch 'sam/durability' into 'master' ... Durability See merge request veloren/veloren!3509	2023-04-06 22:42:52 +00:00
Hudson	e03406b103	fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one	2023-04-06 13:43:11 -05:00
Hudson	4881d2fd8b	fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one	2023-04-06 12:40:08 -05:00
Monty Marz	29a7520a48	adjusted death message, fixed repair bench text	2023-04-06 10:57:17 -04:00
Sam	132f26dbc0	Addressed review	2023-04-06 10:57:16 -04:00
Sam	00710a4eb0	Fixed csv tools	2023-04-06 10:57:13 -04:00
Sam	e4ebd17363	Addressed feedback	2023-04-06 10:57:12 -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
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	df13741be9	Durability system in place	2023-04-06 10:54:46 -04:00
Christof Petig	e60aace448	realize zesterers proposal	2023-04-05 00:11:26 +02: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	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	0b8bc507ac	fix clippy	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
Avi Weinstock	908b2a62fa	Change item color in details mode.	2023-04-03 15:40:34 -04:00
Avi Weinstock	6899023fde	Sort merchant inventories lexicographically by (quality, name, quantity) ... in details mode.	2023-04-03 14:43:14 -04:00
Avi Weinstock	8facf7b58d	Add a list mode to inventories to make it easier to see item names at merchants.	2023-04-03 14:43:14 -04:00
Joshua Barretto	17cdd3e38d	Merge branch 'zesterer/choose-starting-site' into 'master' ... Allow new players to choose their starting site See merge request veloren/veloren!3848	2023-04-02 00:45:25 +00:00
Joshua Barretto	ab5561df61	Removed redundant things	2023-04-02 01:09:12 +01:00
Monty Marz	33e643fbfd	fmt	2023-04-02 01:21:10 +02:00
Monty Marz	d1f6db9da6	different site name col	2023-04-02 00:55:21 +02:00
Sam	6849f9fc21	Fix function name typo	2023-04-01 18:11:16 -04:00
Joshua Barretto	33ebb0a4a3	Make clippy happy	2023-04-01 22:55:45 +01:00
Sam	352d34557e	Fix modular crafting window showing an item output when it is not possible to craft two components together.	2023-04-01 17:22:01 -04:00
Sam	2e6d55a78b	Use topographic map for town selection screen.	2023-04-01 17:10:44 -04:00
Monty Marz	ca18da8061	UI tweaks	2023-04-01 21:54:48 +02:00
Maxicarlos08	ac377e2bbf	Hide invites comming from muted players	2023-04-01 18:45:19 +02:00
Joshua Barretto	19db823092	Proper next/prev site buttons	2023-04-01 12:34:58 +01:00
Joshua Barretto	0d7ee4479b	Limit starter sites to towns	2023-03-31 21:31:01 +01:00
Joshua Barretto	6add1b851d	Simplified map drawing	2023-03-31 20:44:59 +01:00
Joshua Barretto	0f7648aadb	Better use of space on char create screen	2023-03-31 18:08:12 +01:00
Joshua Barretto	c28e61383d	Added target to starting site map	2023-03-31 16:25:24 +01:00
Joshua Barretto	45644da98a	Don't display the world map on character edit	2023-03-31 14:36:30 +01:00
Joshua Barretto	acec45b756	Initial implementation of starting site choice	2023-03-31 14:24:14 +01:00
Monty Marz	d1a7884ac8	Merge branch 'more_spot_things' into 'master' ... grave models, spot fixes, sword overlay See merge request veloren/veloren!3842	2023-03-31 02:57:39 +00:00
Isse	c34e5ad4ed	Small fixes	2023-03-29 23:11:59 +00:00
Monty Marz	e4c5e50fb2	grave models, spot fixes, sword overlay	2023-03-29 13:10:49 +02:00
Samuel Keiffer	a737a1862c	Merge branch 'sam/sword-balance-0' into 'master' ... Sword Tweaks See merge request veloren/veloren!3838	2023-03-29 01:26:33 +00:00
Sam	c9af470cc7	Final tweaks	2023-03-28 20:55:21 -04:00
flo	aec35a4792	bird_medium_wing_tweaks	2023-03-27 19:13:19 +00:00
Sam	cdaf9e5c0e	Ability changes	2023-03-26 21:41:22 -04:00
Sam	5c675fdbe2	Addressed review	2023-03-21 20:18:34 -04:00
Monty Marz	3e37586ba5	icons	2023-03-21 20:18:32 -04:00