3773 Commits

Author	SHA1	Message	Date
Sam	4a690840e4	Savage sense	2023-07-29 18:53:47 -04:00
Sam	8c66bf8f70	Rising tide	2023-07-29 18:53:46 -04:00
Sam	af0a9ca3a4	Berserk	2023-07-29 18:53:46 -04:00
Sam	3bdde16881	Brutal swing	2023-07-29 18:53:45 -04:00
Sam	8ff7ee2819	Cleave	2023-07-29 18:53:45 -04:00
Sam	3e8b2b283a	Triple chop	2023-07-29 18:53:44 -04:00
Sam	80ab9c26ec	Initial setup	2023-07-29 18:53:38 -04:00
Samuel Keiffer	026b61baee	Merge branch 'maxicarlos08/chieftain-mask-fix' into 'master' ... Maxicarlos08/chieftain mask fix See merge request veloren/veloren!4024	2023-07-29 01:22:28 +00:00
Neras	e72a8f2fcc	Nerasw/defensive stance tweaks	2023-07-28 21:29:32 +00:00
Michal Sroczynski	2c220e5548	Fix	2023-07-26 15:28:32 +02:00
Michal Sroczynski	ced87c08ec	Fix	2023-07-25 20:55:42 +02:00
Michal Sroczynski	ccd469cb0a	Potions fixes	2023-07-25 20:37:51 +02:00
Michal Sroczynski	74a0c9caa3	Revert "Potions fixes" ... This reverts commit 1a52c4d24d.	2023-07-25 20:03:56 +02:00
Michal Sroczynski	1a52c4d24d	Potions fixes	2023-07-25 17:28:21 +02:00
Marcel	3ad6517aa1	Merge branch 'czech-translation-supply-missing-files' into 'master' ... Czech translation - adding missing files See merge request veloren/veloren!4018	2023-07-24 15:02:13 +00:00
Marcel	90e33e96bd	Merge branch 'qsto/instruments-recipes-fix' into 'master' ... Instruments recipes fix See merge request veloren/veloren!4034	2023-07-23 21:45:56 +00:00
Michał	45170212c5	Instruments recipes fix	2023-07-23 21:45:54 +00:00
Michał	89ce7a5c3a	Wild cyclop loot fix	2023-07-23 21:33:18 +00:00
Michał	29a1a7050b	Loot, foods and salvage tweaks	2023-07-19 14:16:20 +00:00
Maxicarlos08	9901ba691e	fix alignment of wanderer's hat and a typo	2023-07-14 00:59:27 +02:00
Maxicarlos08	2cbb104243	Miner helmet migrations	2023-07-13 17:18:46 +02:00
Maxicarlos08	b16b1bf51f	Fix alignments and remove unused variations	2023-07-13 17:11:07 +02:00
flo666	326d33d935	re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest	2023-07-13 16:25:43 +02:00
Maxicarlos08	d057e9d4d6	remove incorret chieftain mask definitions	2023-07-13 14:19:04 +02:00
Monty Marz	102945b9e7	Dungeon rework initial patch	2023-07-09 20:03:09 +00:00
Jaroslav Lichtblau	e0212f4470	Czech translation - adding missing files	2023-07-09 12:59:58 +02:00
Marcel	fd5fdd1840	Merge branch 'fix-typos-czech-translation' into 'master' ... Typos fixed in Czech localisation See merge request veloren/veloren!4016	2023-07-08 10:36:50 +00:00
Marcel	9b73fa0807	Merge branch 'sglorch/translation-de' into 'master' ... sglorch/translation-de See merge request veloren/veloren!3996	2023-07-07 15:11:16 +00:00
Stefan Glorch	4cf73b2eb4	sglorch/translation-de	2023-07-07 15:11:16 +00:00
Marcel	b79ef70a17	Merge branch 'consumable-improvements' into 'master' ... Small reduction of craftable consumables costs See merge request veloren/veloren!4011	2023-07-06 12:13:14 +00:00
Michał	a8ce3240c2	Loot changes	2023-07-06 12:11:28 +00:00
Hugo Famechon	a648c68233	Sort items in inventory by quantity	2023-07-05 19:07:16 +00:00
Jaroslav Lichtblau	bade2a176a	Typos fixed in Czech localisation	2023-07-05 18:44:24 +02:00
Marcel	32c7994cca	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!4009	2023-07-05 13:01:08 +00:00
Michal Sroczynski	884b881b68	Small reduction of craftable consumables costs	2023-07-04 19:43:34 +02:00
Samuel Keiffer	dab040baa4	Merge branch 'trade-thirdconfirm' into 'master' ... Added additional confirmation when trading for nothing. See merge request veloren/veloren!3997	2023-07-03 23:45:59 +00:00
Marcel	620c58fecc	Merge branch 'bd/esperanto' into 'master' ... Esperanto translation See merge request veloren/veloren!3432	2023-07-03 23:34:36 +00:00
Brandon Dyer	a7ff12f012	Esperanto translation	2023-07-03 23:34:35 +00:00
Samuel Keiffer	7380b9b485	Merge branch 'wildlife_spawn_work' into 'master' ... wildlife_spawn_work See merge request veloren/veloren!3992	2023-07-03 23:21:56 +00:00
flo	3611fd2b3d	wildlife_spawn_work	2023-07-03 23:21:56 +00:00
tygyh	0b2ad222dc	Update swedish translations	2023-07-03 21:10:37 +02:00
walpo	9c0046f790	i18n: add bulgarian (bg) translation	2023-07-02 08:50:17 +00:00
Joshua Barretto	ffabace13d	Fixed bloom sample UV, added Cinematic shader	2023-06-28 12:21:16 +01:00
Monty Marz	5c3ab74bdf	login background	2023-06-27 21:37:19 +02:00
Avi Weinstock	ced6880168	Added additional confirmation when trading for nothing.	2023-06-26 10:39:30 -04:00
Youssef Fahmy	65ea69bef3	Small balance changes	2023-06-19 01:16:42 +00:00
Samuel Keiffer	079e7bfed6	Merge branch 'uniior/cacti' into 'master' ... New/revamped cacti sprites See merge request veloren/veloren!3986	2023-06-18 01:22:33 +00:00
unknown	413befadae	Lowercase asset files	2023-06-17 20:35:28 -04:00
unknown	1269cfe00d	Lowercase asset files	2023-06-17 20:20:05 -04:00
Imbris	69dcc12dcd	Merge branch 'gradientsobel' into 'master' ... Add `GradientSobel` experimental filter that adds object outlines based on the normal map. See merge request veloren/veloren!3975	2023-06-08 16:59:20 +00: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
unknown	526386e51c	Initial cacti work	2023-06-07 14:46:54 -04:00
walpo	b919312d1b	Make i18n language identifiers comply with IETF BCP 47	2023-06-07 13:12:34 +00:00
Justin Shipsey	d90926e4a3	Merge branch 'master' into 'master' ... updating fr_FR translations See merge request veloren/veloren!3966	2023-06-04 09:32:10 +00:00
Isse	a884e0e058	Various rtsim related stuff	2023-06-03 22:14:18 +00:00
Samuel Keiffer	272d57b4fa	Merge branch 'cyclops_and_dullahan_tweaks' into 'master' ... npc_attack_tweaks See merge request veloren/veloren!3969	2023-06-03 14:04:11 +00:00
flo	53288d0b22	npc_attack_tweaks	2023-06-03 14:04:10 +00:00
flo	16d58c6b4e	plant creatures	2023-06-03 13:59:52 +00:00
Thomas S	7e7017d705	adding fr_FR translations	2023-06-01 20:17:51 +02:00
Pedro H	25c3fe3657	Add all missing pt_br translations	2023-05-31 21:19:23 +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
Marcel	b5c4b435ff	Merge branch 'vasco-steam' into 'master' ... Italian translation See merge request veloren/veloren!3949	2023-05-26 15:01:05 +00:00
Marcel	5b7005f8f4	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3929	2023-05-26 15:01:01 +00:00
Jonathan Berglin	fc4e1c8a87	Update swedish translations	2023-05-26 15:01:00 +00: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	6a2796dc17	Everything damage	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	c2d04501fe	Better skiff	2023-05-25 00:25:28 +01:00
Joshua Barretto	3c1cfe574d	Added skiff	2023-05-25 00:25:28 +01:00
Joshua Barretto	74d4fc8e64	Added sprites to ship models	2023-05-25 00:25:28 +01:00
Francesco Vasco	713533da0b	Italian translation	2023-05-24 22:45:09 +02:00
flo	a55276ea73	seachapel_rework	2023-05-24 18:13:29 +00:00
DaforLynx	1555797675	Merge branch 'thanosfisherman/loudness_adjustments' into 'master' ... adjusted eq and loudness to align with the majority of tracks See merge request veloren/veloren!3941	2023-05-21 21:54:30 +00:00
Thanos Psaridis	8dad923c3a	adjusted eq and loudness to align with the majority of tracks	2023-05-21 21:54: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
Francesco Vasco	c6ab618d2e	Italian translation	2023-05-20 11:49:07 +02:00
Joshua Barretto	00b2bcb7b4	Merge branch 'zesterer/one-way-walls' into 'master' ... One-way walls See merge request veloren/veloren!3943	2023-05-19 17:55:13 +00:00
Joshua Barretto	423e6f0348	Adjusted particle offset	2023-05-19 15:05:18 +01:00
Joshua Barretto	2893f400f8	Better particle lighting	2023-05-19 14:58:59 +01:00
Joshua Barretto	4961ca2f6d	Fixed particle effect UB	2023-05-19 14:46:22 +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
Marcel	d5ca004d2b	Merge branch 'vasco-adlet' into 'master' ... Italian translation See merge request veloren/veloren!3934	2023-05-19 09:35:30 +00: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	52b5967914	Fix pet idle movement, add a way to configure agent behaviour through manifests	2023-05-16 18:51:46 +01:00
Francesco Vasco	295e7003af	Italian translation	2023-05-16 17:50:56 +02:00
Joshua Barretto	aeb72bcf22	Added support for block kinds in shaders	2023-05-15 17:31:21 +01:00
Sam	ca070f7ae8	Removed old tier-1 files	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	19b90d078a	rebase & fix pipeline	2023-05-13 09:32:25 -04:00
Sam	fd3c377d1c	Taught adlet elder how to use leap	2023-05-13 09:32:25 -04:00
flo666	7739aaff78	add more loot	2023-05-13 09:32:24 -04:00