1022 Commits

Author	SHA1	Message	Date
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
Pfauenauge90	875f23c4b1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 19:34:05 +01:00
Pfauenauge90	6035db3666	stack numbers	2020-03-19 19:33:59 +01:00
timokoesters	ae5f0b2f12	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
timokoesters	0e9a96e8af	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	4271ddb4e4	Restore old boost stick behavior	2020-03-19 17:01:58 +01:00
timokoesters	414f2564ee	Add inventory stacking	2020-03-19 14:32:17 +01:00
Pfauenauge90	77e2524e83	swift leather armour parts	2020-03-19 14:17:53 +01:00
Pfauenauge90	7cf24fe8b6	npc armour	2020-03-18 23:09:58 +01:00
Imbris	2a52245e86	Delete Vel and Ori on the client when they are removed on the server	2020-03-18 17:01:51 -04:00
Pfauenauge90	f57497fda4	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	4b7eacfdc6	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Joshua Barretto	99bc1825d3	Omitted unnecessary test	2020-03-17 16:37:39 +00:00
Pfauenauge90	e0a4bcc2b2	unclothed parts	2020-03-17 15:39:29 +01:00
Joshua Barretto	5c58fd318d	Fixed remaining pathfinding issues	2020-03-17 14:14:20 +00:00
timokoesters	2880048312	Add ability requirements system	2020-03-17 15:01:41 +01:00
timokoesters	c6fc1a109f	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +01:00
timokoesters	298c24918e	Fix body parts not changing	2020-03-16 22:06:23 +01:00
timokoesters	01b73cc110	Smaller damage and health numbers	2020-03-16 19:55:12 +01:00
timokoesters	5d26545174	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	d9e980e04c	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	b5db94d5a1	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	eda349189d	Adjust first person camera and underwater wield orientation	2020-03-16 13:19:51 +01:00
timokoesters	d48dc8fa19	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	b159a93664	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	d2859e894c	item images	2020-03-15 16:42:09 +01:00
Pfauenauge90	749a71014e	plate armour	2020-03-15 16:42:09 +01:00
Joshua Barretto	b087e1845a	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	dd0aa8e7c3	plate chest armour	2020-03-15 15:53:51 +01:00
Pfauenauge90	33c227bb48	assassin armour	2020-03-15 15:53:51 +01:00
timokoesters	914d1979b7	Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates	2020-03-15 15:43:52 +01:00
timokoesters	583aa1e482	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
AdamWhitehurst	c67e688464	Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates	2020-03-15 08:24:40 -06:00
timokoesters	e025363199	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
AdamWhitehurst	730344e04d	Damage increase, remove lines	2020-03-15 07:26:42 -06:00
AdamWhitehurst	7051230f82	add knockback localevent	2020-03-15 07:20:42 -06:00
Songtronix	5cbd629118	fix: do not depend on hash file during runtime	2020-03-15 09:02:56 +01:00
timokoesters	b5c6952fb8	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	419662c9b4	Finish state struct data refactor	2020-03-14 15:17:27 -06:00
AdamWhitehurst	4686c3bc96	Tweaking timed_combo	2020-03-14 13:04:04 -06:00
AdamWhitehurst	86c12f3961	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	dac8eeb295	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Adam Whitehurst	51efa2ae31	Begin TripleStrike Logic	2020-03-12 08:22:42 -07:00
Adam Whitehurst	5e8548968e	add ToolData::get_primary_abilities()	2020-03-12 07:47:27 -07:00
Adam Whitehurst	6e88349c40	Add some ability costs	2020-03-12 07:36:02 -07:00
Adam Whitehurst	44d5fc5087	Add triple_strike behavior to cs behavior sys	2020-03-12 07:34:24 -07:00
Adam Whitehurst	aab87741ba	Remove can_transition and begin triple_strike	2020-03-12 07:33:19 -07:00
Adam Whitehurst	ccb3141c40	Add TripleStrike	2020-03-12 07:25:06 -07:00
Adam Whitehurst	8e27a07bd3	TripleAttack -> TimedCombo ... (it wasnt the right logic for the tiple attack)	2020-03-12 05:16:40 -07:00