3279 Commits

Author	SHA1	Message	Date
Vincent Foulon	d80db38bc9	Remove TRADE capability, use trade_site attribute instead	2021-04-08 19:06:57 +02:00
Vincent Foulon	bc1797a240	Address comments	2021-04-08 18:33:00 +02:00
holychowders	a4b00a3b97	Fix issue #1061 - Combat Rating is Affected by Buffs ... Replaced `stats` with `None` into the calculation for damage reduction	2021-04-07 17:09:51 -07:00
Vincent Foulon	a30cbaf735	Move Behavior to Agent's Component	2021-04-07 22:11:29 +02:00
Vincent Foulon	dbee13f9be	Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly	2021-04-07 22:02:57 +02:00
Vincent Foulon	45fb9f3211	Address comments ... - make Behavior's capabilities and state private - Typo in a comment - add basic tests Apply 1 suggestion(s) to 1 file(s) Remove comments in agent.rs	2021-04-07 22:02:42 +02:00
Vincent Foulon	a0157ac5f5	use bitflags instead of HashSet	2021-04-07 17:37:21 +02:00
Vincent Foulon	114715908a	fix tag removing	2021-04-07 17:26:54 +02:00
Vincent Foulon	b1718cf578	Use HashSet instead of Vec	2021-04-07 17:26:48 +02:00
Vincent Foulon	211ab02897	Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments	2021-04-07 17:26:42 +02:00
Vincent Foulon	18694b30ad	Use Behavior into Agent	2021-04-07 17:26:12 +02:00
Vincent Foulon	41314e9098	Create Behavior component	2021-04-07 17:21:53 +02:00
Marcel	45b4349bc7	Merge branch 'james/topo-map' into 'master' ... Adds topographic map option and allows for map layers See merge request veloren/veloren!2074	2021-04-07 09:34:13 +00:00
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
James Melkonian	8ee1fc4a0f	Add layers to minimap	2021-04-06 08:42:08 -07:00
James Melkonian	bacda06dba	Added map layers	2021-04-06 08:42:07 -07:00
James Melkonian	70ede7f34d	Topographic map	2021-04-06 08:42:06 -07:00
Avi Weinstock	2c4612bff1	Fix loadout_builder panic.	2021-04-06 10:34:13 -04:00
Marcel	f0cabf1add	Merge branch 'aweinstock/stackable-merchants' into 'master' ... Make merchants spawn with stacks of stackable items. See merge request veloren/veloren!2062	2021-04-06 08:14:33 +00:00
Samuel Keiffer	3c50321a80	Merge branch 'sam/consolidate-roll' into 'master' ... Flattened roll progression. See merge request veloren/veloren!2073	2021-04-06 03:31:46 +00:00
Sam	ba0b6c309b	Flattened roll progression.	2021-04-05 17:50:53 -04:00
Sam	a7e39bc8c9	Nerfs	2021-04-05 17:38:52 -04:00
Avi Weinstock	56137aff92	Address MR 2062 comments: avoid an expect-equivalent pattern.	2021-04-05 11:29:10 -04:00
Louis Pearson	91a647e35f	Return none from depot get if stale id used	2021-04-05 06:16:23 -06:00
Marcel	69891f0b70	Merge branch 'login-trim-username' into 'master' ... login trim username, improve validation, social ordering #1040 Closes #1040 See merge request veloren/veloren!2042	2021-04-04 22:09:16 +00:00
Marcel	958c75642c	Merge branch 'christof/stats_per_price' into 'master' ... output stats per value for all categories in the trade pricing test See merge request veloren/veloren!2057	2021-04-04 18:35:39 +00:00
Avi Weinstock	a1cfd9ea3c	Make merchants spawn with stacks of stackable items.	2021-04-04 13:47:05 -04:00
Monty Marz	06bbb7f0ff	Crafting Tabs and more item tags	2021-04-04 13:02:27 +00:00
DaforLynx	6734198104	Adds on-hit combat sfx	2021-04-04 03:04:02 +00:00
Joshua Yanovski	4be0f1b02e	Merge branch 'sam/hashset-touch-entities' into 'master' ... Changed touch_entities from a vec to a hashset. See merge request veloren/veloren!2056	2021-04-03 22:06:05 +00:00
Christof Petig	d3bdaaec1a	output stats per value for all categories in the trade pricing test	2021-04-03 23:22:34 +02:00
Joshua Yanovski	143fe3876d	Merge branch 'sam/use-lottery-result' into 'master' ... Handled error in setting stack size for item quantity in lottery. See merge request veloren/veloren!2055	2021-04-03 20:11:12 +00:00
Sam	18eed650f4	Changed touch_entities from a vec to a hashset.	2021-04-03 15:13:04 -04:00
Samuel Keiffer	8d9f63404e	Merge branch 'sam/combat-ratings' into 'master' ... Tweaks to Combat Rating Calculation See merge request veloren/veloren!2051	2021-04-03 17:33:34 +00:00
Sam	fd61b94b5d	Handled error in setting stack size for item quantity in lottery.	2021-04-03 11:37:57 -04:00
Sam	ca1a93ba21	Actually committed bone staff fix.	2021-04-03 10:26:32 -04:00
Samuel Keiffer	69b64e26c7	Merge branch 'sam/loot-table-features' into 'master' ... Loot Table Rework See merge request veloren/veloren!2046	2021-04-03 08:45:53 +00:00
Justin Shipsey	d99627e1dd	Merge branch 'refactor-cell' into 'master' ... refactor Cell back to 4 byte size #993 Closes #993 See merge request veloren/veloren!1997	2021-04-03 07:56:06 +00:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Sam	be5d47a512	Factored out weapons into their own rating.	2021-04-03 00:08:40 -04:00
Sam	27f178286d	Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.	2021-04-02 23:24:55 -04:00
Sam	9ad5b0f6b7	Changelog. Fixed a few qualities.	2021-04-02 23:04:36 -04:00
Sam	7c8242b5b1	Added unit test to validate contents of loot tables.	2021-04-02 23:04:35 -04:00
Sam	c8b8cd436e	Made item prices sane.	2021-04-02 23:04:34 -04:00
Sam	7eb1eefa13	Re-created item_price_calculation with new loot tables.	2021-04-02 23:04:34 -04:00
Sam	a2906168a6	Moved materials into their own loot tables.	2021-04-02 23:04:33 -04:00
Sam	cb638180f8	Moved food items into their own loot tables.	2021-04-02 23:04:32 -04:00
Sam	31e69021cb	Switched loot tables from declaring each weapon individually to just referencing a different loot table.	2021-04-02 23:04:31 -04:00
Sam	2e37cefce5	Created weapon loot tables.	2021-04-02 23:04:29 -04:00
Sam	833f1f3309	Converted all armor in loot tables to reference armor set loot tables.	2021-04-02 23:04:28 -04:00
Sam	96b354c178	Consolidated loot tables by switching to CreatureMaterial where possible	2021-04-02 23:04:27 -04:00
Sam	ab2fca21cf	Fixed trading	2021-04-02 23:04:26 -04:00
Sam	bdbe6134f2	Fixed csv tools	2021-04-02 23:04:26 -04:00
Sam	cbca2a66b6	Support for creature specific materails and materials having a quantity.	2021-04-02 23:04:25 -04:00
Sam	247004d180	Loot tables can now recursively specify loot tables. Mercahnts broken.	2021-04-02 23:04:25 -04:00
aljazerzen	9b3f080838	refactor Cell back to 4 byte size	2021-04-01 17:38:10 +02:00
aljazerzen	08146f6a3a	login trim username, improve validation, social ordering	2021-04-01 16:43:27 +02:00
aljazerzen	8ac879e4c1	after leaving group, issue warning instead of changing chat mode	2021-04-01 15:43:50 +02:00
Avi Weinstock	0122dca3c3	Allow fast stacking into and out of a trade with {ctrl,shift} click. ... Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.	2021-03-30 18:39:10 -04:00
Marcel Märtens	ccb78eeb5c	move tracing code to own crate	2021-03-30 16:35:36 +02:00
Joshua Barretto	3c19713e63	Merge branch 'zesterer/sprite-text' into 'master' ... Added text prompts to sprites See merge request veloren/veloren!2034	2021-03-30 11:41:14 +00:00
Joshua Barretto	92afdaf423	Merge branch 'zesterer/small-fixes' into 'master' ... Bow improvements See merge request veloren/veloren!2032	2021-03-30 00:16:45 +00:00
Joshua Barretto	bed863c50c	Added indicator text to terrain sprites	2021-03-30 01:04:23 +01:00
Samuel Keiffer	12ec46c572	Merge branch 'sam/mindflayer-balancing' into 'master' ... Mindflayer balance tweaks. See merge request veloren/veloren!2031	2021-03-29 21:05:49 +00:00
Joshua Barretto	ead861e509	Added patch for sticky hitboxes	2021-03-29 21:52:05 +01:00
Joshua Barretto	85237c7a32	Fixed training dummy hitbox	2021-03-29 21:52:05 +01:00
Joshua Barretto	b0acbda236	Improved archery with feedback sfx and particles	2021-03-29 21:52:04 +01:00
Snowram	6adaac8106	Addresses comments	2021-03-29 18:35:12 +02:00
Snowram	d1e734b9b1	Tooltip now use ItemDesc instead of Item	2021-03-29 18:34:45 +02:00
Snowram	2c09180189	Set the item tooltip for every bag slots	2021-03-29 18:34:45 +02:00
Snowram	aa71dcb9c7	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
Snowram	4786f84afd	New tooltip	2021-03-29 18:34:45 +02:00
Vincent Foulon	a35fa19409	Implement a basic dialogue system	2021-03-29 14:47:42 +00:00
Sam	71ba9b6a54	Mindflayer balance tweaks.	2021-03-29 10:44:46 -04:00
Treeco	12cf8847c8	Added command to teleport to sites by name	2021-03-28 17:02:17 +01:00
Avi Weinstock	40f2c59401	Reclassify Glowing Remains as Armor for econsim.	2021-03-28 10:29:40 -04:00
Marcel	519c01a888	Merge branch 'christof/item_price_fix' into 'master' ... Fix the price category of the newly added items See merge request veloren/veloren!2010	2021-03-28 09:25:52 +00:00
Christof Petig	66d0948d06	Fix the price category of the newly added items	2021-03-28 09:25:51 +00:00
Sam	f117a57083	Switched to using ForceUpdate to forcefully update the client position after a blink	2021-03-27 21:33:45 -04:00
Sam	ade466a12b	Removed potential for divide by zero	2021-03-27 21:06:21 -04:00
Sam	0e3b0a9ee7	Repalced stone golems with 10 husks in T5 dungeon miniboss rooms.	2021-03-27 21:06:18 -04:00
jshipsey	558c82ee54	flayer anims	2021-03-27 21:05:16 -04:00
Sam	91ddcaa155	Particles for summoned minions	2021-03-27 21:05:15 -04:00
Sam	1edf79d109	Moved all legendaries to mindflayer loot table.	2021-03-27 21:05:12 -04:00
Sam	4ec387af82	Added particles for lifesteal effect	2021-03-27 21:05:12 -04:00
Sam	5966b1541d	Mindflayer can now lifesteal off of its own minions	2021-03-27 21:05:11 -04:00
Sam	50e832b6d0	Mindflayer summons husks instead of dogs now	2021-03-27 21:05:10 -04:00
Snowram	39c8efe11f	Adds husk npc	2021-03-27 21:05:09 -04:00
Sam	f9835e78da	Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner.	2021-03-27 21:05:07 -04:00
Sam	720482d994	Gave mindflayer AI. ... Fixed particles and made them sync across network.	2021-03-27 21:05:06 -04:00
Sam	a5b7477e96	Added summon minions ability to mindflayer	2021-03-27 21:05:05 -04:00
Sam	30da614e89	Added dimensional door ability for mindflayer	2021-03-27 21:05:05 -04:00
Sam	f1156c9ce5	Added necrotic vortex attack to mindflayer	2021-03-27 21:05:03 -04:00
Sam	0d3795112c	Added cursed flame attack to mindflayer	2021-03-27 21:05:03 -04:00
Sam	46799daed2	Switched normalized function to try_normalized	2021-03-27 19:05:48 -04:00
Louis Pearson	165065725e	Add build_area_list command ... * Reworks CanBuild to use HashSet * Removes player argument from build permission, use sudo instead	2021-03-27 07:54:02 -06:00
Louis Pearson	21f794f84c	Use Depot instead of Store for BuildArea	2021-03-27 07:54:02 -06:00
Louis Pearson	f08c4e6585	Add commands to manage build areas	2021-03-27 07:54:02 -06:00
Louis Pearson	77d48657c6	Store build areas outside of CanBuild component	2021-03-27 07:54:02 -06:00
Louis Pearson	120a0cd9a7	Limit build mode to bounding box	2021-03-27 07:54:02 -06:00
Louis Pearson	eade0540b2	Add permit_build command ... This commit separates permission to build from building mode, allowing build to become a NoAdmin command (since players will first need permission from an Admin to enter build mode)	2021-03-27 07:54:02 -06:00
Marcel	da5c73c84b	Merge branch 'refactor-login' into 'master' ... refactor handling of duplicate login #1015 Closes #1015 See merge request veloren/veloren!1992	2021-03-27 13:49:09 +00:00
Sam	6c2de7d70e	Fixed boost having ridiculous velocity.	2021-03-26 16:11:25 -04:00
Scott Williams	d35475eaef	Added leather scraps recipe	2021-03-26 16:44:38 +00:00
Marcel	843850a4b8	Merge branch 'aweinstock/tradepricing' into 'master' ... Get SitePricing information to clients, and use it to display coin-denominated... See merge request veloren/veloren!1991	2021-03-26 00:17:39 +00:00
Louis Pearson	0a294bcf56	Use older version of Store and introduce Depot ... Removal of items in Store can cause get to fail. It has been reverted to an older version that did not support removal. The newer version is now called Depot and changed so that None is returned if the item does not exist instead of crashing.	2021-03-25 07:41:53 -06:00
aljazerzen	0ea102dc9c	refactor handling of duplicate login	2021-03-25 12:33:56 +01:00
Avi Weinstock	8d90548331	Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.	2021-03-25 02:11:58 -04:00
Marcel	28952f6d7b	Merge branch 'aweinstock/agent-retargetting' into 'master' ... In `agent::Sys`, perform target selection periodically to avoid agents going... See merge request veloren/veloren!1985	2021-03-24 22:22:04 +00:00
Christof Petig	aa6a75808f	adapt unit test	2021-03-24 07:37:46 +01:00
Christof Petig	acba98366a	loop over slots_mut instead of using an index	2021-03-24 07:37:46 +01:00
Christof Petig	a83a74d216	replace an unwrap by returning an Option	2021-03-24 07:37:45 +01:00
Avi Weinstock	ebc8e945d4	In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly.	2021-03-23 23:00:05 -04:00
Joshua Barretto	21b20ea75e	Merge branch 'aweinstock/enable-rtsim-airships' into 'master' ... Enable RtSim Airships. See merge request veloren/veloren!1973	2021-03-23 14:29:43 +00:00
Marcel	f2c01409a2	Merge branch 'sam/continuous-roll' into 'master' ... Roll Tweaks See merge request veloren/veloren!1975	2021-03-23 09:46:21 +00:00
Avi Weinstock	75f1b0f5e0	Remove level from create_ship and CreateShip.	2021-03-23 10:44:42 +01:00
Avi Weinstock	deb9358c3a	Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.	2021-03-23 10:44:37 +01:00
Avi Weinstock	49f39fb752	Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).	2021-03-23 10:44:32 +01:00
Joshua Barretto	456ceab6d0	Remove eye height check for beam	2021-03-23 10:43:22 +01:00
Joshua Barretto	695f6c52fe	Added raycast check to beams	2021-03-23 10:43:18 +01:00
heydabop	0e3f7625a9	Fix #962 - kick old client and add new client on duplicate login	2021-03-22 19:15:24 -05:00
Sam	356bb5baee	If roll input remains held, allows you to keep rolling and stay in roll state. ... You can now jump to interrupt the recovery portion of roll. Jumping out of roll slightly increases jump strength.	2021-03-22 18:47:13 -04:00
Marcel Märtens	6b23101fac	update toolchain to nightly-2021-03-22	2021-03-22 16:41:04 +01:00
Marcel Märtens	3d45262ebb	warn when a single system takes longer than 500ms	2021-03-22 14:26:05 +01:00
Samuel Keiffer	4356f67bed	Merge branch 'loot-tables' into 'master' ... Loot tables See merge request veloren/veloren!1968	2021-03-22 09:39:35 +00:00
Samuel Keiffer	f65cd1e771	Loot tables	2021-03-22 09:39:35 +00:00
Justin Shipsey	f57af6f776	Merge branch 'slipped/animtweaks' into 'master' ... airship movement bits See merge request veloren/veloren!1967	2021-03-22 08:49:04 +00:00
Samuel Keiffer	1374900928	Merge branch 'sam/combat-fixes' into 'master' ... Fixes gaining combo by shooting loot bag See merge request veloren/veloren!1953	2021-03-22 02:01:22 +00:00
jshipsey	31747d8ff1	airship movement bits	2021-03-21 21:43:49 -04:00
Joshua Barretto	7ae4230dc8	Merge branch 'zesterer/pick' into 'master' ... Pickaxe See merge request veloren/veloren!1959	2021-03-22 00:19:42 +00:00
Joshua Barretto	6ea5aa796b	Faster pick, less vibrant block selection	2021-03-21 20:38:08 +00:00
Joshua Barretto	fb3980e273	Outcome for block destruction, take select_pos from ControllerInputs	2021-03-21 20:10:05 +00:00
Joshua Barretto	003e76113f	Fetch InputAttr from controller	2021-03-21 19:11:44 +00:00
Marcel	983523c463	Merge branch 'vfoulon80/climbing-skill' into 'master' ... Add climbing speed and cost See merge request veloren/veloren!1950	2021-03-21 18:35:44 +00:00
Marcel	e64258afcf	Merge branch 'xMAC94x/tracing_slowjob' into 'master' ... harden slowjob code See merge request veloren/veloren!1961	2021-03-21 18:34:21 +00:00
Marcel Märtens	a77578a25b	harden slowjob code	2021-03-21 18:45:23 +01:00
Joshua Barretto	b45df7fe10	Switched to BasicMelee	2021-03-21 17:45:01 +00:00
Joshua Barretto	347e1022a0	Initial implementation of pickaxe	2021-03-21 16:09:16 +00:00
Vincent Foulon	e06870702f	Add skill for swimming speed	2021-03-21 15:58:38 +01:00
Vincent Foulon	9e11a574d2	remove CharacterAbility::Climb	2021-03-21 00:35:34 +01:00
Vincent Foulon	d0df01fe51	move climbing skill adjustment into climb module	2021-03-21 00:22:04 +01:00
Avi Weinstock	1351b9515c	Update fall damage calculations.	2021-03-20 18:46:34 -04:00
Vincent Foulon	8b01abde67	address comments	2021-03-20 22:56:54 +01:00
Sam	d7090315ff	Increased combo duration by 50%	2021-03-20 16:44:18 -04:00
Sam	92c9e8c477	Fixed gaining combo by shooting loot bags	2021-03-20 16:26:10 -04:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Marcel Märtens	2733ba2e27	Change the version number to 0.9	2021-03-20 13:07:09 +01:00
Samuel Keiffer	d489ade082	Parallelized beam	2021-03-19 20:18:36 +00:00
Imbris	9fb44e5674	More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations	2021-03-18 21:20:22 -04:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Marcel Märtens	e6e56f19f9	cleanup faster physics calc	2021-03-18 15:22:28 +01:00
Imbris	bf383d9562	Combine 5 things into 1	2021-03-18 14:26:32 +01:00
Imbris	99805f9a8d	Merge branch 'imbris/voxel-collider-broadphase' into 'master' ... Spatial grid for voxel colliders as well as a basic bounding sphere test See merge request veloren/veloren!1927	2021-03-18 07:03:04 +00:00
Marcel	a6cae66a54	Merge branch 'sam/fix-dash' into 'master' ... Fixed dash See merge request veloren/veloren!1933	2021-03-18 03:09:46 +00:00
Joshua Barretto	6c939b35b8	Merge branch 'zesterer/network-tweaks' into 'master' ... Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage See merge request veloren/veloren!1935	2021-03-18 01:47:29 +00:00
Joshua Barretto	64c8f75a4f	Merge branch 'sam/remove-combat-last-pos' into 'master' ... Shockwaves and beams no longer use last position in calculating if they hit. See merge request veloren/veloren!1934	2021-03-18 01:07:18 +00:00
Sam	5384e5a01e	Fixed dash	2021-03-17 20:13:12 -04:00
DaforLynx	fbf4defa04	Adds sfx for Sceptre aura	2021-03-17 23:54:49 +00:00
Joshua Barretto	e8b053a09f	Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage	2021-03-17 21:31:07 +00:00
Sam	2bceb2d3a6	Shockwaves and beams no longer use last position in calculating if they hit.	2021-03-17 17:24:39 -04:00
Marcel Märtens	49e5fe96df	add a check that at least 1 thread works for slowJobPool and for every configuration	2021-03-17 14:36:58 +01:00
Marcel Märtens	529eae2e9d	slowjob: allow at least 1 job of every type	2021-03-17 08:26:43 +01:00
Imbris	198cc7e75a	Remove extra instrumentation and the old voxel collider loop	2021-03-16 23:42:13 -04:00
Imbris	e70f097738	Spatial grid for voxel colliders as well as a basic bounding sphere test ... before doing any actual expensive voxel collision checking	2021-03-16 23:32:03 -04:00
Monty Marz	e9cbac387e	new loading bg, staff models ... item images fix paths loot tables, adjustments Update main.ron	2021-03-16 23:23:24 +00:00
Marcel Märtens	b534282dcc	fix ci	2021-03-16 23:31:40 +01:00
Marcel	34b194d179	Merge branch 'aweinstock/forcedupdate-interpolation' into 'master' ... Apply ForcedUpdate messages to the interpolation system, potentially improving... See merge request veloren/veloren!1917	2021-03-16 22:23:04 +00:00
Marcel	ac904f59f0	Merge branch 'sam/invuln-fixes' into 'master' ... Safezone fixes See merge request veloren/veloren!1920	2021-03-16 22:20:42 +00:00
Sam	18173caefe	NPCs no longer target players inside safezones (and consider them to be defeated) ... Warding aura no longer sometimes bypasses safezone invulnerability	2021-03-16 15:17:08 -04:00
Avi Weinstock	4d6fb0584a	Fix mounting by making deferred {pos,vel} writes optional in physics.	2021-03-16 14:04:28 -04:00
Avi Weinstock	62de0816e0	Apply ForcedUpdate messages to the interpolation system, potentially improving the handling of teleports.	2021-03-16 11:55:01 -04:00
Marcel Märtens	a286eb084a	create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it	2021-03-16 13:31:04 +01:00
Marcel Märtens	0ec863b236	further experiments via a special Group	2021-03-16 09:59:05 +01:00
Marcel Märtens	8b6b463177	experiment with a slowjob that can return data	2021-03-16 09:58:58 +01:00
Imbris	8d9809ed25	update changelog, clippy fixes	2021-03-16 04:06:15 -04:00
Imbris	f2ff5c9655	Instrument all par joins, defer ubiquitous pos/vel writes with a component instead of using vecs	2021-03-16 03:50:45 -04:00
Imbris	6146adf5f0	Remove tweaks and plots	2021-03-16 03:50:45 -04:00
Imbris	4b6688ddfe	Add tracy plot for showing use_grid	2021-03-16 03:50:45 -04:00
Imbris	1306ccb6d9	Remove commented out radius list	2021-03-16 03:50:45 -04:00
Imbris	cfa0512cd0	Setup spatial grid for entity versus entity collisions	2021-03-16 03:50:45 -04:00
James Melkonian	6ea43cfd75	Various RtSim and Agent Interaction Fixes	2021-03-16 01:30:35 +00:00
Marcel	39ac300bef	Merge branch 'sam/buff-fix-test' into 'master' ... Fif Buff Emission See merge request veloren/veloren!1910	2021-03-15 22:46:44 +00:00
Sam	a983f5249f	Test	2021-03-15 17:35:53 -04:00
Joshua Barretto	578d81058a	Fixed incorrect velocity snapping on collision	2021-03-15 20:28:48 +00:00
Sam	0c7ea992c2	Mounting fix	2021-03-15 00:26:19 -04:00
Avi Weinstock	41342deab6	Cargo fmt after rebasing.	2021-03-14 23:23:03 -04:00
Avi Weinstock	9304ecab3d	Address Imbris's MR 1888 comments, and add changelog entry. ... - Use Ori::{new,to_quat} and make the field private. - Update/capitalize/add various comments. - Implicitly drop scope guards where applicable. - Take !Copy colliders by reference instead of cloning. - s/cylinder_voxel_collision/box_voxel_collision/ - Unindent some physics code with a continue.	2021-03-14 23:21:46 -04:00
Joshua Barretto	1e9ee3d243	Improved climbing, block-hopping on airships	2021-03-14 23:21:45 -04:00
Avi Weinstock	546ee48073	Fix interpolation for possession, and make the mount point of airships above their deck.	2021-03-14 23:21:45 -04:00
Joshua Barretto	be9476a1ca	Fixed climbing/falling friction when on a wall	2021-03-14 23:21:45 -04:00
Joshua Barretto	6add95bd5c	Fixed block-snapping, climbing and airship takeoff	2021-03-14 23:21:44 -04:00
Avi Weinstock	23b1417275	Add hermite interpolation for position (disabled for now with a flag, since it breaks possession).	2021-03-14 23:20:48 -04:00
Joshua Barretto	29b93d791b	Made level flight work	2021-03-14 23:20:48 -04:00
Avi Weinstock	bbb11882e2	Add lerping of physics to extrapolated position, and enable sending updates for stopped entities.	2021-03-14 23:20:48 -04:00
Avi Weinstock	dad0012973	Get linear interpolation working for {Pos,Vel,Ori} with client-side timestamps.	2021-03-14 23:20:48 -04:00
Avi Weinstock	a71bacdce0	Add machinery for storing component buffers for interpolation.	2021-03-14 23:20:47 -04:00
Joshua Barretto	f6c6319952	Made entities rotate smoothly with airships, fixed rotation speeds	2021-03-14 23:20:47 -04:00
Joshua Barretto	e232a2e473	Fixed jumping inconsistencies, no block-snapping for ships	2021-03-14 23:20:46 -04:00
Joshua Barretto	8247c136bc	Prevented jumping airships	2021-03-14 23:17:29 -04:00
Joshua Barretto	b8a27f493c	Initial pass for gravity and air resistance for more stable physics	2021-03-14 23:17:29 -04:00
Joshua Barretto	71c07734f7	Slightly increase block-hop height for better airship block-hopping	2021-03-14 23:17:29 -04:00
Joshua Barretto	1af86ef2f8	Removed unnecessary matrix mul	2021-03-14 23:17:29 -04:00
Joshua Barretto	9424998e6e	Fixed arrows	2021-03-14 23:17:29 -04:00
Joshua Barretto	44f9932450	Properly propagate velocity steps during airship collision to avoid falling through airships	2021-03-14 23:17:28 -04:00
Joshua Barretto	6d8ba31e5b	Reduced air resistance for better-behaving airships	2021-03-14 23:17:28 -04:00
Joshua Barretto	a4e5ba0639	Fixed incorrectly reversed orientation matrix	2021-03-14 23:17:28 -04:00
Joshua Barretto	7feb4942e3	Fixed incorrect wall climb direction on airships	2021-03-14 23:17:28 -04:00
Joshua Barretto	b2ab1046c8	Fewer precision issues by using player-relative coordinate space	2021-03-14 23:17:28 -04:00
Avi Weinstock	a32be4ac5a	Address MR 1888 review comments. ... - Delete obsolete symbolic links. - Add suggested comments. - Remove dead code.	2021-03-14 23:17:28 -04:00
Avi Weinstock	aa56166c80	Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.	2021-03-14 23:17:26 -04:00
Joshua Barretto	40c284fd71	Relative velocity collisions	2021-03-14 23:14:26 -04:00
Joshua Barretto	3496c356e2	More relative motion changes	2021-03-14 23:14:26 -04:00
Avi Weinstock	5ff72a4a2e	/airship angle command and RtSim airships.	2021-03-14 23:14:26 -04:00
Joshua Barretto	e59b68c262	Mountable airships	2021-03-14 23:14:25 -04:00
Joshua Barretto	09142d99b8	Fixed water collision bug	2021-03-14 23:14:25 -04:00
Joshua Barretto	f44ca1898c	Made airship terrain hitboxes smaller	2021-03-14 23:14:25 -04:00
Joshua Barretto	f4b3d8145b	Smooth airship movement	2021-03-14 23:14:21 -04:00
Joshua Barretto	afd99788b2	Made animations and friction ground-relative	2021-03-14 23:09:52 -04:00
Joshua Barretto	e1e6403c63	Fixed airship collisions under rotation, added position increment for velocity when on ground	2021-03-14 23:09:52 -04:00
Avi Weinstock	e9aab63a04	Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.	2021-03-14 23:09:52 -04:00
James Melkonian	6ff054099f	Allow spawned airships to move	2021-03-14 23:09:52 -04:00
Avi Weinstock	bcd3799395	Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.	2021-03-14 23:09:51 -04:00
Avi Weinstock	5d85775dcf	Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).	2021-03-14 23:09:51 -04:00
Avi Weinstock	8b9e84972a	Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).	2021-03-14 23:09:49 -04:00
Marcel	5570b57282	Merge branch 'sam/yeet-inputs' into 'master' ... Reworked Controller Inputs to use Control Actions See merge request veloren/veloren!1900	2021-03-15 01:32:02 +00:00
Sam	ecff675cc4	Wielding now works again ... Rolling now resumes combo states correctly again Cleanup	2021-03-14 17:26:55 -04:00
Sam	ac6e192db4	Completely purged old method of inputs	2021-03-14 17:26:55 -04:00
Sam	be27289a7f	Inputs remain in queue while active, allowing interrupts and queued inputs to be more cleanly handled	2021-03-14 17:26:54 -04:00
Sam	b5d501199d	Secondary input now fully functional	2021-03-14 17:26:53 -04:00
Sam	21e6f4797c	Primary ability fully functional.	2021-03-14 17:26:53 -04:00
Sam	19c81f1528	Support for canceling an input. Boost state hooked up to system.	2021-03-14 17:26:52 -04:00
Sam	c6d8daaae3	Primary input now activated from control actions. ... Moved a lot of key_state to a HashSet so that it is handled automatically.	2021-03-14 17:26:51 -04:00
Snowram	60dd47cdea	Theropod charge attack	2021-03-14 18:10:40 +01:00
Snowram	9d7e8957bb	Add new npcs	2021-03-14 14:24:35 +01:00
Christof Petig	15b11d9154	Implement /price_list (work in progress), stub for /buy and /sell ... remove outdated economic simulation code remove old values, document add natural resources to economy Remove NaturalResources from Place (now in Economy) find closest site to each chunk implement natural resources (the distance scale is wrong) cargo fmt working distance calculation this collection of natural resources seem to make sense, too much Wheat though use natural resources and controlled area to replenish goods increase the amount of chunks controlled by one guard to 50 add new professions and goods to the list implement multiple products per worker remove the old code and rename the new code to the previous name correctly determine which goods guards will give you access to correctly estimate the amount of natural resources controlled adapt to new server API instrument tooltips Now I just need to figure out how to store a (reference to) a closure closures for tooltip content generation pass site/cave id to the client Add economic information to the client structure (not yet exchanged with the server) Send SiteId to the client, prepare messages for economy request Make client::sites a HashMap Specialize the Crafter into Brewer,Bladesmith and Blacksmith working server request for economic info from within tooltip fully operational economic tooltips I need to fix the id clash between caves and towns though fix overlapping ids between caves and sites display stock amount correctly handle invalid (cave) ids in the request some initial balancing, turn off most info logging less intrusive way of implementing the dynamic tool tips in map further tooltip cleanup further cleanup, dynamic tooltip not fully working as intended correctly working tooltip visibility logic cleanup, display labor value separate economy info request in a separate translation unit display values as well nicer display format for economy add last_exports and coin to the new economy do not allocate natural resources to Dungeons (making town so much larger) balancing attempt print town size statistics cargo fmt (dead code) resource tweaks, csv debugging output a more interesting town (and then all sites) fix the labor value logic (now we have meaningful prices) load professions from ron (WIP) use assets manager in economy loading professions works use professions from ron file fix Labor debug logic count chunks per type separately (preparing for better resource control) better structured resource data traders, more professions (WIP) fix exception when starting the simulation fix replenish function TODO: - use area_ratio for resource usage (chunks should be added to stock, ratio on usage?) - fix trading documentation clean up fix merge artifact Revise trader mechanic start Coin with a reasonable default remove the outdated economy code preserve documentation from removed old structure output neighboring sites (preparation) pass list of neighbors to economy add trade structures trading stub Description of purpose by zesterer on Discord remember prices (needed for planning) avoid growing the order vector unboundedly into_iter doesn't clear the Vec, so clear it manually use drain to process Vecs, avoid clone fix the test server implement a test stub (I need to get it faster than 30 seconds to be more useful) enable info output in test debug missing and extra goods use the same logging extension as water, activate feature update dependencies determine good prices, good exchange goods a working set of revisions a cozy world which economy tests in 2s first order planning version fun with package version buy according to value/priority, not missing amount introduce min price constant, fix order priority in depth debugging with a correct sign the trading plans start to make sense move the trade planning to a separate function rename new function reorganize code into subroutines (much cleaner) each trading step now has its own function cut down the number of debugging output introduce RoadSecurity and Transportation transport capacity bookkeeping only plan to pay with valuable goods, you can no longer stockpile unused options (which interestingly shows a huge impact, to be investigated) Coin is now listed as a payment (although not used) proper transportation estimation (although 0) remove more left overs uncovered by viewing the code in a merge request use the old default values, handle non-pileable stocks directly before increasing it (as economy is based on last year's products) don't order the missing good multiple times also it uses coin to buy things! fix warnings and use the transportation from stock again cargo fmt prepare evaluation of trade don't count transportation multiple times fix merge artifact operational trade planning trade itself is still misleading make clippy happy clean up correct labor ratio of merchants (no need to multiply with amount produced) incomplete merchant labor_value computation correct last commit make economy of scale more explicit make clippy happy (and code cleaner) more merchant tweaks (more pop=better) beginning of real trading code revert the update of dependencies remove stale comments/unused code trading implementation complete (but untested) something is still strange ... fix sign in trading another sign fix some bugfixes and plenty of debugging code another bug fixed, more to go fix another invariant (rounding will lead to very small negative value) introduce Terrain and Territory fix merge mistakes	2021-03-14 03:18:32 +00:00
Imbris	0127832172	Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode	2021-03-13 13:30:20 -05:00
Imbris	2511b8959c	Add tracy entity count plot, span tweaks	2021-03-13 02:59:58 -05:00
Imbris	8d0b776f18	Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements ... - remove overwritten logging setting in server-cli - add server-cli command to load a random area for testing without a client - make admin add/remove commands modify ingame players instead of needing to reconnect - add spans to par_join jobs - added test command that loads up an area of the world - add tracy-world-server alias - set debug directives to info for logging	2021-03-13 02:28:59 -05:00
jshipsey	49f496e290	intitial values	2021-03-12 00:58:12 -05:00
Marcel	93cab075f8	Merge branch 'xMAC94x/non_blocking_register' into 'master' ... Auth requests are now done async, the register system is fetching it, via a PendingLogin component See merge request veloren/veloren!1875	2021-03-11 21:51:55 +00:00
Joshua Barretto	f479231b15	Merge branch 'glowy-shiny-pretty' into 'master' ... Glowy shiny pretty See merge request veloren/veloren!1874	2021-03-11 17:37:33 +00:00
Samuel Keiffer	9b198b5cda	Merge branch 'sam/sceptre-overhaul' into 'master' ... Overhaul sceptre Closes #768 See merge request veloren/veloren!1845	2021-03-11 16:47:50 +00:00
Marcel Märtens	728bff610b	Allow HTTP auth servers again. ... only `localhost` are allowed in a release build. when debug assertions are on, others are also allowed. This change undoes the changes to the settings, so compared to master, there is no effect	2021-03-11 17:24:52 +01:00
Marcel Märtens	a98e72c391	Auth requests are now done async, the register system is fetching it, via a PendingLogin component ... The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`	2021-03-11 17:05:02 +01:00
Joshua Barretto	6e0807f3f5	Cheaper and less broken material reflection/glow	2021-03-11 13:56:11 +00:00
Marcel Märtens	f8b7d96066	git push -fTransport ChunkRequests and Chunkupdates in a own stream. ChunkUpdates are very big and having them in a own stream, helps slow clients to keep up with entity syncs and ... lagging a bit behind on terrain. Which is fine. Block Places and Block Pickup are not handled in this stream, as they go through the standart route of event handling.	2021-03-11 14:50:46 +01:00
Joshua Barretto	09e32cb952	Initial implementation of glow/shininess	2021-03-10 18:58:25 +00:00
ccgauche	67b24294d6	Change Ecs access system to allow write accesses to be used + reintroduced get_player_name	2021-03-10 19:36:53 +01:00
Marcel Märtens	b151a246c3	update specs to get rid of old deps	2021-03-10 13:22:17 +01:00
Marcel	81959c0a89	Merge branch 'ccgauche/move-back-register-to-system' into 'master' ... Moved back register to a system See merge request veloren/veloren!1868	2021-03-10 00:56:33 +00:00
Sam	de5ef03ac4	Auras will now refresh buffs if a buff was already present that had a lesser duration. ... Attack effects can now have multiple requirements. Fix for sceptre heal not requiring energy. Nerfed warding aura protection. Added icon for warding aura. Changelog.	2021-03-09 18:03:06 -05:00
Sam	16222948a3	Sceptre skill tree and migration.	2021-03-09 18:02:07 -05:00
Sam	c13e84aff5	Aura duration separated from cast duration in aura state ... Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura	2021-03-09 18:02:00 -05:00
Sam	940b4b5de7	Combo counter now uses outcomes.	2021-03-09 17:59:42 -05:00
Sam	398370ca51	Changed lifesteal beam particles to look better. ... Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.	2021-03-09 17:59:41 -05:00
Sam	b6f4543a14	Fixed beam offsets, told healing beam to use beam animation.	2021-03-09 17:59:40 -05:00
Sam	c6a222340e	Particles for lifesteal beam. Changed how frontend recognized beams.	2021-03-09 17:59:39 -05:00
Sam	18edc1092b	Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal.	2021-03-09 17:59:33 -05:00
Sam	43874a4aa5	Added healing beam character state. ... This was done as there was a lot of special casing in basic beam to account for healing.	2021-03-09 17:58:20 -05:00
Sam	a1bbc136fc	New abilities for sceptre are done	2021-03-09 17:56:38 -05:00
ccgauche	10e5620642	Moved back register to a system	2021-03-09 21:16:23 +01:00
Marcel Märtens	d7df741671	update dependencies, including removal of some tracy deps as they are get through common/tracy	2021-03-09 20:17:29 +01:00
Marcel	f6028f4ae3	Merge branch 'xMAC94x/metrics_fixes' into 'master' ... get rid of a lazy_static and update agent multithreaded metrics See merge request veloren/veloren!1865	2021-03-09 12:59:00 +00:00
Marcel	d229ab1eb9	Merge branch 'aweinstock/critical-stats' into 'master' ... Add critical chance and critical multiplier stats to weapons. See merge request veloren/veloren!1864	2021-03-09 10:55:36 +00:00
Marcel Märtens	77dea4980c	get rid of a lazy_static and update agent multithreaded metrics	2021-03-09 11:52:57 +01:00
Avi Weinstock	d8f0a1c426	Add critical chance and critical multiplier stats to weapons.	2021-03-08 23:27:25 -05:00
Marcel Märtens	4ebfbdde0f	Move Specs code to own common_ecs create, put tracy and macros into common_base	2021-03-09 00:54:01 +01:00
Marcel Märtens	f353f14703	change Name from VSystem to System	2021-03-08 13:15:00 +01:00
Marcel Märtens	6b88545481	restructure server metrics ... - get rid of old SysTimers for each system in favour of VSystem tracking - move metrics generation from lib.rs to own system - code cleanup - remove time tracking in common::sys	2021-03-08 11:51:13 +01:00
Marcel Märtens	c515fece28	Implement a VSystem trait that can be implemented by Systems. ... It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren	2021-03-08 11:51:04 +01:00
ccgauche	89774980b4	First commit	2021-03-07 22:32:52 +01:00
Marcel	e29964ead1	Merge branch 'sarrakitty/fireworks' into 'master' ... added a white firework See merge request veloren/veloren!1856	2021-03-07 18:37:35 +00:00
Joshua Barretto	911acdd9db	Fixed clippy warnings and fmt	2021-03-07 14:25:07 +00:00
Joshua Barretto	db573f6b2d	Turn giant trees into proper sites	2021-03-07 14:25:07 +00:00
Joshua Barretto	862cd5fe49	fmt	2021-03-07 14:25:03 +00:00
Joshua Barretto	a229d65932	Static light improvements, fixed lighting update bug	2021-03-07 14:25:02 +00:00
Joshua Barretto	9875e2c025	Began work on CSG-based primitive tree site structure generation system	2021-03-07 14:25:02 +00:00
Joshua Barretto	7d94c3600f	New town layouts, initial progress	2021-03-07 14:25:02 +00:00
Joshua Barretto	6274987fa6	Fixed snow blocking all light	2021-03-07 14:25:01 +00:00
Joshua Barretto	620e2000d2	Experimental cliffs, use column alt for world map	2021-03-07 14:25:01 +00:00
Joshua Barretto	717bbbf23e	Better static light propagation between translucent objects	2021-03-07 14:25:01 +00:00
Joshua Barretto	6af0e77efd	Better stairs	2021-03-07 14:25:01 +00:00
Joshua Barretto	0c302bb020	Lanterns in trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	6fc7d2a906	Faster More interesting giant trees, better oaks, hives on branches	2021-03-07 14:25:01 +00:00
Joshua Barretto	185b1c3053	Specialised giant trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	7d526da735	Experimental giant mother trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	e30c625d81	More tree variety, denser forests	2021-03-07 14:25:01 +00:00
Joshua Barretto	68b0aa5c50	sync	2021-03-07 14:25:00 +00:00
Joshua Barretto	9cf13ac3b2	Simple coral	2021-03-07 14:25:00 +00:00
Joshua Barretto	6dd0f73c2d	Fixed clipping issues, faster generation	2021-03-07 14:25:00 +00:00
Joshua Barretto	23f0dfb078	Began work on new sites	2021-03-07 14:25:00 +00:00
Sarra	ab12df50cc	added white firework	2021-03-07 03:59:04 -05:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Avi Weinstock	22fcc6417c	Make fireworks recursively shoot more fireworks (95% average replication).	2021-03-06 14:05:51 -05:00
Marcel	875bdd8d71	Merge branch 'sam/asset-validation-tests' into 'master' ... Added Item Validation Test See merge request veloren/veloren!1849	2021-03-04 15:46:12 +00:00
Joshua Yanovski	2dd7089e52	Bring vek up to date so we can bump rustc (hopefully).	2021-03-04 05:46:59 +01:00
Sam	39a580b5ee	Added test that all items are properly formatted and valid. Fixed items that were broken.	2021-03-03 16:45:36 -05:00
James Melkonian	018d51b1a0	Move agent data into structs	2021-03-02 15:51:43 -08:00
James Melkonian	0c25896b2c	Fix fleeing and combat a little	2021-03-02 15:51:40 -08:00
James Melkonian	29c5ae5af9	Fix interaction and clean up, broken fleeing	2021-03-02 15:51:38 -08:00
James Melkonian	045ec011c9	Behavior tree minus interacting	2021-03-02 15:51:32 -08:00
James Melkonian	8bdadc47b5	Initial behavior tree refactoring	2021-03-02 15:49:58 -08:00
ccgauche	7f4411ba1f	Merge branch 'master' into 'ccgauche/plugin-player-join-event' ... # Conflicts: # CHANGELOG.md	2021-03-02 09:45:15 +00:00
Sam	d02c61ad8a	Item use is now goes through a control action rather than a control event.	2021-03-01 20:51:08 -05:00
Justin Shipsey	9ad8804b60	Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835	2021-03-02 01:29:46 +00:00
Ben Wallis	0f7ff21c20	Merge branch 'item-stacking-and-splitting' into 'master' ... Implement stacking and splitting Closes #904 See merge request veloren/veloren!1802	2021-03-02 00:08:47 +00:00
Jesus Bracho	c0573cca44	Implement stacking and splitting	2021-03-02 00:08:46 +00:00
ccgauche	db9991ce6d	Adressed all comments	2021-03-01 22:24:02 +01:00
heydabop	bfc82f7236	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
ccgauche	9628dfaf99	Fixed comments	2021-03-01 21:29:18 +01:00
ccgauche	dbd4d70b79	Lots of improvement in pointer management (switched from i32 to u64) + New event implemented	2021-03-01 19:00:44 +01:00
Sam	f304fe0f10	Fix a few asset paths for armors.	2021-03-01 00:58:43 -05:00
Samuel Keiffer	0497a437a4	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
Sam	7e34f1225f	Migration for armor re-organization.	2021-03-01 00:42:35 -05:00
jshipsey	8944115f8e	more asset organization	2021-02-28 22:18:43 -05:00
Samuel Keiffer	537efdd47e	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	d09baadab2	Added command: '/safezone'	2021-02-28 18:14:59 -05:00
Sam	a88ad7b971	Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.	2021-02-28 15:02:03 -05:00
Samuel Keiffer	7a62cbbafc	Merge branch 'sam/fix-roll-combo' into 'master' ... Fixes being stuck in roll when interrupting combo melee. See merge request veloren/veloren!1831	2021-02-28 18:02:01 +00:00
Avi Weinstock	7e458ecd40	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
Sam	d818ea2f1d	Fixes being stuck in roll when interrupting combo melee.	2021-02-28 08:50:33 -05:00
Sam	50c47ce84d	Made changes to fix torvus	2021-02-27 22:42:11 -05:00
Samuel Keiffer	cb267ac3ee	Merge branch 'sam/combo-comp' into 'master' ... Combo now persists as a compnent, rather than a field on a state See merge request veloren/veloren!1828	2021-02-28 02:42:40 +00:00
Joshua Barretto	b9b36e0bf5	Merge branch 'zesterer-master-patch-28400' into 'master' ... Fix jump routes not being pathed See merge request veloren/veloren!1706	2021-02-28 00:41:38 +00:00
Sam	b25a376995	Re-allowed for what stage you were on to persist through a roll	2021-02-27 19:24:18 -05:00
Sam	404c7f0905	Combo melee now checks combo	2021-02-27 18:24:28 -05:00
Joshua Barretto	6051c06462	fmt	2021-02-27 23:21:01 +00:00
Sam	f24433c8cf	Added combo component	2021-02-27 14:55:06 -05:00
Sam	238fcaf5f1	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	8d316aac8c	feedback adjustments	2021-02-27 01:42:47 -05:00
jshipsey	0a353576dc	address comments	2021-02-27 01:42:47 -05:00
Snowram	17112926e7	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	51bc74b2a5	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	16a44cd532	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	417f4638ed	balance pass 2	2021-02-27 01:42:47 -05:00
jshipsey	79ec9115f5	rebase, yeti in dungeon	2021-02-27 01:42:47 -05:00
jshipsey	e06ebf3507	initial balance	2021-02-27 01:42:47 -05:00
Snowram	858fbe1a6c	Adds yeti npc	2021-02-27 01:42:46 -05:00
Snowram	1b9815dc34	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	53b0ba286a	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00
jshipsey	ce3b2141e1	theropod retrofit, some more moves	2021-02-27 01:42:46 -05:00
jshipsey	5792faa992	some new moves, combine biped weapons into one file	2021-02-27 01:42:46 -05:00
jshipsey	57d5e90ddd	full bipedsmall armor swaps	2021-02-27 01:42:46 -05:00
jshipsey	cb59c8017e	anim tweaks, more loadout setup	2021-02-27 01:42:46 -05:00
jshipsey	aa4237b019	BL improvements, various fixes	2021-02-27 01:42:45 -05:00
jshipsey	e4e25e20c9	rebase	2021-02-27 01:42:45 -05:00
jshipsey	ca3248cc93	new dungeon setups, new npcs, weapon specific loadouts, anims	2021-02-27 01:42:45 -05:00
jshipsey	ac16a8900d	bow	2021-02-27 01:42:45 -05:00
jshipsey	66664f3f89	the stabs	2021-02-27 01:42:45 -05:00
unknown	559ece5ede	More npcs work	2021-02-27 01:42:45 -05:00
unknown	6f18d16aa2	Add new quadmeds npcs with rough offsets	2021-02-27 01:42:44 -05:00
Snowram	f48fea57f4	Sahagin, Adlet npcs	2021-02-27 01:42:43 -05:00
jshipsey	7cf723bb9d	gnome	2021-02-27 01:42:43 -05:00
jshipsey	266986626d	biped_small setup	2021-02-27 01:42:43 -05:00
Samuel Keiffer	a99a78abdb	Merge branch 'sam/improve-aura-buffs' into 'master' ... Auras now apply a buff only once, instead of applying a buff every second. See merge request veloren/veloren!1824	2021-02-27 03:21:47 +00:00
Snowram	1172c2f2c3	Merge branch 'Sarrakitty/OceanFlora' into 'master' ... added coral reefs, kelp forests, and seagrass See merge request veloren/veloren!1819	2021-02-27 01:52:33 +00:00
Sam	64a809ee5b	Made comments more descriptive	2021-02-26 18:15:24 -05:00
Sam	45dd36be07	Auras now apply a buff only once, instead of applying a buff every second. ... Also supports for buffs persisting a period of time after leaving the aura. Campfire regen slightly buffed.	2021-02-26 17:57:01 -05:00
Samuel Keiffer	8e07174c1d	Merge branch 'aweinstock/coin-item' into 'master' ... Add a coin item and make amounts visible on dropped items. See merge request veloren/veloren!1821	2021-02-26 04:17:12 +00:00
Samuel Keiffer	6af9e58965	Merge branch 'add-gemu-models' into 'master' ... Add sword and bow models from backlog See merge request veloren/veloren!1818	2021-02-26 02:59:51 +00:00
Avi Weinstock	7d2e8f72eb	Add a coin item and make amounts visible on dropped items.	2021-02-25 21:31:30 -05:00
Samuel Keiffer	00937a4e8b	Merge branch 'aweinstock/modularforms' into 'master' ... Support modular weapon components made from a tagged material using the material as a multiplier. See merge request veloren/veloren!1815	2021-02-26 00:53:02 +00:00
Avi Weinstock	e1484c28c0	Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.	2021-02-25 15:26:49 -05:00
Sarra	f39f5ab5d3	added coral reefs, kelp forests, and seagrass	2021-02-25 05:33:18 -05:00
Sam	ee5c9d78ca	Swords	2021-02-24 18:54:06 -05:00
Marcel	553e8c2195	Merge branch 'sam/torvus-fix-test' into 'master' ... Fix for torvus See merge request veloren/veloren!1816	2021-02-23 20:51:14 +00:00
Avi Weinstock	78014d7d3b	Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers.	2021-02-23 15:49:34 -05:00
Avi Weinstock	4e57678f34	Support modular weapon components made from a tagged material using the material as a multiplier.	2021-02-23 15:31:51 -05:00
Snowram	14c252d8b2	Merge branch 'snowram/turret' into 'master' ... Object animation, beam fixes, turret implementation See merge request veloren/veloren!1805	2021-02-23 20:16:56 +00:00
Sam	3d57db9485	Test fix for torvus	2021-02-23 14:38:58 -05:00
Imbris	da3edf54fb	Merge branch 'ccgauche/plugin-retreive' into 'master' ... ccgauche/plugin retreive See merge request veloren/veloren!1788	2021-02-23 16:36:05 +00:00
ccgauche	4b1c033f6e	Added scopeguard to protect against unwind	2021-02-23 13:58:13 +01:00
ccgauche	74ec5c652a	Added safety section to the EcsAccessManager	2021-02-23 13:58:07 +01:00
Marcel	2fbd382c91	Merge branch 'xMAC94x/physics_followup' into 'master' ... physics followup, fix arrow problems See merge request veloren/veloren!1811	2021-02-23 02:00:40 +00:00
Imbris	f33d3873b4	Merge branch 'aweinstock/modular-weapon-rigging' into 'master' ... Support modular weapon voxel meshes being made by assembling their components. See merge request veloren/veloren!1806	2021-02-23 00:45:26 +00:00
Avi Weinstock	c3ac8a1b51	Support modular weapon voxel meshes being made by assembling their components.	2021-02-23 00:45:26 +00:00
Marcel	6081ebbe15	Merge branch 'sam/ecs-sys-struct' into 'master' ... Sam/ecs sys struct See merge request veloren/veloren!1813	2021-02-23 00:08:09 +00:00
ccgauche	f85e79af07	Fixed turbofish issues	2021-02-23 00:03:29 +01:00
ccgauche	a12e554266	Removed the unwrap to ensure the WASM instance can't crash the host	2021-02-23 00:03:27 +01:00
ccgauche	387daf8aea	Change invalid message in examples and cleanup ... Updated changelog + Removed hello plugin from plugins folder	2021-02-23 00:02:58 +01:00
ccgauche	6c991cc2cd	Changed to less restrictive memory ordering	2021-02-23 00:02:51 +01:00
ccgauche	267e7d8b4c	Finalized Retrieve API	2021-02-22 23:59:41 +01:00
ccgauche	06aa7ab70c	Retrieves added + New ECS memory layout for plugins	2021-02-22 23:59:32 +01:00
ccgauche	1597fcc79e	Fixed the plugin compilation and added comments ... TODO: Remove compilation errors on WASM side (while using common).	2021-02-22 23:59:25 +01:00
ccgauche	8a693d9fde	New cleaner safer version	2021-02-22 23:59:15 +01:00
ccgauche	a067a20b69	added basic retreive	2021-02-22 23:59:11 +01:00
Marcel Märtens	6008109413	physics followup, fix arrow problems by adding the vel_dt to the collision boundry	2021-02-22 23:51:01 +01:00
Sam	3f467a32e6	Changed naming from 'immutable data' to 'read data'	2021-02-22 16:02:37 -05:00
Sam	2b5120319d	Character behavior system now uses immutable data struct	2021-02-22 15:30:53 -05:00
Sam	fae1db90d5	Controller system now uses immutable data struct	2021-02-22 14:33:54 -05:00
Sam	dcacd82293	Stats system now uses immutable data struct	2021-02-22 14:27:34 -05:00
Sam	27fe1c20ac	Aura system now uses immutable data struct	2021-02-22 14:14:10 -05:00
Sam	4c0c06ea4c	Buff system now uses immutable data struct	2021-02-22 14:03:18 -05:00
Sam	605513ea56	Beam system now uses immutable data struct	2021-02-22 13:57:56 -05:00
Sam	11a0d67b35	Shockwave system now uses immutable data struct	2021-02-22 13:49:56 -05:00
Sam	b278cad807	Projectile system now uses immutable data struct	2021-02-22 13:37:42 -05:00
Sam	91e982b3ee	Melee system now uses immutable data struct	2021-02-22 13:25:21 -05:00
Marcel Märtens	1a7c179bbb	share tokio Runtime between Client and Server, name rayon Threadpool	2021-02-22 17:35:06 +01:00
Vincent Glize	4f37c626ea	Optimize Entity <> Entity collision check by calculating a entity via sphere.	2021-02-22 12:36:42 +01:00
Justin Shipsey	1f88b87ca4	fix glider crash	2021-02-22 06:31:12 +00:00
Joshua Barretto	e2290783fc	Merge branch 'humanoid_ai_glide_when_falling' into 'master' ... FIX #956: Humanoid ai glide when falling See merge request veloren/veloren!1772	2021-02-22 00:57:25 +00:00
Overblob	370259fe54	CI - Fix clippy errors ... Fix trailing whitspace	2021-02-22 00:57:25 +00:00
Snowram	4078eeb877	Various fixes to object animation, cleanup	2021-02-21 19:56:46 +01:00
Snowram	f25b2b1500	Various fixes to beam, body based interp	2021-02-21 19:17:56 +01:00
Sam	11050a05ce	Beam particles now determined from beam segment rather than character state.	2021-02-21 19:17:56 +01:00
Snowram	e7bbf3981d	Object animation	2021-02-21 19:17:44 +01:00
Snowram	775224983b	Initial turret implementation	2021-02-21 18:23:54 +01:00
Samuel Keiffer	3cb6a5592d	Merge branch 'aweinstock/speed-floor-quickfix' into 'master' ... Change the speed floor to `0.1` (avoiding a division by zero in modular... See merge request veloren/veloren!1804	2021-02-21 02:49:57 +00:00
Avi Weinstock	3606490308	Change the speed floor to 0.1 (avoiding a division by zero in modular weapons accidentally buffed the Twitching Root).	2021-02-20 19:19:26 -05:00
Sam	f24490dc80	Added functionality for buffs queueing. Saturation now queues.	2021-02-20 17:13:17 -05:00
Avi Weinstock	c489d095df	Implement persistence for modular weapons. ... This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search. Squahed fixes: - Fix some constraint violations that occurred when swapping inventory items. - Comment out recipes for modular weapons. - Make update_item_at_slot_using_persistence_key and is_modular more idiomatic. - Add changelog entry. - Document `defer_foreign_keys` usage.	2021-02-20 14:31:46 -05:00
Avi Weinstock	8bdbf4f7c9	Implement modular weapons. ... - Add ItemKind::ModularComponent, Item::components. - Add tool::StatKind::{Direct,Modular} for the modular weapons themselves. - Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account. - Crafting stores into the components field. - Components/recipes/placeholders are created dynamically. - Show which components a modular weapon contains in the tooltip in voxygen. Squashed fixes: - `Item::duplicate` components in `Item::new_from_item_def`. - Speed of 1.0 for now.	2021-02-20 14:30:39 -05:00
Snowram	f78170704a	Allows some species to be immune to specific buffs	2021-02-20 14:03:15 +00:00
Samuel Keiffer	479cf9fc4e	Merge branch 'sam/dual-wielding' into 'master' ... Dual wielding backend See merge request veloren/veloren!1787	2021-02-20 05:12:17 +00:00
Sam	eaf3e02e39	Addressed comments ... Fixed audio test	2021-02-19 19:55:23 -05:00
Sam	d5ccc33abc	Factored out duplicate code into closures, consolidated ability handling logic to a single function.	2021-02-19 18:45:48 -05:00
Sam	411b4083b1	Added 1h hammers. ... Fixed audio tests.	2021-02-19 17:30:24 -05:00
Sam	18309fe4c6	Added AbilityInfo struct to attack states	2021-02-19 17:30:24 -05:00
Sam	50cbe42b07	Added one-handed axes.	2021-02-19 17:30:23 -05:00
Sam	8f0cca074d	Dual wielding now uses skillbar abilities from multiple weapons.	2021-02-19 17:30:22 -05:00
Sam	6f6a37faf2	Wielding a 1 handed weapon now correctly uses abilities when the second weapon is not also a 1 handed weapon.	2021-02-19 17:30:22 -05:00
Sam	f50fa25467	ItemConfig now stores AbilitySet directly instead of each individual ability.	2021-02-19 17:30:21 -05:00
Sam	fc01e9ea68	Handedness of weapons affects power and speed.	2021-02-19 17:30:21 -05:00
Sam	582c3f8459	Check for prerequisite skill in using an ability is no longer hardcoded.	2021-02-19 17:30:21 -05:00
Sam	341affdae2	Added hands field to all ron files of weapons. ... Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons. Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version. Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword	2021-02-19 17:30:20 -05:00
Sam	d4f509b3d0	Added hands field onto weapons.	2021-02-19 17:30:20 -05:00
Avi Weinstock	559ad7b7f5	Client-side trade improvements. ... - Add item tooltips in trade. - More localization support. - Fix bindings (R for trade, B for bag).	2021-02-19 15:20:27 -05:00
Caelan	dda4931f46	Clean and update dependencies ... * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API	2021-02-17 01:27:06 -08:00
Joshua Barretto	4d19308612	Merge branch 'lboklin/quat-ori' into 'master' ... Redefine Ori as a quaternion See merge request veloren/veloren!1755	2021-02-16 22:39:11 +00:00
Imbris	1352d7ad9c	Merge branch 'quellus/max-name-length' into 'master' ... Limit character name length Closes #528 See merge request veloren/veloren!1774	2021-02-16 21:29:45 +00:00
Quellus	8b4230db61	Limit character name length	2021-02-16 21:29:45 +00:00
Avi Weinstock	03d28f7d93	Implement tags for items, allowing a crafting recipe to take any item with that tag as input. ... - Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps. - Animate placeholder items for tagged crafting.	2021-02-16 01:05:54 +00:00
Avi Weinstock	c984035976	MR 1775 review fixes. ... - Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable). - Move some invite/trade machinery to `ControlEvent`. - Make `TradePhase` a proper enum instead of a bunch of bools. - Make `TradeId` a proper newtype. - Remove trades from `Trades` on accept (previously was only on decline). - Typo fixes/misc cleanup. - Add bullet point for trading to the changelog.	2021-02-14 11:13:56 -05:00
Avi Weinstock	232ddb0860	Polish trading implementation and address review comments. ... - Fix item swapping edge case - Document more assumptions/edge cases - fmt and clippy - s/ServerGeneral::GroupInvite/ServerGeneral::Invite/ - Use `Client::current` in `Client::is_dead`	2021-02-14 11:11:35 -05:00
Avi Weinstock	f6db8bb7c4	Implement actual inventory-manipulation part of trading server side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	abb5684883	Trade implementation progress. ... - Accept/decline buttons that submit the proper messages - A phase2 screen that renders the (item, quantity) pairs as text - More checks in the trade state machine server-side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	e2b55e0706	Implement enough of a trade UI that dragging & dropping items into it round-trips between clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	aeb2398fc6	Trade implementation progress. ... - Server messages now bring up the trade window. - When a trade is declined, it closes the window on both clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	ae528124fc	Trade implementation progress. ... - State machine for modifying trades. - ServerGeneral/ClientGeneral messages.	2021-02-12 18:43:09 -05:00
Avi Weinstock	e9b811b62b	Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement.	2021-02-12 18:43:09 -05:00
DaforLynx	ebbb06a400	Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic	2021-02-12 00:54:42 +00:00
Quellus	63952875d9	Rebase !1447 Chat input color and icon reflect channel message is sent to.	2021-02-10 19:42:59 +00:00
Ludvig Böklin	74badd3dbd	Add note about to_quat() being a cheap copy operation	2021-02-10 17:35:20 +01:00
Snowram	477bdfdfe7	Adresses some comments, various visual tweaks	2021-02-10 00:30:23 +01:00
Snowram	02f446fe4b	Adds lights to dungeons	2021-02-10 00:30:23 +01:00
Ludvig Böklin	990198cd87	Don't test Dir->Ori correctness because it will fail from floating point errors	2021-02-09 15:44:12 +01:00
Ludvig Böklin	065e260e78	Code quality	2021-02-09 14:06:27 +01:00
Ludvig Böklin	582ddfc3cd	Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot	2021-02-09 13:52:03 +01:00
Sam	398fcf7bdd	Changing main tool while in wield state moves character back to idle state.	2021-02-08 17:25:40 -05:00
Sam	e033fe6bee	Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.	2021-02-08 13:55:50 -05:00
Sam	1c83c5ee6f	Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.	2021-02-08 12:31:17 -05:00
Sam	f026aeb2dc	Server events directly emitted in states now.	2021-02-08 12:01:48 -05:00
Sam	6a1e583d45	Eradicated clones	2021-02-08 12:01:48 -05:00
Sam	9f2255a5de	Extended what states inventory manipulations touching the loadout could affect.	2021-02-08 12:01:47 -05:00
Sam	8eebcdfcd2	Inventory changes that modify the loadout now go through a control action instead of a control event.	2021-02-08 12:01:47 -05:00
Ludvig Böklin	46750880eb	Add Plane type, Projection trait, fix upright() and add doc tests	2021-02-07 17:16:15 +01:00
Samuel Keiffer	909ed80e9e	Merge branch 'sam/fix-roll' into 'master' ... Fixes roll being free See merge request veloren/veloren!1757	2021-02-06 22:15:06 +00:00
Imbris	a5c76a6d36	Merge branch 'trollderim/replace-magic-dr-number' into 'master' ... Replace magic dr constant Closes #915 See merge request veloren/veloren!1756	2021-02-06 20:28:40 +00:00
Sam	252e421692	Roll is no longer free.	2021-02-06 15:20:08 -05:00
Phillipp Mevenkamp	f5e1d446ad	Replace magic dr constant	2021-02-06 18:21:58 +01:00
James Melkonian	1d8496ea21	Move agent system to server	2021-02-06 06:15:25 +00:00
Ludvig Böklin	a1ff9ab83f	Redefine Ori as a quaternion	2021-02-05 09:33:14 +01:00
Pascal Fuhrmann	9f7637ab21	Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts	2021-02-05 01:39:12 +00:00
Sam	be8df9aef6	Addressed comments.	2021-02-02 16:08:09 -05:00
Sam	80954f3ba4	Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps.	2021-02-02 13:07:07 -05:00
Sam	af982ec0bb	Changed knockback to be an effect on the overall attack, rather than a damage.	2021-02-02 13:07:07 -05:00
Sam	17d1432be0	Outcomes now correctly read if an attack had any healing components.	2021-02-02 13:07:06 -05:00
Sam	5eec915c2e	Added support for damage falloff with explosions.	2021-02-02 13:07:06 -05:00
Sam	5c16b0b532	Explosions now use attacks.	2021-02-02 13:07:06 -05:00
Sam	7675e53740	Shockwaves now use attacks.	2021-02-02 13:07:05 -05:00
Sam	e5caef8a54	Effects on attacks can now require energy.	2021-02-02 13:07:05 -05:00
Sam	2b11ae6569	Attacks can now heal.	2021-02-02 13:07:04 -05:00
Sam	edcfcc31f6	Attacks can now deal poise damage.	2021-02-02 13:07:04 -05:00
Sam	fcd89a5d41	Lifesteal now functional on Attack.	2021-02-02 13:07:03 -05:00
Sam	fdef168e82	Beams now use Attack, with limited functionality in some cases.	2021-02-02 13:07:03 -05:00
Sam	59ce8c6843	Projectiles now use attacks.	2021-02-02 13:06:57 -05:00
Sam	46dbb8aef4	Attack effects can now have requirements.	2021-02-02 13:06:34 -05:00
Sam	c77f263cd1	Effects now work when not tied to a damage.	2021-02-02 13:06:34 -05:00
Sam	18aa315f0d	Rolling now dodges melee attacks again.	2021-02-02 13:06:34 -05:00
Sam	78879d5189	Attacks can now inflict de/buffs.	2021-02-02 13:06:33 -05:00
Sam	6d509932db	Attacks can now reward energy.	2021-02-02 13:06:33 -05:00
Sam	c3408c084c	Critical hits are now functional.	2021-02-02 13:06:32 -05:00
Sam	2690e9caa1	Applied basic functionality of attack-effects system to melee.	2021-02-02 13:06:32 -05:00
Sam	d3b75df76f	Changed name of Attacking comp to MeleeAttack	2021-02-02 13:06:31 -05:00
Sam	bb019309ea	Attack builder implemented.	2021-02-02 13:06:31 -05:00
Sam	78a2459e6d	Changed knockback from an enum to a struct.	2021-02-02 13:06:30 -05:00
Pascal Fuhrmann	f4deb08a40	fixing #944 - LeapMelee fall damage fix & adjustments	2021-02-02 16:51:04 +00:00
Blob	5c8fc4f378	Fix projectile explosion being triggered twice.	2021-02-01 15:41:34 +00:00
James Melkonian	23b1df3cdd	Add basic NPC interaction and fix NPC chat spamming	2021-01-31 20:29:50 +00:00
jiminycrick	ea13f75427	Quick poise fix	2021-01-29 15:52:40 -08:00
jiminycrick	a02444825d	Address some comments ... Eliminated extra stagger state Responding to more comments Move poise character state changes to character behavior system Move poise out of JoinTuple/Data Finish up comments (various fixes)	2021-01-28 17:31:05 -08:00
jiminycrick	46c8c744fa	Add migration for starter gear	2021-01-28 17:22:39 -08:00
jshipsey	d456271921	animal stuns ... Fix rebase	2021-01-28 17:22:39 -08:00
jiminycrick	661764f4aa	Some preliminary balancing ... Fix rebase	2021-01-28 17:22:39 -08:00
jshipsey	29732bb763	starting stun anim ... stagger anim, mirroring, bettern walk anim wielding with stuns/stagger Knockback fix Added Poise documentation/comments	2021-01-28 17:22:37 -08:00
jiminycrick	0f244bf84b	Made stunned state invulnerable to poise damage ... Fixing silly error for comp creation	2021-01-28 17:22:35 -08:00
jiminycrick	dd69b5f2bc	Poise stats	2021-01-28 17:22:35 -08:00
jiminycrick	af076aa87f	Add knockback to poise	2021-01-28 17:22:35 -08:00
jiminycrick	e3965ae0ab	Very basic functioning stun	2021-01-28 17:22:35 -08:00
jiminycrick	c83296a4ec	Initial broken implementation of poise ... Character movement no longer broken.	2021-01-28 17:22:33 -08:00
jiminycrick	8b97199245	Update rand dependency	2021-01-26 20:35:08 -08:00
Sam	680a4e4dde	Fixed base energy being 0.	2021-01-26 21:25:00 -05:00
Entropy9s	1f6cf7e155	StaminaPlus buff, modifying stamina via buffs ... trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified bracket bulldozing, boldly hopefully this should be good? need to rebase real quick please let me be done StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified hopefully this should be good? cargo clippy fmt stuff deleted an extraneous file?? how did that even...?	2021-01-26 22:47:55 +00:00
Sam	9b7edcf32f	Changed how beams determined the energy regen and energy cost.	2021-01-24 23:47:10 -05:00
Snowram	ad6cdcab71	Merge branch 'swilliams/gems' into 'master' ... Adds 6 different gems and removes shiny gem. See merge request veloren/veloren!1729	2021-01-25 01:25:40 +00:00
Samuel Keiffer	0343b57b2b	Merge branch 'lboklin/glider-stamina' into 'master' ... Glider stamina cost now only when first starting to glide based on fall speed See merge request veloren/veloren!1727	2021-01-25 00:17:32 +00:00
Samuel Keiffer	c349afc9e9	Merge branch 'sam/speed-beam' into 'master' ... Fixed how the speed stat was applied to beams. See merge request veloren/veloren!1732	2021-01-24 23:23:53 +00:00
Sam	a83baa8243	Fixed how the speed stat was applied to beams.	2021-01-24 16:01:38 -05:00
Sam	6dd740feaa	Nerfed bow M1 and M2, slightly buffed bow skillbar ability.	2021-01-24 14:24:59 -05:00
Scott Williams	157e56d8ca	Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds	2021-01-24 16:40:22 +00:00
Scott Williams	32bbdffc38	Added 6 gems, removed shiny gem from cave, replaced with diamond.	2021-01-24 14:00:49 +00:00
Ludvig Böklin	f42869f6ec	Glider deploy stamina cost value tweak	2021-01-24 12:06:23 +01:00
Ludvig Böklin	30168e375f	Glider stamina only costs on deploy	2021-01-24 10:56:35 +01:00
Samuel Keiffer	bdbed58b09	Merge branch 'swilliams/hitbox-adjustments' into 'master' ... General NPC Hitbox Adjustments See merge request veloren/veloren!1723	2021-01-24 04:00:57 +00:00
Scott Williams	c7baf1fd86	General NPC Hitbox Adjustments	2021-01-24 04:00:57 +00:00
Samuel Keiffer	3866bc73a4	Merge branch 'lboklin/glider-stamina' into 'master' ... Fix glider stamina drain See merge request veloren/veloren!1718	2021-01-23 23:21:22 +00:00
Marcel	82147653df	Merge branch 'torvus-quick-fix' into 'master' ... Fix torvus See merge request veloren/veloren!1720	2021-01-23 22:31:15 +00:00
Samuel Keiffer	39d1c9e885	Merge branch 'sam/skill-balancing-1' into 'master' ... Skill balancing See merge request veloren/veloren!1716	2021-01-23 21:12:35 +00:00
Sam	77312ccdd4	Move outcome vec from being defined in frontend and server to common.	2021-01-23 15:17:36 -05:00
Ludvig Böklin	5eefa86d68	Fix glider stamina drain	2021-01-23 18:20:43 +01:00
Justin Shipsey	fb09d14725	Merge branch 'Rotsuoy/SavannaGrass' into 'master' ... Rotsuoy/savanna grass See merge request veloren/veloren!1711	2021-01-23 07:46:54 +00:00
Rotsuoy	994677a4d0	Rotsuoy/savanna grass	2021-01-23 07:46:54 +00:00
Samuel Keiffer	97f0413307	Merge branch 'sam/fix-dash' into 'master' ... Dash now ticks damage based off distance rather than duration. See merge request veloren/veloren!1715	2021-01-23 04:42:56 +00:00
Sam	5e4b6809ca	Sceptre nerfs.	2021-01-22 22:46:18 -05:00
Sam	d6be67e0a0	Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee.	2021-01-22 18:10:47 -05:00
Sam	4014b28d19	Removed body from stats component as there is already a body component.	2021-01-22 16:50:22 -05:00
Scott Williams	2a9c4f6f2e	Swilliams/golem hitbox fix	2021-01-22 16:30:35 +00:00
Justin Shipsey	6de8ca32ce	Merge branch 'sam/lactose-tolerant-golems' into 'master' ... Gives golems a spin attack See merge request veloren/veloren!1709	2021-01-22 07:30:53 +00:00
Sam	b5a3b3442c	Addressed comments.	2021-01-21 17:45:03 -05:00
Sam	d2f3c1dd25	Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions.	2021-01-21 14:56:24 -05:00
Sam	aaad5e49cc	Changed how it moved golem.	2021-01-20 17:22:24 -05:00
Sam	c888ec0535	Golems are now lactose tolerant.	2021-01-20 11:54:57 -05:00
Joshua Barretto	1223519ea1	Fix jump routes not being pathed	2021-01-20 14:39:01 +00:00
Monty Marz	1eb7f78189	Revert "Added TR translations for deaths by debuffs." ... This reverts commit 0817e45e13.	2021-01-20 11:20:06 +00:00
Samuel Keiffer	27796aac4e	Merge branch 'james/fix-biped-large-roll' into 'master' ... Make only humanoid agents attempt to roll See merge request veloren/veloren!1701	2021-01-19 21:37:48 +00:00
jiminycrick	08922dfc64	Make only humanoid agents attempt to roll	2021-01-19 10:42:46 -08:00
Sarra Kitty	e7d852835c	Sarrakitty/rotsys item sprites	2021-01-19 18:23:44 +00:00
Samuel Keiffer	b04158c5f9	Merge branch 'sam/combat-skill-trees' into 'master' ... Sam/combat skill trees See merge request veloren/veloren!1680	2021-01-19 14:18:07 +00:00
Monty Marz	ac60bf5794	Better visuals for skill button labels, don't show "0 EXP" in the SCT ... Made functions that were called every frame significantly cheaper. Final UI fixes.	2021-01-19 08:08:29 -05:00
Sam	eaa41c7dea	Skills are now factored into combat rating. New formula for exp scaling per SP. ... Adjust lvl up msg fade Add female humanoid names WIP Changed text formatting when skill is max level. Added message to show you have 0 skill points available. Addressed a lot of comments. various changes to UI - fix skillbar offset - remove CR indicators for group members - add CR indicators to group member frames - use unified CR indicator icon Exp reward tweaks. Fixed flamethrower range skill description.	2021-01-19 08:08:26 -05:00
jshipsey	0b156542e4	roll keyframes ... Changed roll to have non-fixed acceleration.	2021-01-19 08:08:21 -05:00
jshipsey	5d1993009f	keyframed axe spin ... Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.	2021-01-19 08:08:18 -05:00
Monty Marz	de5c5702b3	stats display ... Addressed comments. Addressed comments.	2021-01-19 08:08:11 -05:00
Sam	c809569f6b	Added level up sound to skill point gain. Fixed tests. ... Fixed duplicate roll description.	2021-01-19 08:08:08 -05:00
jiminycrick	3d44ac2c35	Humanoid skill config and AI skill check ... updated axe skill with correct icons	2021-01-19 08:08:05 -05:00
Noé	acbd965e65	implemented en translation for Hammer, Bow, Scepter and Staff skills ... skill tree translation Clamped earning SP to avoid u16 overflow. translation fixes Fixed exp scaling function Fixed exp scaling function remove debug combat rating display Update overhead.rs implemented en translation for Axe	2021-01-19 08:08:02 -05:00
Sam	a606313856	Added scaling exp costs per skill point. ... Fix tooltip being red. multiple fixes, started translation change exp giving items adjust loot tables adjust combat rating indicators fix group frame offsets	2021-01-19 08:07:57 -05:00
Sam	6ce422748c	Added SkillSetConfig to specify skill sets for npcs.	2021-01-19 08:07:55 -05:00
Sam	968b66260e	Levling health gives you health. Added combat scaling to UI.	2021-01-19 08:07:54 -05:00
Sam	83fdc8806d	Added function to automatically generate a combat rating. Currently, it is used to calculate exp.	2021-01-19 08:07:54 -05:00
Sam	4f552a736e	Added skill point costs to tooltips.	2021-01-19 08:07:53 -05:00
Sam	ae8c8b47f1	Added tooltips with numbers. Balancing on some skills. ... Added experience scaling for tougher enemies.	2021-01-19 08:07:51 -05:00
Sam	89766b2b34	Added command to give yourself skill points. ... adjusted social window Changelog	2021-01-19 08:07:49 -05:00
Sam	986c05621a	Wired up skill UI to check for prerequisites being met and sufficient skill points. ... available SP check in general HUD, more skill icons Trimmed 2000 lines from a file. UI tweaks	2021-01-19 08:07:45 -05:00
Sam	4b52574750	Skill point gains are displayed in hud. ... level up message visuals and functionality Handles simultaneous skill point gains in UI.	2021-01-19 08:07:41 -05:00
Sam	cb3e44a811	Health can now be scaled for npcs again.	2021-01-19 08:07:40 -05:00
Sam	1d90b64898	Added function to get the max amount of skill points that can be spent in a tree.	2021-01-19 08:07:39 -05:00
Sam	b6d2d48ead	Exp floaters. ... You load in with correct energy and health values now.	2021-01-19 08:07:36 -05:00
Sam	51c0bd765f	Database support for refunding skills. ... Nonfunctional xp floaters, squash when working. more icons, lock visuals	2021-01-19 08:07:29 -05:00
Monty Marz	48bd921d0a	EXP bar and available points UI ... fix overhead UI Add WIP overhead difficulty indicator readd commented out exp counter for later use Wired skill information into UI.	2021-01-19 08:07:25 -05:00
Sam	c0c45a1996	Purged stats, including level and experience	2021-01-19 08:07:23 -05:00
Sam	48c98b11cf	General combat skill tree. ... UI for general skill tree	2021-01-19 08:07:20 -05:00
Monty Marz	3f436079e8	Skill-Tree UI ... switchable tabs rework icons, fix cursor toggle auto slot placing Bow leap skill changed to bow glide skill.	2021-01-19 08:07:06 -05:00
Sam	0ccbdc3b8c	Sceptre skill tree.	2021-01-19 08:07:03 -05:00
Sam	5c7705f874	Staff skill tree.	2021-01-19 08:07:03 -05:00
Sam	662a08defc	Implemented bow skill tree.	2021-01-19 08:07:02 -05:00
Sam	4dfe14c103	Hammer skill tree complete.	2021-01-19 08:07:02 -05:00
Sam	72604e8a4e	Axe skill tree functional.	2021-01-19 08:07:01 -05:00
Sam	69be3a3d93	Added persistence for skill trees.	2021-01-19 08:07:00 -05:00
Sam	cc60ca58be	Added sword skill tree	2021-01-19 08:06:59 -05:00
Sam	0e84ba18c2	Moved skill max level and skill prerequisites into ron files.	2021-01-19 08:06:59 -05:00
Sam	5a23f063a0	Ron file now used for skills belonging to each skill group.	2021-01-19 08:06:58 -05:00
Sam	fa073bceff	Skills can now optionally have levels. Max level prevents adding skill of higher level. Support for skills having a prerequisite of a particular level.	2021-01-19 08:06:57 -05:00
Sam	5d474974b9	Skills can now have prerequisite skills. Skills can now cost different amounts of skill points.	2021-01-19 08:06:57 -05:00
Sam	cbfe064e4f	You now gain skill points after a threshold of xp within a particular skill group. ... Skills can now unlock skill groups. Temp method of using chat to unlock skills.	2021-01-19 08:06:52 -05:00
Jesus Bracho	42679201b0	Set up aura filtering	2021-01-18 22:58:56 +00:00
Sam	63eb71ed5b	Exp is now awarded to specific skill groups. It's automatically split between a general pool and weapon pools based on if you have the weapon in your loadout and if you've unlocked the weapon pools.	2021-01-18 17:54:03 -05:00
Jesus Bracho	ec79890335	Provide buff information on killed entities	2021-01-18 05:46:53 +00:00
ubruntu	74d17ff4c8	Slightly better bird pathing	2021-01-15 00:42:57 +00:00
Acrimon	ceae51b0b7	fix #925	2021-01-14 13:21:55 +01:00
Ben Wallis	c785e75e60	Follow-up fixes from review of inventory MR	2021-01-10 11:27:09 +00:00
Ben Wallis	d7cbf479e3	Fixed a bug which prevented picking up stackable items with a full inventory	2021-01-08 23:34:35 +00:00
Ben Wallis	aef2637288	Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts	2021-01-08 19:12:09 +00:00
ccgauche	5ff2f5bc5d	updated to wasmer 1.0.0 ... - Everything seems to be working just fine	2021-01-08 16:33:19 +01:00
Joshua Barretto	1604616768	Merge branch 'ccgauche/new-wasmer-backend' into 'master' ... ccgauche/new wasmer backend See merge request veloren/veloren!1644	2021-01-08 08:48:31 +00:00
ccgauche	06ffe61219	Added feature flag ... changed field name to size	2021-01-08 08:48:30 +00:00
Joshua Barretto	a4b9230f03	fixed Cargo.lock conflict ... Fixed `crossbeam-queue` being referenced twice in the lockfile	2021-01-07 20:25:12 +00:00
ubruntu	ae366e03c5	Reduced downward fall of birds, Humanoid travelers no longer visit dungeons, birds only travel between dungeons	2021-01-05 01:04:01 +00:00
Marcel Märtens	c37384979c	switch toolchain to nightly-2021-01-01	2021-01-03 21:31:21 +01:00
Benoît du Garreau	8ced0a3810	Fix i18n::list_localizations	2021-01-03 17:48:23 +01:00
Acrimon	e76474463a	update authc	2020-12-28 16:42:40 +01:00
unknown	3c1e1c6733	Converts npcs names file to ron	2020-12-23 00:58:25 +01:00
Frinksy	53d5a9373e	fixing #881 ... - Multiple buffs make the UI icons flicker	2020-12-22 15:40:57 +00:00
Justin Shipsey	3466d638fe	Merge branch 'gliding-energy-cost' into 'master' ... Glider mid-air deploy and gliding energy-cost See merge request veloren/veloren!1626	2020-12-18 21:18:32 +00:00
Ludvig Böklin	8f9db19a4a	Glider mid-air deploy and gliding energy-cost	2020-12-18 19:16:06 +01:00
Benoît du Garreau	1ace001fde	Fix debug items	2020-12-18 18:11:48 +01:00
Benoît du Garreau	989683d2d3	Improve world::Index	2020-12-17 12:08:04 +01:00
Benoît du Garreau	1c4e334cd4	Apply suggestion ... - Remove default value for CharacterAbility - Put back accidentally removed comment	2020-12-17 12:06:32 +01:00
Benoît du Garreau	ce9d706ed4	Fix clippy lints	2020-12-17 12:06:28 +01:00
Benoît du Garreau	7b4aa6d4cc	cargo fmt	2020-12-17 12:06:22 +01:00
Benoît du Garreau	d090eefb00	Move the asset module to a single file	2020-12-17 12:06:13 +01:00
Benoît du Garreau	0cf164f33a	Use assets_manager to load assets	2020-12-17 12:06:07 +01:00
jiminycrick	60d5d62eef	Switched to hashbrown everywhere	2020-12-17 10:31:35 +01:00
Marcel Märtens	e8003a44dd	update specs	2020-12-16 14:31:16 +01:00
Marcel Märtens	e3307344ab	get rid of some insecure dependencies	2020-12-16 10:42:36 +01:00
Marcel	24a840bc6b	Merge branch 'xMAC94x/dependencies' into 'master' ... update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) See merge request veloren/veloren!1641	2020-12-16 09:33:34 +00:00
Justin Shipsey	e7249210f6	accel based run	2020-12-16 08:07:38 +00:00
Marcel Märtens	107fd432f5	update further crates	2020-12-16 08:56:21 +01:00
Marcel Märtens	26918d10c9	update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)	2020-12-16 00:51:07 +01:00
Joshua Barretto	198b1970a7	Merge branch 'ccgauche/fix-memory-overwrite' into 'master' ... ccgauche/fix memory overwrite See merge request veloren/veloren!1631	2020-12-15 17:09:17 +00:00
ccgauche	2b9dee0727	Updated buffer	2020-12-15 16:04:55 +01:00
Marcel	754b149316	Merge branch 'HiggsTardigradeTau/fix-slow-motion-effect-after-lag' into 'master' ... Fixed slow motion effect after lag See merge request veloren/veloren!1634	2020-12-15 14:31:05 +00:00
Joshua Barretto	494436be01	Hid plugins behind a feature flag to resolve Windows CI issue	2020-12-15 11:14:26 +00:00
Monty	cd1c1ffe9c	hotfix NPC inviting	2020-12-15 01:43:44 +01:00
Owen McCormick	ea28f93dc0	Fixed slow motion effect after lag	2020-12-14 16:05:42 -08:00
Monty	8b9db7b179	cleanup, changelog, small bugfixes ... fmt fix rebase fmt	2020-12-14 21:52:24 +01:00
ccgauche	ea1efd1ce1	Runned FMT	2020-12-14 18:46:04 +01:00
ccgauche	69dba49884	Fixed clippy warnings	2020-12-14 18:31:01 +01:00
ccgauche	d7aa26371c	Fixed memory issue now using alloc	2020-12-14 17:07:05 +01:00
Joshua Barretto	fc96fd780b	Moved plugin API to Uid instead of usize for entity IDs, hello plugin to an example	2020-12-13 23:08:15 +00:00
Joshua Barretto	023888f560	Updated changelog, fmt and clippy fixes	2020-12-13 17:40:15 +00:00
Joshua Barretto	f8c8e342e6	Moved common networking code to common/net, clippy fixes	2020-12-13 17:23:45 +00:00
Joshua Barretto	027842f832	Resolved plugin dependency cycle, allowing more interesting plugin API	2020-12-13 17:15:33 +00:00
Joshua Barretto	8e937a50ca	Better plugin API	2020-12-13 17:15:33 +00:00
ccgauche	b18eda37b5	Added parallelism to event execution using rayon	2020-12-13 17:15:33 +00:00
ccgauche	cae81e625e	Added plugin command support	2020-12-13 17:15:33 +00:00
Joshua Barretto	780f54ac90	Reorganised plugin crates	2020-12-13 17:15:32 +00:00
ccgauche	05aee7df18	Removed unsafe unsage in favour of unwrap_or and get	2020-12-13 17:15:03 +00:00
ccgauche	c95f57cafd	Fixed comments ... - Would be better to remove the iterator and just collect with a loop to avoid extra allocations - tructure - A HashSet is probably better - Usefull -> Useful - I'd have thought plugin-api-derive is a better name	2020-12-13 17:14:39 +00:00
ccgauche	ee7fb990c3	Added plugin system ... Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)	2020-12-13 17:14:37 +00:00
Joshua Barretto	12b29ea174	Began work on plugin API and plugin loading	2020-12-13 17:13:57 +00:00
Marcel Märtens	eba3532386	move tools and chat-cli in src/bin and examples	2020-12-12 02:12:00 +01:00
Pfauenauge90	6d1bae67d0	adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes	2020-12-10 18:06:31 +01:00
Monty Marz	f2ba7cc297	add baobabs, fix map difficulty, make mushrooms lootable	2020-12-10 18:06:29 +01:00
Marcel Märtens	ccb01e1898	adjust fmt and clippy after toolchain upgrade	2020-12-10 14:53:01 +01:00
Snowram	6713ac935f	Addressed comments	2020-12-08 23:04:21 +01:00
Snowram	f94a4ec90d	Improves fish_small, new npc	2020-12-08 23:03:39 +01:00
Snowram	72d73ecd38	Initial fish work	2020-12-08 23:03:38 +01:00
Marcel	ed9413e96a	Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master' ... Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike Closes #867 See merge request veloren/veloren!1592	2020-12-08 21:07:15 +00:00
HiggsTardigradeTau	57d3a595ce	Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike	2020-12-08 21:07:14 +00:00
Sam	490915d384	Modified how most abilites that could scale were scaled.	2020-12-07 22:00:24 -06:00
Joshua Barretto	52f2bccf2f	Fixed incorrect grid check	2020-12-05 18:30:07 +00:00
Joshua Barretto	b37be14b86	Added cave mushrooms	2020-12-05 18:00:29 +00:00
Joshua Barretto	e5ebbd31fa	Began using Grid<T> for LoD data	2020-12-05 11:20:25 +00:00
James Melkonian	71303fecfd	Aura System and Campfire Health Regen	2020-12-04 22:24:56 +00:00
ubruntu	c975f811e7	Chat commands for group manipulation	2020-12-04 02:18:42 +00:00
Marcel Märtens	e398cca53c	move common_state into common_sys	2020-12-01 13:46:28 +01:00
Marcel Märtens	add7922653	Move Systems out of common into common_sys ... This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`	2020-12-01 13:44:07 +01:00
Marcel Märtens	ca1601a980	Change the version number to 0.8	2020-11-28 11:25:58 +01:00
Marcel	a431fe3fad	Merge branch 'sam/dehardcode-energy' into 'master' ... Graying out skills with insufficient energy no longer dependent on hard-coded values Closes #824 See merge request veloren/veloren!1560	2020-11-27 16:27:09 +00:00
Samuel Keiffer	352917d9cb	Graying out skills with insufficient energy no longer dependent on hard-coded values	2020-11-27 16:27:09 +00:00
Sam	332a636647	You can now leap in directions other than forward with repeater ranged again.	2020-11-26 18:23:15 -06:00
Sam	6a6260daa1	Weapon combat fixes: ... - Modified energy and speed scaling of sword, axe, and hammer combo melees. - Nerfed bow basic attack knockback. Buffed bow damage and energy regen. - Corrected xp values for theropods. Removed unnecessary function for xp increase per level. - Guards no longer flee at low health. - Buffed sword spin. - Nerfed axe spin and sword dash moderately. - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.	2020-11-26 09:15:45 +01:00
Joshua Barretto	867ca911e5	Parallelised agent code for some sweet performance gains	2020-11-25 22:47:16 +00:00
Monty Marz	e7d27a2c21	fmt ... cleanup	2020-11-25 16:53:48 +00:00
Marcel	5e64dcce02	Merge branch 'yusdacra/fix-improve-nix-build' into 'master' ... Fix and improve Nix build See merge request veloren/veloren!1548	2020-11-25 11:14:57 +00:00
Sam	33e4448542	Replaced every unnecssary powf in the entire codebase with either powi or sqrt.	2020-11-24 18:28:24 -06:00
Sam	5461f002fe	Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body.	2020-11-24 17:56:39 -06:00
Sam	8ab2d2524a	Changed default main and secondary tool from Some(empty) to None. ... weapon fixes	2020-11-24 17:49:04 -06:00
jiminycrick	aad9734055	Agent tactic refactoring ... Lower theropods spawns clippy, changelog review response	2020-11-24 17:49:00 -06:00
jiminycrick	1cf0aff5ef	More ai work ... balance Lavadrake AI tweaks feedback tweaks	2020-11-24 17:48:54 -06:00
jshipsey	d10dd83e5f	theropods in world, small tweaks	2020-11-24 17:48:51 -06:00
jshipsey	f411ff7e04	bunch of animations and more attacks	2020-11-24 17:48:51 -06:00
jshipsey	6f72e68ad6	hoof attack, tweaks	2020-11-24 17:48:50 -06:00
jiminycrick	1337fdaa57	Generalize rotation time	2020-11-24 17:48:49 -06:00
jshipsey	a27b086401	placeholder for charge animal, animated leapmelee, small fixes	2020-11-24 17:48:49 -06:00
jiminycrick	a1aa3efd29	Moved hit timer to charged melee and adjusted for tail slap	2020-11-24 17:48:48 -06:00
jshipsey	1f59ef92d8	species specific speeds, more animation	2020-11-24 17:48:48 -06:00
jiminycrick	ee03304a3a	Fix charged melee swing	2020-11-24 17:48:47 -06:00
jiminycrick	6b534729be	Initial AI for quad low	2020-11-24 17:48:47 -06:00
jshipsey	c07d8df58b	assigning weapons, building animations ... ability mapping	2020-11-24 17:48:43 -06:00
jiminycrick	793d6095b3	Maneater AI ... Rebase fixes and maneater AI	2020-11-24 17:48:38 -06:00
jshipsey	e3e513cc11	initial quadlow ranged work	2020-11-24 17:48:27 -06:00
jshipsey	ae06016e9a	Wolf attacks and ai. ... initial wolf dash testing tool.rs Wolf attack AI	2020-11-24 17:48:20 -06:00
Yusuf Bera Ertan	62d34422fe	fix and improve nix build: actually output a proper veloren voxygen package now	2020-11-25 02:00:50 +03:00
Sam	17656c990d	Changed default main and secondary tool from Some(empty) to None.	2020-11-23 21:54:12 -06:00
Samuel Keiffer	7774599a19	Merge branch 'sam/rt-loadout-fix' into 'master' ... Fixes loadout for RT NPCs See merge request veloren/veloren!1545	2020-11-24 01:34:18 +00:00
Sam	0abe02ca13	Restructures loadout builder function to better support weapons being passed in.	2020-11-23 18:22:24 -06:00
Christof Petig	a3db20c9d6	Show caves in map	2020-11-23 19:05:17 +01:00
Joshua Barretto	26fd40c0e3	Fmt, make clippy happy	2020-11-23 15:39:03 +00:00
Joshua Barretto	765a1ca17b	Switched light map iteration order, fire bowls in dungeons	2020-11-23 10:58:21 +00:00
Snowram	b7a33c56cc	Add basic guards to towns	2020-11-23 10:58:21 +00:00
Monty Marz	d069eb9a57	street lamp particles, ground fire bowl, misc fixes	2020-11-23 10:58:21 +00:00
Snowram	8885efd702	Adds (mini)bosses spawns	2020-11-23 10:58:21 +00:00
Joshua Barretto	e461fbd951	Make chimneys glow	2020-11-23 10:58:21 +00:00
Joshua Barretto	b539ecf438	More lights, minimised light and glow map data	2020-11-23 10:58:21 +00:00
Joshua Barretto	54989cf4a6	Switched to pure iterator space search	2020-11-23 10:57:57 +00:00
Snowram	0737c71749	Adds new cultist armors, defines loadouts for dungeons	2020-11-23 10:57:57 +00:00
Joshua Barretto	8fd2e4537d	Addressed review comments	2020-11-23 10:57:57 +00:00
Joshua Barretto	51d1a2ecff	Added glow	2020-11-23 10:57:56 +00:00
Snowram	3bcffe1bf7	Assigns spawned npcs loadout with new method	2020-11-23 10:57:56 +00:00
Sam	0b86943e66	Added LoadoutConfig to better specify loadouts.	2020-11-23 10:57:56 +00:00
Joshua Barretto	7850b0bcaf	Added site names, dungeon difficulty, better explosions	2020-11-23 10:57:55 +00:00
Joshua Barretto	de685b00b2	Improved water pathfinding	2020-11-23 10:45:01 +00:00
Joshua Barretto	71b7e1ef90	Better non-climbing NPC pathfinding in rivers	2020-11-23 10:45:01 +00:00
Joshua Barretto	b352ef5d55	Terrain pop-in, fixed agent pathfinding in water	2020-11-23 10:45:01 +00:00
Joshua Barretto	d4d4f17d3c	Added world map size icons	2020-11-23 10:45:01 +00:00
Joshua Barretto	450bc6c4ae	Prevented rtsim entities always climbing	2020-11-23 10:45:01 +00:00
Joshua Barretto	22fb71905b	Added rtsim entities moving when unloaded, better generation	2020-11-23 10:45:01 +00:00
Joshua Barretto	99a881f349	Added entity simulation to rtsim, reification, assimilation	2020-11-23 10:44:59 +00:00
Joshua Barretto	808d1873bd	Began implementing rtsim	2020-11-23 10:37:59 +00:00
Joshua Barretto	3ee4245652	Added test poles, minor improvements	2020-11-23 10:37:59 +00:00
Joshua Barretto	da9b23d4f6	Merge branch 'knarkzel/fix-npc-spawn' into 'master' ... Fix bug that caused campfires and other stuff to duplicate See merge request veloren/veloren!1543	2020-11-22 21:03:06 +00:00
Odd-Harald Lillestø Myhren	56e37a4846	Fix bug that caused campfires and other stuff to duplicate	2020-11-22 21:03:06 +00:00
Imbris	1355c1e8f5	Move tracy frame markers to proper locations, add a few spans	2020-11-22 14:22:39 -05:00
Joshua Barretto	2ae51de7f0	Added more creature spawns	2020-11-21 14:33:32 +01:00
Imbris	e72c69ca41	Merge branch 'imbris/fix-apple-bug' into 'master' ... Fix issues with not being able to grab highlighted apples by unifying distance checking Closes #820 See merge request veloren/veloren!1532	2020-11-21 02:55:09 +00:00
Imbris	ea275e320f	Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module	2020-11-20 20:51:44 -05:00
Sam	c00720fb44	Swapped bool values, only_roll changed to attack_interrupts.	2020-11-20 11:54:56 -06:00
Sam	e62960e75d	Rolling can now interrupt any attack.	2020-11-20 11:30:48 -06:00
Snowram	d98bfa72ad	Improves bipedlarge and theropod anims, balance tweaks	2020-11-19 00:56:50 +01:00
Snowram	b48de84f8c	Adds 3 new npcs	2020-11-19 00:53:17 +01:00
Snowram	44fe398ba3	Adds 2 new npcs, some models tweaks	2020-11-19 00:53:13 +01:00
Snowram	42d2108c39	Adds mindflayer npc	2020-11-19 00:53:09 +01:00
Snowram	9bfccd42d3	Adds new animals	2020-11-19 00:53:02 +01:00
jiminycrick	3b47add55a	Fully move sfx away from ECS event bus	2020-11-18 13:31:13 -08:00
jiminycrick	b3aa454f8e	Initial work to move combat sfx to outcomes	2020-11-18 13:31:12 -08:00
jiminycrick	77d624f640	Made level up sounds use outcomes instead of emitting an event	2020-11-18 13:31:12 -08:00
jiminycrick	a9711eea01	Beginning to address comments	2020-11-18 13:31:12 -08:00
jiminycrick	a684bc90fd	Quadraped footsteps and songs in biomes	2020-11-18 13:31:12 -08:00
jiminycrick	bc1059610b	More clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	c2a2361c22	Fix rebase	2020-11-18 13:31:12 -08:00
jiminycrick	ea1bc2941b	Clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	695cc7f5cb	Broken wind implementation	2020-11-18 13:31:12 -08:00
jiminycrick	9b759efe41	Snow footsteps	2020-11-18 13:31:12 -08:00
jiminycrick	09a1974974	River water sfx	2020-11-18 13:31:12 -08:00
jiminycrick	c8d79b0b0e	Dungeon and cave specific music	2020-11-18 13:31:12 -08:00
jiminycrick	46d3f6f6d2	Initial biome specific music and ambient sound channel	2020-11-18 13:31:11 -08:00
Imbris	7427367d96	Fix issues with not being able to grab highlighted apples by unifying distance checking	2020-11-17 23:06:02 -05:00
Snowram	950eb1976d	Addressed more comments	2020-11-17 23:54:01 +01:00
Snowram	83b2640e02	Makes basic beam Y offset depend on body scale	2020-11-17 23:27:13 +01:00
Snowram	7af561263d	Addressed comments	2020-11-17 23:27:13 +01:00
Snowram	93642428f2	Move eye sight and scale in body.rs, mounts tweaks	2020-11-17 23:27:13 +01:00
Imbris	cbb701f30d	Temp fix for the home command	2020-11-15 20:40:12 -05:00
Knarkzel	917ae5a0b5	added persist combo counter on roll when mid-combo	2020-11-15 23:08:14 +01:00
Imbris	891e81cf58	Merge branch 'imbris/save-selected-char' into 'master' ... Save the selected character, deselect character when deleting, auto select newly created character See merge request veloren/veloren!1516	2020-11-15 01:40:44 +00:00
Imbris	4f2512f126	Save the selected character, deselect character when deleting, auto select newly created character	2020-11-14 19:17:42 -05:00
Imbris	2072929a5a	Send ability map from the server to the client on connection instead of loading from the assets	2020-11-14 16:07:07 -05:00
Samuel Keiffer	0c7cd3d8fb	Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master' ... Make Axe Spin More Realistic Closes #827 See merge request veloren/veloren!1510	2020-11-14 04:15:50 +00:00
Jason Lee	1d2ccd5762	Make Axe Spin More Realistic	2020-11-13 21:49:12 -05:00
Imbris	1373b752ff	Merge branch 'imbris/fix-5' into 'master' ... Remove randomization of species and body_type with the randomize button in char creation See merge request veloren/veloren!1512	2020-11-14 01:56:28 +00:00
Imbris	51dd5110d0	Merge branch 'imbris/fix-3' into 'master' ... Tweak clock related things and fix voxygen tracy feature See merge request veloren/veloren!1506	2020-11-14 01:39:33 +00:00
Imbris	1952785af2	Remove randomization of species and body_type with the randomize button in char creation	2020-11-13 19:43:32 -05:00
Sam	b5f59f9cf3	Fixed tests. Addressed comments.	2020-11-13 10:41:34 -06:00
Sam	e2fe2fd532	Speed and power on weapons are now able to modify abilities after they are loaded from ron files.	2020-11-12 21:24:36 -06:00
Imbris	37e4ea4669	Remove ability map from top level functions	2020-11-12 21:24:35 -06:00
Sam	9b4fa4e961	Started moving loading of ability manifest to an ecs variable.	2020-11-12 21:24:34 -06:00
Sam	050ad82e55	Abilities are now loaded from .ron files.	2020-11-12 21:24:34 -06:00
Sam	770aaf6b93	Added projectile constructor. Removed a bunch of cloning.	2020-11-12 21:24:32 -06:00
Sam	abf7301a89	Changed how buffs were constructed on projectiles.	2020-11-12 21:24:32 -06:00
Sam	f4244ecbaf	Added ron files for unique and WIP tools.	2020-11-12 21:24:31 -06:00
Imbris	27d4310498	Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds	2020-11-12 19:18:54 -05:00
Imbris	c0e8298ac3	Display averaged busy dt	2020-11-11 23:26:13 -05:00
Imbris	a97b188bea	Make fps display and specification more precise	2020-11-11 21:47:22 -05:00
Imbris	ba042c76c8	Only limit negative z velocity by gravity instead of total negative z velocity	2020-11-11 20:09:07 -05:00
Snowram	bed3a5c70a	Adds a speed variable to charged states	2020-11-11 22:06:05 +01:00
Snowram	af346806de	Addressed comments	2020-11-11 22:03:54 +01:00
Snowram	fe977f0a6c	Adds a speed stat to weapons	2020-11-11 22:03:53 +01:00
Imbris	cd1a134c26	Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style	2020-11-11 03:02:22 -05:00
James Melkonian	6085edaa34	Improve NPC aiming and humanoid hitboxes	2020-11-11 04:36:40 +00:00
Marcel	696f607a70	Merge branch 'xMAC94x/clock' into 'master' ... massivly switch clock algorithm. See merge request veloren/veloren!1499	2020-11-10 22:12:12 +00:00
Monty Marz	0e072f72cc	frost cleaver ... velorite mage set offsets armor stats	2020-11-10 21:43:45 +00:00
Marcel Märtens	72afd7af6c	switch to spin_sleep	2020-11-10 22:39:10 +01:00
Marcel Märtens	e4e5c6e55b	massivly switch clock algorithm. ... - before we had a Clock that tried to average multiple ticks and predict the next sleep. This system is massivly bugged. a) We know exactly how long the busy time took, so we dont need to predict anything in the first place b) Preduction was totally unrealistic after a single lag spike c) When a very slow tick happens, we dont benefit from 10 fast ticks. - Instead we just try to keep the tick time exact what we expect. If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.	2020-11-10 18:31:42 +01:00
Justin Shipsey	a8ac051f33	Merge branch 'james/axe-hammer-keyframes' into 'master' ... James/axe hammer keyframes See merge request veloren/veloren!1497	2020-11-10 01:03:11 +00:00
jshipsey	cd188fd32b	tweaks	2020-11-09 18:32:23 -05:00
Joshua Barretto	71718d9c98	Better humidity, better snow trees	2020-11-09 15:06:37 +00:00
Sam	9b0e1c8dfc	Slight balance tweaks.	2020-11-08 19:33:24 -06:00
Sam	8fa7e246e9	Minor tweaks.	2020-11-08 18:11:53 -06:00
jshipsey	0618de138e	rebase	2020-11-08 19:02:48 -05:00
jshipsey	20efc692fd	ranged	2020-11-08 18:52:22 -05:00
Sam	edff3a75c3	Made bow stay in BasicRanged state while autofiring.	2020-11-08 18:51:36 -05:00
jshipsey	92aa6a1b12	axe basic	2020-11-08 18:51:35 -05:00
jiminycrick	33e87de17e	Initial combo melee for axe M1	2020-11-08 18:48:48 -05:00
Christof Petig	b56919b123	Make waypoints persistent ... Closes #549	2020-11-08 22:15:47 +01:00
AlKabir	6535deae9c	added two meat assets for mobs to drop	2020-11-07 23:34:20 -06:00
Sam	158fb36420	Other stupid fix.	2020-11-07 21:07:53 -06:00
Imbris	133ba82a9b	Use item_definition_id for weapon asset mapping	2020-11-07 16:44:11 -06:00
Sam	a4046872b2	Yeeted from code files.	2020-11-07 15:53:10 -06:00
AlKabir	77f3c7e3c5	Minor combat fixes (see issue 785)	2020-11-07 18:00:07 +00:00
TheBoredProgrammer64	b2ec207979	Revert "Removed toolCategory" ... This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.	2020-11-06 15:33:20 +00:00
Marcel Märtens	40f5afc2b0	ci cleanup, dependency update	2020-11-06 14:34:42 +01:00
Samuel Keiffer	44f676d90c	Merge branch 'sam/make-roll-great-again' into 'master' ... Roll overhaul See merge request veloren/veloren!1484	2020-11-06 03:25:18 +00:00
Sam	37ecb165ef	Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.	2020-11-05 20:40:20 -06:00
Snowram	262ceac060	fmt	2020-11-06 01:08:35 +01:00
Monty Marz	642ad805a1	potion buff	2020-11-06 01:08:34 +01:00
Snowram	4b439e9b58	Adresses comment	2020-11-06 01:08:34 +01:00
Snowram	0d92f02deb	Buff stonegolem, nerf giants, add missing sfxs	2020-11-06 01:08:33 +01:00
Monty Marz	ca932f6c15	easier to get minor potions ... increase cost of a minor potion to 4 apples	2020-11-06 01:08:32 +01:00
Snowram	a52f83e92c	Addresses some comments	2020-11-06 01:08:31 +01:00
Snowram	ce96af4363	Allow for an arbitrary array of effects and buffs for consumables	2020-11-06 01:08:30 +01:00
Sam	4a1a3f3ecc	Roll now gives i-frames.	2020-11-05 16:48:04 -06:00
Sam	860c766d62	Changed roll movement.	2020-11-05 14:22:30 -06:00
Sam	55e75adec0	Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.	2020-11-05 12:28:18 -06:00
Marcel	121364821a	Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master' ... xMAC94x/feuerzeugBierflasche See merge request veloren/veloren!1478	2020-11-05 09:22:50 +00:00
Marcel Märtens	a7ce3e5a2e	switch back to cylindric entity <-> entity collision check. ... I still doubt why we do cylindric vs cylindric in entity <-> entity check, but box vs box in entity <-> terrain check. Though i did a spheric calculation here. The cylindric one is alot slower though, 500 entities take 1.9s instead of 1.3s	2020-11-05 08:54:10 +01:00
Sam	a0af315930	Addressed comments.	2020-11-04 19:22:08 -06:00
Sam	bda7fefdc0	Removed Damages struct. Added GroupTarget enum. Changed RadiusEffect to use Effect instead of Daamges. Added Damage variant to Effect Eenum.	2020-11-04 19:22:07 -06:00
Sam	d38f1d319c	Energy and health change server events now reference EcsEntity instead of Uid. Added TargetGroup to use to determine targets of effects/damage. Added Entity(TargetGroup, Effect) to RadiusEffect enum.	2020-11-04 19:22:06 -06:00
Sam	87bff41a66	Addressed comments.	2020-11-04 19:22:05 -06:00
Sam	c48c022f7e	Separated out health from stats component.	2020-11-04 19:22:04 -06:00
Sam	b8f722af8d	Removed most hardcoded ability keys.	2020-11-04 19:22:02 -06:00
Sam	f1f5c2b21b	Added energy change server event.	2020-11-04 19:22:01 -06:00
Sam	e0cbbf52ed	Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage.	2020-11-04 19:22:00 -06:00
Joshua Barretto	87ac4bd998	Merge branch 'christof/home_town' into 'master' ... implement /home to return to home town See merge request veloren/veloren!1481	2020-11-04 15:58:35 +00:00
Marcel Märtens	a7123c6e14	put cache in ECS to get rid of allocations	2020-11-04 14:19:28 +01:00
Marcel Märtens	ce3173ecdf	add metrics for physics sys and implement concurrent physics	2020-11-04 11:53:13 +01:00
Marcel Märtens	bbe6e8be7c	Improve Phyiscs speed of entity handling. ... Before we had accessed velocities in a nested loop O(n²). Now we copy it only once out of the ECS system and store it in a tmp Vec. As we no longer need to hold a mut and imutable reference, we can iter of `&mut velocities` again in the outer loop. Also improved many calculations called in the loop to make the check if 2 entities are to far apart as easy as possible	2020-11-04 11:53:09 +01:00
jshipsey	28cde31bbb	setup for staff, more anim conversions	2020-11-04 01:48:05 +01:00
Christof Petig	ac92c8a6af	implement /home to return to home town	2020-11-04 00:55:15 +01:00
Joshua Barretto	6331ad9455	Implemented Flight	2020-11-03 22:46:07 +00:00
Marcel Märtens	00456c8373	extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game	2020-11-03 08:56:02 +01:00
Marcel Märtens	6bb74c9c6f	Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly	2020-11-03 08:55:54 +01:00
ubruntu	8c1e1fdc5c	Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance	2020-11-03 04:09:38 +00:00
ubruntu	b11041dfa4	10% of bow hits cause bleed debuff	2020-11-01 18:38:57 +00:00
Sam	4d8a635843	Sceptre fix.	2020-10-31 12:57:51 -05:00
Imbris	64def3cde4	Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts	2020-10-29 18:40:11 -04:00
Imbris	74ef766051	Rename running_tps_average -> running_average_delta	2020-10-29 18:30:19 -04:00
Sam	52c93f613e	Addressed comments.	2020-10-28 22:04:15 -05:00
Sam	1a8cf33a60	Transitioned forced movement to an enum.	2020-10-28 18:15:27 -05:00
Sam	981eee5936	Transitioned knockback to an enum.	2020-10-28 18:15:27 -05:00
Sam	1ccbdec35c	Tweaked dash melee some more.	2020-10-28 18:15:26 -05:00
Sam	a7e3e55a12	Transitioned damage and healing from u32/i32s to enums.	2020-10-28 18:15:25 -05:00
Sam	844e6f2b60	Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3.	2020-10-28 18:15:25 -05:00
Sam	15286a094a	Leaps now require a non-negative vertical velocity to use.	2020-10-28 18:15:24 -05:00
Sam	555bc559f5	Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity.	2020-10-28 18:15:24 -05:00
Sam	63011241ea	Added keyframes to all states that were lacking them.	2020-10-28 18:15:23 -05:00
Sam	6559df459e	Addressed comments.	2020-10-26 21:32:01 -05:00
Sam	e8f6338eb0	Admin armor now provides immunity to debuffs.	2020-10-26 19:49:40 -05:00
Sam	5d0fd3d9bc	Addressed more comments. Changed how buffs were sorted so that duration was also taken into account.	2020-10-26 19:30:18 -05:00
Adam Whitehurst	f759895d63	add maxhealthmodifier ... oops variable	2020-10-26 19:30:18 -05:00
Adam Whitehurst	8aad7adab8	add comments	2020-10-26 19:30:17 -05:00
Sam	f60985d733	Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now.	2020-10-26 19:30:17 -05:00
Sam	337cf6e137	Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented.	2020-10-26 19:30:10 -05:00
Sam	fdf8decb18	Handled health change over time buff effect better.	2020-10-26 19:28:27 -05:00
Monty Marz	8fa398954d	Initial implementation of buffs UI ... player buffs animation more testing debuffs sorting and display limit fix overhead buffs fix WIP buff removal function fmt Update buffs.rs Now with compiling: WIP group UI buffs positioning Update group.rs Update group.rs Small optimizations. Fixed positioning of buffs in group panel. Broke buff tooltips in group panel. buff frame visuals added setting for displaying buffs at minimap	2020-10-26 19:28:24 -05:00
Sam	007d3c09ac	Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs.	2020-10-26 19:28:23 -05:00
Samuel Keiffer	60a5346a0b	Addressed comments.	2020-10-26 19:28:22 -05:00
Sam	0df061a38e	Moved duration to inside BuffId enum to future-proof for when buffs are persisted.	2020-10-26 19:28:20 -05:00
Sam	1a1ceb54bc	Server event used to deal damage/heal with buffs. Buff kills now award xp.	2020-10-26 19:28:20 -05:00
Sam	de7191b985	Added functionality to remove buffs by category.	2020-10-26 19:28:19 -05:00
Sam	ccad1fa0b8	Separated buffs into active and inactive buffs. There can only be 1 active buff at a time of a particular buff id. If a new buff is stronger than an active buff, it moves the active buff to inactive buffs. When active buffs are removed, it checks inactive buffs for any buffs of the same id and moves the strongest one to active buffs.	2020-10-26 19:28:18 -05:00
Sam	19c7ed7885	Added builder function for buffs	2020-10-26 19:28:18 -05:00
Sam	b8690473e4	When buffs expire from duration, now only they expire rather than ending all buffs of the same type.	2020-10-26 19:28:17 -05:00
Sam	125de0b46e	Creatures and playrs now have buffs component, buffs that expire now only end their particular buff instead of every buff with the same type.	2020-10-26 19:28:16 -05:00
Sam	c50063ad0c	Move addition/removal of buffs to server event.	2020-10-26 19:28:15 -05:00
BottledByte	7ab99a3bbf	Initial WIP implementation of the Buff system	2020-10-26 19:28:14 -05:00
Marcel Märtens	1b47913835	fix clippy after toolchain update	2020-10-26 22:30:51 +01:00
Marcel Märtens	153c6c3b13	Fixing Tarpaulin isn't easy. ... So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.	2020-10-26 17:04:20 +01:00
Adam Whitehurst	4dcac28f8a	Ensure leap melee swing animation and hit are sync	2020-10-24 20:15:19 +00:00
jiminycrick	b98e2a924d	Fixed hammer AI and added axe AI	2020-10-19 16:20:59 +02:00
Snowram	34ce8bb042	Addressed comments	2020-10-19 16:20:59 +02:00
jiminycrick	64ef7f39d6	Addressed comments on agent code	2020-10-19 16:20:59 +02:00
jshipsey	64d73abdec	roshwalr fix	2020-10-19 16:20:59 +02:00
jshipsey	caa048b1d5	small fixes	2020-10-19 16:20:59 +02:00
Snowram	7a62ddfd3f	Add BeastClaw npc weapontype	2020-10-19 16:20:59 +02:00
Snowram	f9383e4dd8	Add roshwalr npc	2020-10-19 16:20:59 +02:00
jiminycrick	be1596a703	fixed agent code for staff rework	2020-10-19 16:20:59 +02:00
jshipsey	66b1fe67dc	rebase	2020-10-19 16:20:58 +02:00
Snowram	c9985e14cb	Rename Saurok, various anim fixes	2020-10-19 16:20:58 +02:00
jshipsey	6a86567301	fix agent bug	2020-10-19 16:20:58 +02:00
jshipsey	65df398672	werewolf work	2020-10-19 16:20:58 +02:00
jiminycrick	50aac17d94	Added secondary skills to agent code (except bow)	2020-10-19 16:20:58 +02:00
Snowram	6c54e6d8fe	Add sand, snow and wood raptor npcs	2020-10-19 16:20:58 +02:00
Snowram	588f66a1ee	Add treant npc	2020-10-19 16:20:58 +02:00
unknown	d2f91bc3a0	Assigns a ToolKind to bipedlarge weapons	2020-10-19 16:20:58 +02:00
Snowram	0a9ec848a7	add lizardman npcs	2020-10-19 16:20:58 +02:00
Snowram	204fa50de9	Add werewolf npc	2020-10-19 16:20:57 +02:00
Sam	e6684009c2	Made ability key not hardcoded in tool.rs.	2020-10-15 20:05:58 -05:00
Sam	d869f7e430	Moved explsion struct from within comp to common.	2020-10-14 21:06:55 -05:00
Sam	14e4af7ab6	Addressed playtesting feedback.	2020-10-14 21:06:52 -05:00
jshipsey	6a744eed82	anims	2020-10-14 21:06:32 -05:00
Sam	1ba8a6cfb3	Balance tweaks to staff abilities.	2020-10-14 20:57:01 -05:00
Sam	b5091a5891	Ai for staff-wielding enemies. Keyframes for shockwave state.	2020-10-14 20:56:24 -05:00
Sam	1c21362bc3	Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles.	2020-10-14 20:56:23 -05:00
Sam	7ef73f5981	Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.	2020-10-14 20:56:22 -05:00
Sam	cbb72363af	Reworked explosions. Tweaked staff fireball.	2020-10-14 20:56:21 -05:00
Sam	04dcd012da	Flamethrower particles.	2020-10-14 20:56:21 -05:00
Sam	c80f16ae74	Started to add particles.	2020-10-14 20:56:20 -05:00
Sam	256846a669	Initial implementation of new staff abilities.	2020-10-14 20:56:16 -05:00
jiminycrick	4de42e36fd	Consolidated recover code in repeater_ranged	2020-10-14 17:10:27 -07:00
jiminycrick	512d881cd2	Fixed clippy errors and added SFX	2020-10-14 15:30:58 -07:00
jiminycrick	95c36cc3fb	Skill icons with proper rotation	2020-10-14 12:50:33 -07:00
jiminycrick	1f3bd0e1d2	Responded to testing feedback	2020-10-14 12:50:33 -07:00
jshipsey	3bb59b36cd	energy values, remove hotload	2020-10-14 12:50:33 -07:00
jshipsey	64f72a73f9	axeleap tweaks	2020-10-14 12:50:33 -07:00
jiminycrick	691acd730d	Smoother leap and recovery leap handling	2020-10-14 12:50:33 -07:00
jshipsey	22d8792c4b	adjustments to chargedmelee, repeater	2020-10-14 12:50:33 -07:00
jshipsey	521ffd64ba	cleanup	2020-10-14 12:50:33 -07:00
jshipsey	28eb58ddfa	anims	2020-10-14 12:50:33 -07:00
Sam	fadba23dde	Slight tweaks to leap	2020-10-14 12:50:33 -07:00
jshipsey	281155186f	hammer leap melee anim	2020-10-14 12:50:33 -07:00
Sam	e1634fa83a	Fixed errors from transitioning some states to keyframes.	2020-10-14 12:50:33 -07:00
Sam	21cf1e2168	Added keyframes to leap melee.	2020-10-14 12:50:33 -07:00
Sam	7e0cc2d8e5	Added keyframes to repeater ranged.	2020-10-14 12:50:33 -07:00
Sam	97f580be2b	Added keyframes to charged melee.	2020-10-14 12:50:32 -07:00
jiminycrick	9ebda3c353	Made bow leap more graceful and set energy costs and removed jitter for no leap	2020-10-14 12:50:32 -07:00
jiminycrick	431f99a791	Reducing the amount of data in character state	2020-10-14 12:50:32 -07:00
jiminycrick	05623eb8bd	Addressed comments	2020-10-14 12:50:32 -07:00
jiminycrick	04175bab09	Add skillbar stuff for 3rd skills	2020-10-14 12:50:32 -07:00