437 Commits

Author	SHA1	Message	Date
jshipsey	0941f03608	buffs to stretch progression	2021-06-16 20:50:46 -04:00
K. Kisa	fbb34b7331	Veloren/veloren/master	2021-06-15 16:36:41 +00:00
Marcel	1b36f6cab3	Merge branch 'aweinstock/forcemove-no-pushback' into 'master' ... Don't apply e2e pushback during a forced movement character state. See merge request veloren/veloren!2429	2021-06-14 14:42:01 +00:00
Marcel	4cafdb3bfd	Merge branch 'aweinstock/mining-skill-tree' into 'master' ... Mining skill tree. See merge request veloren/veloren!2406	2021-06-14 14:19:06 +00:00
Marcel	0ef6cc6576	Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' ... Не полный перевод навыков, исправлены оригинальные описания и названия. See merge request veloren/veloren!2432	2021-06-13 21:55:57 +00:00
Marcel	4ea189f056	Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' ... Полный перевод на русский язык See merge request veloren/veloren!2434	2021-06-13 21:55:55 +00:00
Monty Marz	01a04a80fa	icons and naming	2021-06-13 14:34:42 -04:00
Avi Weinstock	0e394029de	Mining skill tree.	2021-06-13 14:34:42 -04:00
K. Kisa	883297d4cc	Upload New File	2021-06-13 13:30:42 +00:00
K. Kisa	acb0589277	Полный перевод на русский язык	2021-06-13 13:24:57 +00:00
K. Kisa	2e305744fe	Не полный перевод навыков, исправлены оригинальные описания и названия.	2021-06-13 13:08:52 +00:00
Avi Weinstock	d02ff2db20	Don't apply e2e pushback during a forced movement character state.	2021-06-12 11:10:06 -04:00
João Victor Cardoso Kdouk	228d2f05a6	Small fixes to pt_br language.	2021-06-09 14:36:10 +00:00
Marcel Märtens	e96dc21d30	fix swedish ron files	2021-06-07 12:02:02 +02:00
Marcel	97b7c8d68a	Merge branch 'master' into 'master' ... Update Swedish translation See merge request veloren/veloren!2380	2021-06-07 09:42:09 +00:00
Sam	0488b2fcd0	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	76ca99ece4	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	3fa7d0b6d4	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
Filip Bengtsson	172c96d83d	Missed strings	2021-06-06 17:48:09 +02:00
Filip Bengtsson	cba9affbb3	Strings in various files	2021-06-06 01:05:08 +02:00
Filip Bengtsson	fcc266bfa8	Translate trade.ron	2021-06-06 00:42:50 +02:00
Filip Bengtsson	1b6c43dfe2	Translate social.ron	2021-06-06 00:42:07 +02:00
Filip Bengtsson	3e37549518	Translate sct.ron	2021-06-06 00:40:30 +02:00
Filip Bengtsson	5191a90432	Translate misc.ron	2021-06-06 00:39:55 +02:00
Filip Bengtsson	3cbf362462	Translate hud/map.ron	2021-06-06 00:34:06 +02:00
Filip Bengtsson	28c44b6bb9	Translate hud/hud_setting.ron	2021-06-06 00:32:16 +02:00
Filip Bengtsson	12ba5e1848	Translate hud/group.ron	2021-06-06 00:07:53 +02:00
Filip Bengtsson	1841923795	Translate hud/crafting.ron	2021-06-06 00:07:03 +02:00
Filip Bengtsson	f9e42f4107	Translate hud/chat.ron	2021-06-06 00:06:05 +02:00
Filip Bengtsson	10ac6b3d4c	Translate hud/char_window.ron	2021-06-06 00:00:51 +02:00
Filip Bengtsson	fd608ccb6f	Translate hud/bag.ron	2021-06-05 23:39:24 +02:00
Filip Bengtsson	f111b87fe5	template.ron boilerplate	2021-06-05 23:33:54 +02:00
Filip Bengtsson	6277106e78	Start translating skills.ron	2021-06-05 23:25:11 +02:00
Filip Bengtsson	cf051fd9fb	Translate main.ron	2021-06-05 23:13:42 +02:00
Filip Bengtsson	37c12977c1	Translate most of gameinput.ron	2021-06-05 23:08:59 +02:00
Filip Bengtsson	cb0f00d447	Translate esc_menu.ron	2021-06-05 23:04:55 +02:00
Filip Bengtsson	35f7c206e5	Translate most of common.ron	2021-06-05 23:03:48 +02:00
Filip Bengtsson	8db65e0554	Translate char_selection.ron	2021-06-05 22:45:55 +02:00
Filip Bengtsson	d663d05f4f	Translate buff.ron	2021-06-05 22:28:01 +02:00
Filip Bengtsson	d0bb260057	Translate _manifest.ron	2021-06-05 14:26:00 +02:00
Filip Bengtsson	6df35564c2	Copy files from English	2021-06-05 13:26:41 +02:00
Sam	c81e1534f7	First 3 abilities for tidal warrior functional. Added bubble particles.	2021-06-03 21:39:13 -05:00
Avi Weinstock	cf6717ac90	Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it.	2021-06-03 00:10:06 -04:00
Imbris	d8520c8743	Add localization text for GPU timing checkbox	2021-06-03 00:10:06 -04:00
Imbris	e1af485e5f	Add setting for the PresentMode	2021-06-02 23:59:49 -04:00