437 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
Ben Simpson	0cd8150e98	Update common/src/sys/movement.rs	2020-02-13 08:13:36 +00:00
Ben Simpson	a49482503d	Update common/src/sys/controller.rs, common/src/sys/movement.rs files ... Deleted energy.rs, movement.rs files	2020-02-13 07:59:54 +00:00
Ben Simpson	1aa98dbb62	Update common/src/comp/energy.rs, energy.rs, common/src/sys/controller.rs, common/src/sys/movement.rs, movement.rs files	2020-02-13 07:30:32 +00:00
Adam Whitehurst	d383abf950	Re add combat	2020-02-11 07:42:17 -08:00
timokoesters	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00
timokoesters	aeb37a1f33	improvement: char speed	2020-02-03 20:43:36 +01:00
timokoesters	aa52c6fd4f	fix: jumping and attacking	2020-02-03 17:03:52 +01:00
Marcel Märtens	dae31ae5b6	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00
Joshua Barretto	344eb9d45d	Added intermittent rolling to NPCs during a chase	2020-01-27 16:18:36 +00:00
Joshua Barretto	de96551f65	Resolved pet alignment issues, added ranged aggro	2020-01-27 15:51:07 +00:00
Joshua Barretto	09f0a5744f	Improved NPC spawning and names, made idle NPCs stop before hitting things	2020-01-27 10:58:33 +00:00
Joshua Barretto	631124f3fc	Switched to _squared(), added comments, parallelised waypoint gen	2020-01-26 12:52:32 +00:00
Joshua Barretto	723b578378	Improved pet aggression system, made waypoints rarer	2020-01-26 12:52:32 +00:00
Joshua Barretto	c9138d913c	Fixed pathfinding limit bug, improvements to idle AI	2020-01-26 12:52:32 +00:00
Joshua Barretto	7437c18b99	Various bug fixes	2020-01-26 12:52:32 +00:00
Joshua Barretto	b22ee24362	Cleanup	2020-01-26 12:52:32 +00:00
Joshua Barretto	feeccc2ff3	Improved patrol idling	2020-01-26 12:52:32 +00:00
Joshua Barretto	d04a595b3f	Made waypoints work, added waypoint spawning	2020-01-26 12:52:28 +00:00
Joshua Barretto	11193a692a	Better neutral AI, initial waypoint objects	2020-01-26 12:52:28 +00:00
Joshua Barretto	290cb52d0d	I don't know how much I put in this commit, but it's some stuff	2020-01-26 12:52:28 +00:00
Joshua Barretto	f92371101c	Added pauseable pathfinding, improved Chaser heuristics, etc.	2020-01-26 12:52:07 +00:00
Joshua Barretto	f14037e4a3	Occasional path recalculate, stopped pathfinder thrashing	2020-01-26 12:52:07 +00:00
Joshua Barretto	2d9aa21eef	Added test world, friendly NPC pathfinding	2020-01-26 12:52:07 +00:00
timokoesters	7b558b4542	refactor: combine actionstate and movestate	2020-01-21 23:54:59 +01:00
timokoesters	28fe73825d	feat: fitness stat effects movement speed	2020-01-21 19:24:09 +01:00
Gilbert Röhrbein	4f90e6325e	feat: add endurance fitness willpower to stats	2020-01-21 18:49:17 +01:00
timokoesters	2e8bf9d212	improvement: enemy balance	2020-01-20 19:15:12 +01:00
Pfauenauge90	8a0efd3654	added TODO for energy numbers	2020-01-19 22:39:20 +01:00
Joseph Gerardot	454aa82669	Fixup energy regen math to properly account for acceleration at any ... framerate.	2020-01-19 22:39:20 +01:00
timokoesters	6e651eb659	fix: make fall damage behave correctly again after changing gravity	2020-01-19 22:39:20 +01:00
timokoesters	65d0a1c4f4	refactor: use restrict_mut	2020-01-19 22:39:20 +01:00
timokoesters	8064b51ee2	improvement: better movement	2020-01-19 22:39:18 +01:00
Joseph Gerardot	c10c31043c	Make charging take a discrete amount of energy and change energy ... regeneration to use floats so it is smoother and tickrate-independent.	2020-01-19 22:39:17 +01:00
Joseph Gerardot	b4337e57aa	Add energy comsumption on rolling and charging, and accelerating ... regeneration when idle.	2020-01-19 22:39:17 +01:00
AdamWhitehurst	976eface66	Update from MR comments	2020-01-17 08:39:21 -08:00
Adam Whitehurst	5959d2a5c7	Fix SFX and Assets	2020-01-16 05:28:45 -08:00
Adam Whitehurst	d82e93b39f	Merge master and build	2020-01-16 05:27:30 -08:00
AdamWhitehurst	1816d4b805	Move states/ to common/src/	2020-01-12 15:06:52 -08:00
Piotr Korgól	e1adf40856	Improvement: Replace all '..=b' with '..b + 1'	2020-01-12 15:46:53 +01:00
Shane Handley	c6f64564a8	Remove emission of an audio event from stats sys ... This was accidentally left in by me during some testing of server emission of SFX events to all clients. There was no effect on gameplay since we dont emit a sound for this event yet, but it should not be here. The audio event is correctly handled elsewhere by each client.	2020-01-11 13:08:33 +09:00
Monty Marz	851d7858e6	Scrolling Combat Text (SCT)	2020-01-10 00:33:38 +00:00
AdamWhitehurst	5527d83a0e	Update mod imports	2020-01-08 08:56:36 -08:00
Adam Whitehurst	8648641362	Grooming	2020-01-07 07:49:08 -08:00
Adam Whitehurst	4e5cf63452	Clean Up Systems	2020-01-05 14:55:27 -08:00
Adam Whitehurst	8fe5cec947	Clean up, make state handlers options	2020-01-05 10:19:09 -08:00
Imbris	4fa05150a2	Merge branch 'imbris/char-screen-transition' into 'master' ... Fix issues regarding going back to the character selection screen Closes #386 See merge request veloren/veloren!700	2020-01-02 19:40:21 +00:00
Imbris	f52aef224e	Fix typos, don't insert Controller if it doesn't already exist in the ... mount system so that Controller components are not added to entities client side	2020-01-02 05:34:27 -05:00
Adam Whitehurst	2635c405fe	Ability comps and sys	2020-01-01 09:16:29 -08:00
Imbris	1acf08390a	Fix issue where controller events aren't processed while mounted. Fix non humanoids being able to climb and glide.	2019-12-31 16:41:45 -05:00
AdamWhitehurst	b67a4835f4	Update disabled state flags	2019-12-31 05:19:23 -08:00