387 Commits

Author	SHA1	Message	Date
Imbris	6ba158b7e1	Input handling changes	2020-03-25 01:38:37 -04:00
Adam Whitehurst	37ec191021	update controller tick fn	2020-03-25 01:38:25 -04:00
timokoesters	7f02f5e7d2	Npcs can't be healed anymore	2020-03-24 23:03:57 +01:00
timokoesters	2117bb05d0	Healing staff	2020-03-24 22:03:11 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +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
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
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
Adam Whitehurst	862efb147c	clean up based on pr review comment	2020-03-21 15:55:20 -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
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
timokoesters	44ec09a8e7	Go to idle state when picking items up	2020-03-20 20:23:04 +01: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	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +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	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
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	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
Adam Whitehurst	990ea5c5a2	Add triple_strike behavior to cs behavior sys	2020-03-12 07:34:24 -07:00
Adam Whitehurst	a64bf1ac60	TripleAttack -> TimedCombo ... (it wasnt the right logic for the tiple attack)	2020-03-12 05:16:40 -07:00
timokoesters	841a2bbd6d	clean up old states, lower gravity	2020-03-10 19:12:16 +01:00
timokoesters	70027da9aa	feat: hitting enemies with basic_attack gives energy	2020-03-10 18:54:59 +01:00
Adam Whitehurst	5f8751e2d3	Begin implementing triple attack	2020-03-08 12:37:17 -07:00
Adam Whitehurst	f769c74bf4	Add charging back	2020-03-08 10:04:26 -07:00
Adam Whitehurst	49c7143144	Clean up warnings	2020-03-07 13:03:10 -08:00
Adam Whitehurst	54a7112ad9	resolve conflicts merging master -> clientstates	2020-03-07 12:49:48 -08:00
Adam Whitehurst	096d3b691e	Merge master	2020-03-07 12:49:15 -08:00
Adam Whitehurst	c678ca9540	Re-add blocking	2020-03-07 11:55:15 -08:00
Adam Whitehurst	cb9e3859da	Rename character behavior sys	2020-03-07 11:02:54 -08:00
Adam Whitehurst	b1d1299fe6	Clean up character states	2020-03-07 10:15:02 -08:00
Caleb Cochran	219f9fa3be	Added missed comma	2020-02-25 22:01:51 -06:00
Caleb Cochran	8479230e66	Replaced commas (fmt issue)	2020-02-25 21:59:08 -06:00
Caleb Cochran	9f7aa61fbd	Fixing #504 - Enemies stop attacking after combat	2020-02-25 20:48:09 -06:00
timokoesters	4cc998f92b	fix: non-humanoid npcs can attack again	2020-02-24 22:20:50 +01:00
timokoesters	d0439fdd84	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-24 21:34:17 +01:00
timokoesters	ac611f4618	fix: sync characterstates, better energy management	2020-02-24 20:57:33 +01:00
timokoesters	31f3aae75c	fix: make climbing cost stamina	2020-02-24 19:18:06 +01:00
timokoesters	1f4065ae32	fix: attacking	2020-02-24 14:32:12 +01:00
Ben Simpson	636bf7d343	Merge branch 'expandedreality/energy-regen' into 'master' ... Energy now does not regen when climbing,gliding,and swimming Closes #483 See merge request veloren/veloren!800	2020-02-14 01:15:47 +00:00
Ben Simpson	c427f2298e	Energy now does not regen when climbing,gliding,and swimming	2020-02-13 18:46:01 -06:00
Ben Simpson	3343f8e5c0	Update common/src/sys/controller.rs, common/src/sys/movement.rs, common/src/comp/energy.rs files	2020-02-13 08:36:29 +00:00
Ben Simpson	bfd2f345b1	Update common/src/sys/movement.rs	2020-02-13 08:19:36 +00:00