86 Commits

Author	SHA1	Message	Date
Imbris	3889ec7292	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> ... not registered	2020-03-25 02:05:28 -04:00
Imbris	6ba158b7e1	Input handling changes	2020-03-25 01:38:37 -04:00
timokoesters	2117bb05d0	Healing staff	2020-03-24 22:03:11 +01:00
timokoesters	f0ce088810	Add lights and gravity again	2020-03-24 20:31:54 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	ea2500e7ab	Add minimum prepare duration to fireball and bow	2020-03-24 14:42:31 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
timokoesters	fbb24e7c8a	Even better fireballs	2020-03-23 22:52:35 +01:00
timokoesters	0eebf945fe	Glowing fireballs, no gravity	2020-03-23 13:55:52 +01:00
timokoesters	5194cef03a	Easier swimming, better damage calculation for explosions	2020-03-23 12:50:08 +01:00
Adam Whitehurst	68e3e36c6a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 12:50:55 -07:00
Adam Whitehurst	a510283277	update triple_strike	2020-03-22 12:50:52 -07:00
timokoesters	f3ca06aa71	feat: fireball explosions	2020-03-22 20:40:16 +01:00
timokoesters	0456d3cbed	Better staff M1, random +1 damage, better attackrange,angle impl	2020-03-22 16:26:32 +01:00
Adam Whitehurst	862efb147c	clean up based on pr review comment	2020-03-21 15:55:20 -07:00
Adam Whitehurst	b96d71a8c7	Reset vel on triple_strike	2020-03-21 15:06:42 -07:00
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	3ae2b8de2e	Remove excess code	2020-03-21 10:32:32 -07:00
Adam Whitehurst	180ec89060	add SwapLoadout	2020-03-21 10:26:38 -07:00
Adam Whitehurst	7eaf6f664b	Fix water swimming jump velocity	2020-03-21 09:45:26 -07:00
Adam Whitehurst	79de60d791	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 07:08:14 -07:00
Adam Whitehurst	cb04df7736	swim now uses handle_orientation fn	2020-03-21 07:06:35 -07:00
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
Adam Whitehurst	ae175e57f3	Tweaking consts	2020-03-20 15:20:14 -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
Adam Whitehurst	bb76cc37bd	Oops	2020-03-19 16:14:04 -07:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
timokoesters	208245e82e	Make orientation not dependend on camera dir while wielded	2020-03-19 22:03:17 +01:00
timokoesters	83be1226ef	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
timokoesters	22652cfa37	Restore old boost stick behavior	2020-03-19 17:01:58 +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	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	4195273cf9	Adjust first person camera and underwater wield orientation	2020-03-16 13:19:51 +01:00
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
AdamWhitehurst	6078b9a468	Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates	2020-03-15 08:24:40 -06:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
AdamWhitehurst	7520798567	Damage increase, remove lines	2020-03-15 07:26:42 -06: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