5171 Commits

Author	SHA1	Message	Date
Monty Marz	138e7bf0a2	Merge branch 'mkatsenelson/focused_chat_border' into 'master' ... add focus chat borders with avarage opacity of chat and input text color See merge request veloren/veloren!3984	2023-06-16 08:29:39 +00:00
mkatsenelson	7d39d3e30e	changing margin from 3px to 2px size	2023-06-15 09:31:36 +03:00
mkatsenelson	db5fe2210c	add focus chat borders with avarage opacity of chat and input text color	2023-06-13 11:58:48 +03:00
Avi Weinstock	d023f9db54	Only bind the materials texture in the postprocess bindgroup if it's needed.	2023-06-07 16:21:28 -04:00
Avi Weinstock	025831d9a2	Add GradientSobel experimental filter that adds object outlines based on the normal map.	2023-06-07 15:39:57 -04:00
Imbris	a976aa3f40	fmt after rebase	2023-06-04 12:58:16 -04:00
Imbris	a8fbfc026a	Fix compilation errors from recent changes	2023-06-04 12:58:16 -04:00
Imbris	c60f994c7f	Some random changes and a fmt	2023-06-04 12:58:16 -04:00
Imbris	4094887997	Rename UidAllocator to IdMaps everywhere, also rename lookup_entity to ... uid_entity. Also made more progress on changes in common/src/uid.rs (does not compile so don't know if all rebase quirks resolved)	2023-06-04 12:58:16 -04:00
Imbris	3277d18265	Rename retrieve_entity_internal to lookup_entity	2023-06-04 12:58:16 -04:00
Imbris	ea725fffde	Cleanup UidAllocator and Uid a bit: ... * Remove unnecessary Marker/MarkAllocator trait implementations. * Delete excess functions * Change some methods to take Uid instead of u64	2023-06-04 12:58:15 -04:00
Samuel Keiffer	6071fe0adb	Merge branch 'quadruped_low_anim_fix' into 'master' ... quadruped_low anim fix See merge request veloren/veloren!3957	2023-06-03 14:03:49 +00:00
flo	0657df80a1	quadruped_low anim fix	2023-06-03 14:03:48 +00:00
flo	16d58c6b4e	plant creatures	2023-06-03 13:59:52 +00:00
Joshua Barretto	e71eee0cd2	Merge branch 'zesterer/damage-fixes' into 'master' ... Make items vanish after 5 minutes See merge request veloren/veloren!3963	2023-06-01 14:49:00 +00:00
Joshua Barretto	ec3a7d1898	Make items vanish after 5 minutes	2023-06-01 14:51:19 +01:00
Isse	174dac9206	Remove print	2023-06-01 13:12:03 +00:00
Joshua Barretto	2064ad5d80	Added color dither	2023-05-31 19:10:09 +01:00
Joshua Barretto	2a9e43b847	Draw distinction between bilinear filtering and nearest neighbour	2023-05-31 18:26:53 +01:00
Joshua Barretto	b2051767ff	More experimental shaders	2023-05-31 17:07:22 +01:00
Joshua Barretto	4fa799e7c7	Fixed volume mount orientation	2023-05-25 03:16:27 +01:00
Joshua Barretto	f986e0793d	Better orientation, axels	2023-05-25 00:28:35 +01:00
Joshua Barretto	8a8a5526f1	Added carriage	2023-05-25 00:28:28 +01:00
Joshua Barretto	a09dbf0396	Cleaned up and documented voxel collider code	2023-05-25 00:25:28 +01:00
Joshua Barretto	04687aa0b2	An underwater thing	2023-05-25 00:25:28 +01:00
Joshua Barretto	465a62a072	Correct for orientation movement on voxel entities	2023-05-25 00:25:28 +01:00
Joshua Barretto	3c1cfe574d	Added skiff	2023-05-25 00:25:28 +01:00
Joshua Barretto	96bf86dae0	Rebalanced masses, dimensions, swim thrusts, and made various improvements to water movement that help with gameplay and pathfinding. Also fixed swimming animations for many creatures.	2023-05-25 00:25:25 +01:00
flo	a55276ea73	seachapel_rework	2023-05-24 18:13:29 +00:00
Joshua Barretto	2219797142	Merge branch 'zesterer/shader-block-kinds' into 'master' ... Added support for block kinds in shaders See merge request veloren/veloren!3932	2023-05-21 17:19:51 +00:00
Joshua Barretto	2d9e800422	Fixed doc comment	2023-05-21 17:51:17 +01:00
Joshua Barretto	f5b24a5953	Removed redundant hit code	2023-05-19 16:54:14 +01:00
Joshua Barretto	c73848b932	Fixed minor issues with walls, better particles	2023-05-19 14:25:49 +01:00
Joshua Barretto	c94d6c502a	Added one-way wall sprites	2023-05-19 13:24:45 +01:00
Tao In Way	f18297ec75	taoist/charms	2023-05-19 03:07:44 +00:00
Joshua Barretto	a634da2d07	Addressed review comments	2023-05-17 22:22:54 +01:00
Joshua Barretto	8e9314d32b	Fixed mount offsets for more quarupeds	2023-05-16 21:57:18 +01:00
Joshua Barretto	306c3e1423	Fixed masses, mount offsets and mountability for quad_low	2023-05-16 21:48:09 +01:00
Joshua Barretto	3238863c26	Good bird_large mount offsets	2023-05-16 21:10:53 +01:00
Joshua Barretto	8e03f87881	Addressed review comments	2023-05-16 10:08:25 +01:00
Joshua Barretto	aeb72bcf22	Added support for block kinds in shaders	2023-05-15 17:31:21 +01:00
Joshua Barretto	0ec5ea87d7	Reduce default audio volume	2023-05-14 22:12:49 +01:00
Joshua Barretto	391c9ecba5	Default to fullscreen	2023-05-14 22:11:37 +01:00
Sam	20a8788eee	Rebase fixes and changelog	2023-05-13 09:38:10 -04:00
flo666	aca38d0cf4	review fixes	2023-05-13 09:32:29 -04:00
flo666	0ba58d8785	map icon fix & set difficulty indicator to 2	2023-05-13 09:32:28 -04:00
flo666	c7831a8ca9	loot_tables yeti&elder , ... change drum to wildskin_drum, add map icons, yeti attacks buff	2023-05-13 09:32:27 -04:00
flo666	7739aaff78	add more loot	2023-05-13 09:32:24 -04:00
flo666	9a6ab28c3d	adlet elder tweaks	2023-05-13 09:32:24 -04:00
flo666	f66cc47554	- adlet melee tweaks ... - fix adlet elder shoot combomelee - adjust trap projectile mass	2023-05-13 09:32:23 -04:00
flo666	7e6e8c97a3	Roshwalr scale up & hitbox adjust	2023-05-13 09:32:20 -04:00
flo666	f0e0034fb0	adlet elder anim fix	2023-05-13 09:32:19 -04:00
flo666	17e4af3c48	BlockKind::ArtSnow ... replace BlockKind::Snow with BlockKind::Misc	2023-05-13 09:32:19 -04:00
flo666	8cbfb28da5	change adlet elder triplestrike swing order	2023-05-13 09:30:58 -04:00
flo666	6668df9f08	add adlet elder	2023-05-13 09:30:56 -04:00
flo666	c46ea4ae91	-add quadruped_medium/combomelee ... -frostfang ability_set	2023-05-13 09:30:55 -04:00
Sam	5a83f85779	Initial ice drake AI	2023-05-13 09:30:55 -04:00
flo666	86803c43bf	adlet tracker tweaks	2023-05-13 09:30:54 -04:00
Sam	95347e8a60	Spear magic	2023-05-13 09:30:53 -04:00
flo666	c8bb0050ad	adlet npc work	2023-05-13 09:30:53 -04:00
flo666	ef5fe63bc2	tursus npc - add 2 abilities	2023-05-13 09:30:52 -04:00
Sam	680d987e11	Adlet hunter AI	2023-05-13 09:30:51 -04:00
flo666	715a0b7b20	rebase	2023-05-13 09:30:50 -04:00
jshipsey	da3c2369e5	initial setup	2023-05-13 09:30:13 -04:00
Joshua Barretto	eb7d712093	Merge branch 'zesterer/in-soviet-russia-pet-mount-you' into 'master' ... Allow pet birds to sit on the player's shoulder See merge request veloren/veloren!3930	2023-05-13 12:14:21 +00:00
Joshua Barretto	451e586aac	Made mounting biped_large work, for the hell of it	2023-05-12 22:11:06 +01:00
Joshua Barretto	2aca9db4ac	Prevent mounted pets stealing targetting, allowed sitting on chairs with a pet on your shoulder	2023-05-12 21:18:32 +01:00
Joshua Barretto	9e9889eed6	Allowed bird pets to mount their owners when nearby	2023-05-12 21:03:44 +01:00
Joshua Barretto	4253833aaf	Add photorealistic experimental shader	2023-05-12 14:02:23 +01:00
Joshua Barretto	1924c67033	Adjusted night ambience	2023-05-12 13:47:01 +01:00
Marcel Märtens	3a19669d53	use workspace dependencies to make our life easier maintaining them :)	2023-05-10 18:16:25 +02:00
Isse	1617c180ef	small changes	2023-05-09 19:55:52 +02:00
Isse	6219b52f87	rename Vox trait to FilledVox, and change is_empty to is_filled	2023-05-09 19:43:10 +02:00
Isse	1d60d72c01	format line	2023-05-09 19:43:10 +02:00
Isse	87b2f0fd26	don't apply move state velocity if volume riding, don't mount sprites on interact	2023-05-09 19:43:10 +02:00
Isse	a0ed18c3db	add doc comments	2023-05-09 19:43:10 +02:00
Isse	61ecd2c178	various small fixes	2023-05-09 19:43:10 +02:00
Isse	f6f332af6a	send full matrix to shader	2023-05-09 19:43:10 +02:00
Isse	b4c3868dd4	different translation key for mounting Helm	2023-05-09 19:43:10 +02:00
Isse	a6665ed988	some comments	2023-05-09 19:43:10 +02:00
Isse	2e2e5680bc	use spacial grid for interactables	2023-05-09 19:43:10 +02:00
Isse	78dc394c48	use sitting animation by default when sprite mounted	2023-05-09 19:43:10 +02:00
Isse	192356f6c5	use interpolated pos and ori	2023-05-09 19:43:09 +02:00
Isse	facea64a58	remove todo!	2023-05-09 19:43:09 +02:00
Isse	57551c479c	force of mount in teleporting commands	2023-05-09 19:43:09 +02:00
Isse	e39790e9e4	make sprites work on multiple ships at once	2023-05-09 19:43:09 +02:00
Isse	134d0f0c04	varius fixes	2023-05-09 19:43:09 +02:00
Isse	b3a70627e5	fix volumes	2023-05-09 19:43:09 +02:00
Isse	a35a1a34c4	more sprites on airships	2023-05-09 19:43:09 +02:00
Isse	6674cce2cc	intercat with sprites on ships	2023-05-09 19:43:09 +02:00
Isse	7fbe2cd5ec	particles on volume	2023-05-09 19:43:09 +02:00
Isse	d292234c47	lod for sprites on volumes	2023-05-09 19:43:09 +02:00
Isse	fcb7011cde	sprites on volumes	2023-05-09 19:43:09 +02:00
Isse	6ddfd631d6	don't sit through walls	2023-05-09 19:43:09 +02:00
Isse	7eba16a2d7	use mount key	2023-05-09 19:43:08 +02:00
Isse	2928eb8d15	sit on sprites	2023-05-09 19:43:08 +02:00
Joshua Barretto	1cc221f653	Merge branch 'zesterer/rtsim-tweaks' into 'master' ... Started adding wandering rtsim monsters See merge request veloren/veloren!3908	2023-05-09 14:51:15 +00:00
Marcel Märtens	95bca5418a	update toolchain to nightly-2023-04-20	2023-05-08 18:58:54 +02:00
Sam	d5fc65ce83	Fix ci test	2023-05-07 21:50:59 -04:00
Sam	a38f336c9e	Added dual wielding sword contextual abilities.	2023-05-07 20:43:51 -04:00