4736 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	61983b1b06	poll twice	2020-07-17 21:24:29 -04:00
Imbris	28e00a0f6e	Fix singleplayer feature and rebase related stuff	2020-07-17 21:24:28 -04:00
Imbris	7dfb24d4a5	Clean comments, fix mistake, change dep source now that compatible version is available on crates.io	2020-07-17 21:24:28 -04:00
Imbris	5e8d74e00e	fix Window::logical_size	2020-07-17 21:24:28 -04:00
Imbris	70eba0c30a	Update changelog	2020-07-17 21:24:28 -04:00
Imbris	db91ebe9b5	fix a few minor bugs	2020-07-17 21:24:28 -04:00
Imbris	21a1382850	Update to winit 0.21.0	2020-07-17 21:24:28 -04:00
Imbris	d1b635efa4	Rearrange PlayState system to work without loop control	2020-07-17 21:24:28 -04:00
Imbris	515dbc30a7	Switch to updated gfx_window_glutin	2020-07-17 21:24:28 -04:00
Joshua Barretto	807a27328c	Updated to winit 20	2020-07-17 21:24:27 -04:00
Justin Shipsey	5d18fc26f5	Merge branch 'sam/armor-stats' into 'master' ... Armor Protection Stat Closes #640 See merge request veloren/veloren!1204	2020-07-18 00:05:28 +00:00
Samuel Keiffer	6cce09be85	Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.	2020-07-18 00:05:28 +00:00
Imbris	d387709ed0	Merge branch 'imbris/vdfix' into 'master' ... Loosen in_vd calculation on the server so that it accepts all chunks a client would request See merge request veloren/veloren!1213	2020-07-17 18:04:40 +00:00
Imbris	9e880009e0	Loosen in_vd calculation on the server so that it accepts all chunks a client with the specified vd would request	2020-07-17 17:32:31 +01:00
Marcel	8c1854f22a	Merge branch 'xMAC94x/optional_builds' into 'master' ... put optional builds in check like imbris suggested in order to test macOS and other builds easily See merge request veloren/veloren!1214	2020-07-17 15:40:45 +00:00
Marcel Märtens	30bd570b8f	put optional builds in check like imbris suggested in order to test macOS and other builds easily	2020-07-17 12:17:34 +02:00
Marcel	a89c88dcb3	Merge branch 'T-Dark-char-alias-slur-check' into 'master' ... Char alias slur check Closes #580 See merge request veloren/veloren!1200	2020-07-16 14:05:35 +00:00
T-Dark0	d5e9e19881	Created banned words file ... By default, it's an empty list	2020-07-16 14:05:35 +00:00
Marcel	b4ef6bcbc0	Merge branch 'yusdacra/nix-dependency-updates' into 'master' ... Update nix dependencies and some tweaks See merge request veloren/veloren!1195	2020-07-16 13:40:39 +00:00
Yusuf Bera Ertan	f49b4a9908	nix: regenerate Cargo.nix, update dependencies, some tweaks for better reproducibility, remove rustup from shell.nix (causes issues) and add rustc, cargo instead	2020-07-16 13:40:39 +00:00
Songtronix	9195c06c95	Merge branch 'fix-611' into 'master' ... fix #611; add distance check when mounting pet Closes #611 See merge request veloren/veloren!1208	2020-07-16 12:39:10 +00:00
Marcel	b4cf3297a4	Merge branch 'ismail.assaidi/fr' into 'master' ... Ismail.assaidi/fr See merge request veloren/veloren!1210	2020-07-16 11:34:38 +00:00
Marcel	d6411f478d	Ismail.assaidi/fr	2020-07-16 11:34:37 +00:00
Monty Marz	d43950e2f5	Merge branch 'pfau/smöl_fixes' into 'master' ... Fix item images, cleanup debug items folder See merge request veloren/veloren!1212	2020-07-16 02:46:10 +00:00
Monty Marz	4facf1e3f3	Fix item images, cleanup debug items folder	2020-07-16 02:46:10 +00:00
Joshua Yanovski	add2cfae04	Revert some irrelevant stuff.	2020-07-16 01:57:39 +02:00
Monty Marz	d9209bed9d	Merge branch 'lausek/german-translation' into 'master' ... de_DE: minor updates on the German translation See merge request veloren/veloren!1209	2020-07-15 20:56:17 +00:00
lausek	9a54031e15	de_DE: minor updates on the German translation	2020-07-15 20:56:16 +00:00
Marcel	fc30cad5fd	Merge branch 'jackrubino/it_IT' into 'master' ... Jackrubino/it it See merge request veloren/veloren!1211	2020-07-15 18:29:28 +00:00
Marcel	305598c25c	Merge branch 'es_la' into 'master' ... update es_la See merge request veloren/veloren!1205	2020-07-15 18:29:26 +00:00
Marcel	d992e2144c	Merge branch 'xMAC94x/netfix' into 'master' ... xMAC94x/netfix See merge request veloren/veloren!1203	2020-07-15 16:12:43 +00:00
Marcel Märtens	6c59caf8e1	make prometheus optional in network and fix a panic in the server ... - an extra interface `new_with_regisitry` was created to make sure the interface doesn't depend on the features	2020-07-15 16:45:49 +02:00
Marcel Märtens	58cb98deaa	use type to reduce complexity	2020-07-15 16:45:44 +02:00
lausek	05cc6f222b	avoid comparing to own entity when mounting; fix coding style	2020-07-15 15:31:42 +02:00
lausek	a3326b5744	fix #611; add distance check when mounting pet	2020-07-15 14:54:53 +02:00
Joshua Yanovski	2e2ab3dc1e	Fixing various things about shadows. ... * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc.	2020-07-15 13:30:49 +02:00
PatatasDelPapa	1cdab4b4e8	update es_la	2020-07-14 23:25:46 -04:00
Monty Marz	20af325165	Merge branch 'pfau_zest/crafting' into 'master' ... Crafting See merge request veloren/veloren!1183	2020-07-14 20:11:39 +00:00
Joshua Barretto	8d6b442193	Crafting	2020-07-14 20:11:39 +00:00
Marcel	d5bfae886e	Merge branch 'xMAC94x/net-improve' into 'master' ... xMac94x/net improve See merge request veloren/veloren!1162	2020-07-14 14:09:43 +00:00
Joshua Barretto	446923f7d8	Merge branch 'zesterer/small-fixes' into 'master' ... Zesterer/small fixes See merge request veloren/veloren!1190	2020-07-14 09:54:17 +00:00
Forest Anderson	6510d38b8b	Merge branch 'nwilder/improve-pt-br-translation' into 'master' ... Nwilder/improve pt br translation See merge request veloren/veloren!1199	2020-07-14 03:21:45 +00:00
Joshua Barretto	3e5c3de2ac	Neater compass	2020-07-13 23:23:44 +01:00
Marcel Märtens	c74e5e4b47	Changes requested in rewiew	2020-07-13 23:41:32 +02:00
Marcel	011cfe4942	Merge branch 'clippy-fixes-useless_conversion' into 'master' ... Fixed suppressed clippy warnings for #587 - useless_conversion See merge request veloren/veloren!1198	2020-07-13 20:54:42 +00:00
Ben Wallis	a9be045cb8	Fixed suppressed clippy warnings for #587 - useless_conversion	2020-07-13 20:57:13 +01:00
Marcel Märtens	6db9c6f91b	fix a followup bug, after a protocol fail now Participant is closed, including all streams, so we get the stream errors. ... We MUST handle them and we are not allowed to act on a stream after it failed, as i am to lazy to change the structure to ensure the client to be imeadiatly dropped i added a AtomicBool to it.	2020-07-13 13:03:35 +02:00
Marcel Märtens	187ec42aa2	fix Participant shutdown ... - we had the problem that Participants couldn't shutdown them self, only by scheduler, which was controlled by api. it's needed e.g. to handle the Schudown Frame - my initial solution did a full shutdown, which was a problem if in parallel a 2nd shutdown was requested, no possibility of getting the error - new solution will only deactivate Participant and Stream. and then still functions correctly, till the api closes the participant and calls the scheduler which then calls the bparticipant again - i experimented with a Mutex<oneshot> or 2 and a `select` but it didn't prove that well - also adjusted the Error messages to now either Disconnected when gracefully shutdown or ProtocolFailed when some msg couldn't be delivered (note later might not be 100% returned correctly yet)	2020-07-13 13:03:30 +02:00
Marcel Märtens	df45d35c0e	tcp protocol hardening ... - make it harder for the server to crash and also kill invalid sessions properly (instead of waiting for them to close) - introduce macros to reduce code duplication - added tests to check for valid handshake as well as garbage tcp	2020-07-13 13:03:25 +02:00
Marcel Märtens	9d32e3f884	proper voxygen connect and code cleanups: ... - voxygen abort when the server has a invalid veloren_network handshake, e.g. by outdated version instead of try again - rename Network `Address` to `ProtocolAddr` as sugested by zest as it's a combination of Protocol and std::io::Addr - remove the manual byte arrays in `protocols.rs` with something more nice	2020-07-13 13:03:20 +02:00