2937 Commits

Author	SHA1	Message	Date
Samuel Keiffer	80fb4fc530	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	9460d76a06	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	fdb5dedac1	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	572072608b	Addressed review comments. Removed individual stat assignments.	2021-07-06 15:27:49 -05:00
Sam	aa60081ec7	Added range stat to weapons.	2021-07-05 20:32:12 -05:00
Benoît du Garreau	ab6105d789	Add a feature to optionnally disable hot-reloading	2021-07-06 00:27:09 +02:00
Marcel	4f87576482	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	63aa4219c5	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	0640902b7f	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	28c9ea029b	Fill trade_pricing with craftable items	2021-07-05 15:43:03 +03:00
AldanTanneo	b50188d69f	Implemented trading stackable items with a full inventory	2021-07-05 10:34:03 +00:00
juliancoffee	3c20c4383b	(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	4f75e98cfa	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	ac5bc5a217	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	dfd57d3c43	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	70cfeb3e65	Addressed potential for divide by zero.	2021-07-04 22:00:13 -05:00
Sam	ddcaf98f03	Fix first person backwards roll.	2021-07-04 21:54:38 -05:00
Sam	09d1cd68d7	Fix interaction of max health and max health over time buffs causing infinite health scaling.	2021-07-04 21:43:29 -05:00
Sam	d7e90dccd6	Fix oob panic in combo melee which can happen during desyncs.	2021-07-04 20:54:08 -05:00
Marcel	404dc50fb9	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
Marcel	f8cc483228	Merge branch 'juliancoffee/fix_test_parse_ron' into 'master' ... Split asset_tweak tests to separate command See merge request veloren/veloren!2552	2021-07-04 17:14:14 +00:00
juliancoffee	5157b84f2f	Run asset_tweak tests separately ... + Make parse_all_ron_files_to_value panic-friendly. Remove unwraps to unwrap_or_else with panic message.	2021-07-04 19:31:57 +03:00
Ben Wallis	9464a45783	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	9aa1985172	Remove allocation in SpriteKind::collectible_id.	2021-07-03 15:32:36 -04:00
eckso	43bc40c7d5	Fix #1158 - Add a test that all the .ron manifests parse	2021-07-03 18:11:04 +00:00
Imbris	4013a10c0e	Merge branch 'aweinstock/networktracy' into 'master' ... Add some tracy plots about network usage to the client. See merge request veloren/veloren!2510	2021-07-03 05:44:30 +00:00
Avi Weinstock	aba2f232e4	Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.	2021-07-02 15:23:19 -04:00
Marcel	426ed0a8cc	Merge branch 'aweinstock/blockstats' into 'master' ... Add block statistics generator to world/examples. See merge request veloren/veloren!2526	2021-07-02 17:10:26 +00:00
Avi Weinstock	6e525783bc	Use approximate byte count for the terrain recv graph.	2021-07-02 12:43:34 -04:00
Avi Weinstock	058a832d37	Add benchmark for color quantization using the rtree crate.	2021-07-01 13:41:37 -04:00
Samuel Keiffer	70d52e9495	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
Avi Weinstock	d3d4cc1382	Fix underwater campfires.	2021-06-30 18:36:43 -04:00
Ben Wallis	2ddfa9fe5d	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	f4d457bc04	Better error signaling in assets::load_dir_expect	2021-06-30 21:06:06 +03:00
juliancoffee	bd1aff2405	Use assets::load_dir to test item assets	2021-06-30 18:48:28 +03:00
Joshua Barretto	8e2f0021e3	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	e20a5db899	Sfx fixes and new test	2021-06-30 11:43:00 +00:00
juliancoffee	9eb1ae8b91	Nerf Husk Brute ... - Remove HuskBrute health level buff - Make their attack slower	2021-06-30 03:52:50 +03:00
juliancoffee	d929d454d1	Make QuadMed great again ... - Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber attack)	2021-06-30 03:52:50 +03:00
juliancoffee	912d371487	Remove post-armor crit damage	2021-06-30 03:16:04 +03:00
juliancoffee	1cf66bf42a	bumb Biped Cultist armour	2021-06-30 02:10:39 +03:00
Sam	246dc50a90	Moved match on ItemUseKind to create durations to a function under ItemUseKind.	2021-06-29 05:59:02 -05:00
Sam	8bf3109133	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	c4c183cdf0	anims	2021-06-29 05:59:02 -05:00
Sam	203b3111d1	Item use now goes through use item character state if it is a consumable.	2021-06-29 05:59:02 -05:00
Sam	ab74ee3f01	Added UseItem character state.	2021-06-29 05:59:02 -05:00
Sam	938978bdbd	Destringified consumables	2021-06-29 05:59:02 -05:00
Avi Weinstock	7b0dcad68f	Generate palette info from block statistics, and benchmark how well it compresses.	2021-06-28 22:11:19 -04:00
Snowram	eb0a8efad1	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	64045ed7bd	Adds an outcome to death with SFX and VFX	2021-06-29 00:14:05 +02:00