1724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	ae4fb7eac0	Merge branch 'zesterer/small-fixes' into 'master' ... Used 3-level asset directory searching, not 2 See merge request veloren/veloren!285	2019-07-02 12:04:06 +00:00
Joshua Barretto	bb900fff0f	Used 3-level asset directory searching, not 2	2019-07-02 12:58:33 +01:00
Sheldon Knuth	cdda20a1e8	hotfix on assets_folder issue by increasing the depth to 3.	2019-07-02 19:43:38 +08:00
Dominik Broński	4167e92d95	Merge branch 'audio/audio-base' into 'master' ... Revamping the audio system for Voxygen from #163 See merge request veloren/veloren!247	2019-07-02 04:10:55 +00:00
Sheldon Knuth	c699801d78	Revamping the audio system for Voxygen from #163	2019-07-02 04:10:55 +00:00
Sheldon Knuth	ee32f752a6	add no-audio feature while constructing AudioFrontend with no_audio().	2019-07-02 11:45:28 +08:00
Sheldon Knuth	7f7d35fe7f	fix audio thread by removing PopError but use customised block function instead.	2019-07-02 11:29:00 +08:00
Sheldon Knuth	d75d632279	Add mpmc support to audio-base.	2019-07-02 11:29:00 +08:00
Joshua Barretto	0f38fba897	Merge branch 'qutrin/command-stuff' into 'master' ... Add /health command See merge request veloren/veloren!283	2019-07-01 20:07:31 +00:00
Piotr Korgól	a66dc9a24f	Add /health command	2019-07-01 20:07:30 +00:00
Joshua Barretto	d64ca810d5	Merge branch 'songtronix/fix-server-warnings' into 'master' ... fix warnings from server See merge request veloren/veloren!281	2019-07-01 18:49:42 +00:00
Songtronix	ea340ddac7	fix warnings from server	2019-07-01 18:49:42 +00:00
Joshua Barretto	8874093bd9	Merge branch 'songtronix/fix-warnings-from-world' into 'master' ... Fix warnings from world See merge request veloren/veloren!282	2019-07-01 18:40:41 +00:00
Songtronix	863731f3ae	Fix warnings from world	2019-07-01 18:40:41 +00:00
Joshua Barretto	4cba73ff72	Merge branch 'songtronix/clean-server-and-cli' into 'master' ... Clean server and server-cli See merge request veloren/veloren!279	2019-07-01 16:38:19 +00:00
Songtronix	1ee65a66cf	Clean server and server-cli	2019-07-01 16:38:19 +00:00
Joshua Barretto	8b14775a59	Merge branch 'qutrin/chat-cli-cleanup' into 'master' ... Get rid of warnings in chat-cli See merge request veloren/veloren!280	2019-07-01 16:16:35 +00:00
Piotr Korgól	8368bea654	Get rid of warnings	2019-07-01 17:24:41 +02:00
Joshua Barretto	631df59083	Merge branch 'zesterer/small-fixes' into 'master' ... Fixed chonk memory usage bug, added block manipulation See merge request veloren/veloren!278	2019-07-01 15:22:04 +00:00
Joshua Barretto	a55bbca6e3	Only create one block with /solid	2019-07-01 15:38:40 +01:00
Joshua Barretto	489f5f6b2a	fmt	2019-07-01 14:38:45 +01:00
Joshua Barretto	586b62ea28	Fixed remesh data race	2019-07-01 14:38:38 +01:00
Joshua Barretto	90566243ca	Removed debug printing	2019-07-01 14:37:32 +01:00
Joshua Barretto	c8a2e4722c	Fixed chonk memory usage bug, added block manipulation	2019-07-01 14:36:45 +01:00
Joshua Barretto	4ce89a6406	Merge branch 'wielding-animation' into 'master' ... Wielding animation groundwork See merge request veloren/veloren!276	2019-06-30 23:07:53 +00:00
jshipsey	826a30c178	Merge branch 'wielding-animation' of https://gitlab.com/veloren/veloren into wielding-animation	2019-06-30 18:54:06 -04:00
jshipsey	cc548eb669	glider animation fix	2019-06-30 18:53:45 -04:00
jshipsey	e9bbe0e800	rebase	2019-06-30 18:53:45 -04:00
jshipsey	aea0d0002b	head position fixes	2019-06-30 18:53:45 -04:00
jshipsey	2ce5c5881e	combat run/jump/idle animation states	2019-06-30 18:53:44 -04:00
jshipsey	4e19e46a24	glider animation fix	2019-06-30 18:52:25 -04:00
Joshua Barretto	e4dc145f17	Merge branch 'zesterer/small-fixes' into 'master' ... More small fixes See merge request veloren/veloren!271	2019-06-30 22:52:21 +00:00
Joshua Barretto	0de505b74c	fmt	2019-06-30 23:46:55 +01:00
Joshua Barretto	14d9071670	Fixed minor physics bugs	2019-06-30 23:46:46 +01:00
jshipsey	b42c6dba61	rebase	2019-06-30 17:57:30 -04:00
jshipsey	e5bdace124	head position fixes	2019-06-30 17:57:30 -04:00
jshipsey	fa60e231d0	combat run/jump/idle animation states	2019-06-30 17:57:30 -04:00
Timo Koesters	0c92ccbc99	Merge branch 'timo-fix-death' into 'master' ... Fix death respawn See merge request veloren/veloren!275	2019-06-30 20:38:49 +00:00
timokoesters	370e7db1ee	Fix death	2019-06-30 22:29:00 +02:00
Joshua Barretto	b35832c37d	Prevent movement in unloaded chunks	2019-06-30 19:54:13 +01:00
Joshua Barretto	2985f94751	Prevented stalling when jumping before a block-hopping	2019-06-30 19:54:13 +01:00
Joshua Barretto	45e30d0c84	Merge branch 'issue_109' into 'master' ... Configured GameInput::Glide to be managed like the rest of events that stop on key release See merge request veloren/veloren!274	2019-06-30 18:52:19 +00:00
J. R. Vidal F	e2b4b5106a	Configured GameInput::Glide to be managed like the rest of events that stop on key release	2019-06-30 20:44:52 +02:00
Timo Koesters	96a2dfc15d	Merge branch 'timo-actor-body' into 'master' ... Remove Actor and use Body instead See merge request veloren/veloren!270	2019-06-30 17:55:23 +00:00
timokoesters	7fec42ce2c	Fix controls	2019-06-30 19:48:38 +02:00
Joshua Barretto	d0e1be91b1	Merge branch 'issue_109' into 'master' ... Fixed Issue #109 and some related problems that took place while holding shortcut keys See merge request veloren/veloren!272	2019-06-30 17:34:21 +00:00
timokoesters	14400f6380	Remove Actor and use Body instead	2019-06-30 18:57:24 +02:00
J. R. Vidal F	fca9590cee	Fixed Issue #109 and some related problems that took place while holding shortcut keys	2019-06-30 06:20:50 +02:00
Joshua Barretto	b1a7a61d77	Merge branch 'snok-online-players-cmd' into 'master' ... Snok: Show online players cmd See merge request veloren/veloren!264	2019-06-29 22:16:27 +00:00
Cedric Hutchings	6bda6e2025	adding a mut	2019-06-29 18:05:34 -05:00