3365 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Pfauenauge90	e1dacf8b34	stat icons, frame colours	2020-03-20 20:52:32 +01:00
timokoesters	897f925c18	Go to idle state when picking items up	2020-03-20 20:23:04 +01:00
timokoesters	d28b5669aa	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	358469311a	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00
Pfauenauge90	0540469c02	placement fix	2020-03-20 14:55:31 +01:00
timokoesters	e6c6749fb0	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
Pfauenauge90	dd55829262	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 13:02:35 +01:00
Pfauenauge90	3134d7a2c2	new loading screen bg	2020-03-20 13:01:31 +01:00
timokoesters	963a8d1556	Arrows shouldn't turn into loot, staff shoots fireballs again	2020-03-20 11:25:53 +01:00
jshipsey	6b341f7951	hammer go smash	2020-03-20 02:38:53 -04:00
jshipsey	b41e91cbb4	axe, hammer proper wields	2020-03-20 01:27:54 -04:00
Pfauenauge90	9b5aaaf50e	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	e36746c582	Oops	2020-03-19 16:14:04 -07:00
Adam Whitehurst	4d6f955bf2	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	b09dba3321	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 22:36:45 +01:00
Pfauenauge90	d902212676	item images	2020-03-19 22:36:40 +01:00
timokoesters	f90fb41d41	Make orientation not dependend on camera dir while wielded	2020-03-19 22:03:17 +01:00
timokoesters	903c3df5a3	Fix weapon not updating after swapping to a weapon of the same type	2020-03-19 20:57:36 +01:00