15792 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Samuel Keiffer	0dc194bb6b	Merge branch 'uniior/sword-anims' into 'master' ... Sword animations #1 See merge request veloren/veloren!4520	2024-07-08 23:56:10 +00:00
Marcel	94c74cb2f2	Merge branch 'xMAC94x/prepare_toolchain_upgrade' into 'master' ... prepare comments intendation for next toolchain See merge request veloren/veloren!4519	2024-07-08 23:08:28 +00:00
uniior	38e403eab2	cargo fmt	2024-07-08 18:40:38 -04:00
Marcel Märtens	618492da39	prepare comments intendation for next toolchain	2024-07-09 00:27:25 +02:00
uniior	fc6b87d5ca	Dual Cross Cut	2024-07-08 16:21:46 -04:00
uniior	ef3489806e	Cross Cut	2024-07-08 16:21:45 -04:00
uniior	4b0e31a91d	Cascade	2024-07-08 16:21:45 -04:00
uniior	d9ff439ffe	Skewer	2024-07-08 16:21:45 -04:00
uniior	67691eda44	Fell Strike	2024-07-08 16:15:51 -04:00
uniior	255b084619	Hamstring/Crescent Slash	2024-07-08 16:15:50 -04:00
uniior	44c6270ad2	Quick Draw + tweaks ... "Rebase"	2024-07-08 16:15:50 -04:00
uniior	6638184096	Double Slash, Heavy Sweep and Pommel Strike ... "Rebase"	2024-07-08 16:15:49 -04:00
uniior	e7eb6b4159	Gouge	2024-07-08 16:15:49 -04:00
uniior	b402fa8473	Disengage	2024-07-08 16:15:49 -04:00
uniior	4eb0e8cd36	Feint draft + tweaks ... "Rebase"	2024-07-08 16:15:48 -04:00
uniior	0ca6109769	Quick Draw + tweaks	2024-07-08 16:15:48 -04:00
uniior	67f7f24285	Double Slash, Heavy Sweep and Pommel Strike	2024-07-08 16:15:48 -04:00
Samuel Keiffer	9c424b98d4	Merge branch 'sam/display-recipes' into 'master' ... Show acquired recipes in diary screen See merge request veloren/veloren!4518	2024-07-07 20:14:56 +00:00
Sam	2daba842bd	Show acquired recipes in diary screen	2024-07-06 20:55:09 -04:00
Samuel Keiffer	a3ef7ddf93	Merge branch 'james/charm-recipe-category' into 'master' ... Make charm recipes accessible by putting them in the potion tab of the crafting menu See merge request veloren/veloren!4509	2024-06-30 23:27:33 +00:00
James Melkonian	3dcf9ab62e	Make charm recipes accessible by putting them in the potion tab of the crafting menu	2024-06-30 23:27:33 +00:00
Marcel	6214f9df5a	Merge branch 'neura/minor-updates' into 'master' ... Update ratatui and run cargo update See merge request veloren/veloren!4516	2024-06-29 22:31:08 +00:00
Youser Nayme	2ab41e56e6	Run cargo update	2024-06-29 17:26:05 -04:00
Youser Nayme	d7c82ce534	Update ratatui	2024-06-29 17:05:29 -04:00
Marcel	3ece56eb4a	Merge branch 'horblegorble/recipe-pricing' into 'master' ... recipe pricing adjustments; changed sea cleric drop See merge request veloren/veloren!4515	2024-06-27 20:03:05 +00:00
Marcel	6a4fcbe412	Merge branch 'neura/update-noise' into 'master' ... Update noise See merge request veloren/veloren!4512	2024-06-26 12:12:15 +00:00
horblegorble	ef81ec1fdd	scaling tweaks	2024-06-26 17:04:02 +10:00
horblegorble	37bfc7581f	changelog entry	2024-06-26 16:52:36 +10:00
horblegorble	f9651a1289	recipe pricing adjustments; changed sea cleric drop	2024-06-26 16:45:24 +10:00
Youser Nayme	ce7732674a	Update noise	2024-06-26 00:59:36 -04:00
Marcel	5e41b34dc2	Merge branch 'neura/update-crates' into 'master' ... Update various crates See merge request veloren/veloren!4513	2024-06-24 04:58:20 +00:00
Youser Nayme	a145b0ea2c	Update dispatch	2024-06-23 21:50:46 -04:00
Youser Nayme	a12c320f8c	Update ordered-float	2024-06-23 21:50:45 -04:00
Youser Nayme	ca6bcaab7d	Update strum and itertools	2024-06-23 21:50:33 -04:00
Youser Nayme	36d192a2f6	Update chrono-tz	2024-06-23 11:17:07 -04:00
Youser Nayme	a1930b81d0	Update image	2024-06-23 11:07:15 -04:00
Youser Nayme	48dfac6f8b	Update hashbrown	2024-06-23 10:40:04 -04:00
Samuel Keiffer	2d3303384a	Merge branch 'uniior/armor-pricing' into 'master' ... Saner pricing for worker/linen clothing See merge request veloren/veloren!4511	2024-06-23 01:04:13 +00:00
Uniior	c399a549f8	Merge branch 'master' into 'uniior/armor-pricing' ... # Conflicts: # CHANGELOG.md	2024-06-22 17:57:23 +00:00
uniior	92a2e5da8b	Resolve merge conflict	2024-06-22 13:56:09 -04:00
Marcel	46ab1cb11e	Merge branch 'james/prevent-vertical-scaling-crash' into 'master' ... Limit vertical scaling UI minimum to 0.1 See merge request veloren/veloren!4510	2024-06-22 16:04:20 +00:00
uniior	b3c5c4b48a	Changelog	2024-06-22 11:27:38 -04:00
uniior	ad62d5f9a3	Hotfix for worker/linen clothing pricing	2024-06-22 11:26:22 -04:00
James Melkonian	b3ae2abbd2	Limit vertical scaling UI minimum to 0.1	2024-06-22 00:25:25 -07:00
Samuel Keiffer	92af46c08f	Merge branch 'sam/fix-anims' into 'master' ... Fix anims See merge request veloren/veloren!4508	2024-06-22 00:54:01 +00:00
Sam	907c469afa	Fix anims	2024-06-21 18:03:57 -04:00
Marcel	d6d9c2ca57	Merge branch 'muphblu/fix-item-img-export' into 'master' ... Fixes img-export #1761 set square dimensions for image Closes #1761 See merge request veloren/veloren!4505	2024-06-19 07:19:59 +00:00
flo	790aeff27a	Merge branch 'wood-price-hotfix' into 'master' ... Hotfix for log prices See merge request veloren/veloren!4506	2024-06-19 03:57:58 +00:00
uniior	61193939fc	Hotfix for log prices	2024-06-18 21:17:56 -04:00
Samuel Keiffer	2f968095c7	Merge branch 'sam/anim-restructure' into 'master' ... Character animation restructuring See merge request veloren/veloren!4504	2024-06-18 00:27:01 +00:00