3485 Commits

Author	SHA1	Message	Date
juliancoffee	25cbff68d3	remove meaningless variables	2021-06-11 11:44:48 +03:00
juliancoffee	2e5f868f31	Make bow zoom less intense	2021-06-11 01:46:32 +03:00
juliancoffee	edc4af8023	fix Wet debuff image	2021-06-11 01:45:02 +03:00
Marcel	f255f01ac0	Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master' ... Extract 'get_duration_image' function from 'update' See merge request veloren/veloren!2407	2021-06-09 14:08:38 +00:00
Dr. Dystopia	cead9a019b	Extract 'create_new_text' function from 'update'	2021-06-09 13:35:41 +02:00
Dr. Dystopia	e31cb062a2	Extract 'get_duration_image' function from 'update'	2021-06-09 13:09:31 +02:00
jshipsey	7cb5323eb6	small tweaks ... t	2021-06-09 01:58:08 -04:00
juliancoffee	df2c3a4950	Fix find_root() search in case if .git isn't dir	2021-06-08 13:34:46 +03:00
Marcel	7e8bebdfa1	Merge branch 'xMAC94x/hashbrown' into 'master' ... switch to hashbrown 0.11 and specs 0.16.2 See merge request veloren/veloren!2390	2021-06-07 14:31:58 +00:00
Monty	dd0368eed4	3d icon shading	2021-06-07 14:27:49 +02:00
Marcel Märtens	7185dcee68	switch to hashbrown 0.11 and specs 0.16.2	2021-06-07 13:01:01 +02:00
Snowram	279d3ade83	Item tooltip refactor and fixed related to new stats	2021-06-07 11:06:32 +02:00
Sam	0488b2fcd0	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	76ca99ece4	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	9034d0f25d	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
jshipsey	5fdb2ac01d	migration	2021-06-07 11:01:04 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	3fa7d0b6d4	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
jshipsey	74fbe9a123	cloth/metallic armor	2021-06-07 10:56:54 +02:00
Imbris	95bfcde6d1	Remove unused velocity field in the Hud and remove unused fields from ... the image slider widget code	2021-06-07 02:49:35 -04:00
Monty	336d83fc49	new bgs	2021-06-06 19:30:37 +02:00
Marcel	521e1eacf3	Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371	2021-06-06 16:56:21 +00:00
Marcel	45741b0dbd	Merge branch 'hqurve/crafting-sorting2' into 'master' ... Widened recipe list in crafting menu and added quality indicators to names in the list See merge request veloren/veloren!2378	2021-06-06 15:55:11 +00:00
hqurve	39fc48ac17	Widened recipe list in crafting menu and added quality indicators to names in the list	2021-06-06 15:55:11 +00:00
Jonathan Berglin	38c0e02114	Extract 'create_unlock_skill_button' function from 'update' in diary.rs	2021-06-06 14:14:53 +00:00
Snowram	edfe713076	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00
Samuel Keiffer	85b8d4e7c0	Merge branch 'sam/yeti' into 'master' ... Yeti Rework See merge request veloren/veloren!2359	2021-06-05 23:15:20 +00:00
Snowram	864f230a3c	Yeti combat anims	2021-06-06 00:17:23 +02:00
João Capucho	a148d4d01a	Fix scissor panics when window height is 1	2021-06-05 20:36:27 +01:00
Ben Wallis	7b8a398234	Merge branch 'xvar/title-screen-fps-cap' into 'master' ... Added 60 FPS framerate cap for title/menu screens See merge request veloren/veloren!2377	2021-06-05 14:00:57 +00:00
Ben Wallis	1a93e3d84f	Added 60 FPS framerate cap for title/menu screens	2021-06-05 14:13:53 +01:00
Ben Wallis	e9a5fe1b4d	Merge branch 'capucho/wgpu-outdated-swapchain' into 'master' ... Rebuild swapchain on Outdate error See merge request veloren/veloren!2376	2021-06-05 10:27:32 +00:00
Sam	93f90d514c	Particles for ice spikes	2021-06-04 18:17:15 -05:00
Sam	81f7e690fd	Snowball attack.	2021-06-04 18:17:15 -05:00
Sam	a82984b925	Added base ability set	2021-06-04 18:17:14 -05:00
João Capucho	b647cd35f1	Don't draw when window size is minimized	2021-06-04 23:37:33 +01:00
Ben Wallis	059dfd2602	Merge branch 'hqurve/fix-lootscrller' into 'master' ... Fixed loot scroller collisions and cleaned up previous changes See merge request veloren/veloren!2358	2021-06-04 20:00:18 +00:00
João Capucho	36c28af46d	Regenerate the swapchain if the frame is outdated	2021-06-04 20:37:39 +01:00
Sam	f066f844b6	Fmt and clippy from toolchain rebase.	2021-06-03 21:39:18 -05:00
jshipsey	ca43a0058a	some animation	2021-06-03 21:39:17 -05:00
Sam	35876411cd	Fixed tests	2021-06-03 21:39:16 -05:00
Sam	5bf99eac11	Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.	2021-06-03 21:39:15 -05:00
Sam	c81e1534f7	First 3 abilities for tidal warrior functional. Added bubble particles.	2021-06-03 21:39:13 -05:00
Avi Weinstock	05c699878f	Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.	2021-06-03 19:24:34 -04:00
Yusuf Bera Ertan	05cbaff682	build(nix): add new dependencies to nix build and dev env for wgpu	2021-06-04 00:08:02 +03:00
Imbris	6ffdad173d	Switch to using block_on directly from futures-executor instead of the umbrella crate	2021-06-03 14:28:28 -04:00