15585 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Samuel Keiffer	f8428eda85	Merge branch 'fix_adlet_elder_sword' into 'master' ... fix_adlet_elder_sword See merge request veloren/veloren!4265	2024-01-20 22:06:56 +00:00
flo666	a849286563	fix_adlet_elder_sword	2024-01-20 21:07:38 +01:00
Woeful_Wolf	3cb5132ab9	Simplified match, use filter and cargo fmt suggestions	2024-01-20 20:40:16 +02:00
Samuel Keiffer	3224bc5147	Merge branch 'crabman/earthsplitter-nerf' into 'master' ... earthsplitter nerf See merge request veloren/veloren!4264	2024-01-20 18:30:55 +00:00
Samuel Keiffer	5d6824aace	Merge branch 'haniwa' into 'master' ... haniwa See merge request veloren/veloren!4234	2024-01-20 17:45:23 +00:00
flo	48a79b3e78	haniwa	2024-01-20 17:45:23 +00:00
Maxicarlos08	de5df01c1b	changelog	2024-01-20 18:33:16 +01:00
Maxicarlos08	d30fed3961	earthsplitter nerf	2024-01-20 18:32:29 +01:00
Woeful_Wolf	25e4e09ab4	Fixes #1923 - Pickaxe tooltip wrong for digging	2024-01-20 19:08:41 +02:00
Illia Denysenko	dba8c94030	Merge branch 'alphyr/assets_manager_v0.11' into 'master' ... Update `assets_manager` to v0.11 See merge request veloren/veloren!4248	2024-01-20 15:46:16 +00:00
Benoît du Garreau	b6ffb3a146	Update assets_manager to v0.11	2024-01-20 15:46:16 +00:00
Joshua Barretto	88a4d0898f	Merge branch 'making-things-sprite' into 'master' ... Overhauled sprite representation to support many more sprites and attributes See merge request veloren/veloren!4259	2024-01-20 11:16:18 +00:00
Joshua Barretto	777d03b361	Categorised more sprites	2024-01-20 10:36:34 +00:00
Joshua Barretto	e5aa8cd3b7	Fix warnings	2024-01-19 20:14:32 +00:00
Joshua Barretto	5260c82c4a	Overhauled sprite representation to support many more sprites and attributes	2024-01-19 18:05:56 +00:00
Marcel	33126c8771	Merge branch 'crabman/rules-panic-fix' into 'master' ... Fix panic when pressing rule button in character screen See merge request veloren/veloren!4258	2024-01-19 16:22:37 +00:00
Maxicarlos08	e9d61c2d34	fix rule button panic	2024-01-19 16:44:43 +01:00
Isse	99154897b2	Merge branch 'fvasco-command' into 'master' ... Add assets/voxygen/i18n/it/command.ftl See merge request veloren/veloren!4124	2024-01-18 18:00:51 +00:00
Francesco Vasco	0e9630bd13	Add assets/voxygen/i18n/it/command.ftl	2024-01-18 18:00:51 +00:00
Isse	d0f966160c	Merge branch 'weblate-translation' into 'master' ... Translated using Weblate (Russian) See merge request veloren/veloren!4114	2024-01-18 18:00:48 +00:00
Codeberg Translate	b91d37a5ee	Update translation files ... Updated by "Squash Git commits" hook in Weblate. Translation: Veloren/voxygen-hud-subtitles Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/	2024-01-17 18:56:43 +00:00
Codeberg Translate	ff73a9b3cc	Update translation files ... Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Codeberg Translate <translate@codeberg.org> Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/ Translation: Veloren/voxygen-npc	2024-01-17 18:56:43 +00:00
Joshua Barretto	b1c7c2946f	Merge branch 'juliancoffee/item-i18n-followup' into 'master' ... Add test that checks that all items have en i18n See merge request veloren/veloren!4255	2024-01-16 22:36:18 +00:00
juliancoffee	ab8a7147b4	Add test that checks that all items have en i18n	2024-01-16 23:07:36 +02:00
Joshua Barretto	a852298010	Merge branch 'zesterer/better-char-select-scene' into 'master' ... Render render LoD terrain on char select, remove old backdrop figure See merge request veloren/veloren!4254	2024-01-16 18:51:04 +00:00
Isse	4f084506c0	Merge branch 'juliancoffee/item-i18n' into 'master' ... Add Item i18n Closes #903 See merge request veloren/veloren!4250	2024-01-16 17:58:35 +00:00
Joshua Barretto	64debe2f0b	Remove unnecessary conversion	2024-01-16 17:47:24 +00:00
Joshua Barretto	2a13fe3228	Merge branch 'zesterer/server-rules' into 'master' ... Added an optional rules screen that requires accepting See merge request veloren/veloren!4253	2024-01-16 17:14:57 +00:00
juliancoffee	d3fcade857	Rename ItemL10n to ItemI18n	2024-01-16 19:14:14 +02:00
Maxicarlos08	25c7169991	Renamed share_with_server -> send_to_server ... requested by @juliancoffee	2024-01-16 17:21:52 +01:00
juliancoffee	db569513f3	review	2024-01-16 13:07:53 +02:00
Joshua Barretto	751df7801f	Render airship sprites in char select	2024-01-15 22:51:54 +00:00
JCoxeye	941e953348	Merge branch veloren:master into jcoxeye/price-entries	2024-01-15 22:47:06 +00:00
Joshua Barretto	d51b5c5bea	Add airship to char select	2024-01-15 22:35:42 +00:00
Joshua Barretto	3420e7a227	Appease clippy	2024-01-15 19:07:19 +00:00
Joshua Barretto	5bc60f2436	Add LoD zone data to char select screen	2024-01-15 19:07:19 +00:00
Joshua Barretto	5d4133eea5	Updated changelog	2024-01-15 19:07:15 +00:00
Joshua Barretto	43d935a150	Render render LoD terrain on char select, remove old backdrop figure	2024-01-15 19:06:17 +00:00
Maxicarlos08	d814296676	review fixes	2024-01-15 17:55:16 +01:00
Maxicarlos08	56cc33ec55	fix pipeline	2024-01-15 00:03:23 +01:00
Maxicarlos08	d6371f7f9b	Server rules i18n and rules button in character screen	2024-01-15 00:03:23 +01:00
Joshua Barretto	e4dbe50f39	Tick client when in server info menu	2024-01-15 00:03:23 +01:00
Joshua Barretto	f991a5677f	Updated changelog	2024-01-15 00:03:22 +01:00
Joshua Barretto	f99bf91617	Added rules menu when connecting to server	2024-01-15 00:02:43 +01:00
Joshua Barretto	3d9ab445d9	Added rules field to server description	2024-01-15 00:02:42 +01:00
Imbris	05ca01ce89	Merge branch 'walpo/remove-twitter-refs' into 'master' ... Remove Twitter account references on the documentation Closes #1900 See merge request veloren/veloren!4187	2024-01-14 20:06:22 +00:00
juliancoffee	7228543fbf	Mark legacy item asset content	2024-01-14 21:25:15 +02:00
juliancoffee	28b400825e	Add item localization assets	2024-01-14 21:25:15 +02:00
juliancoffee	d743293e56	clippy & fmt	2024-01-14 21:25:15 +02:00
juliancoffee	1748b5e76f	Final(?) step to deprecating item names	2024-01-14 21:25:15 +02:00