994 Commits

Author	SHA1	Message	Date
Songtronix	866cfa3a8f	Merge branch 'ElXreno/proper-assets-path-finding' into 'master' ... Find assets by using other environment variables See merge request veloren/veloren!912	2020-04-15 10:38:00 +00:00
Imbris	9ff816f006	Clarify todo comment	2020-04-12 15:35:43 -04:00
ElXreno	4cdc1300a1	Find assets by using other environment variables ... By using HOME, XDG_DATA_HOME and XDG_DATA_DIRS we can build potentially proper paths for finding assets folder.	2020-04-12 20:25:29 +03:00
Imbris	f52d66d721	Fix selecting and remove amount text when dragging	2020-04-12 18:41:06 +02:00
Imbris	c1c09dce1b	Enable unequipping as well as equipping to specific slots	2020-04-12 18:41:06 +02:00
Pfauenauge90	eb7ded989f	7 dwarf accessories	2020-04-12 18:41:03 +02:00
Pfauenauge90	2263b9be95	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge90	85f9f80024	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge90	ca667fd02b	tooltips	2020-04-12 18:40:58 +02:00
Pfauenauge90	156b554023	item types	2020-04-12 18:40:57 +02:00
Pfauenauge90	f5a768dccf	more armour types	2020-04-12 18:40:56 +02:00
Pfauenauge90	7f97fbac0b	cape item	2020-04-12 18:40:56 +02:00
Pfauenauge90	771baaaae5	cape item	2020-04-12 18:40:55 +02:00
Imbris	0b932ae99a	Use new slot widget for armor slots	2020-04-12 18:40:53 +02:00
Piotr Korgól	84b1abdfcb	Prevent projectiles from hitting their owners	2020-04-06 23:08:54 +02:00
Imbris	4652ae2f03	Show errors loading individual files during glob asset loading	2020-04-01 20:37:23 -04:00
Imbris	831d7c77a6	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
Imbris	97148cb6bb	Merge branch 'master' into 'combat' ... # Conflicts: # CHANGELOG.md	2020-04-01 20:42:27 +00:00
Imbris	83c7a944da	fmt	2020-04-01 11:52:44 -04:00
AdamWhitehurst	1ea2abd247	better timing const name, ... timing_delay 400 -> 350	2020-04-01 08:40:25 -07:00
AdamWhitehurst	2b10797db1	refactor transition logic (thx imbris)	2020-04-01 08:39:18 -07:00
Imbris	a73d010f7b	Point to newly released vek, add todo to reconsider empty item, remove uneeded ori slerp, remove agent from character behavior, add todos to combat sys, check if entities still exist before possessing & if possessed entity has a loadout move the active item into the second item space	2020-04-01 11:15:14 -04:00
AdamWhitehurst	9ad9a24e22	Remove unused KnockUp LocalEvent (use ApplyForce)	2020-04-01 07:30:06 -07:00
AdamWhitehurst	0c4d428298	remove unnecessary line	2020-04-01 07:10:35 -07:00
AdamWhitehurst	e04fdd715e	expose and use blocking consts	2020-04-01 07:07:10 -07:00
AdamWhitehurst	237393993f	triple_strike combo timing window 600 -> 400	2020-04-01 06:43:28 -07:00
AdamWhitehurst	95bc486f7c	Roll move_dir handling 1.5 -> 0.25	2020-04-01 06:42:56 -07:00
AdamWhitehurst	56fab6db09	Roll duration 500 -> 700ms	2020-04-01 06:24:02 -07:00
AdamWhitehurst	89f441ae2c	Roll speed 15.0 -> 25.0	2020-04-01 06:23:26 -07:00
Imbris	b3791a2b4e	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -07:00
AdamWhitehurst	86b0b8f644	triple_strike orientation	2020-03-28 13:50:42 -07:00
Imbris	d3b5b1e637	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
Imbris	f551c4a2c5	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
Imbris	ce0f54e9d6	Combine dir and force in KnockUp and ApplyForce events	2020-03-27 22:19:23 -04:00
Imbris	ba3fa16c33	Create Dir type for better enforcement of non NaN, normalized representations of directions	2020-03-27 22:02:07 -04:00
Imbris	df5a7ef0e3	split toggle events	2020-03-27 21:32:30 -04:00
AdamWhitehurst	1d51f8fc0f	prevent transition if pressing too early & timed	2020-03-27 11:17:34 -07:00
AdamWhitehurst	e4f2bf7ebf	prevent holding to time combo	2020-03-27 11:08:10 -07:00
AdamWhitehurst	02b29efbfc	Undo mistake, axe ability corrected. ... Axe m2 cost 0 -> 100 Axe m2 dmg 8 -> 12	2020-03-27 11:07:21 -07:00
AdamWhitehurst	233595737e	Axe m2 dmg 10 -> 15 ... Axe m2 cost 0 -> 50	2020-03-27 11:03:07 -07:00
AdamWhitehurst	d774091fa4	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
AdamWhitehurst	8eb233bdbc	Add timing window duration to triple strike	2020-03-27 10:43:18 -07:00
AdamWhitehurst	01264ce167	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 10:40:19 -07:00
AdamWhitehurst	2ffac59aa3	add triple strike timing	2020-03-27 10:40:15 -07:00
timokoesters	c6e635c511	Increase movement speed, make npcs slower than players	2020-03-27 18:39:26 +01:00
Pfauenauge90	0b3fb2dd3c	fire bolt visuals	2020-03-27 18:31:45 +01:00
timokoesters	6fe5c5724c	Fix char selection not showing tools	2020-03-27 18:17:41 +01:00
timokoesters	ad0314b4f5	Projectile hits regenerate energy	2020-03-27 17:07:19 +01:00
AdamWhitehurst	4bfc934772	triples strike knockback 15.0 -> 16.0	2020-03-27 08:26:53 -07:00