6052 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Forest Anderson	5f8d5825ec	Cleaning	2020-12-01 10:28:39 -05:00
weldar	7ff39f1195	Removed SSAA option to resolve issue #871.	2020-12-01 09:43:06 -05:00
Marcel	dec494d531	Merge branch 'xMAC94x/common_seperation_1' into 'master' ... Move Systems out of common into `common_sys` See merge request veloren/veloren!1583	2020-12-01 13:31:33 +00:00
Marcel Märtens	791f8d6f16	move common_state into common_sys	2020-12-01 13:46:28 +01:00
Marcel Märtens	d216ed2a2f	Move Systems out of common into common_sys ... This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`	2020-12-01 13:44:07 +01:00
Marcel	cc735c8bc7	Merge branch 'yusdacra/fix-nix-build-tag-bug' into 'master' ... Improve Nix build files (yet again!) See merge request veloren/veloren!1571	2020-11-30 21:50:15 +00:00
Marcel	399d94c203	Merge branch 'xvar/fix-docker-shutdown-signal' into 'master' ... Fixed graceful shutdown countdown for servers running in Docker See merge request veloren/veloren!1580	2020-11-30 21:42:08 +00:00
Yusuf Bera Ertan	893b2de47b	nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff	2020-12-01 00:15:18 +03:00
Marcel	a9aaa4c22a	Merge branch 'ubruntu/fix-home-fall-damage' into 'master' ... Stop /home from causing fall damage Closes #843 See merge request veloren/veloren!1552	2020-11-30 21:13:06 +00:00
ubruntu	fecf5bad92	Stop /home from causing fall damage	2020-11-30 21:13:06 +00:00
Marcel	5da7cb6049	Merge branch 'xvar/tooltip-fade-fix' into 'master' ... Changed tooltip fade time from 100 to 0ms to fix tooltip glitching See merge request veloren/veloren!1567	2020-11-30 21:13:05 +00:00
Marcel	e3d5185894	Merge branch 'azymohliad/sun-movement-direction' into 'master' ... Fix Sun and Moon movement direction See merge request veloren/veloren!1568	2020-11-30 21:13:03 +00:00
Yusuf Bera Ertan	3ed3e39c51	nix: add envrc and envrc-nvidia file for auto dev env setup with direnv	2020-11-30 23:51:05 +03:00
Marcel	1f12ec67e5	Merge branch 'offspec/larger-scalemode-range' into 'master' ... Offspec/larger scalemode range See merge request veloren/veloren!1579	2020-11-30 20:36:58 +00:00
Nicholas Kinney	f2014f7896	Offspec/larger scalemode range	2020-11-30 20:36:58 +00:00
Ben Wallis	62edafa075	Changed Dockerfile to use ENTRYPOINT to allow the veloren-server-cli process to receive signals sent by Watchtower	2020-11-30 16:46:36 +00:00
Yusuf Bera Ertan	2a4aeb4f8d	nix: dont run git-lfs shell hook if its already initialized, add experimental nix-bundle bundling command, add nixGL to shell.nix for non-nixos users, switch to nixpkgs-fmt for formatting, update niv deps and many other minor improvements	2020-11-30 03:48:00 +03:00
Yusuf Bera Ertan	c2d82eb773	nix: add git-lfs setup to shell hook for dev shell	2020-11-29 16:59:13 +03:00
Yusuf Bera Ertan	8b0f060def	nix: auto setup cachix cache, do git-lfs check in Nix, link assets dir directly (no assets package) and other minor improvements	2020-11-29 02:02:46 +03:00
Yusuf Bera Ertan	46221a1620	nix: fix build failing when on tag, combine nixpkgs.nix and common.nix	2020-11-28 17:45:58 +03:00
Marcel	0bdb440a0c	Merge branch 'xMAC94x/release_numbers' into 'master' ... Change the version number to 0.8 See merge request veloren/veloren!1570	2020-11-28 11:12:06 +00:00
Marcel Märtens	8468e67217	Change the version number to 0.8	2020-11-28 11:25:58 +01:00
Andrii Zymohliad	ed934a53f2	Fix sun & moon movement direction ... They were rising on the west and setting on the east	2020-11-27 23:17:59 +02:00
Ben Wallis	eaf6f57b56	Changed tooltip fade time from 100 to 0ms to fix tooltip glitching	2020-11-27 19:51:45 +00:00
Forest Anderson	8702be6cae	Merge branch 'imbris/audio-fixes' into 'master' ... Stop unbounded wind volume when zooming out, make campfires quieter Closes #844 See merge request veloren/veloren!1566	2020-11-27 18:59:23 +00:00
Forest Anderson	9ecef560d2	Merge branch 'timsueberkrueb/log-path-override' into 'master' ... Make VOXYGEN_LOGS override logs_path setting See merge request veloren/veloren!1565	2020-11-27 18:25:39 +00:00
Imbris	aaa02bbb77	Stop unbounded wind volume when zooming out, make campfires quieter	2020-11-27 12:43:47 -05:00
Marcel	1bb801d35b	Merge branch 'sam/dehardcode-energy' into 'master' ... Graying out skills with insufficient energy no longer dependent on hard-coded values Closes #824 See merge request veloren/veloren!1560	2020-11-27 16:27:09 +00:00
Samuel Keiffer	f6ac9b43b5	Graying out skills with insufficient energy no longer dependent on hard-coded values	2020-11-27 16:27:09 +00:00
Marcel	0b1f907192	Merge branch 'sam/leap-fix' into 'master' ... Fixes leap for repeater ranged See merge request veloren/veloren!1563	2020-11-27 13:51:00 +00:00
Marcel	03bcdf2a1d	Merge branch 'xMAC94x/experimental_netfix' into 'master' ... I would except this to be implcitly done by the `drop` though it doesn't hurt... See merge request veloren/veloren!1564	2020-11-27 11:57:54 +00:00
Marcel Märtens	d3f7d99813	I would except this to be implcitly done by the drop though it doesn't hurt here, as this channel is dropped anyway a line later. ... But i have the feeling that maybe something with the channel is wrong which leads to this behavior (or maybe did i made a copy somewhere, though i dobt this). Again, not sure if this is a fix, but i think it doesn't hurt	2020-11-27 10:47:01 +01:00
Sam	3392bb4435	You can now leap in directions other than forward with repeater ranged again.	2020-11-26 18:23:15 -06:00
Marcel	d7b3f3b151	Merge branch 'update-ru-translation' into 'master' ... Updates ru_RU translation See merge request veloren/veloren!1562	2020-11-27 00:02:22 +00:00
Marcel	885cb1f6b6	Merge branch 'treeco/fixes' into 'master' ... Various tiny fixes See merge request veloren/veloren!1561	2020-11-26 23:34:40 +00:00
Snowram	d017c18a75	Updates ru_RU translation	2020-11-26 22:59:39 +01:00
Treeco	009d9b8923	Various tiny fixes: ... Text over lootbags no longer scales with distance due to performance Fixed meshing panic Fixed ambiant lighting default	2020-11-26 21:46:41 +00:00
Marcel	cd00c04c84	Merge branch 'sam/combat-tweaks' into 'master' ... Combat tweaks See merge request veloren/veloren!1559	2020-11-26 09:31:38 +00:00
Sam	043d615f3f	Weapon combat fixes: ... - Modified energy and speed scaling of sword, axe, and hammer combo melees. - Nerfed bow basic attack knockback. Buffed bow damage and energy regen. - Corrected xp values for theropods. Removed unnecessary function for xp increase per level. - Guards no longer flee at low health. - Buffed sword spin. - Nerfed axe spin and sword dash moderately. - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.	2020-11-26 09:15:45 +01:00
Joshua Barretto	ffe6d9a5a4	Merge branch 'zesterer/fixes' into 'master' ... Parallelised agent code for some sweet performance gains See merge request veloren/veloren!1558	2020-11-25 23:32:15 +00:00
Marcel	6d65693e5b	Merge branch 'xMAC94x/login_quickfix' into 'master' ... Drop is run only AFTER each statement. See merge request veloren/veloren!1557	2020-11-25 23:01:23 +00:00
Joshua Barretto	48a8bbe943	Parallelised agent code for some sweet performance gains	2020-11-25 22:47:16 +00:00
Marcel Märtens	aeb50dff60	Drop is run only AFTER each statement. ... And the guard generated here in the if let Some() will live through the WHOLE statement, which is definitly critical. The fix is quite easy. We just move it out in a seperate line. There are still some participants where the dropping will fail, and followup disconnects will NOT get triggered and be queued up till ethernity, but at least we are not blocking new logins	2020-11-25 22:10:10 +01:00
Tim Süberkrüb	858cb34870	Make VOXYGEN_LOGS override settings ... This is needed to support package managers that enforce strict application confinement (e.g. snap).	2020-11-25 20:36:41 +01:00
Marcel	bfbae4c3ed	Merge branch 'azymohliad/add-ukrainian' into 'master' ... Added Ukrainian translation See merge request veloren/veloren!1555	2020-11-25 17:21:32 +00:00
Andrii Zymohliad	95d4a43fa3	Added Ukrainian translation	2020-11-25 17:21:32 +00:00
Joshua Barretto	55c11694a4	Merge branch 'pfau/massive_fixes' into 'master' ... Pfau/massive fixes See merge request veloren/veloren!1556	2020-11-25 16:53:48 +00:00
Monty Marz	6aaacc3847	fmt ... cleanup	2020-11-25 16:53:48 +00:00
Forest Anderson	f8300495df	Merge branch 'yusdacra/update-tr-translation' into 'master' ... Update Turkish translation See merge request veloren/veloren!1554	2020-11-25 13:58:21 +00:00
Yusuf Bera Ertan	4e2aa2d133	update Turkish translations	2020-11-25 15:46:56 +03:00