348 Commits

Author	SHA1	Message	Date
Adam Whitehurst	c5378b7065	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	819c2767bc	* move swap loadout to handle_swap_loadout util fn ... * impl From<JoinData> for StateUpdate	2020-03-21 14:16:26 -07:00
Adam Whitehurst	180ec89060	add SwapLoadout	2020-03-21 10:26:38 -07:00
Adam Whitehurst	0cdb80427d	better triple_strike	2020-03-20 15:03:29 -07:00
timokoesters	df858cb370	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	3ec2cc08b3	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00
timokoesters	c630df7f9a	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
timokoesters	835f3f5fe3	Arrows shouldn't turn into loot, staff shoots fireballs again	2020-03-20 11:25:53 +01:00
Pfauenauge90	6094e4b017	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	3a55ae5848	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 22:36:45 +01:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01:00
timokoesters	208245e82e	Make orientation not dependend on camera dir while wielded	2020-03-19 22:03:17 +01:00
Pfauenauge90	ce5eb2e2ab	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 19:34:05 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
timokoesters	83be1226ef	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
timokoesters	bb1b3ceabc	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	22652cfa37	Restore old boost stick behavior	2020-03-19 17:01:58 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
Pfauenauge90	d863e12235	swift leather armour parts	2020-03-19 14:17:53 +01:00
Pfauenauge90	509615c15b	npc armour	2020-03-18 23:09:58 +01:00
Pfauenauge90	4d9327cef5	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Pfauenauge90	40910b28e4	unclothed parts	2020-03-17 15:39:29 +01:00
timokoesters	19a09782a0	Add ability requirements system	2020-03-17 15:01:41 +01:00
timokoesters	f32eb1db75	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +01:00
timokoesters	b3057add42	Smaller damage and health numbers	2020-03-16 19:55:12 +01:00
timokoesters	d5db1f6ca0	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	81591fcaf7	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	1279f70184	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	bf1c46d596	item images	2020-03-15 16:42:09 +01:00
Pfauenauge90	913393963a	plate armour	2020-03-15 16:42:09 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	e80750bc53	plate chest armour	2020-03-15 15:53:51 +01:00
Pfauenauge90	5a962771d9	assassin armour	2020-03-15 15:53:51 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	7dfe00b674	Finish state struct data refactor	2020-03-14 15:17:27 -06:00
AdamWhitehurst	ee706fa32a	Tweaking timed_combo	2020-03-14 13:04:04 -06:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Adam Whitehurst	00e4ad61f7	add ToolData::get_primary_abilities()	2020-03-12 07:47:27 -07:00
Adam Whitehurst	68dd8c578f	Add some ability costs	2020-03-12 07:36:02 -07:00
Adam Whitehurst	772f7ff92d	Remove can_transition and begin triple_strike	2020-03-12 07:33:19 -07:00
Adam Whitehurst	3cb288bc8c	Add TripleStrike	2020-03-12 07:25:06 -07:00
Adam Whitehurst	a64bf1ac60	TripleAttack -> TimedCombo ... (it wasnt the right logic for the tiple attack)	2020-03-12 05:16:40 -07:00