2663 Commits

Author	SHA1	Message	Date
Swrup	a8579670cf	make apply_attack() return if attack was actually applied	2021-07-08 21:05:32 +02:00
Dominik Broński	e6af005ed1	Merge branch 'pfau/stuff' into 'master' ... Minimap modes, Danari customizations update & bald hairstyles See merge request veloren/veloren!2576	2021-07-08 00:01:09 +00:00
Monty Marz	7c8d73a0c6	Minimap modes, Danari customizations update & bald hairstyles	2021-07-08 00:01:08 +00:00
Sam	509461763b	Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.	2021-07-06 22:54:23 -05:00
Samuel Keiffer	01a8f53ba3	Merge branch 'aweinstock/improve-airship-pid' into 'master' ... Fix integral error calculations in PID controller, and change coefficients for... See merge request veloren/veloren!2568	2021-07-06 21:38:07 +00:00
Samuel Keiffer	e5a5d28246	Merge branch 'sam/range-stat' into 'master' ... Added range stat to weapons. See merge request veloren/veloren!2563	2021-07-06 21:18:47 +00:00
Avi Weinstock	1a60ebd5db	Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.	2021-07-06 16:52:12 -04:00
Sam	1c3bd13afa	Addressed review comments. Removed individual stat assignments.	2021-07-06 15:27:49 -05:00
Sam	e8e953ffab	Added range stat to weapons.	2021-07-05 20:32:12 -05:00
Marcel	572a41b029	Merge branch 'juliancoffee/trade_rebalancing' into 'master' ... Make trade_pricing great again See merge request veloren/veloren!2546	2021-07-05 21:40:58 +00:00
juliancoffee	15d83e65cc	Remove load_expect_dir as it's misused ... - load_expect_dir while expected to fail on erros, fails only on filesystem errors and only on root directory. This commit replaces this function with `read_expect_dir` which returns iterator which loads all files and panics if can't load them.	2021-07-05 20:14:26 +03:00
juliancoffee	1e358e6f0c	Make ItemEquality work ... + Create own directory for trade_pricing `assets/common/trading` + Move fictive loot tables there + Mark sellable/non-sellable items in trade_pricing tests	2021-07-05 19:55:08 +03:00
juliancoffee	f213ba138a	Fill trade_pricing with craftable items	2021-07-05 15:43:03 +03:00
AldanTanneo	3804c3d032	Implemented trading stackable items with a full inventory	2021-07-05 10:34:03 +00:00
juliancoffee	d4c61ae2f3	(voxygen) Better support for multibuff items ... + change `effect` field in ItemKind::Consumable to `effects`, as it's set of effects and not single effect.	2021-07-05 10:56:29 +03:00
juliancoffee	c538a9696c	Use Food after Buildup ... + Remove Saturation effect by rolling + Remove Saturation effect if interrupted with poise + Rename Potion to Drink, add ComplexFood	2021-07-05 10:56:29 +03:00
Samuel Keiffer	21523de394	Merge branch 'sam/fix-roll' into 'master' ... Fix first person backwards roll. See merge request veloren/veloren!2558	2021-07-05 03:46:47 +00:00
Samuel Keiffer	1020fbe86a	Merge branch 'sam/fix-health-buffs' into 'master' ... Fix interaction of max health and max health over time buffs causing infinite health scaling. See merge request veloren/veloren!2557	2021-07-05 03:46:45 +00:00
Sam	d2cb0c76a7	Fix first person backwards roll.	2021-07-04 21:54:38 -05:00
Sam	4ac9d9e0a5	Fix interaction of max health and max health over time buffs causing infinite health scaling.	2021-07-04 21:43:29 -05:00
Sam	4bc54e0287	Fix oob panic in combo melee which can happen during desyncs.	2021-07-04 20:54:08 -05:00
Marcel	5da8c70f48	Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master' ... Deduplicate data involved in sprite harvesting, making it harder to make mistakes with. See merge request veloren/veloren!2542	2021-07-04 17:23:53 +00:00
Ben Wallis	b499cf2c58	Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds. ... Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.	2021-07-04 09:47:18 +00:00
Avi Weinstock	836f10ae63	Remove allocation in SpriteKind::collectible_id.	2021-07-03 15:32:36 -04:00
Avi Weinstock	b4c2bc14df	Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.	2021-07-02 15:23:19 -04:00
Samuel Keiffer	099ddea165	Merge branch 'juliancoffee/dungeon_rebalance' into 'master' ... Make cultist great again See merge request veloren/veloren!2513	2021-07-01 02:37:39 +00:00
Ben Wallis	398b658524	Merge branch 'juliancoffee/better_item_tests' into 'master' ... More informative item tests See merge request veloren/veloren!2534	2021-06-30 20:12:21 +00:00
juliancoffee	a3bf073875	Use assets::load_dir to test item assets	2021-06-30 18:48:28 +03:00
Joshua Barretto	269c6171e4	Merge branch 'DaforLynx/aeh' into 'master' ... Sfx fixes and new test See merge request veloren/veloren!2529	2021-06-30 11:43:01 +00:00
DaforLynx	a757bf3dbd	Sfx fixes and new test	2021-06-30 11:43:00 +00:00
juliancoffee	c5da56e900	Nerf Husk Brute ... - Remove HuskBrute health level buff - Make their attack slower	2021-06-30 03:52:50 +03:00
juliancoffee	b9134a3f61	Make QuadMed great again ... - Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber attack)	2021-06-30 03:52:50 +03:00
juliancoffee	46772c67e3	Remove post-armor crit damage	2021-06-30 03:16:04 +03:00
juliancoffee	ef6a12edc2	bumb Biped Cultist armour	2021-06-30 02:10:39 +03:00
Sam	f5533cdb92	Moved match on ItemUseKind to create durations to a function under ItemUseKind.	2021-06-29 05:59:02 -05:00
Sam	8a9de26132	Food now applies buff at end of state. ... Rolling and poise states now cancel the potion buff. UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state. Rolling can no cancel item use. Rolling now checks for move_dir instead of velocity.	2021-06-29 05:59:02 -05:00
jshipsey	37c6fe9ee8	anims	2021-06-29 05:59:02 -05:00
Sam	9ff7ecea81	Item use now goes through use item character state if it is a consumable.	2021-06-29 05:59:02 -05:00
Sam	3559ce5803	Added UseItem character state.	2021-06-29 05:59:02 -05:00
Sam	1978b590aa	Destringified consumables	2021-06-29 05:59:02 -05:00
Snowram	aaf5f89076	Merge branch 'snowram/death-outcome' into 'master' ... Adds an outcome to death with SFX and VFX See merge request veloren/veloren!2519	2021-06-28 23:18:45 +00:00
Snowram	3ec5306ed0	Adds an outcome to death with SFX and VFX	2021-06-29 00:14:05 +02:00
Dr. Dystopia	11d2017bb3	Extract 'swap_equipment' and 'swap_armor' functions	2021-06-28 16:17:18 +02:00
Marcel	f063dcd939	Merge branch 'alphyr/assets_manager0_5' into 'master' ... Update `assets_manager` to 0.5 See merge request veloren/veloren!2501	2021-06-27 15:50:16 +00:00
Snowram	b477eac816	Merge branch 'juliancoffee/fix_dismantle' into 'master' ... Improve Dismantle UX See merge request veloren/veloren!2498	2021-06-27 00:11:01 +00:00
juliancoffee	681fd37429	style	2021-06-27 02:44:19 +03:00
juliancoffee	12243bd0c0	Add is_recycling field to recipe book	2021-06-26 21:37:13 +03:00
Daan Vanoverloop	0076b8379c	Fixing #1169 - use strum macros for BlockKind conversion	2021-06-26 17:52:32 +02:00
Benoît du Garreau	1cba7db9b6	Update assets_manager to 0.5	2021-06-26 12:05:40 +02:00
Justin Shipsey	f983295318	Merge branch 'swilliams/jewellery' into 'master' ... Gem Rings and small change to trading. See merge request veloren/veloren!2500	2021-06-26 02:44:04 +00:00