2581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shane Handley	8bc53693e1	Re-add the metrics port logging which was lost in the merge.	2019-11-06 21:34:19 +01:00
Shane Handley	d6785da21b	Ignore warning about variant never being constructed. It's being used ... elsewhere. Not sure why that isn't being picked up.	2019-11-06 21:34:19 +01:00
Shane Handley	08a3d47543	Hmm, alright have it your way rust. Not my change, so leaving it alone.	2019-11-06 21:34:18 +01:00
Shane Handley	93cef29378	Removed error which is now handled by the ServerTimeout case	2019-11-06 21:34:18 +01:00
Shane Handley	2461318576	Address code review points: ... - Clarify caffeine fueled comment - Be better at comparing Instant's, and catch the 0 seconds case to say Goodbye to the user - Switch println for 'info!'	2019-11-06 21:34:18 +01:00
Shane Handley	33a1a0ba63	Re-add the handling of error when the player loses connection on the character select screen.	2019-11-06 21:34:17 +01:00
Shane Handley	c9de7a0ae6	Fix issue with the timeout error showing when there is an intentional logout from the game.	2019-11-06 21:34:17 +01:00
Shane Handley	bcd214187b	Remove unused warn and fix dangling parameter.	2019-11-06 21:34:17 +01:00
timokoesters	ef33675fd0	improvement: remove wait because it now always retries	2019-11-06 21:34:16 +01:00
Shane Handley	ca2b32acd6	Bump up the timeout tie for booting the single player server	2019-11-06 21:34:16 +01:00
timokoesters	97dda3b2ca	improvement: UI for connecting to singleplayer servers + threading fixes	2019-11-06 21:34:15 +01:00
timokoesters	35dbd94ce6	feat: show errors in main menu when client fails ... Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`	2019-11-06 21:34:15 +01:00
Shane Handley	94c453de93	Formatting	2019-11-06 21:34:15 +01:00
Shane Handley	5c4cd552d9	Fix chat-cli to account for new case.	2019-11-06 21:34:14 +01:00
Shane Handley	97f36ec917	Eeek, remove logging.	2019-11-06 21:34:14 +01:00
Shane Handley	7848944c17	Network timeout updates ... - Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire. - Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.	2019-11-06 21:34:14 +01:00
Marcel	9c29288b12	Merge branch 'soruh/audit-dependencies' into 'master' ... Updated most dependencies. Removed potential vulnerability. See merge request veloren/veloren!635	2019-11-05 11:14:39 +00:00
soruh	94beb0fa33	Mitgated RUSTSEC-2019-0014 by updating noise and ... disabling its default features, specifically `image`, which had the vulnerability.	2019-11-05 11:14:39 +00:00
Marcel	ed7392e83f	Merge branch 'soruh/update-toolchain' into 'master' ... Update the toolchain to `nightly-2019-11-04` See merge request veloren/veloren!645	2019-11-04 18:58:06 +00:00
soruh	352694eecd	update toolchain to nightly-2019-11-04	2019-11-04 18:26:32 +01:00
Marcel	5e153f1b5c	Merge branch 'angelonfira/add-lines-of-code-readme' into 'master' ... Added lines of code badge into readme See merge request veloren/veloren!622	2019-11-04 16:14:11 +00:00
Monty Marz	e79385086c	Merge branch 'login_info' into 'master' ... login info text See merge request veloren/veloren!642	2019-11-01 20:53:52 +00:00
Monty Marz	cbb794f676	login info text	2019-11-01 20:53:52 +00:00
Joshua Barretto	2f6006341a	Merge branch 'soruh/calculate-spawn-point' into 'master' ... dynamically calculate the spawn point's z coordinate See merge request veloren/veloren!637	2019-11-01 00:24:18 +00:00
soruh	49f7be290b	iterate up to max_z + 1 ... (because max_z could still be a soild block)	2019-11-01 00:24:18 +00:00
Acrimon	46b00255b0	Merge branch 'xacrimon/update-lockfile' into 'master' ... Updated lockfile.\ See merge request veloren/veloren!639	2019-10-30 23:34:33 +00:00
Acrimon	cf154669bf	Updated lockfile.	2019-10-30 23:25:18 +01:00
Acrimon	4417080ce5	Merge branch 'xacrimon/artifacts-license' into 'master' ... Add LICENSE to all builds. Closes #364 See merge request veloren/veloren!638	2019-10-29 23:51:58 +00:00
Acrimon	bf7e157726	Fix #364.	2019-10-29 23:48:15 +01:00
Acrimon	5cf858a1e9	Merge branch 'xacrimon/remove-heaptrack' into 'master' ... Remove heaptrack as it is now deprecated. See merge request veloren/veloren!636	2019-10-29 06:55:45 +00:00
Acrimon	bc9667d669	Remove heaptrack as it is now deprecated.	2019-10-29 06:55:45 +00:00
Acrimon	bad72c1d0a	Merge branch 'xacrimon/security-status' into 'master' ... Add a security job which displays cargo-audit info See merge request veloren/veloren!634	2019-10-28 19:28:11 +00:00
Acrimon	6b6f81de47	Fix ci job.	2019-10-28 19:23:27 +01:00
Acrimon	3a82aa384f	Added basic security job that just runs audit.	2019-10-28 19:18:02 +01:00
Monty Marz	acdcdeed1f	Merge branch 'pfau/keybinds_item_desc' into 'master' ... Updated: Help Window, Map, Item Descriptions See merge request veloren/veloren!633	2019-10-27 22:22:40 +00:00
Monty Marz	7d63f0297d	Updated: Help Window, Map, Item Descriptions	2019-10-27 22:22:40 +00:00
Justin Shipsey	064703a996	Merge branch 'slipped/skeletons' into 'master' ... new skeletons See merge request veloren/veloren!620	2019-10-27 14:06:54 +00:00
Joshua Barretto	f0e48e3cd7	Merge branch 'mckol/update-readme' into 'master' ... Updated download info in readme See merge request veloren/veloren!632	2019-10-27 12:17:36 +00:00
Mckol	2f395ec454	updated download info in readme	2019-10-27 12:07:09 +01:00
Marcel	1aeb354fbc	Merge branch 'physics-fix' into 'master' ... fixing character movement to no longer fail normalization then get a zero vec... See merge request veloren/veloren!631	2019-10-26 22:56:21 +00:00
Marcel Märtens	5ee567dfb6	fixing character movement to no longer fail normalization then get a zero vec and then normalize again ... may this can be further simplyfied	2019-10-26 22:14:11 +02:00
Imbris	11b0270745	Merge branch 'imbris/more-fixes' into 'master' ... Fix some bugs introduced by !555 See merge request veloren/veloren!630	2019-10-26 03:11:39 +00:00
jshipsey	3536b0f273	rebase, small fixes	2019-10-25 22:20:38 -04:00
Imbris	fd06a0a7bf	fix: bugs in new server ecs systems fixed	2019-10-25 22:00:47 -04:00
jshipsey	d74f0bb2ce	purged references to npckind from anim files, removed warnings	2019-10-25 21:50:14 -04:00
jshipsey	c503f6e063	streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.	2019-10-25 21:50:14 -04:00
jshipsey	345095a183	added large bipeds, small birbs, small fish skeletons	2019-10-25 21:47:23 -04:00
jshipsey	1c1e577c5b	added dragon skeleton	2019-10-25 21:44:33 -04:00
jshipsey	33fb92aa08	fish_medium and bird_medium skelingtons	2019-10-25 21:39:06 -04:00
jshipsey	81f37241d0	body tweak	2019-10-25 21:34:29 -04:00