3395 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
timokoesters	e7c370d03b	Easier swimming, better damage calculation for explosions	2020-03-23 12:50:08 +01:00
timokoesters	71a8671a4a	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
Songtronix	9b7b994530	Merge branch 'capucho/panic_log_wrong_directory' into 'master' ... Fix the wrong logs directory being displayed on panic See merge request veloren/veloren!858	2020-03-23 08:02:16 +00:00
jshipsey	995b36b204	raised run anim speed 20%	2020-03-22 21:32:34 -04:00
Capucho	7bd4492233	Fix the wrong logs directory being displayed on panic	2020-03-22 22:06:05 +00:00
jshipsey	5b76f3f90d	rewrote the whole stupid skeleton to work much smarter	2020-03-22 16:06:53 -04:00
Adam Whitehurst	79f6f1331b	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 12:50:55 -07:00
Adam Whitehurst	fb9c832284	update triple_strike	2020-03-22 12:50:52 -07:00
timokoesters	5767d31190	feat: fireball explosions	2020-03-22 20:40:16 +01:00
Pfauenauge90	494e06532c	small fixes, weapon models	2020-03-22 18:51:23 +01:00
jshipsey	5a04e37f67	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 11:55:35 -04:00
jshipsey	f488c28a12	wield idle, wield run	2020-03-22 11:55:28 -04:00
timokoesters	cd0bf0084f	Better staff M1, random +1 damage, better attackrange,angle impl	2020-03-22 16:26:32 +01:00
Pfauenauge90	15dc5ebbb8	added new stuff to chests	2020-03-22 16:19:30 +01:00
Marcel	288ced16e3	Merge branch 'xMAC94x/really-fix-docker' into 'master' ... add watchtower support and fix CMD in Dockerfile See merge request veloren/veloren!857	2020-03-22 14:56:35 +00:00
Marcel	6376827df8	add watchtower support and fix CMD in Dockerfile	2020-03-22 14:56:14 +00:00
Pfauenauge90	e1222fdf02	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Pfauenauge90	44379f9159	item images	2020-03-22 14:38:21 +01:00
Adam Whitehurst	e2a26a432c	consistent naming	2020-03-22 05:49:48 -07:00
Adam Whitehurst	b110efef34	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Adam Whitehurst	eb0176a7c3	* remove Component Trait from CharacterAbility	2020-03-22 05:45:39 -07:00
Marcel	9d8a9db329	Merge branch 'xMAC94x/fix-docker' into 'master' ... Fix docker image for server-cli See merge request veloren/veloren!856	2020-03-22 12:44:57 +00:00
Marcel	464d4622db	Fix docker image for server-cli	2020-03-22 12:44:32 +00:00
Imbris	90b2a0fa1f	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
jshipsey	7e0b320299	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 00:14:11 -04:00
jshipsey	83fc551c52	axe attack	2020-03-22 00:11:24 -04:00
Pfauenauge	2d369298aa	cloth armor	2020-03-22 00:21:11 +01:00
Adam Whitehurst	7d01d16ff9	remove CharacterAbility ecs component sync	2020-03-21 16:04:45 -07:00
Adam Whitehurst	7f82dae1a0	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:55:23 -07:00
Adam Whitehurst	650f53eaeb	clean up based on pr review comment	2020-03-21 15:55:20 -07:00
Imbris	12af35a3b9	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04:00
Adam Whitehurst	72278d0c07	Reset vel on triple_strike	2020-03-21 15:06:42 -07:00
Adam Whitehurst	9f84d8ea92	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	f93d1add44	* move swap loadout to handle_swap_loadout util fn ... * impl From<JoinData> for StateUpdate	2020-03-21 14:16:26 -07:00
timokoesters	9a40b5b957	fix sfx	2020-03-21 21:01:50 +01:00
jshipsey	434a3f9036	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:47:28 -04:00
jshipsey	768b2914e5	proper hammer smash, small tweaks	2020-03-21 15:47:16 -04:00
Pfauenauge90	8278fae7b3	27 new armor asset files	2020-03-21 20:23:22 +01:00
jshipsey	da19e3b4b3	spin attack	2020-03-21 14:54:29 -04:00
Adam Whitehurst	3cf281e504	Remove excess code	2020-03-21 10:32:32 -07:00
Adam Whitehurst	e967c44e6c	add SwapLoadout	2020-03-21 10:26:38 -07:00
Adam Whitehurst	00d6736e3a	Fix water swimming jump velocity	2020-03-21 09:45:26 -07:00
Adam Whitehurst	96f66f5997	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 07:08:14 -07:00
Adam Whitehurst	de90eb600c	swim now uses handle_orientation fn	2020-03-21 07:06:35 -07:00
jshipsey	ea8c4f40ed	bow work	2020-03-21 03:40:14 -04:00
Imbris	a6a1a08ec9	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
jshipsey	9d691aa344	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 18:54:54 -04:00
jshipsey	753c20a956	shooting anim state, cast anim, small tweaks	2020-03-20 18:54:27 -04:00
Adam Whitehurst	48bb8bb21f	Tweaking consts	2020-03-20 15:20:14 -07:00
Adam Whitehurst	0276e38aa3	better triple_strike	2020-03-20 15:03:29 -07:00