9708 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Samuel Keiffer	370e0f8f24	Merge branch 'juliancoffee/food_rework' into 'master' ... Post-potion-animation food rework See merge request veloren/veloren!2535	2021-07-05 08:39:44 +00:00
juliancoffee	47aa371965	Update CHANGELOG with food rework	2021-07-05 10:57:11 +03:00
juliancoffee	b70e191483	Bump some food duration to 10 seconds	2021-07-05 10:56:29 +03:00
juliancoffee	21d10b641b	Add new food to consumables /kit	2021-07-05 10:56:29 +03:00
juliancoffee	e6ed0137e8	Add descriptions to the potions	2021-07-05 10:56:29 +03: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	eb61b23d04	Rebalance food for new consumables changes	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
juliancoffee	8b9316a2c6	Change Mortar and Pestle crafting recipe ... - Make it require bowl instead of coconut	2021-07-05 10:56:29 +03:00
Ben Wallis	e05a79e6c4	Merge branch 'yusdacra/chore/nix' into 'master' ... build(nix): use default-publish for release builds of voxygen See merge request veloren/veloren!2556	2021-07-05 06:26:50 +00:00
Samuel Keiffer	dcdf1c83a3	Merge branch 'swrup/fix_combo_decay_on_death' into 'master' ... fix combo not reset at respawn See merge request veloren/veloren!2553	2021-07-05 03:56:24 +00: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
Samuel Keiffer	d97db508ff	Merge branch 'juliancoffee/yeti_nerf' into 'master' ... Adjust Yeti difficulty See merge request veloren/veloren!2550	2021-07-05 03:46:42 +00:00
Sam	d8f68668b1	Addressed potential for divide by zero.	2021-07-04 22:00:13 -05: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
Samuel Keiffer	6dd3693faa	Merge branch 'sam/fix-combo-melee' into 'master' ... Fix oob panic in combo melee which can happen during desyncs. See merge request veloren/veloren!2555	2021-07-05 02:28:21 +00:00
Yusuf Bera Ertan	055a46e3aa	build(nix): use default-publish for release builds of voxygen	2021-07-05 05:06:41 +03: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
Marcel	f0f64a9fc0	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	33a37a8857	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
Swrup	971dd9059c	fix combo not reset at respawn	2021-07-04 17:28:11 +02:00
Ben Wallis	fca8227db8	Merge branch 'xvar/wgpu-egui' into 'master' ... Added egui debug UI See merge request veloren/veloren!2252	2021-07-04 09:47:19 +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
Samuel Keiffer	ca2dcf7712	Merge branch 'master' into 'master' ... Correct spelling for glowing remains description See merge request veloren/veloren!2551	2021-07-04 04:41:54 +00:00
steanne	0752ee728c	Update assets/common/items/crafting_ing/mindflayer_bag_damaged.ron	2021-07-04 01:44:33 +00:00
juliancoffee	303f03dd3a	Adjust Yeti difficulty ... Frost breath: - ori_rate reduced from 0.6 to 0.1 - time of breath increased from 1 second to 2 seconds - buildup increased from 0.4 to 0.8 - make it more gentle, with less damage per tick, but faster tick rate (50 * 1 to 10 * 5) - make Frozen debuff strength smoler, 1.5 to 0.5 and make it chance to apply debuff. - make him use it when closer range (10 and not 15) Ice spikes: - increase recovery_duration from 0.3 to 1.0 - make him slower while doing ice spikes, make ice spikes move slower - make him use it when closer range (15 and not 20) Snowball: - increase recover_duration from 0.4 to 0.9 Strike: - increase buildup_duration fron 0.6 to 0.8 - increase recover_duration from 0.5 to 1.0 - increase knockback from 40.0 to 70.0	2021-07-04 03:44:17 +03:00
Alex Bethel	0e4ca28ee4	Correct spelling errors in item descriptions	2021-07-03 15:53:19 -05:00
Marcel	89b71dc9a9	Merge branch 'juliancoffee/merchants_ux' into 'master' ... Improve Merchant loadout from UX perspective See merge request veloren/veloren!2544	2021-07-03 20:25:49 +00:00
Avi Weinstock	836f10ae63	Remove allocation in SpriteKind::collectible_id.	2021-07-03 15:32:36 -04:00
juliancoffee	dd2d0a98fb	Improve Merchant inventory from UX perspective ... Changes: - Make it use red bags with 18 slots (2 rows * 9) - Sort items by quality - Stack ingredients, food, potions - Move coins to ingedients bag and put it first - Filter unconsumed good (case when you saw 16 rugged shirts) Refactoring: - Split bag creation to separate functions	2021-07-03 22:16:06 +03:00
Marcel	3ebc5428bd	Merge branch '1158-parse-all-rons-to-value' into 'master' ... Fix #1158 - Add a test that all the `.ron` manifests parse Closes #1158 See merge request veloren/veloren!2533	2021-07-03 18:11:04 +00:00
eckso	4f66bff54a	Fix #1158 - Add a test that all the .ron manifests parse	2021-07-03 18:11:04 +00:00
Imbris	a9767c40d1	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	b4c2bc14df	Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.	2021-07-02 15:23:19 -04:00
Marcel	c751ec1381	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	c2106e158f	Use approximate byte count for the terrain recv graph.	2021-07-02 12:43:34 -04:00
Avi Weinstock	6ba512efc8	Add some tracy plots about network usage to the client.	2021-07-02 12:40:52 -04:00
Avi Weinstock	f9c263faf6	Add benchmark for color quantization using the rtree crate.	2021-07-01 13:41:37 -04:00
Marcel	9bcec54313	Merge branch 'tygyh/bot-main-refactor' into 'master' ... Tygyh/bot main refactor See merge request veloren/veloren!2528	2021-07-01 15:59:05 +00:00
Jonathan Berglin	85285f9b8e	Tygyh/bot main refactor	2021-07-01 15:59:05 +00:00
Marcel	bad4da8769	Merge branch 'Extract-create-new-button-from-update' into 'master' ... Extract 'create_new_button' function from 'update' See merge request veloren/veloren!2440	2021-07-01 14:39:03 +00:00
Jonathan Berglin	fc618b2222	Extract 'create_new_button' function from 'update'	2021-07-01 14:39:02 +00: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
Joshua Barretto	83f0807754	Merge branch 'aweinstock/fix-campfires' into 'master' ... Fix underwater campfires. See merge request veloren/veloren!2536	2021-06-30 23:19:45 +00:00
Avi Weinstock	110aa17642	Fix underwater campfires.	2021-06-30 18:36:43 -04: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	d92d54f8ad	Better error signaling in assets::load_dir_expect	2021-06-30 21:06:06 +03:00