853 Commits

Author	SHA1	Message	Date
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
S Handley	2864e7603a	Add audio and chat message feedback when the player attempts to collect something while thier inventory is full.	2020-03-11 10:30:59 +00:00
Imbris	fa1f24ec2e	Merge branch 'imbris/se-latency' into 'master' ... Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects See merge request veloren/veloren!840	2020-03-10 23:21:57 +00:00
Acrimon	2dddc2e692	Merge branch 'capucho/voxygen-logout-timeout' into 'master' ... FIX #513 logout timeout See merge request veloren/veloren!837	2020-03-10 22:12:29 +00:00
S Handley	fdefcf3926	Check that a targeted collectible is within a certain pickup range of the character before highlighting it	2020-03-10 20:50:04 +00:00
Capucho	d8e65318cb	Fix the spam on disconnect	2020-03-10 20:34:50 +00:00
Capucho	cc5845d756	Proper fix to the logout timeout problem using Disconnect ACK	2020-03-10 20:34:50 +00:00
Capucho	d131a5ce8f	Janky fix of the logout timeout problem	2020-03-10 20:34:50 +00:00
timokoesters	d902828e00	exit basic_attack when no weapon is equipped	2020-03-10 20:40:54 +01:00
timokoesters	8efcda724e	clean up old states, lower gravity	2020-03-10 19:12:16 +01:00
timokoesters	665dab6d93	fix: deny gliding/jumping/rolling under water	2020-03-10 19:00:49 +01:00
timokoesters	1685c05739	feat: hitting enemies with basic_attack gives energy	2020-03-10 18:54:59 +01:00
timokoesters	6929a8b684	fix: stop switching quickly between climbing and idle at low energy	2020-03-10 17:33:36 +01:00
Imbris	c72148a587	Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects	2020-03-09 22:31:24 -04:00
Adam Whitehurst	10eb4aa35b	rename get_tool_data to unwrap_tool_data	2020-03-08 21:28:45 -07:00
Acrimon	ea33a8e2b3	Rebased.	2020-03-08 23:02:15 +01:00
Imbris	1ccff31be5	Add uid to Player component ... fix: world examples	2020-03-08 22:58:38 +01:00
Imbris	59011de228	improve(login): more precise error handling during login	2020-03-08 22:56:59 +01:00
Acrimon	20ac07374f	Update auth to use new hashing scheme.	2020-03-08 22:56:34 +01:00
Acrimon	c6a159ff14	Update chat-cli to work properly. ... Update reqwest to 0.10.0	2020-03-08 22:54:15 +01:00