308 Commits

Author	SHA1	Message	Date
yashaslokesh	be71aea20b	Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types ... Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>	2019-08-27 22:33:14 +00:00
timokoesters	b725b0e9ea	End rolling when player is in the air	2019-08-27 11:06:55 +02:00
timokoesters	74677784c0	Add attack buildup duration (Delay before hit)	2019-08-27 11:06:54 +02:00
timokoesters	72564cf8b4	Make action durations constants	2019-08-27 11:06:54 +02:00
timokoesters	a7747fe965	Simplify code	2019-08-26 13:12:45 +02:00
timokoesters	b89bfcbfc1	Remove unnecessary map	2019-08-26 13:12:44 +02:00
timokoesters	08fa6a3414	Prevent problems with no vel while rolling in the future	2019-08-26 13:12:44 +02:00
timokoesters	c278ac9927	Add todo making glide an ability/item	2019-08-26 13:12:44 +02:00
timokoesters	98f8196a16	Put combat related values into constants	2019-08-26 13:12:43 +02:00
timokoesters	05f2f168fd	Make falldamage local, don't use force update for local, cleanup	2019-08-26 13:12:43 +02:00
timokoesters	eb34e5bb27	fmt	2019-08-26 13:12:43 +02:00
timokoesters	b96557d012	Fix roll from cliff bug	2019-08-26 13:12:42 +02:00
timokoesters	a715a84ea7	Implement unstoppable rolling	2019-08-26 13:12:42 +02:00
timokoesters	01410569a4	Use look_dir when blocking	2019-08-26 13:12:41 +02:00
Songtronix	814e858720	Split Events in ServerEvent and LocalEvent	2019-08-26 13:12:41 +02:00
timokoesters	75368dbac1	Remove dbg	2019-08-26 13:12:40 +02:00
timokoesters	62745c4cad	Only use look_dir for ori when wielded or attacking	2019-08-26 13:12:40 +02:00
timokoesters	295969517c	Improve combat range	2019-08-26 13:12:40 +02:00
timokoesters	b826edf6e8	Make aiming 2D	2019-08-26 13:12:39 +02:00
timokoesters	0912de2a26	Make aiming more precise	2019-08-26 13:12:38 +02:00
timokoesters	e90f95bc75	Look in the direction of the camera	2019-08-26 13:12:38 +02:00
jshipsey	39bd888a7c	idle block animation	2019-08-26 13:12:38 +02:00
timokoesters	e7c61c30cc	Block when pressing right click while looking at the attacker	2019-08-26 13:12:37 +02:00
timokoesters	b748c1a6e5	Make gliding the error animation	2019-08-26 13:12:37 +02:00
timokoesters	0bb70d8182	Fix water	2019-08-26 13:12:36 +02:00
timokoesters	5ab03abbdd	Remove animation warnings	2019-08-26 13:12:36 +02:00
timokoesters	799c73d43a	Fix characterstate in movement.rs, not phys.rs	2019-08-26 13:12:35 +02:00
timokoesters	808467c616	Reset controller after each tick	2019-08-26 13:12:35 +02:00
timokoesters	4d6a32e00f	Allow non player entites to be removed again	2019-08-26 13:12:35 +02:00
timokoesters	90c81b4759	Reset controller after each tick	2019-08-26 13:12:34 +02:00
timokoesters	5d5ccd7b99	Move from state components to single CharaterState struct ... This makes split animations easy and improves overall code quality	2019-08-26 13:12:34 +02:00
Vechro	c6b2303890	Fix wielding jump issue	2019-08-21 20:34:21 +03:00
Vechro	c40e15f070	Fix velocity when stuck	2019-08-21 20:17:19 +03:00
Joshua Barretto	825d8bb632	Fixed water in caves, made water reflection vary with lighting	2019-08-18 10:33:18 +01:00
jshipsey	f14a182734	removed wield slowdown by popular request	2019-08-18 03:26:52 -04:00
Joshua Barretto	192f5d355f	Switched to EventBus system	2019-08-07 16:39:16 +01:00
Joshua Barretto	98a913195b	Added entity event system, fixed fall damage	2019-08-07 10:50:49 +01:00
telastrus	e4f2c73b85	undo unnecessary pub mod ... fixed comments fixed other comment	2019-08-06 22:46:25 -04:00
telastrus	0eafd42c0f	fall damage + velocity debug	2019-08-06 17:51:13 -04:00
Joshua Barretto	73a44d0fb1	Collision fixes, better camera in build mode	2019-08-06 16:00:14 +01:00
Joshua Barretto	a324f01a1d	Improved orientation slerping	2019-08-04 15:51:17 +01:00
Joshua Barretto	c7d2fbc20e	Made humanoids glide when chasing	2019-08-04 09:21:29 +01:00
Joshua Barretto	ee0eb8d53c	Better enemy AI targetting and combat	2019-08-04 08:58:41 +01:00
Joshua Barretto	f08d8bb00a	Better movement lerping	2019-08-03 22:15:23 +01:00
Monty Marz	d180c47edc	Pfau/combat	2019-08-03 21:11:57 +00:00
Joshua Barretto	c9f1a793db	Merge branch 'timo-kill-xp' into 'master' ... Give xp depending on max hp and lvl of entity killed See merge request veloren/veloren!400	2019-08-03 20:57:06 +00:00
timokoesters	7365dbe9e6	Give xp depending on max hp and lvl of entity killed	2019-08-03 21:30:01 +02:00
timokoesters	6b69b24185	Make ori more precise	2019-08-03 20:41:55 +02:00
Joshua Barretto	5fc6ab2126	Better enemy attack rate	2019-08-03 19:40:20 +01:00
timokoesters	91b8b69186	Use slerp for ori	2019-08-03 20:33:31 +02:00
Joshua Barretto	c33892e8af	Made entity collisions z-dependent	2019-08-03 19:09:01 +01:00
Joshua Barretto	71bf09d3b7	Better orientation in the air	2019-08-03 18:30:48 +01:00
Joshua Barretto	e52250a193	Made orientation change with move_dir, added a small amount of knockback	2019-08-03 18:24:07 +01:00
Joshua Barretto	5e3e87f9c5	Made enemies sometimes roll	2019-08-03 13:31:40 +01:00
Joshua Barretto	51fa4f3cfc	Merge branch 'animation-tweaks' into 'master' ... animation and movement tweaks See merge request veloren/veloren!389	2019-08-03 12:09:38 +00:00
Joshua Barretto	cab898a91f	Made enemies actually attack	2019-08-03 13:01:54 +01:00
timokoesters	3a43150bc5	Make hostile npcs back away when too close	2019-08-03 12:53:39 +01:00
Pfauenauge90	c919b68346	changed angle of attack, changed z offset on hit	2019-08-03 12:46:07 +01:00
timokoesters	e39324a9d2	Remove knockback	2019-08-03 12:46:07 +01:00
Joshua Barretto	3063546a58	Added entity pushback	2019-08-03 12:26:05 +01:00
Joshua Barretto	e6fe07dd3d	Shortened enemy sight distance	2019-08-02 21:35:03 +01:00
Joshua Barretto	8aa7af781e	Fixed enemy combat	2019-08-02 20:52:46 +01:00
Joshua Barretto	5e4f383952	Better enemy AI	2019-08-02 20:41:38 +01:00
Joshua Barretto	677c5781ba	Added bosses, improved secret object spawn rates	2019-08-02 20:10:52 +01:00
timokoesters	55079c3d1e	Fix hostile npcs new target selection	2019-08-02 20:44:56 +02:00
jshipsey	13310ab9ca	improved animations and movement	2019-08-01 23:57:26 -04:00
Piotr Korgól	ec550620ad	Add a health bonus for level ups, fix pets	2019-08-01 18:56:08 +02:00
Joshua Barretto	39fc1d6b71	Added entity pickup, changed item model	2019-08-01 09:12:00 +01:00
Joshua Barretto	fc49293874	Clickthrough on items	2019-08-01 09:09:26 +01:00
Joshua Barretto	31f8794c39	Started work on inventory manipulation	2019-08-01 09:09:26 +01:00
Joshua Barretto	123a78552a	Fixed block-hopping on edges, added correct inventory slots	2019-08-01 09:09:26 +01:00
timokoesters	b695a63e98	Send different physics components individually	2019-07-30 13:35:16 +02:00
Joshua Barretto	5cdfb26e0d	Added LightEmitter component	2019-07-21 19:22:49 +01:00
Joshua Barretto	dd84c6698b	Fixed infinite NPC jumping	2019-07-21 19:22:49 +01:00
Joshua Barretto	1dc654dde7	Added object entities	2019-07-21 19:22:49 +01:00
Joshua Barretto	d4821b8de8	Better fog	2019-07-21 00:32:36 +01:00
Joshua Barretto	bbd7f579d2	Fix for clipping	2019-07-09 15:07:53 +01:00
Joshua Barretto	9f6f9cb25f	Fixed block snapping at lower framerates	2019-07-09 14:04:30 +01:00
Joshua Barretto	0f0f28284c	Added 'perfect' collisions	2019-07-09 13:37:51 +01:00
Joshua Barretto	6bb48760d7	Fixed jittering collision bug	2019-07-09 11:51:00 +01:00
Justin Shipsey	1c10ff756f	Holding weapon while running/jumping/standing	2019-07-06 19:00:05 +00:00
timokoesters	f5da167ce5	Fix warnings and clippy recommendations in common	2019-07-02 15:48:25 +02:00
jshipsey	cc548eb669	glider animation fix	2019-06-30 18:53:45 -04:00
jshipsey	e9bbe0e800	rebase	2019-06-30 18:53:45 -04:00
jshipsey	2ce5c5881e	combat run/jump/idle animation states	2019-06-30 18:53:44 -04:00
Joshua Barretto	e4dc145f17	Merge branch 'zesterer/small-fixes' into 'master' ... More small fixes See merge request veloren/veloren!271	2019-06-30 22:52:21 +00:00
Joshua Barretto	0de505b74c	fmt	2019-06-30 23:46:55 +01:00
Joshua Barretto	14d9071670	Fixed minor physics bugs	2019-06-30 23:46:46 +01:00
timokoesters	370e7db1ee	Fix death	2019-06-30 22:29:00 +02:00
Joshua Barretto	b35832c37d	Prevent movement in unloaded chunks	2019-06-30 19:54:13 +01:00
Joshua Barretto	2985f94751	Prevented stalling when jumping before a block-hopping	2019-06-30 19:54:13 +01:00
timokoesters	7fec42ce2c	Fix controls	2019-06-30 19:48:38 +02:00
timokoesters	14400f6380	Remove Actor and use Body instead	2019-06-30 18:57:24 +02:00
Joshua Barretto	af755c0964	fmt	2019-06-29 22:47:24 +01:00
Joshua Barretto	f2df3a9d18	Block-hopping fix, better dusk shaders	2019-06-29 22:47:24 +01:00
Joshua Barretto	f1ba97ae7a	Merge branch 'timo-rolling-fix' into 'master' ... Rolling bugs + NPC bugs + "Impossible" bug See merge request veloren/veloren!265	2019-06-29 21:47:05 +00:00
timokoesters	ccbacabd2f	Make agents use controller correctly	2019-06-29 22:51:22 +02:00
timokoesters	d235374d8e	Fix npc and death bug	2019-06-29 22:43:44 +02:00
timokoesters	5fcf6ededa	magnitude_squared everywhere, actionstate everywhere, constant for moving	2019-06-29 22:11:21 +02:00
timokoesters	610c86a3b9	Animation fixes	2019-06-29 21:01:27 +02:00
timokoesters	9f83533741	Fix invisible characters	2019-06-29 20:24:07 +02:00
timokoesters	c80351f6ca	Fix double roll bug	2019-06-29 19:49:51 +02:00
Joshua Barretto	324de39bfe	fmt	2019-06-29 16:48:43 +01:00
Joshua Barretto	905b3d6f45	Prevented block-hopping when not on ground	2019-06-29 16:48:43 +01:00
timokoesters	5a41a58c0a	End roll when going too slow	2019-06-29 14:10:52 +02:00
Joshua Barretto	acb184e15d	Made physics cheaper still	2019-06-27 15:37:33 +01:00
Joshua Barretto	6444ba1933	Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling	2019-06-27 15:21:41 +01:00
Joshua Barretto	cdb405d7b8	Made physics fps-independent	2019-06-26 22:43:47 +01:00
Joshua Barretto	7b7d843d0f	Comments and fmt	2019-06-26 11:53:43 +01:00
Joshua Barretto	4a340f69b5	Camera clipping and block-hop fix	2019-06-26 11:53:43 +01:00
Joshua Barretto	5decd48db6	Used velocity bias for collision correction	2019-06-26 11:53:43 +01:00
Joshua Barretto	6258035a4d	Added attempts counter to prevent infinite collision loops	2019-06-26 11:53:43 +01:00
Joshua Barretto	44f4031e58	Resolved collision bugs with prioritised collision system	2019-06-26 11:53:43 +01:00
Joshua Barretto	ae168711d7	Added configurable details	2019-06-26 11:53:43 +01:00
Joshua Barretto	0d984a5671	Fixed collision bugs	2019-06-26 11:53:43 +01:00
Joshua Barretto	2c24ba7776	Fixed block-hopping, block-snapping, added interpolation to figures	2019-06-26 11:52:36 +01:00
Joshua Barretto	7a1359961c	Removed block-hopping, fixed collisions	2019-06-26 11:52:36 +01:00
Joshua Barretto	285cf2f973	Added proper 3D collisions	2019-06-26 11:52:36 +01:00
Joshua Barretto	9ad2feb037	Ignore ForcedUpdate insertion	2019-06-16 20:53:10 +01:00
timokoesters	eb10389eb6	cargo fmt	2019-06-16 19:59:16 +02:00
timokoesters	f0e6e76423	Don't sync animations, just sync components used to construct them	2019-06-16 19:59:15 +02:00
jshipsey	8e019cdbec	lowered roll duration	2019-06-16 19:59:14 +02:00
timokoesters	14ff033770	Fix glider	2019-06-16 19:59:14 +02:00
timokoesters	2afc45617d	More input validation	2019-06-16 19:59:14 +02:00
jshipsey	0c534efddd	adjusted v-tilt, roll speed, run animation tempo	2019-06-16 19:59:13 +02:00
jshipsey	e066d98762	slight roll tweak, altered speeds in physics	2019-06-16 19:59:13 +02:00
timokoesters	ae081b8f67	Make roll timed	2019-06-16 19:59:13 +02:00
jshipsey	ecf0d9647c	added roll physics, improved anims for roll, glide, run, attached hands to torso	2019-06-16 19:59:12 +02:00
timokoesters	7deb3da1af	Add pub use phys:: and remove most pub mods	2019-06-16 19:59:12 +02:00
timokoesters	955c20fa61	Remove crun and cidle components and inputs	2019-06-16 19:57:04 +02:00
timokoesters	e2c81dd036	Fixes for .maybe() and animation	2019-06-16 19:57:04 +02:00
jshipsey	4de5489367	groundwork for role, crun, cidle	2019-06-16 19:57:04 +02:00
Cody	1f6c1188bc	Removes input sys, moves code to combat and phys	2019-06-16 19:57:03 +02:00
timokoesters	b947d78dac	Improve organization of controls	2019-06-16 19:57:03 +02:00
timokoesters	69cb2ed84f	Revamp control system	2019-06-16 19:57:03 +02:00
Cody	14ac5babd4	Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes.	2019-06-06 14:48:41 +00:00
Louis Pearson	4cf13cc588	Integrate forces *after* velocity is applied	2019-06-04 12:14:10 -06:00
Louis Pearson	84ac965240	Normalize move_dir only if the magnitude is greater than one	2019-06-04 10:13:40 -06:00
Louis Pearson	52764376ae	Use constants and normalized move direction	2019-06-04 10:09:34 -06:00
Louis Pearson	82aabf242a	Add a function for integrating forces	2019-06-04 09:42:31 -06:00
Louis Pearson	c7a2ecd1f2	Adjust gliding speed ... Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1	2019-06-04 07:57:12 -06:00
Louis Pearson	e2d96cc7e0	Add CollisionShape, move friction calculations to phys ... Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030	2019-06-04 07:57:12 -06:00
Louis Pearson	afc5199b63	Remove z < 0 hack ... Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0	2019-06-04 07:55:49 -06:00
Cody	692b216651	Fixes a bug where animals continually jumped after their target was any height above them, even once the target was no longer above them.	2019-06-03 20:09:18 +00:00
Cody	8562a09595	cargo fmt	2019-05-31 16:36:24 -04:00
Cody	75ca605f5d	Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names.	2019-05-31 16:36:24 -04:00
Forest Anderson	2fc4e9a2f8	Merge branch 'enemies' into 'master' ... Enemies See merge request veloren/veloren!186 Former-commit-id: f920608508868119aad286cbe45599342dc1942b	2019-05-28 19:08:02 +00:00
Joshua Barretto	8407908af2	fmt ... Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23	2019-05-28 19:59:32 +01:00
timokoesters	5c48330460	Fix moving after death (again) ... Former-commit-id: 1c46fed1f5d9a74bcf926354b3b4efd442f5b5bc	2019-05-28 18:37:49 +02:00
Marcel	b5b61462ee	Merge branch 'event-chat-messages' into 'master' ... Event chat messages See merge request veloren/veloren!188 Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7	2019-05-28 10:45:24 +00:00