2411 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Timo Koesters	c0732d7787	Merge branch 'timo-tweeks' into 'master' ... fix: all enemies start with lvl 1 hp See merge request veloren/veloren!572	2019-10-09 15:54:25 +00:00
timokoesters	be5d79b123	fix: all enemies start with lvl 1 hp	2019-10-09 17:09:25 +02:00
Marcel	0e7a922d78	Merge branch 'timo-tweeks' into 'master' ... Timo tweeks See merge request veloren/veloren!569	2019-10-08 20:27:28 +00:00
timokoesters	45f756343d	fix: blocking now ends in wielded ... This makes blocking more viable because while blocking you can wait for the enemy to attack and then quickly exit the block and attack yourself.	2019-10-08 21:19:48 +02:00
timokoesters	095e66fc01	fix: tweek hp	2019-10-08 20:36:46 +02:00
Forest Anderson	ea055d4ed9	Merge branch 'angelonfira/ci-hotfixes-arifacts' into 'master' ... Angelonfira/ci hotfixes arifacts See merge request veloren/veloren!568	2019-10-08 17:03:00 +00:00
Forest Anderson	8fa4ffdfd9	Angelonfira/ci hotfixes arifacts	2019-10-08 17:03:00 +00:00
timokoesters	051a964798	fix: server side fall damage ... This avoids flickering health	2019-10-08 18:55:30 +02:00
timokoesters	b20cf6c62b	fix: set minimum speed for fall damage and balance it	2019-10-08 18:55:30 +02:00
timokoesters	f76f74b411	fix: spawnpoint nearer to the floor ... We can change this back when we have a proper spawn location system or random seeds.	2019-10-08 18:55:29 +02:00
timokoesters	4e87f125a2	fix: fix level and health distribution	2019-10-08 18:12:08 +02:00
Joshua Barretto	05cecf5ee2	Merge branch 'zesterer/small-fixes' into 'master' ... Small Fixes See merge request veloren/veloren!566	2019-10-08 12:34:43 +00:00
Acrimon	a2651dc692	Merge branch 'ci-artifact-placing' into 'master' ... Fixed ci artifact placement. See merge request veloren/veloren!567	2019-10-08 12:00:14 +00:00
Acrimon	2835caf778	Fixed ci artifact placement.	2019-10-08 14:39:52 +02:00
Joshua Barretto	889fd678c6	More opaque water surface	2019-10-08 12:21:05 +01:00
Joshua Barretto	2171e77fe5	Fixed block snapping ground clip	2019-10-08 12:21:05 +01:00
Acrimon	4af15bcba2	Fixed a typo on the ci config. Fixes master pipelines.	2019-10-08 12:46:40 +02:00
Acrimon	9bc2a99557	Merge branch 'fix-pipeline' into 'master' ... Fixed a typo on the ci config. Fixes master pipelines. See merge request veloren/veloren!565	2019-10-08 10:15:54 +00:00
Acrimon	61b2b87eba	Merge branch 'update-docker-image222' into 'master' ... Update dockerimage. See merge request veloren/veloren!564	2019-10-08 09:04:17 +00:00
Acrimon	0d01480b7a	Update dockerimage.	2019-10-08 11:14:46 +02:00
Marcel	576d39aa71	Merge branch 'xacrimon/fix-ci-this-retarded' into 'master' ... CI improvements Closes #274 See merge request veloren/veloren!552	2019-10-08 08:13:40 +00:00
Acrimon	4f52a88c27	CI improvements	2019-10-08 08:13:40 +00:00
Forest Anderson	f95561f9df	Merge branch 'wusyong/fix_ipv6' into 'master' ... Fix singleplayer not working if IPv6 is not available Closes #281 See merge request veloren/veloren!561	2019-10-07 15:35:20 +00:00
Wu Yu Wei	75df4600bd	Switch portpicker dependemcy to git ... A pull request to fix has been created on original repository. But since 0.4 is coming out pretty soon, let's swithc to this fork temporary.	2019-10-07 15:35:20 +00:00
Marcel	97441cef39	Merge branch 'songtronix/partially-fix-ghosting' into 'master' ... reduce amount of network related ghosts See merge request veloren/veloren!562	2019-10-07 14:03:49 +00:00
Songtronix	03f0024607	fix: reduce amount of network related ghosts	2019-10-07 15:15:29 +02:00
Joshua Barretto	6e59571637	Merge branch 'zesterer/small-fixes' into 'master' ... Minor Tweaks See merge request veloren/veloren!560	2019-10-07 08:21:44 +00:00
Acrimon	8cc8caf4d4	Merge branch 'kyozm/removelights' into 'master' ... create /removelights command Closes #270 See merge request veloren/veloren!559	2019-10-07 08:05:51 +00:00
Joshua Barretto	087bfffc8a	Proper tree colour variation	2019-10-07 09:05:18 +01:00
Joshua Barretto	6fc6864e7c	Better grass colours, made flora more common	2019-10-07 08:49:02 +01:00
KyoZM	9ac089ae26	consume vector without calling the iterator	2019-10-07 01:49:56 -03:00
KyoZM	5abe88ecee	cargo format	2019-10-07 01:38:28 -03:00
KyoZM	064f33666a	removelights no longer deletes players with lanterns	2019-10-07 01:03:53 -03:00
KyoZM	ea82115656	create /removelights command	2019-10-07 00:19:46 -03:00
Joshua Barretto	1a9408c397	Merge branch 'timo-arrowheight' into 'master' ... timo arrow spawn height See merge request veloren/veloren!558	2019-10-06 20:19:01 +00:00
timokoesters	25cc1f0103	fix: orientation now supports z rotation	2019-10-06 22:03:29 +02:00
timokoesters	3078591060	feat(bow): arrow spawn height	2019-10-06 21:21:33 +02:00
Monty Marz	7fd113e7c6	Merge branch 'pfau/help-window' into 'master' ... Help window, UI fixes, asset fixes See merge request veloren/veloren!556	2019-10-06 19:19:09 +00:00
Monty Marz	b3862278af	Help window, UI fixes, asset fixes	2019-10-06 19:19:08 +00:00
Monty Marz	e5c246e25e	Merge branch 'timo-msg' into 'master' ... fix: error message for give_exp See merge request veloren/veloren!557	2019-10-06 19:03:57 +00:00
timokoesters	a01edbe370	fix: error message for give_exp	2019-10-06 20:52:26 +02:00
Joshua Barretto	a76e0792a9	Merge branch 'timo-arrow-despawn' into 'master' ... feat(bow): arrows despawn after some time See merge request veloren/veloren!554	2019-10-06 17:48:27 +00:00
timokoesters	182b98081b	feat(bow): arrows despawn after some time	2019-10-06 19:32:46 +02:00
Timo Koesters	70718b9d02	Merge branch 'timo-logout' into 'master' ... Fix bugs causing duplicate login/logout messages See merge request veloren/veloren!553	2019-10-06 17:05:23 +00:00
timokoesters	0d1bf16e46	fix: selecting another character no longer shows a new login message	2019-10-06 18:26:51 +02:00
timokoesters	4501fef503	fix: don't show logout message when player never was ingame	2019-10-06 17:34:51 +02:00
Acrimon	a0d01c064c	Merge branch 'zuwow/veloren-fix-alsa-crash' into 'master' ... Fix crashing due to error in Alsa. Closes #280 See merge request veloren/veloren!551	2019-10-06 10:00:21 +00:00
Brian Lewis	86619d4192	Fix crashing due to error in Alsa. ... This uses a more recent version of cpal (a dependency of rodio hence the rodio change) which seems to have fixed a crash due to 'device not available: "Invalid argument"' coming from Alsa. The change in cpal also made some functions now return `Result` instead of a bare type which I dealt with by using `expect` to minimize how far these changes fan out into the code but maybe this isn't ideal. Fixing https://gitlab.com/veloren/veloren/issues/280 - Crash with ALSA	2019-10-06 11:24:42 +02:00
Acrimon	7b45f59682	Merge branch 'songtronix/disable-lfs-check-with-env' into 'master' ... Disable git lfs check with DISABLE_GIT_LFS_CHECK Enviroment Variable See merge request veloren/veloren!542	2019-10-06 07:47:50 +00:00
Acrimon	82789f9565	Merge branch 'revert-4498cece' into 'master' ... Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" See merge request veloren/veloren!549	2019-10-06 07:32:43 +00:00