4811 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Snowram	eb5ebdce12	Various changes to npcs animations ... - Improved dragon run with tilting - New run animation for quadsmall, added tilting	2020-08-01 02:19:43 -04:00
Snowram	18546d0ba5	Skeleton rework with rough offsets	2020-08-01 02:19:43 -04:00
Judge Griesa	87742b98cc	-Removed some white spaces. Added some lines about tips. Fixed some sections.	2020-07-31 13:36:43 +00:00
Imbris	ea90ddce94	Merge branch 'imbris/fix' into 'master' ... Fix glyph too large panic See merge request veloren/veloren!1250	2020-07-31 06:31:22 +00:00
Imbris	d24ca1a037	Fix glyph to large panic	2020-07-31 01:13:31 -04:00
Marcel	b823ab0203	Merge branch 'xMAC94x/test_other_auth' into 'master' ... switch to auth that doesn't use agent See merge request veloren/veloren!1249	2020-07-30 23:44:53 +00:00
Marcel Märtens	0713c1dd54	switch to auth that doesn't use agent	2020-07-31 01:05:01 +02:00
Marcel	3645e7e035	Merge branch 'Judge_Griesa/es_la_translation' into 'master' ... Judge griesa/es la translation See merge request veloren/veloren!1244	2020-07-30 10:22:10 +00:00
Marcel	190cd41182	-Update on Latinamerican Spanish translation! ... Some spell check and changed some words for others to have a better context.	2020-07-30 10:22:09 +00:00
Marcel	3abddae550	Merge branch 'updateauth' into 'master' ... update auth to newest version See merge request veloren/veloren!1242	2020-07-29 17:53:22 +00:00
Marcel Märtens	e4eb380cdf	update auth to newest version	2020-07-29 19:28:22 +02:00
Marcel	55b7bd390b	Merge branch 'vzikl/add-zh-translation' into 'master' ... add zh_CN support and chinese ttf fonts See merge request veloren/veloren!1241	2020-07-29 14:35:47 +00:00
VZIKL	83e4f8e2e7	add some chinese language	2020-07-29 21:09:19 +08:00
Marcel	74a29cf3b8	Merge branch 'update_authc' into 'master' ... update auth to the newest version and remove useless dep See merge request veloren/veloren!1239	2020-07-28 23:21:13 +00:00
Marcel Märtens	451b6fddef	update auth to the newest version and remove useless dep	2020-07-29 00:05:23 +02:00
VZIKL	eaac2eee69	add zh_CN support and add chinese ttf fonts	2020-07-28 21:39:51 +08:00
Marcel	9e02620d8b	Merge branch 'yusdacra/update-tr-translation' into 'master' ... tr_TR localization: add missing and update some keys See merge request veloren/veloren!1229	2020-07-27 08:16:20 +00:00
Marcel	9011af9cf1	Merge branch 'snowram/french-translation' into 'master' ... fr_FR: Loading tips and villagers attack speech See merge request veloren/veloren!1230	2020-07-27 08:16:14 +00:00
Imbris	4885407e90	Merge branch 'imbris/resize-fix' into 'master' ... Fix filtering out resize events in the ui See merge request veloren/veloren!1232	2020-07-26 23:27:53 +00:00
Imbris	97e602ef68	Fix filtering out resize events in the ui	2020-07-26 18:21:20 -04:00
Yusuf Bera Ertan	f427627d36	tr_TR localization: add missing and update some keys	2020-07-26 12:59:40 +03:00
Imbris	3fd81a73eb	Merge branch 'sam/arrow-charged-shot' into 'master' ... Bow charged shot attack See merge request veloren/veloren!1226	2020-07-26 03:06:53 +00:00
Samuel Keiffer	b41fff299f	Bow charged shot attack	2020-07-26 03:06:53 +00:00
Imbris	d1097bace0	Merge branch 'sam/armor-fixes' into 'master' ... Armor fixes See merge request veloren/veloren!1222	2020-07-25 23:57:04 +00:00
Samuel Keiffer	527453c54a	Armor fixes	2020-07-25 23:57:04 +00:00
Imbris	4f31b33556	Merge branch 'imbris/fix' into 'master' ... Make video mode selection slightly better See merge request veloren/veloren!1227	2020-07-25 22:25:30 +00:00
Imbris	ed3cea411c	Make video mode selection slightly better	2020-07-25 17:07:50 -04:00
Snowram	3d01b37e20	Loading tips and villagers attack speech	2020-07-23 20:31:47 +02:00
Marcel	3ad3d0ec29	Merge branch 'lausek/admin-joining' into 'master' ... fix #660; Admins should join even if they aren't on whitelist Closes #660 See merge request veloren/veloren!1219	2020-07-23 17:16:52 +00:00
lausek	b870b16c87	fix #660; Admins should join even if they aren't on whitelist	2020-07-23 17:16:52 +00:00
Monty Marz	dfff951eaf	Merge branch 'hotfix_filepath' into 'master' ... Hotfix filepath See merge request veloren/veloren!1225	2020-07-23 14:02:22 +00:00
Monty Marz	5ac2d63d96	Update terrain.rs	2020-07-23 15:01:39 +02:00
Monty Marz	6ff3b7200d	Merge branch 'pfau/loading_tips' into 'master' ... Loading Screen tips See merge request veloren/veloren!1224	2020-07-23 12:10:14 +00:00
Monty Marz	6d3f0f2e29	lots of things ... animation fixes by slipped new cultist item settings option for loading screen tips loot table adjustments	2020-07-23 12:10:13 +00:00
Marcel	b1b69636fa	Merge branch 'xMAC94x/netfix2' into 'master' ... Participant closure was immeatiatly, even in case a new participant was... See merge request veloren/veloren!1223	2020-07-23 08:39:33 +00:00
Marcel Märtens	21007429cc	fixed !688	2020-07-22 09:50:26 +02:00
Marcel Märtens	c58ed4a027	Participant closure was immeatiatly, even in case a new participant was connected, send a MSG and then dropped immeadiatly. ... The remote site should see it connect, be open for 1 single stream and read the message before it's notified that the participant is closed actually. This caused the faulure in one of our API tests (in lib, with client and server). Where it was possible that all messages were send and one side was dropped before the other side asked for the opened stream Also introduce better error detection in participant(and scheduler) by removing the std_async::Result and intruduce `Result<(),ParticipantError>` instead	2020-07-22 09:18:15 +02:00
Justin Shipsey	4a5837397d	Merge branch 'quickfixes' into 'master' ... small fixes See merge request veloren/veloren!1221	2020-07-21 13:36:10 +00:00
Marcel	b53ebcf599	Merge branch 'T-Dark-char-alias-slur-check-hotfix' into 'master' ... T dark char alias slur check hotfix See merge request veloren/veloren!1215	2020-07-21 09:59:00 +00:00
T-Dark0	d8c6f82d6b	Voxygen and server-cli no longer panic if server creation returns error ... The process just exists instead	2020-07-21 09:59:00 +00:00
jshipsey	ae79ffc68d	small fixes	2020-07-20 21:37:13 -04:00
Forest Anderson	cbc6facbd0	Merge branch 'sharp/fix-corrupted-inventory' into 'master' ... Fix corrupted character inventories by adding protection. See merge request veloren/veloren!1220	2020-07-20 01:34:48 +00:00
Joshua Yanovski	c891721f92	Fix corrupted character inventories by adding protection. ... This is a temporary bandaid until we move to our new schema, but it should at least allow people to log in with old characters.	2020-07-20 02:34:43 +02:00
Monty Marz	3729c08d3e	Merge branch 'pfau/fix_chat_cutting' into 'master' ... Fix cut off chat See merge request veloren/veloren!1218	2020-07-18 21:56:45 +00:00
Monty Marz	87079b3bba	Fix cut off chat	2020-07-18 21:56:45 +00:00
Imbris	e5ebc3238a	Merge branch 'imbris/screenshot-tweak' into 'master' ... Only screenshot and toggle fullscreen once per frame See merge request veloren/veloren!1217	2020-07-18 19:08:42 +00:00
Imbris	f4e286c087	Merge branch 'treeco/fix-spawn-damage' into 'master' ... Reset rather than accumulate velocity when stuck or in unloaded chunks See merge request veloren/veloren!1185	2020-07-18 19:08:40 +00:00
Imbris	3647c2303f	Only screenshot and toggle fullscreen once per frame	2020-07-18 12:21:22 -04:00
Imbris	85dd14e05d	Merge branch 'imbris/colorfix' into 'master' ... Fix color depth selection See merge request veloren/veloren!1216	2020-07-18 14:10:10 +00:00
Imbris	fae00c19ea	Fix color depth selection	2020-07-18 08:17:42 -04:00