2600 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Forest Anderson	54640f63ba	Merge branch 'xacrimon/strip-ci' into 'master' ... Strip Linux executables generated by CI See merge request veloren/veloren!644	2019-11-11 18:38:23 +00:00
Timo Koesters	ff10e7a034	Merge branch 'conditional-animations' into 'master' ... Make character anims conditional by Tool held See merge request veloren/veloren!649	2019-11-11 18:32:14 +00:00
Acrimon	a75b2da491	Strip linux executables.	2019-11-11 12:52:27 -05:00
Forest Anderson	4f03133950	Merge branch 'qwertycrackers' into 'master' ... Add a `debug_items` chat command that gives all debug items. See merge request veloren/veloren!641	2019-11-11 17:36:31 +00:00
Adam Whitehurst	c5c42e3755	Remove unnecessary elided lifetimes	2019-11-11 08:26:44 -08:00
Adam Whitehurst	b8a291a3dd	Make character anims conditional by Tool held	2019-11-10 15:36:47 -08:00
Acrimon	996b5057af	Merge branch 'login_desc' into 'master' ... Login desc See merge request veloren/veloren!647	2019-11-09 23:19:41 +00:00
Monty Marz	24e9cf702d	Login desc	2019-11-09 23:19:41 +00:00
Monty Marz	08655ed9dc	Merge branch 'pfauenauge/assets' into 'master' ... Pfauenauge/assets See merge request veloren/veloren!646	2019-11-09 13:42:42 +00:00
Monty Marz	1cf4e4be11	assets update ... map image human male hairstyles elf male hairstyle potion item cheese item removed admin items from inventory	2019-11-09 13:42:42 +00:00
Justin Shipsey	9fbfc2fdfc	Merge branch 'shandley/disconnection-kick-warnings' into 'master' ... Network timeout updates and singleplayer UI improvements Closes #25 See merge request veloren/veloren!599	2019-11-07 02:06:05 +00:00
Joseph Gerardot	e16431d990	Cargo fmt	2019-11-06 20:57:05 -05:00
timokoesters	5430cafabf	fix: show error on client failure again	2019-11-07 09:42:03 +09:00
Joseph Gerardot	4bf5bed14e	Don't use the actual multiline doc comment syntax.	2019-11-06 18:02:58 -05:00
Joseph Gerardot	9e40b49b9b	Respond to MR feedback. ... Mainly clean up code with better use of iterators, and rename the debug command to be just `debug`.	2019-11-06 17:57:54 -05:00
Shane Handley	6ed33fa875	Add a TODO regarding the future plan for the connection timeout setting.	2019-11-06 21:34:19 +01:00
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
Joseph Gerardot	e6307431e7	cargo fmt the previous changes.	2019-11-05 15:57:08 -05:00
Joseph Gerardot	b480b5d324	Add debug_items command ... This command gives the player all debug items he does not currently have.	2019-11-05 15:57:08 -05:00
Joseph Gerardot	fbd72b5bbc	Add interface to add stuff in bulk to inventory ... Also includes inventory tests. inventory API.	2019-11-05 15:57:08 -05: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