4744 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	400090f897	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	ae9f4d5a53	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	ba14440a49	Fix filtering out resize events in the ui	2020-07-26 18:21:20 -04:00
Yusuf Bera Ertan	a76d2d3746	tr_TR localization: add missing and update some keys	2020-07-26 12:59:40 +03:00
Imbris	1123073bfd	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	827b91d691	Bow charged shot attack	2020-07-26 03:06:53 +00:00
Imbris	9156dbadb8	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	527e7a329e	Armor fixes	2020-07-25 23:57:04 +00:00
Imbris	c63a1d64e2	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	6435464d00	Make video mode selection slightly better	2020-07-25 17:07:50 -04:00
Snowram	20c2fd2c0b	Loading tips and villagers attack speech	2020-07-23 20:31:47 +02:00
Marcel	d25508e2df	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	f7a3a622e5	fix #660; Admins should join even if they aren't on whitelist	2020-07-23 17:16:52 +00:00
Monty Marz	ff178b503d	Merge branch 'hotfix_filepath' into 'master' ... Hotfix filepath See merge request veloren/veloren!1225	2020-07-23 14:02:22 +00:00
Monty Marz	9497d7e711	Update terrain.rs	2020-07-23 15:01:39 +02:00
Monty Marz	c903e27160	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	31cfc05123	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	e912e3940f	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	46b4c87cf3	fixed !688	2020-07-22 09:50:26 +02:00
Marcel Märtens	dd581bc6c0	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	24f968d813	Merge branch 'quickfixes' into 'master' ... small fixes See merge request veloren/veloren!1221	2020-07-21 13:36:10 +00:00
Marcel	eae5470f7d	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	fd9ec8fbd0	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	5b76ed23f4	small fixes	2020-07-20 21:37:13 -04:00
Forest Anderson	62005e9031	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	51ff7cded2	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	2d4841a4ec	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	e353bd3cfc	Fix cut off chat	2020-07-18 21:56:45 +00:00
Imbris	d46bf03e27	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	3c954534ed	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	14d500abbc	Only screenshot and toggle fullscreen once per frame	2020-07-18 12:21:22 -04:00
Imbris	e6776f3dce	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	d53ad7eb43	Fix color depth selection	2020-07-18 08:17:42 -04:00
Imbris	c7e8a6bfae	Remove gravity rather than reset velocity in unloaded chunks	2020-07-18 07:13:30 -04:00
Imbris	23e1378c78	Merge branch 'zesterer/winit-20' into 'master' ... Upgrade winit to 0.22.2 See merge request veloren/veloren!788	2020-07-18 03:26:59 +00:00
Imbris	db36578f83	Merge branch 'Menko/utility_items_fix_issue_612' into 'master' ... #612 Fixed utility items not being removed from inventory/hotbar See merge request veloren/veloren!1123	2020-07-18 02:41:45 +00:00
Nemanja	5caa6a07b0	#612 Fixed utility items not being removed from inventory/hotbar	2020-07-18 02:41:45 +00:00
Imbris	2a9785a40c	Remove supplement_events from Window, fix suppresed clippy lint, actually use exlusive fullscreen instead of a borderless window	2020-07-17 22:18:43 -04:00
Imbris	c8133ded43	Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes	2020-07-17 21:26:21 -04:00
Imbris	953773e1d3	Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend	2020-07-17 21:26:21 -04:00
Imbris	0275cc9523	Tweak pausing code to reduce duplication	2020-07-17 21:26:21 -04:00
Imbris	2f5c8fa3f3	Fixes for Alt key related issues	2020-07-17 21:26:21 -04:00
Imbris	27bfc74928	small fix and refactor stop auto walk to a method	2020-07-17 21:26:21 -04:00
Imbris	ede0cbdfd3	Get misc conrod fixes onto winit-20 branch, add diagnostic printlns	2020-07-17 21:26:21 -04:00
Imbris	9bfb1b5f00	Fix rebase mistake	2020-07-17 21:26:21 -04:00
Imbris	97364d49ed	Increment glutin version in Cargo.toml file	2020-07-17 21:26:20 -04:00
Imbris	7ab4f71b83	Windows cpal conflict fix not released yet so we need to use the git version	2020-07-17 21:26:20 -04:00
Imbris	a0d88e0774	Fix mistake with event processing	2020-07-17 21:26:20 -04:00
Imbris	f0d4ec32f5	clippy fixes	2020-07-17 21:26:20 -04:00
Imbris	8cd2207495	Proper fix for winit / cpal conflict	2020-07-17 21:26:20 -04:00