4094 Commits

Author	SHA1	Message	Date
Joshua Barretto	bdb0fc9c16	Merge branch 'zesterer/underwater' into 'master' ... Underwater shaders See merge request veloren/veloren!3127	2022-01-23 20:36:47 +00:00
Forest Anderson	d3aa224f15	Merge branch 'tygyh/Fix-warnings' into 'master' ... Fix warnings See merge request veloren/veloren!3051	2022-01-23 19:25:35 +00:00
Joshua Barretto	8504a8ab21	Merge branch 'ubruntu/campfire-hud' into 'master' ... Show HUD for campfires See merge request veloren/veloren!3097	2022-01-23 19:25:11 +00:00
ubruntu	ca2a81c20f	Show HUD for campfires	2022-01-23 19:25:11 +00:00
Forest Anderson	7c99f6eb5e	Merge branch 'unvariant/affix_remap_button' into 'master' ... Affixed remap/clear button to top of control settings window See merge request veloren/veloren!3119	2022-01-23 18:40:43 +00:00
Dr. Dystopia	bb48267827	Fix warnings	2022-01-23 19:03:47 +01:00
InfRandomness	69c3480fce	Move alpha values calculation	2022-01-23 17:16:22 +00:00
Joshua Barretto	8a684973b4	Merge branch 'zesterer/tiny-fixes' into 'master' ... Addressing criticisms See merge request veloren/veloren!3121	2022-01-22 16:44:01 +00:00
Joshua Barretto	b8df17080d	Merge branch 'infrandomness/waypoint_binding_customization' into 'master' ... Add waypoint binding customization code See merge request veloren/veloren!3122	2022-01-21 18:05:41 +00:00
InfRandomness	b33fda1e0c	Add waypoint binding customization code	2022-01-21 18:05:41 +00:00
Joshua Barretto	c0e3f0abef	Merge branch 'ubruntu/chest-sprite-names' into 'master' ... Fix chest display names See merge request veloren/veloren!3125	2022-01-21 18:05:39 +00:00
ubruntu	1d0c861e19	Fix chest display names	2022-01-21 18:05:39 +00:00
Joshua Barretto	31b9cd0565	Fix for translucency blocking clouds	2022-01-21 17:29:59 +00:00
Joshua Barretto	3b347a2aa3	Improved underwater lighting on low shader settings	2022-01-21 13:35:40 +00:00
Samuel Keiffer	a00ac11e25	Merge branch 'sam/fix-possess' into 'master' ... Fix possession bug See merge request veloren/veloren!3123	2022-01-21 07:40:23 +00:00
Joshua Barretto	5b606f0d50	Significantly improved underwater shaders	2022-01-21 00:42:20 +00:00
Sam	fe1db1e9e0	Can move around, so character state system runs ... Hotbar now visible Can't yet activate skillbar abilities, only M1 and M2	2022-01-20 15:26:35 -05:00
Joshua Barretto	4f181c936d	Merge branch 'name_areas_based_on_biome' into 'master' ... name_areas_based_on_biome See merge request veloren/veloren!3115	2022-01-20 19:50:57 +00:00
Joshua Barretto	5a7cd39625	Added point glow slider	2022-01-20 13:40:11 +00:00
Joshua Barretto	89cd58b1ac	Don't allow interaction with mounted entity	2022-01-20 11:25:53 +00:00
jshipsey	136555dbbe	fix crash	2022-01-20 02:14:49 -05:00
ninefox	3e198c5195	Affixed remap/clear button	2022-01-19 17:43:08 -08:00
Joshua Barretto	53574bb6ec	Tweaked lantern offsets	2022-01-19 20:08:13 -05:00
Joshua Barretto	fcd25648fe	Fixed point glow with no clouds	2022-01-19 20:08:13 -05:00
Joshua Barretto	7506dc2a41	Added procedural LoD detail shader	2022-01-19 19:59:14 -05:00
Joshua Barretto	dea540222f	Upped bloom default	2022-01-19 19:59:14 -05:00
Joshua Barretto	391d1f6bf4	Added point glow	2022-01-19 19:59:13 -05:00
Snowram	a6e396e29a	Stunned and jump anims, stats, spawns, more IA work	2022-01-20 00:53:29 +01:00
Snowram	f6d7ba33ef	Arthropods spawns and loots	2022-01-19 19:01:16 +01:00
jshipsey	82df5f23c3	spit anim	2022-01-19 19:01:16 +01:00
jshipsey	269b1fcd00	summon an	2022-01-19 19:01:15 +01:00
Snowram	fd3ed89899	More arthropod animations	2022-01-19 19:01:15 +01:00
Snowram	38bbd60fd2	Arthropod basic attack	2022-01-19 19:01:14 +01:00
Snowram	6da42e61ab	Arthropod jump attack, hitboxes	2022-01-19 19:01:14 +01:00
Snowram	1e6ead4005	Arthropod charge	2022-01-19 19:01:13 +01:00
Snowram	02ed6ffd60	More arthropod work	2022-01-19 19:01:13 +01:00
Snowram	ae71f2e4f0	Adds poisoned debuff (energy change over time)	2022-01-19 19:01:13 +01:00
Snowram	2871fa83bc	Arthropod run	2022-01-19 19:01:12 +01:00
Snowram	fa549eece7	Adds new arthropod species	2022-01-19 19:01:12 +01:00
Snowram	f67bf2a539	Adds arthropod skeleton	2022-01-19 19:01:11 +01:00
Samuel Keiffer	c3e92b6c7a	Merge branch 'sam/melee-constructor' into 'master' ... Melee Constructor See merge request veloren/veloren!3111	2022-01-19 06:36:51 +00:00
floppy	51356d5fad	in terrain.mod.rs, return name as Option in fn name	2022-01-18 19:53:20 +01:00
Joshua Barretto	b85aac6e23	Fixed minor shader issues, added curved world effect	2022-01-18 01:47:06 +00:00
Sam	b0644ca767	Melee attacks are now created through a melee constructor.	2022-01-17 20:41:24 -05:00
floppy	fd920cea1d	allow enabling/disabling biome names on map	2022-01-17 23:47:27 +01:00
floppy	a836b61190	allow enabling/disabling biome names on map	2022-01-17 23:45:51 +01:00
Joshua Barretto	cd428d9267	Added support for experimental shaders	2022-01-17 22:20:33 +00:00
Joshua Barretto	9c565dadc5	Merge branch 'zesterer/mount-everest' into 'master' ... Mount Everest See merge request veloren/veloren!3101	2022-01-17 13:21:38 +00:00
jshipsey	1d76d484bb	anim tweaks	2022-01-17 06:45:26 -05:00
Joshua Barretto	d0c101ed06	Remove redundant orientation	2022-01-17 09:25:46 +00:00