6770 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Melkonian	71303fecfd	Aura System and Campfire Health Regen	2020-12-04 22:24:56 +00:00
Imbris	30563f59f3	Merge branch 'ubruntu/group-commands' into 'master' ... Chat commands for group manipulation See merge request veloren/veloren!1584	2020-12-04 02:18:42 +00:00
ubruntu	c975f811e7	Chat commands for group manipulation	2020-12-04 02:18:42 +00:00
Marcel	f93c2874f9	Merge branch 'yusdacra/update-cargonix' into 'master' ... Update Nix deps, regenerate Cargo.nix and minor changes See merge request veloren/veloren!1590	2020-12-03 14:21:08 +00:00
Yusuf Bera Ertan	39843e847d	nix: update niv deps, regenerate Cargo.nix, add some comments and remove an unused variable	2020-12-02 23:38:26 +03:00
Yusuf Bera Ertan	1a8caaf4de	nix: envrc-common doesn't work apparently, so copy contents in it to both envrc-nvidia and envrc	2020-12-02 23:16:00 +03:00
Marcel	f8d48ad4a0	Merge branch 'stupremee/rust-src-in-nix-shell' into 'master' ... Nix: Add rust-src component to rust toolchain See merge request veloren/veloren!1588	2020-12-02 12:30:31 +00:00
Justus K	a0ca0c1517	nix: add rust-src component to rust toolchain	2020-12-02 12:48:14 +01:00
Imbris	d1431d734a	Merge branch 'imbris/update-winit' into 'master' ... Don't drop the wayland clipboard Closes #855 See merge request veloren/veloren!1576	2020-12-02 01:33:29 +00:00
Imbris	d7f506cf71	Don't drop wayland clipboard	2020-12-01 19:35:32 -05:00
Imbris	b6b03c4a5f	Merge branch 'weldar/remove-ssaa' into 'master' ... Removed SSAA option Closes #871 See merge request veloren/veloren!1587	2020-12-02 00:21:30 +00:00
Marcel	bf136a62c5	Merge branch 'xMAC94x/veloren_anim_move' into 'master' ... move anim code from voxygen/src/anim to voxygen/anim See merge request veloren/veloren!1585	2020-12-01 20:01:26 +00:00
Samuel Keiffer	cdbdadc2ba	Merge branch 'sceptre_buff' into 'master' ... iOddishGX/sceptre_buff See merge request veloren/veloren!1582	2020-12-01 20:01:24 +00:00
iOddishGX	31e2e93786	Lowered the energy cost from 80 to 40 ... Increased the healing multiplier Lowered the damage output Increased the radius Made the projectile slightly faster	2020-12-01 20:01:24 +00:00
Marcel Märtens	e5e255cbd3	move anim code from voxygen/src/anim to voxygen/anim	2020-12-01 20:20:01 +01:00
Forest Anderson	f82016c66c	Updated changelog	2020-12-01 10:29:49 -05:00
Forest Anderson	57c2f21e4d	Cleaning	2020-12-01 10:28:39 -05:00
weldar	a2d98d31a7	Removed SSAA option to resolve issue #871.	2020-12-01 09:43:06 -05:00
Marcel	6da55b8f2e	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	e398cca53c	move common_state into common_sys	2020-12-01 13:46:28 +01:00
Marcel Märtens	add7922653	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	e06dd3fe7e	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	fe46f8d901	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	eb730f6904	nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff	2020-12-01 00:15:18 +03:00
Marcel	e2fccd9694	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	1b27adaffd	Stop /home from causing fall damage	2020-11-30 21:13:06 +00:00
Marcel	9e5c31a27e	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	a189163910	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	bb1a481d1d	nix: add envrc and envrc-nvidia file for auto dev env setup with direnv	2020-11-30 23:51:05 +03:00
Marcel	93d2ee48a0	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	885e1aac61	Offspec/larger scalemode range	2020-11-30 20:36:58 +00:00
Ben Wallis	c37b91fbf1	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	3c7d682361	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	515e444e3d	nix: add git-lfs setup to shell hook for dev shell	2020-11-29 16:59:13 +03:00
Yusuf Bera Ertan	e0096a1a91	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	3c7f0e4375	nix: fix build failing when on tag, combine nixpkgs.nix and common.nix	2020-11-28 17:45:58 +03:00
Marcel	bce6e1c6e9	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	ca1601a980	Change the version number to 0.8	2020-11-28 11:25:58 +01:00
Andrii Zymohliad	8a6f08df91	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	7ce0c7fc05	Changed tooltip fade time from 100 to 0ms to fix tooltip glitching	2020-11-27 19:51:45 +00:00
Forest Anderson	9065d0ca02	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	c8735ba946	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	a96e9982c7	Stop unbounded wind volume when zooming out, make campfires quieter	2020-11-27 12:43:47 -05:00
Marcel	a431fe3fad	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	352917d9cb	Graying out skills with insufficient energy no longer dependent on hard-coded values	2020-11-27 16:27:09 +00:00
Marcel	8e248027c9	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	16c5f467fe	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	7a7c1f6f50	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	332a636647	You can now leap in directions other than forward with repeater ranged again.	2020-11-26 18:23:15 -06:00
Marcel	ccfda1b9e6	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