2372 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Monty Marz	58a8e2351a	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	da7a9c1970	fix: error message for give_exp	2019-10-06 20:52:26 +02:00
Joshua Barretto	2c03587a84	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	aad78d3a1f	feat(bow): arrows despawn after some time	2019-10-06 19:32:46 +02:00
Timo Koesters	745f84c1a4	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	7ac8869cd1	fix: selecting another character no longer shows a new login message	2019-10-06 18:26:51 +02:00
timokoesters	caf1576022	fix: don't show logout message when player never was ingame	2019-10-06 17:34:51 +02:00
Acrimon	dfd72fb0c9	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	63277fc98d	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	5a0a9e5373	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	7f29b83f31	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
Songtronix	775f556d64	feat(env): added DISABLE_GIT_LFS_CHECK	2019-10-06 07:33:24 +02:00
Forest Anderson	604929b5c3	Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" ... This reverts merge request !547	2019-10-06 01:31:47 +00:00
Acrimon	7bb05ce2e8	Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master' ... Change memory allocator to jemalloc Closes #278 See merge request veloren/veloren!547	2019-10-05 22:49:19 +00:00
Forest Anderson	c442ff7d8a	Chanced to ignore msvc instead of windows ... Change server to ignore msvc	2019-10-05 17:57:29 -04:00
Forest Anderson	c37dd91647	Added jemalloc for Linux systems	2019-10-05 17:57:29 -04:00
Forest Anderson	34975879ad	Remove heaptrack	2019-10-05 17:57:29 -04:00
Monty Marz	8899c0aadd	Merge branch 'timo-icon' into 'master' ... fix(bow): use axe as default icon, not debug stick See merge request veloren/veloren!539	2019-10-05 21:51:08 +00:00
Timo Koesters	27fa51b205	fix(bow): adds bow icon art	2019-10-05 21:51:08 +00:00
Acrimon	3d422d9295	Merge branch 'qutrin/npc-levels' into 'master' ... Enemies spawn with random levels, Nametags display levels See merge request veloren/veloren!532	2019-10-05 15:54:06 +00:00
timokoesters	28cc67679a	refactor: joined on &stats twice	2019-10-05 17:37:10 +02:00
timokoesters	2dd51fe2a9	fix(exp): crash when gaining many levels at once	2019-10-05 17:37:10 +02:00
Piotr Korgól	6d0c71042e	Make /adminify admin-only and /waypoint free	2019-10-05 17:37:10 +02:00
Piotr Korgól	bca68e6ed8	Make enemies spawn with different levels	2019-10-05 17:37:09 +02:00
Piotr Korgól	eb538d680d	Make nametags display levels	2019-10-05 17:37:09 +02:00
Songtronix	256e3d873f	Merge branch 'songtronix/fix-rich-presence' into 'master' ... Fix discord rich presence See merge request veloren/veloren!543	2019-10-05 15:35:59 +00:00
Songtronix	c4edda1a80	Fix discord rich presence	2019-10-05 15:35:59 +00:00
Marcel	07fc8367cc	Merge branch 'password-argon2' into 'master' ... Update client-side password hashing to argon2 See merge request veloren/veloren!544	2019-10-05 13:12:20 +00:00
Wu Yu Wei	888c52d161	Update client-side password hashing to argon2	2019-10-05 13:12:20 +00:00
Forest Anderson	d6fab64d1f	Merge branch 'revert-129674eb' into 'master' ... Revert "Added to systems directory" See merge request veloren/veloren!541	2019-10-05 00:28:30 +00:00
Forest Anderson	e6ee44aa1b	Revert "Added to systems directory" ... This reverts commit 129674eb1c34e9e8d35d00d7973b99143d3a888e	2019-10-04 23:53:10 +00:00
Forest Anderson	8d6689a5db	Merge branch 'haslersn/nix/init' into 'master' ... default.nix, shell.nix: init See merge request veloren/veloren!506	2019-10-04 23:47:16 +00:00
Forest Anderson	ee6680125b	Added to systems directory	2019-10-04 19:26:58 -04:00
haslersn	aa765814c7	default.nix, shell.nix: init ... This commit inits the `default.nix` and `shell.nix`. They support `nix build` and `nix-shell`, respectively. * `nix-shell` sets up the build environment for Veloren so that you can manually build it using `cargo build`. This is for developping as it speeds up subsequent compilations because intermediate compilation artifacts are reused. * `nix build` builds Veloren, stores the result in the Nix store and creates a `result` symlink to it. Make sure that the LFS files are checked out before using `nix build`.	2019-10-04 19:26:27 -04:00
Forest Anderson	e1ad5b3a87	Merge branch 'appcrashwin7/veloren-exp-command' into 'master' ... add give_exp command See merge request veloren/veloren!536	2019-10-04 21:02:07 +00:00
Timo Koesters	808cc75fb3	Merge branch 'timo-bow' into 'master' ... Timo bow See merge request veloren/veloren!513	2019-10-04 20:09:29 +00:00
timokoesters	cfa13163b8	Fix fonts	2019-10-04 21:30:32 +02:00
timokoesters	54d3808c3f	fix(bow): Don't remove vel and use sticky component instead	2019-10-04 21:30:13 +02:00
Pfauenauge90	045555f1a2	rebase fix	2019-10-04 21:02:45 +02:00
jshipsey	86f1939dfd	added bow wielding animations	2019-10-04 21:02:45 +02:00
timokoesters	6d056e05f7	feat(combat): melee combat damage depends on power of the weapon ... Normal NPCs have a weapon of power 5 so they do 5 damage if the attack is not blocked. Bosses and players have power 10.	2019-10-04 21:02:44 +02:00
timokoesters	049fe3808e	feat(bow): make arrows stick to walls	2019-10-04 21:02:44 +02:00
timokoesters	e0e7a6e390	fix(render): figures without vel don't render	2019-10-04 21:02:44 +02:00
timokoesters	ec716292cd	feat(bow): sticky arrows	2019-10-04 21:02:43 +02:00
timokoesters	69120552e9	feat(bow): Client side prediction	2019-10-04 21:02:43 +02:00
timokoesters	257443fd37	fix(bow): initial orientation wrong for 1 frame	2019-10-04 21:02:42 +02:00
Pfauenauge90	8939385b92	assets, rotation, offset changes	2019-10-04 21:02:42 +02:00
timokoesters	455e7e08b8	Remove warnings	2019-10-04 21:02:42 +02:00
timokoesters	993936017d	Reuse combat code	2019-10-04 21:02:41 +02:00
timokoesters	c34d18f73f	Make arrows deal damage	2019-10-04 21:02:41 +02:00