8985 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Samuel Keiffer	74d4f3e49c	Merge branch 'potion-animations' into 'master' ... Consumable Animations See merge request veloren/veloren!2512	2021-06-29 16:36:41 +00:00
Marcel	23af50d6c1	Merge branch 'sam/fix-oob-index' into 'master' ... Small fixes See merge request veloren/veloren!2527	2021-06-29 11:58:02 +00:00
Sam	a3dd5f395c	Removed potential for accessing OOB index and panicking in animations for combo melee. ... Made only entities with a character state component emit a death outcome on death.	2021-06-29 06:20:26 -05:00
Sam	246dc50a90	Moved match on ItemUseKind to create durations to a function under ItemUseKind.	2021-06-29 05:59:02 -05:00
Sam	896cd44ddb	Changelog	2021-06-29 05:59:02 -05:00
Sam	8bf3109133	Food now applies buff at end of state. ... Rolling and poise states now cancel the potion buff. UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state. Rolling can no cancel item use. Rolling now checks for move_dir instead of velocity.	2021-06-29 05:59:02 -05:00
jshipsey	c4c183cdf0	anims	2021-06-29 05:59:02 -05:00
Sam	203b3111d1	Item use now goes through use item character state if it is a consumable.	2021-06-29 05:59:02 -05:00
Sam	ab74ee3f01	Added UseItem character state.	2021-06-29 05:59:02 -05:00
Sam	938978bdbd	Destringified consumables	2021-06-29 05:59:02 -05:00
Avi Weinstock	7b0dcad68f	Generate palette info from block statistics, and benchmark how well it compresses.	2021-06-28 22:11:19 -04:00
Snowram	eb0a8efad1	Merge branch 'snowram/death-outcome' into 'master' ... Adds an outcome to death with SFX and VFX See merge request veloren/veloren!2519	2021-06-28 23:18:45 +00:00
Snowram	64045ed7bd	Adds an outcome to death with SFX and VFX	2021-06-29 00:14:05 +02:00
Ben Wallis	5a5cdf2362	Merge branch 'aweinstock/scaleprice' into 'master' ... Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices. See merge request veloren/veloren!2521	2021-06-28 21:03:44 +00:00
Marcel	655dfa31a8	Merge branch 'tygyh/Loadout-builder-refactor' into 'master' ... Extract 'swap_equipment' and 'swap_armor' functions See merge request veloren/veloren!2525	2021-06-28 20:19:49 +00:00
Avi Weinstock	09a68510f2	Use SQL transactions in world_block_statistics to try to speed it up.	2021-06-28 15:50:58 -04:00
Avi Weinstock	b04e820bc4	Add block statistics generator to world/examples.	2021-06-28 15:02:57 -04:00
Imbris	340c531021	Merge branch 'imbris/bind-order' into 'master' ... Ensure bind groups are ordered with the most frequently changed ones in later slots See merge request veloren/veloren!2496	2021-06-28 15:39:31 +00:00
Dr. Dystopia	a47780fdc8	Extract 'swap_equipment' and 'swap_armor' functions	2021-06-28 16:17:18 +02:00
Avi Weinstock	88eebbb6c6	Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.	2021-06-28 09:24:22 -04:00
Marcel	40c0da9198	Merge branch 'juliancoffee/fix_clippy' into 'master' ... update Cargo.lock See merge request veloren/veloren!2523	2021-06-28 13:24:11 +00:00
juliancoffee	1609748009	update Cargo.lock	2021-06-28 16:02:31 +03:00
Marcel	1c1047bb4a	Merge branch 'master' into 'master' ... Update `coreaudio-sys` to v0.2.8 to fix build failure on M1 Macs See merge request veloren/veloren!2505	2021-06-28 07:47:50 +00:00
Marcel	0f0dbd6e68	Merge branch 'aweinstock/nodelay' into 'master' ... Enable TCP_NODELAY. See merge request veloren/veloren!2520	2021-06-27 23:49:01 +00:00
Marcel	d96679d4ef	Merge branch 'xMAC94x/logging_fix' into 'master' ... fix logging cnt didnt reset See merge request veloren/veloren!2518	2021-06-27 21:54:35 +00:00
Marcel	aa8069b53b	Merge branch 'aweinstock/dungeonvoxel' into 'master' ... Use new dungeons in dungeon_voxel_export, remove old dungeon sampling... See merge request veloren/veloren!2516	2021-06-27 21:54:32 +00:00
Avi Weinstock	a04d0391fc	Enable TCP_NODELAY.	2021-06-27 17:45:33 -04:00
Marcel	730de326d7	Merge branch 'yusdacra/chore/nix' into 'master' ... build(nix): fix audio resource patching See merge request veloren/veloren!2517	2021-06-27 20:54:24 +00:00
Marcel Märtens	172dbfbfbd	fix logging cnt didnt reset	2021-06-27 22:51:23 +02:00
Yusuf Bera Ertan	1cfad57684	build(nix): fix audio resource patching	2021-06-27 23:23:01 +03:00
Avi Weinstock	7a5388b8bb	Use new dungeons in dungeon_voxel_export, remove old dungeon sampling function, and add more of world/examples to CI.	2021-06-27 15:35:43 -04:00
Marcel	0137c7f77c	Merge branch 'drunkonhotcoco/issue_1204_chat_scroll_fix' into 'master' ... Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs See merge request veloren/veloren!2514	2021-06-27 18:18:02 +00:00
DrunkOnHotCoco	5852dad802	Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs	2021-06-27 18:18:01 +00:00
Marcel	9e47c177d2	Merge branch 'alphyr/assets_manager0_5' into 'master' ... Update `assets_manager` to 0.5 See merge request veloren/veloren!2501	2021-06-27 15:50:16 +00:00
Justin Shipsey	b5855abe28	Merge branch 'update_pt_BR_20210627' into 'master' ... Update pt br 20210627 See merge request veloren/veloren!2511	2021-06-27 03:26:44 +00:00
Nícolas Wildner	a05cebc64e	Update pt br 20210627	2021-06-27 03:26:44 +00:00
Snowram	1c7c70c1bf	Merge branch 'juliancoffee/fix_dismantle' into 'master' ... Improve Dismantle UX See merge request veloren/veloren!2498	2021-06-27 00:11:01 +00:00
juliancoffee	641aa921bf	style	2021-06-27 02:44:19 +03:00
Ben Wallis	925a174205	Merge branch 'xvar/fix-plugin-build-warnings' into 'master' ... Fixed build warnings for server-cli related to non-default plugin feature See merge request veloren/veloren!2506	2021-06-26 21:35:54 +00:00
Ben Wallis	ed9c619822	Fixed build warnings for server-cli related to non-default plugin feature	2021-06-26 21:56:03 +01:00
Ben Wallis	12b1d1a6ca	Merge branch 'aweinstock/fix-warlord-warlock-migration' into 'master' ... Rename `remove_warlock_warlord` migration so it actually triggers. See merge request veloren/veloren!2507	2021-06-26 20:49:28 +00:00
Avi Weinstock	bea9de0d46	Rename remove_warlock_warlord migration so it actually triggers.	2021-06-26 16:28:49 -04:00
Alex Ryapolov	7a6ee590ae	Update coreaudio-sys to v0.2.8	2021-06-26 18:39:53 +00:00
juliancoffee	cba3187b92	Split Material and Dismantle crafting tabs	2021-06-26 21:37:13 +03:00
juliancoffee	f533e3433c	Add is_recycling field to recipe book	2021-06-26 21:37:13 +03:00
juliancoffee	fb8787a826	Sort tabs in logical sequence	2021-06-26 21:37:13 +03:00
juliancoffee	ffa01621c1	Clean Material tags ... - Make ferocious set (currently not lootable) made from Moonweave - Remove material tag from twig sets	2021-06-26 21:37:13 +03:00
juliancoffee	71e18ef310	Dismantle Leather items to Thick Leather ... - Previously both Leather and Rawhide items were dismantled to simple leather	2021-06-26 21:37:13 +03:00
juliancoffee	e22ddb0385	Improve Dismantle UX ... - Change `Any {}` to `Any {} item` so for example when you want to dismantle something into linen, you will see `Any linen item` which points you that you need to get some item which is made from linen, and not some generic linen.	2021-06-26 21:37:13 +03:00
Ben Wallis	d76c40bb5c	Merge branch 'xvar/default-publish-feature' into 'master' ... Added default-publish feature and updated build scripts. See merge request veloren/veloren!2504	2021-06-26 18:04:53 +00:00