15149 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Isse	82989979a6	try to fix windows build	2024-02-01 12:01:51 +01:00
Isse	00f527fe8b	fix gl	2024-02-01 12:01:45 +01:00
Isse	165c88bd74	patch wgpu to 18.2	2024-02-01 12:01:03 +01:00
maxicarlos08	cbcf1965bf	Merge branch 'treeco/new-trees-lod' into 'master' ... Added LOD objects for new forest types See merge request veloren/veloren!4298	2024-01-31 23:37:58 +00:00
Treeco	7496aa5357	Added LOD objects for new forest types	2024-01-31 23:01:44 +00:00
maxicarlos08	47f583b57b	Merge branch 'AutumnForestKind' into 'master' ... Added Autumn ForestKind See merge request veloren/veloren!4295	2024-01-31 19:41:16 +00:00
BigKhan	9c57a37a58	fixed comma + changelog	2024-01-31 18:27:38 +00:00
BigKhan	7aa9955e98	Update mod.rs	2024-01-31 17:25:27 +00:00
BigKhan	5d6d976b7f	removed comment	2024-01-31 16:52:31 +00:00
BigKhan	16156a8887	removed a SPACE	2024-01-31 16:50:53 +00:00
BigKhan	554e5b6c80	Added Autumn ForestKind	2024-01-31 16:50:13 +00:00
Illia Denysenko	43cbcf2514	Merge branch 'update-zh-Hans' into 'master' ... update zh-Hans item translations See merge request veloren/veloren!4294	2024-01-31 15:30:47 +00:00
Animoe	5ba6ba7ac9	update zh-Hans item translations	2024-01-31 15:30:47 +00:00
maxicarlos08	aade1b545b	Merge branch 'CherryTrees' into 'master' ... Cherry trees See merge request veloren/veloren!4287	2024-01-31 13:59:42 +00:00
BigKhan	87c00b5645	did the fmt thing	2024-01-31 13:22:08 +00:00
BigKhan	ee10e03736	wood darker	2024-01-31 13:19:48 +00:00
BigKhan	a07a4ca926	fixed flying branches	2024-01-31 13:15:52 +00:00
BigKhan	f600d48e15	Added Cherry Tree ForestKind	2024-01-31 13:15:26 +00:00
maxicarlos08	be056ef595	Merge branch 'AutumnTrees' into 'master' ... Autumn trees See merge request veloren/veloren!4284	2024-01-31 11:19:11 +00:00
Christof Petig	b744f66733	Merge branch 'christof/check-hotfix' into 'master' ... Provide the same API when plugins are disabled See merge request veloren/veloren!4296	2024-01-30 23:37:50 +00:00
Christof Petig	80dd3946be	Provide the same API when plugins are disabled	2024-01-30 23:52:41 +01:00
Illia Denysenko	36bd96e116	Merge branch 'fvasco-item' into 'master' ... Add assets/voxygen/i18n/it/item/ See merge request veloren/veloren!4272	2024-01-30 22:25:38 +00:00
Isse	9903d2c545	more testing	2024-01-30 00:52:49 +01:00
João Capucho	d29d22dd0a	update to wgpu 0.18	2024-01-30 00:52:49 +01:00
Isse	5e987efe99	Merge branch 'isse/list-backends' into 'master' ... Voxygen list backends subcommand See merge request veloren/veloren!4288	2024-01-29 17:48:55 +00:00
Imbris	e3b0044186	Add period to comment	2024-01-29 17:02:10 +00:00
Marcel Märtens	272837d4e5	add documentation for list-wgpu-backends	2024-01-29 17:23:45 +01:00
Christof Petig	eaba303670	Merge branch 'christof/hot-reload-fix' into 'master' ... Fix hot reloading for plugin combined manifests See merge request veloren/veloren!4280	2024-01-28 20:02:02 +00:00
Isse	b523423404	Voxygen list backends subcommand	2024-01-28 18:44:18 +01:00
Woeful_Wolf	9af75e1fc9	Settings labels use i18n	2024-01-28 18:00:56 +02:00
Woeful_Wolf	29550f9962	code-quality edits	2024-01-28 16:51:00 +02:00
BigKhan	fd173e7f08	did what isse said i should do	2024-01-28 14:42:08 +00:00
BigKhan	7dce9513c1	cleaned description	2024-01-28 14:37:08 +00:00
Woeful_Wolf	a262521875	Cleaned up some extra imports and debug code	2024-01-28 16:34:52 +02:00
BigKhan	69f549deab	made the trees maples instead. renamed the ForestKind to match.	2024-01-28 14:34:11 +00:00
Woeful_Wolf	ca022a1d1b	Changed how look_dir is calculated when aiming, now ray casts entities and terrain to find target point	2024-01-28 16:12:25 +02:00
Woeful_Wolf	714dbc9c6f	Added x and y aiming offsets to settings	2024-01-28 16:11:21 +02:00
Woeful_Wolf	6b6c5f18ec	Added x and y camera offsets when aiming in third person	2024-01-28 16:10:10 +02:00
Woeful_Wolf	a7602dfef4	Added basic ray_entities and closest_line_seg_line_seg methods	2024-01-28 16:08:28 +02:00
BigKhan	9d36a1446d	adding autumn trees to temperate forest	2024-01-27 22:52:57 +00:00
BigKhan	f626fdc496	Added Autumn Trees	2024-01-27 21:12:51 +00:00
Christof Petig	ed7fd13a50	fix unit tests	2024-01-27 21:24:24 +01:00
maxicarlos08	d11c58b75b	Merge branch 'synis/item-tabcomplete' into 'master' ... Incremental item path autocomplete See merge request veloren/veloren!4281	2024-01-27 18:03:21 +00:00
Isse	2023786f5e	Merge branch 'isse/optimize-weather' into 'master' ... Optimize weather See merge request veloren/veloren!4270	2024-01-27 17:20:53 +00:00
Syniis	04acb82d75	Fix asset prefix not working with sudo	2024-01-27 17:34:25 +01:00
Syniis	488922ac94	Cleaner code	2024-01-27 16:16:30 +01:00
Syniis	b97e27df9a	Allow specifiying prefix for AssetPath command argument	2024-01-27 15:44:03 +01:00
Christof Petig	b407a2b186	Fix the obvious problems, still recipe book isn't hot reloading any more	2024-01-27 15:19:37 +01:00
Syniis	d46dbb9708	Incremental item path autocomplete	2024-01-27 13:41:39 +01:00
Christof Petig	cc93474c2f	fix hot reloading of combined manifests	2024-01-27 12:40:34 +01:00