10287 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	4291fe9e13	Merge branch 'xMAC94x/mumble_api' into 'master' ... mumble positional audio support via mumble-link See merge request veloren/veloren!2788	2021-09-02 11:40:35 +00:00
Marcel Märtens	cf1a6b1806	switch to SharedLink and unset context	2021-09-02 12:29:01 +02:00
Justin Shipsey	a00c0d4c0d	Merge branch 'sam/loot' into 'master' ... Small dungeon loot rebalance. See merge request veloren/veloren!2801	2021-09-02 05:34:19 +00:00
Sam	daf287a469	Small loot rebalance.	2021-09-01 23:50:17 -04:00
Samuel Keiffer	a733ad00e6	Merge branch 'ubruntu/sometimes-drop-nothing' into 'master' ... NPCs can drop nothing See merge request veloren/veloren!2794	2021-09-01 23:17:36 +00:00
ubruntu	bbc366e1b3	NPCs can drop nothing	2021-09-01 23:17:36 +00:00
Marcel	ad5cb064e2	Merge branch 'juliancoffee/i18n_formatting' into 'master' ... (en) i18n cleaning See merge request veloren/veloren!2798	2021-09-01 22:47:36 +00:00
Joshua Barretto	a193620375	Merge branch 'sam/center' into 'master' ... Turn towards center of sprite instead of corner. See merge request veloren/veloren!2800	2021-09-01 22:25:29 +00:00
Sam	41a385c517	Turn towards center of sprite instead of corner.	2021-09-01 17:24:09 -04:00
juliancoffee	f157f8efca	(en) i18n cleaning	2021-09-01 19:38:59 +03:00
Joshua Barretto	82886dcd3f	Merge branch 'zesterer/tiny-fixes' into 'master' ... Worldgen hotfix See merge request veloren/veloren!2797	2021-09-01 12:47:50 +00:00
Samuel Keiffer	ba2b26dfa3	Merge branch 'knightresspaladin/block-tweaks' into 'master' ... Make parrying refund the block stamina cost and cancel the recover animation See merge request veloren/veloren!2792	2021-09-01 11:50:49 +00:00
Joshua Barretto	002cd03430	Tree trunk color differences	2021-09-01 12:49:35 +01:00
Joshua Barretto	71826bccae	Improved tree hanging and cedar distribution	2021-09-01 12:09:15 +01:00
Joshua Barretto	1b0cb40d94	Made ore streams mineable	2021-09-01 12:05:00 +01:00
Marcel	f4af2e2589	Merge branch 'xMAC94x/CodeOfConduct' into 'master' ... add smaller variant of the code of conduct and include feedback See merge request veloren/veloren!2701	2021-09-01 10:03:00 +00:00
Knightress Paladin	f49dc2191d	Make parrying refund the block stamina cost and cancel the recover animation	2021-08-31 23:46:33 -07:00
Imbris	16e2550e46	Merge branch 'capucho/naga' into 'master' ... Replace shaderc with naga See merge request veloren/veloren!2749	2021-08-31 22:38:17 +00:00
João Capucho	446d93dda0	Replace shaderc with naga	2021-08-31 22:53:10 +01:00
Joshua Barretto	70b3374705	Merge branch 'sam/sprite-interaction' into 'master' ... Sprite Interaction See merge request veloren/veloren!2790	2021-08-31 18:42:16 +00:00
Sam	156820cd5c	Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite.	2021-08-31 13:57:17 -04:00
Sam	5dbc05730d	Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement.	2021-08-31 13:37:57 -04:00
Sam	f986176604	Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection.	2021-08-31 13:37:56 -04:00
Sam	2a3cc3d35a	No longer send collect inventory event if interactable sprite kind cannot be found.	2021-08-31 13:37:56 -04:00
Sam	c66e1b3a56	Removed distance check from sprite colelction event handling as it is already checked when entering state.	2021-08-31 13:37:56 -04:00
Sam	6b71133c50	Fixed interaction to work underwater.	2021-08-31 13:37:55 -04:00
Sam	13fa154e55	Changelog and added arm length (body radius) to sprite pickup range.	2021-08-31 13:37:53 -04:00
Sam	6d91bae44b	Sprite interaction now uses pathfinding to check that it can be picked up.	2021-08-31 13:37:36 -04:00
Sam	28d23c89ed	Added simple distance check for sprite interaction.	2021-08-31 13:37:36 -04:00
Sam	9e5744f3ee	Entities will now attempt to orient towards the sprite they are interacting with.	2021-08-31 13:37:36 -04:00
jshipsey	42a0dd785b	finished anim	2021-08-31 13:37:35 -04:00
Sam	44c3b0f153	Added attack hook event, attacks now cancel item use and sprite interaction.	2021-08-31 13:37:32 -04:00
Sam	513982ca43	Fixed compile error when importing sprite position.	2021-08-31 13:36:05 -04:00
jshipsey	3ddcde645f	anim basics	2021-08-31 13:36:04 -04:00
Sam	538cb56b87	Sprites now go through a character state to be picked up.	2021-08-31 13:36:04 -04:00
Joshua Barretto	171e329609	Merge branch 'xvar/fix-egui-toggle' into 'master' ... Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled See merge request veloren/veloren!2793	2021-08-31 17:07:13 +00:00
Ben Wallis	ad079377fb	Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled	2021-08-31 17:21:13 +01:00
Joshua Barretto	eed8070e7e	Merge branch 'zesterer/tiny-fixes' into 'master' ... Tiny fixes See merge request veloren/veloren!2791	2021-08-31 13:15:29 +00:00
Joshua Barretto	6f15233448	Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed	2021-08-31 13:31:52 +01:00
Joshua Barretto	0b1a820762	Make arrows 'bonk' hanging sprites	2021-08-31 13:31:27 +01:00
Joshua Barretto	913c23e1ad	Merge branch 'zesterer/spots' into 'master' ... Spots See merge request veloren/veloren!2695	2021-08-31 12:03:47 +00:00
Joshua Barretto	b646aae2a4	Removed unused tree assets	2021-08-31 10:15:52 +01:00
Monty Marz	13c15b3840	fix witch hut smoke	2021-08-30 12:03:13 +02:00
Joshua Barretto	9ac5e555e6	Improved giant trees	2021-08-30 00:03:16 +01:00
Joshua Barretto	92c463b315	Smaller acacia	2021-08-29 20:38:40 +01:00
Joshua Barretto	01c068a892	Snow on spots	2021-08-29 20:09:48 +01:00
Joshua Barretto	c8b1155b75	Added tree roots	2021-08-29 19:17:58 +01:00
Joshua Barretto	0011e75526	More tree variety	2021-08-29 18:38:34 +01:00
Joshua Barretto	4a9641cf44	More spot detailing	2021-08-29 14:54:01 +01:00
Joshua Barretto	98f4e95111	Improved giant trees	2021-08-29 14:37:11 +01:00