5436 Commits

Author	SHA1	Message	Date
juliancoffee	f2df1adf27	Improve documentation	2022-08-07 16:21:58 +03:00
juliancoffee	c38d94e504	Refactor try_variaton and error handling in i18n	2022-08-07 16:21:53 +03:00
juliancoffee	b5436872ed	Adress review, remove redundant .into_owned	2022-08-07 13:54:58 +03:00
juliancoffee	94dbd4cb25	Respond to review, make char_slider take String	2022-08-07 13:38:36 +03:00
DaforLynx	9a8c288580	Lower volume of river sfx	2022-08-06 21:29:38 +00:00
juliancoffee	d000cc90a1	Migrate code to new i18n API	2022-08-06 21:56:01 +03:00
juliancoffee	8ba50e62d5	New i18n implementation based on Fluent	2022-08-06 21:45:23 +03:00
DaforLynx	bf4a582cf7	WIP: New music, "now playing" line in debug overlay, and music frequency slider	2022-08-01 17:41:44 +00:00
Isse	cfdc2a8ae6	Add setting to disable flashing lights	2022-07-31 21:53:25 +00:00
Sam	ea0192b7e3	Tweaked tooltips so that item name and kind are next to image, to reduce amount of empty space.	2022-07-30 11:38:28 -04:00
Sam	29dd9eac9b	Remvoed CR from UI. Changed all stats in tools and armor to be same size. Cleaned up item stats UI code.	2022-07-28 19:19:20 -04:00
Marcel Märtens	bfcc2cb802	Change the version number to 0.13	2022-07-23 14:06:08 +02:00
John Heath	edc10519c6	fix for #1604 : use correct values in calculation	2022-07-21 18:34:06 +01:00
DaforLynx	d2710635d8	Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout	2022-07-21 08:27:35 +00:00
Avi Weinstock	7f6ba8e492	Closing a subwindow (such as inventory or the list of online players) only regrabs the cursor if no other subwindow requires it. ... Fixes #1116.	2022-07-17 14:58:02 -04:00
Forest Anderson	67534488b3	Merge branch 'tygyh/CleanUp' into 'master' ... Tygyh/clean up See merge request veloren/veloren!3480	2022-07-17 14:04:45 +00:00
Joshua Barretto	79ad06ab60	Early light filter	2022-07-16 15:54:12 +01:00
Joshua Barretto	cda6c031b8	Limit number of minor lights applied to entities to solve performance problems	2022-07-16 15:39:06 +01:00
Treeco	7efddc33f7	Merge branch 'more_humanoid_models' into 'master' ... Humanoid Model Overhaul See merge request veloren/veloren!3478	2022-07-16 11:13:24 +00:00
Youssef Fahmy	91c85dea22	Humanoid Model Overhaul	2022-07-16 11:13:24 +00:00
Joshua Barretto	ea39f78dfd	Minimised rain occlusion problems	2022-07-16 11:14:12 +01:00
Joshua Barretto	b08a501aef	Cleaned up ready for merge	2022-07-16 11:09:35 +01:00
tygyh	9f6df715e7	Readd needed qualifiers	2022-07-15 19:36:36 +02:00
tygyh	120ee6b6c0	Fix typos	2022-07-15 18:59:37 +02:00
tygyh	abdd5e3906	Lift return out of if-statements	2022-07-15 16:36:11 +02:00
tygyh	25e20b5fa0	Remove unecesssary lifetimes	2022-07-15 16:20:15 +02:00
tygyh	fb7bdd8bf8	Fix deprecated imports	2022-07-15 16:17:19 +02:00
tygyh	fefe745508	Reorder impl member order to match trait member order	2022-07-15 15:54:32 +02:00
tygyh	5e5698249b	Remove unnecessarily qualified paths	2022-07-15 14:49:46 +02:00
Joshua Barretto	07ba4dcc33	Fixed particles for non-body entities, AO for non-volumetric illumination	2022-07-15 08:43:34 +01:00
Joshua Barretto	59655451c9	Made particle spawning use interpolated position	2022-07-15 08:42:56 +01:00
Christof Petig	2dce472d1f	Merge branch 'christof/modular-weapon-prices' into 'master' ... Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list See merge request veloren/veloren!3469	2022-07-14 18:24:21 +00:00
DaforLynx	194b1866c6	Music, ambience tweaks, and more	2022-07-14 00:55:35 +00:00
Isse	1e3b5383cf	Merge branch 'zesterer/better-rain' into 'master' ... Better rain See merge request veloren/veloren!3464	2022-07-13 23:25:33 +00:00
Joshua Barretto	f48665366b	More lightning position variety	2022-07-13 21:45:37 +01:00
Christof Petig	5bbb73bc17	changelog + remove dead code, but the test still fails	2022-07-13 20:15:28 +02:00
Christof Petig	2b2ac20403	use ItemDefintionId across trade_pricing	2022-07-13 20:15:27 +02:00
Avi Weinstock	27d2cdeb79	WIP modular weapon pricing.	2022-07-13 20:15:27 +02:00
Joshua Barretto	25c55b6a25	Better rain performance, wetness	2022-07-13 18:34:34 +01:00
Marcel	80d491f003	Merge branch 'socksonme/small_fixes' into 'master' ... Small fixes See merge request veloren/veloren!3465	2022-07-12 21:01:47 +00:00
Socksonme	3f0f1c423c	Small fixes	2022-07-12 21:01:47 +00:00
Awkor	6233db8682	Bump shaderc version to 0.8.0	2022-07-10 21:46:30 +02:00
Joshua Barretto	d4906f55bc	Fixed rain occlusion issues	2022-07-10 16:40:49 +01:00
Ben Wallis	af04843a20	Re-enabled mimalloc for non msvc builds	2022-07-10 14:50:35 +01:00
Joshua Barretto	6fea7205fa	Better lightning at distance	2022-07-09 02:08:55 +01:00
Joshua Barretto	836fe2b1c6	Proper lightning	2022-07-09 01:59:18 +01:00
Joshua Barretto	6d1b46956d	Better storms	2022-07-09 00:14:59 +01:00
Joshua Barretto	6796fe2745	Better lightning attenuation	2022-07-08 23:45:08 +01:00
Joshua Barretto	4531a4e3f9	Added lightning	2022-07-08 23:26:33 +01:00
DaforLynx	0d1bf3efe6	fmt	2022-07-07 16:10:51 -07:00
DaforLynx	fc80a6278c	Fixing looping issues	2022-07-07 16:09:13 -07:00
DaforLynx	00f1e9c407	Music, reorganization, metadata, and fixes	2022-07-07 04:14:20 +00:00
Marcel	7ae65f2c13	Merge branch 'windows-gnu-linking-fix' into 'master' ... Disable mimalloc for non msvc builds See merge request veloren/veloren!3460	2022-07-06 20:21:25 +00:00
Isse	7e18384e1c	Disable mimalloc for non msvc builds	2022-07-06 19:08:19 +02:00
Marcel Märtens	e4909650e1	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00
IsseW	5a0cdc2528	add rain threshold that depends on chunk moisture	2022-07-04 18:18:43 +02:00
IsseW	6d8cbe6f0f	remove relative rain direction and increase FALL_RATE	2022-07-04 18:18:43 +02:00
IsseW	6562c7076f	remove fluid model todo	2022-07-04 18:18:42 +02:00
Imbris	b2d3759105	Cleanup profiling comments and commented code	2022-07-04 18:18:39 +02:00
Imbris	5866e23e32	Pre-compute view_mat_inv * proj_mat_inv on the CPU before sending to the cloud shader	2022-07-04 18:18:38 +02:00
IsseW	80e29e2c20	put rain_density in uniform	2022-07-04 18:18:37 +02:00
IsseW	5b7b13adce	Add medium check to rain	2022-07-04 18:18:36 +02:00
IsseW	ab707b6df1	sample weather at correct position for occlusion	2022-07-04 18:18:36 +02:00
IsseW	a7c724a46d	Limit figures drawn for rain occlusion	2022-07-04 18:18:35 +02:00
DaforLynx	ac82689f83	Clean up audio code, fix egui bug	2022-07-04 18:18:34 +02:00
IsseW	9f26afb4a5	refactor rain_dir to rain_vel	2022-07-04 18:11:45 +02:00
DaforLynx	9104a07530	Code cleanup, doubled volume of leaves.ogg	2022-07-04 18:11:43 +02:00
Treeco	0d21361e05	Add player-relative rain direction	2022-07-04 18:11:42 +02:00
IsseW	fa589e915e	make rain view distance smaller, dont put wind in texture	2022-07-04 18:11:41 +02:00
DaforLynx	dc8424c549	Moving audio code	2022-07-04 18:10:05 +02:00
IsseW	6215ccd522	Remove dead code	2022-07-04 18:07:24 +02:00
DaforLynx	05e7de5629	Adjust some values for ambience volume	2022-07-04 18:07:23 +02:00
IsseW	b82bb5b247	Don't have rain be behind an expiremental shader	2022-07-04 18:07:22 +02:00
IsseW	6274d54e56	fix todos	2022-07-04 18:07:21 +02:00
IsseW	a93240d2a6	cleaner get_ambient_channel	2022-07-04 18:07:20 +02:00
IsseW	3eabe24f12	base occlusion texture size of off voxels	2022-07-04 18:07:19 +02:00
DaforLynx	a6fd5d5c8b	Some organization. Faster volume lerping.	2022-07-04 18:07:19 +02:00
IsseW	08b0989789	add slider for rain map resolution	2022-07-04 18:07:18 +02:00
DaforLynx	6059a30f27	Rain diminishes with distance above terrain	2022-07-04 18:07:16 +02:00
IsseW	54f958acc7	more correct occlusion	2022-07-04 18:07:16 +02:00
DaforLynx	83ee54001e	Ambience slider; fix to utterances	2022-07-04 18:07:15 +02:00
DaforLynx	365f45397b	At this point all sfx should be able to detect underwater	2022-07-04 18:07:14 +02:00
DaforLynx	088d1cfe9d	Remove debug lines, re-mix some sfx, add crafting sfx, separate inv event sfx into spatial and nonspatial	2022-07-04 18:07:13 +02:00
IsseW	234ed5afb2	Rain occlusion projection matrix	2022-07-04 18:07:13 +02:00
IsseW	79cac935c8	Added rain occlusion	2022-07-04 18:07:11 +02:00
DaforLynx	b3200ed89f	More ambience :)	2022-07-04 18:07:10 +02:00
DaforLynx	c4239e074f	Prevent unnecessary running of code	2022-07-04 18:07:09 +02:00
DaforLynx	aafd13508d	Completely redoing ambient sound again.	2022-07-04 18:07:08 +02:00
DaforLynx	16ca1410be	Remove extraneous sfx code	2022-07-04 18:07:08 +02:00
DaforLynx	ca815f25a1	merging some UI sfx from a now-dead branch ... Merge part 2 merge part 3 Merge part 4 merge part 5	2022-07-04 18:07:07 +02:00
IsseW	b578f0231f	Interpolate in client	2022-07-04 18:07:06 +02:00
IsseW	4fa2644507	Interpolate weather in voxygen	2022-07-04 18:07:04 +02:00
IsseW	e37f2be820	Put rainbows behind experimental	2022-07-04 18:07:03 +02:00
Benjam Soule H. Walker	99c76be297	added sound for rain	2022-07-04 18:07:02 +02:00
IsseW	273c5ed2f0	Temporary noise solution	2022-07-04 18:07:00 +02:00
IsseW	67683f315f	Put rain behind expiremental shader	2022-07-04 18:06:59 +02:00
IsseW	9c84a20cef	better sim	2022-07-04 18:06:58 +02:00
IsseW	78c1de19cf	More accurate weather sim	2022-07-04 18:04:39 +02:00
IsseW	6585ef1513	weather dependant music	2022-07-04 18:11:43 +02:00
IsseW	b7c0196129	Server weather sim	2022-07-04 18:11:41 +02:00
Isse	16c5c657cc	Fix mimalloc for hot reloading	2022-07-04 10:08:27 +00:00
IsseW	57d6b4a55f	Switch to mimalloc on windows	2022-07-04 09:15:18 +02:00
Imbris	54f6f278a0	Include an associated Config type in the atlas trait which is provided when creating the atlas	2022-07-01 23:47:42 -04:00
Imbris	95f17a6d22	General cleanup, remove local dependency, switch to u16 from i32 in several places, avoid guillotiere types in atlas API (one spot still remains)	2022-07-01 23:47:42 -04:00
Imbris	16461cfcba	Cleanup atlas allocator work, remaining TODO: ... * refactor meshing and trait API to replace guillotiere types * associated config type on atlas trait * investigate other areas of sprite performance like LOD scaling (i.e. there are now significant gaps in between meshing)	2022-07-01 23:47:41 -04:00
Imbris	5e5f7885e5	Tiled guillotiere allocator for sprites working	2022-07-01 23:47:41 -04:00
Imbris	b1f5fc01db	Before removing variable size edge tiles	2022-07-01 23:47:41 -04:00
Samuel Keiffer	0bd08b1f9e	Merge branch 'socksonme/rework_sct' into 'master' ... Rework SCT See merge request veloren/veloren!3126	2022-07-02 02:42:42 +00:00
Imbris	6c8970f6fd	Merge branch 'imbris/voxygen-compile-time' into 'master' ... Improve voxygen compile time with small tweak See merge request veloren/veloren!3449	2022-07-01 08:22:05 +00:00
Imbris	e9ed7007ec	Convert hashmap to array of SpriteConfigs to ensure we keep quick lookup times since this is queried for every block when processing a new chunk,	2022-07-01 03:34:35 -04:00
Imbris	291a424b4e	This seems to save at least 30 seconds (out of 90 to 120 secs) when tweaking TILE_SIZE in voxygen/src/mesh/greedy.rs (NOTE: I did some more timing, see associated MR description)	2022-06-30 00:11:04 -04:00
Socksonme	6a355c58f2	Remove instance from PoiseChange	2022-06-29 18:36:05 +03:00
Socksonme	da0baa674f	Remove hp_floaters whenever they wouldn	2022-06-29 17:31:59 +03:00
Socksonme	b7a718cb99	Remove old comments	2022-06-29 17:31:58 +03:00
Socksonme	f048600335	Add back old i18n + some small fixes ... - Fix .filter() for combo_floater - Rename sct_inc_dmg_accum_duration to sct_inc_dmg, as it was in the wrong place to rebase	2022-06-29 17:31:58 +03:00
Socksonme	f6189a61f2	Address review - addendum ... - `BlockFloater`s and `ComboFloater`s don't store the owner anymore, `ExpFloater` still does, however the field is used to prevent accumulating old floaters with new ones. This change also makes it so that if the client changes entity, they keep the old entity's floaters. - The `combo_floaters` field is now `combo_floater` plus it now uses an Option<ExpFloater>. - Changed `handle_health_change` to change the health even if the entity does not have a `Pos` or `Uid`, now uses `emit_now`combo_floater` plus it now uses an Option<ExpFloater>. - Changed `handle_health_change` to change the health even if the entity does not have a `Pos` or `Uid`, now uses `emit_now` - Changed some comments	2022-06-29 17:31:58 +03:00
Socksonme	2c5fd06d0b	Address review ... - Change hp_pulse to not be framerate dependent - Change some of the HpFloater checks to be inside the find() function - Remove unnecessary join - Add back option for showing incoming damage + add option for experience accumulation - Change `ExpFloater`s to not store the owner, as they are only shown for the player (will have to see if the implementation is correct so that it may be applied to the other floaters) - Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo` to `HealthChangeInfo` - Update some outdated comments/documentation	2022-06-29 17:31:58 +03:00
socksonme	8feaea5cdf	Exp floater accumulation + ignore all below 0.1	2022-06-29 17:31:57 +03:00
socksonme	eabbfe6a51	Remove damage batch option + crit_mult	2022-06-29 17:31:54 +03:00
socksonme	29ce64b4f5	Small changes to hud	2022-06-29 17:31:43 +03:00
socksonme	0e84794217	change font size formula to not use crit_mult + use ints for change by check	2022-06-29 17:31:43 +03:00
socksonme	3d2dcbf894	Revert some changes	2022-06-29 17:31:43 +03:00
socksonme	559d5ca804	Some changes to DamageSources + various code qual changes	2022-06-29 17:31:43 +03:00
socksonme	762b726d21	basic i18n for english + code touchups ... Getting Invalid Probability error when attacking a lot of enemies - needs to be checked out	2022-06-29 17:31:42 +03:00
socksonme	ddf0ba6dd6	Small UI changes + fix hurt animation	2022-06-29 17:31:41 +03:00
socksonme	5533d139bc	Slider for accumulated damage duration	2022-06-29 17:31:41 +03:00
socksonme	5360a7c93e	Tons of code quality changes, added damage rounding option	2022-06-29 17:31:37 +03:00
socksonme	64f0f05608	Fixed bug with healing above 5.0 and preparing for options	2022-06-29 17:31:10 +03:00
socksonme	202d558246	Instance number generated inside projectile constructor, remove crit field	2022-06-29 17:31:07 +03:00
socksonme	6c75ad6ef8	Code quality changes and comments	2022-06-29 17:30:54 +03:00
socksonme	c0e78d869e	Instance numbers are now based on the AttackDamage struct	2022-06-29 17:30:53 +03:00
socksonme	ac5bf53c42	Instance numbers for HpChanges	2022-06-29 17:30:50 +03:00
socksonme	f8924d6c1a	tweaks to damage floaters ... Added some comments where stuff needs to be discussed	2022-06-29 17:30:32 +03:00
socksonme	7a1e19d42c	Crits now only glob with eachother, now show up like healing ... Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later	2022-06-29 17:30:29 +03:00
socksonme	ce95680df9	Addressed comments, health and damage floaters are now separated ... Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed	2022-06-29 17:29:59 +03:00
socksonme	94f193fbe0	Damage outcomes are now emitted with health change events ... Being healed and damaged at the same time still leads to issues - needs to be sorted out	2022-06-29 17:29:19 +03:00
socksonme	634a3095d6	Handling crits (very bad color choice+naming)	2022-06-29 17:24:05 +03:00
socksonme	93d3ce18b4	Remove dbgs and temporary? 0.0 damage fix	2022-06-29 17:24:05 +03:00
socksonme	aee7888a92	HpFloaters are now created by Outcomes, touched up Damage Outcome	2022-06-29 17:24:05 +03:00
socksonme	bf6c6fb33d	Changed Damage Outcome to store more data	2022-06-29 17:24:05 +03:00
juliancoffee	3e73fba165	Better naming for shortened key functions ... * Old display_shortened that returned Option is now called try_shortened * What was called try_shortened is now just display_shortest, because if shortened version isn't available, it means that regular version is already shortened.	2022-06-26 21:59:36 +03:00
juliancoffee	3d1b2735a2	Clean i18n lifetimes	2022-06-26 00:44:55 +03:00
juliancoffee	9d928261cb	Try to display shortened version of key in diary ... * Make try_shortened method that tries shortened version of key or regular version if shortened one isn't available * Use it in most places where display_shortened + display_string were used * Use it for diary skilbar	2022-06-25 18:17:37 +03:00
juliancoffee	8c837da561	Add i18n keys to abilities ... * New hud/ability.ron file for ability localizations * i18n keys are created by adding .name and .desc to ability id. Because of how i18n worked (returning key if string wasn't found), it was impossible to do because it leads to UB in case string is missed. To solve this we've added get_opt method that returns None * New Localization::get_or method for convinient fallback key usage	2022-06-25 18:17:37 +03:00
Ben Wallis	be02e3ced0	Fixed title screen FPS cap not being applied correctly when background FPS is set to unlimited	2022-06-19 14:04:36 +01:00
IsseW	c7a6955565	fix	2022-06-18 15:25:55 +02:00
Samantha W	57ab1c5767	Add a client-side mutelist	2022-06-14 20:35:01 +00:00
Imbris	9b78d75f06	Add experimental shader option to visualize shadow map texels	2022-06-05 16:35:12 -04:00
Imbris	be1cc1b983	Add a few pieces of documentation to code related to light and shadows	2022-06-05 16:35:12 -04:00
terrarier2111	45efdb6602	Implement group owned loot	2022-06-04 17:16:12 +00:00
Christof Petig	589ceb6d38	avoid one allocation, spotted by imbris	2022-06-01 22:47:53 +02:00
Christof Petig	3cc88f9b1d	move temp and humidity out of array, introduce different smoke types	2022-06-01 22:14:23 +02:00
Christof Petig	bf3eef6e1a	remove dead use	2022-06-01 22:14:23 +02:00
Christof Petig	dd28dc81be	humidity + clean up	2022-06-01 22:13:35 +02:00
Christof Petig	92ab095480	test and fix temperature handling	2022-06-01 22:13:35 +02:00
Christof Petig	59d876a654	pass humidity to meta, move smoke cycle to separate file	2022-06-01 22:13:34 +02:00
Christof Petig	f12f79439f	fix negative values for RGB and vary dryness and strength according to biome	2022-06-01 22:13:34 +02:00
Christof Petig	827006e7e0	vary color, strength based on position, color on biome	2022-06-01 22:13:34 +02:00
Christof Petig	6ddedecc05	introduce smoke strength and color	2022-06-01 22:13:34 +02:00
Sam	5e57eabd11	Code changes and msm	2022-05-30 20:25:31 -04:00
N A	c09f070241	Change animal species to have only one inventory slot	2022-05-29 23:53:00 +00:00
Benoît du Garreau	6431c5567c	Fix clippy error	2022-05-28 23:58:47 +02:00
Benoît du Garreau	f36e74e383	Fix deprecated function use	2022-05-28 23:53:30 +02:00
Benoît du Garreau	ca2ef3e813	Add comments	2022-05-28 23:32:16 +02:00
Benoît du Garreau	8488c7b25e	Upgrade assets_manager to 0.8.0 and image to 0.24 ... This removes a significant number of duplicated dependencies	2022-05-28 23:18:31 +02:00
Ben Wallis	d56e0de392	Merge branch 'xvar/fix-charselect-bug' into 'master' ... Fixed handling of deleted characters on character select screen Closes #1560 See merge request veloren/veloren!3408	2022-05-28 18:12:49 +00:00
Ben Wallis	c001de7409	Fixed pressing enter on character creation screen attempting to log in instead of create the character. Fixed deleting a character with no characters remaining resulting in the deleted character still being selected internally.	2022-05-28 16:28:26 +01:00
Ben Wallis	34f580dfaa	Introduced loot ownership rules to combat loot stealing by players ... * Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity * A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution * Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check * Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up * Added `loot` ECS system to clear expired loot ownerships	2022-05-28 12:06:49 +00:00
Christof Petig	2bf8e1865f	Skiing and ice skating	2022-05-27 17:19:52 +00:00
Imbris	ca1a27bd11	Merge branch 'imbris/update-tracy' into 'master' ... Update tracy See merge request veloren/veloren!3400	2022-05-27 02:50:24 +00:00
Imbris	5cf899c4fe	Plot fixes in client and dynamic name fix in voxygen (tracy update)	2022-05-26 22:19:11 -04:00
Imbris	a366fc4512	Update tracy	2022-05-26 00:04:03 -04:00
Marcel	fb6a8e0360	Merge branch 'xMAC94x/network_error' into 'master' ... Pass network errors through the stack to display them in logs See merge request veloren/veloren!3385	2022-05-25 22:12:42 +00:00
Samuel Keiffer	b9c324a183	Merge branch 'tame_and_mount_special_casing' into 'master' ... Special case taming and mounting. See merge request veloren/veloren!3354	2022-05-24 02:09:45 +00:00
N A	d84a26dfd8	Special case taming and mounting.	2022-05-24 02:09:45 +00:00
Corvella	a9622fe28e	Add a setting to toggle zooming in when charging bow	2022-05-23 23:09:47 +00:00
Marcel Märtens	fc735f509e	fix a unrelated clippy issue that came up suddenly	2022-05-23 09:20:54 +02:00
Imbris	50c34e56ce	Merge branch 'chucksys/chat-opacity-text' into 'master' ... Add chat window opacity value alongside slider See merge request veloren/veloren!3377	2022-05-19 03:48:20 +00:00
Sam	534c7dc8b9	Simplified item key (no assets)	2022-05-18 16:28:06 -04:00
Sam	46fe8604b7	Added search filtering to modular entries in crafting UI	2022-05-16 15:11:46 -04:00
Sam	066b8ef9fd	Address feedback (no assets)	2022-05-16 15:11:43 -04:00
Sam	85c2a85817	Addressed review comments	2022-05-16 15:11:42 -04:00
Sam	13ea6dee93	Addressed second round of balance feedback (assets).	2022-05-16 15:11:40 -04:00
Sam	c0dd748bc7	Addressed second round of balance feedback (no assets).	2022-05-16 15:11:40 -04:00
Sam	95c3fdffa1	Addressed playtest feedback (no assets).	2022-05-16 15:11:39 -04:00
Sam	1b85258838	Crafting slots now properly check component recipe book to see if an input is valid.	2022-05-16 15:11:35 -04:00
Sam	64d07d02c4	Changed item definition id to better handle modular items.	2022-05-16 15:11:34 -04:00
Sam	37442b638c	Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets).	2022-05-16 15:11:33 -04:00
Sam	afd2c8730f	Addressed most review comments (no assets).	2022-05-16 15:11:32 -04:00
Bryant Deters	777fcdf477	closing crafting menu clears crafting components in modular recipe [ci_skip]	2022-05-16 15:11:31 -04:00
Bryant Deters	cabde522b0	cleanup commented line [ci_skip]	2022-05-16 15:11:31 -04:00
Bryant Deters	0d4b05b256	text margin fix, removed some mutable variables, can_perform for modulars accounts for crafting sprites [ci skip]	2022-05-16 15:11:30 -04:00
Sam	f6bf8206ab	Use new icons from Pfau	2022-05-16 15:11:30 -04:00
Monty Marz	c3f92622c1	bg icons	2022-05-16 15:11:29 -04:00
Sam	fceb48c3ac	Removed vec allocation for component recipe iterators	2022-05-16 15:11:26 -04:00
Sam	a5a517916e	Initial UI including ingredients in crafting modular components	2022-05-16 15:11:25 -04:00
Sam	085b18c07a	Formatting tweaks to tooltips	2022-05-16 15:11:25 -04:00
Bryant Deters	075fee5190	modular component tooltips	2022-05-16 15:11:25 -04:00
Sam	d436362a8d	Consolidated crafting UI for the primnary component of modular weapons.	2022-05-16 15:11:21 -04:00
Sam	5877334ed3	Tags are now generated for modular items.	2022-05-16 15:11:20 -04:00
Sam	aeac0f5ad6	Modular inputs now have tooltips.	2022-05-16 15:11:19 -04:00
Monty Marz	3d5e29b44d	Ui	2022-05-16 15:11:18 -04:00
Sam	360e12be22	UI can display a preview of the modular weapon output.	2022-05-16 15:11:17 -04:00
Sam	8fc0138e84	Initial crafting UI for modular weapons.	2022-05-16 15:11:17 -04:00
Sam	bf348b7f43	Addressed further review.	2022-05-16 15:11:16 -04:00
Sam	94c19735ca	Fixed broken stuff during rebase.	2022-05-16 15:11:16 -04:00
Sam	81c83c5e83	Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS	2022-05-16 15:11:15 -04:00
Sam	524845b661	Addressed more comments on MR.	2022-05-16 15:11:15 -04:00
Sam	259db56ca6	Addressed more comments in MR review.	2022-05-16 15:11:14 -04:00
Sam	a9e9a70687	Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS	2022-05-16 15:11:11 -04:00
Sam	b048179c0a	Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS.	2022-05-16 15:11:11 -04:00
Sam	08b7bb781f	Changed Item to have ItemBase instead of ItemDef. NO ASSETS.	2022-05-16 15:11:10 -04:00
Sam	5bacf526ad	Began addressing initial review of modular weapons.	2022-05-16 15:11:10 -04:00
Sam	2aad3f3961	Switched to item list as an input for modular components so that allowed items could be centralized.	2022-05-16 15:11:08 -04:00
Sam	38cb465722	Fixed loading of modular weapons from the loadout to work with nested components. ... Modular weapons can now be correctly dispalyed when wielded.	2022-05-16 15:10:57 -04:00
Sam	0a38567e8d	Modular weapons can now be properly displayed in the inventory.	2022-05-16 15:10:57 -04:00
Sam	762b3be3c3	Modular weapons can now be dropped as loot or assigned to enemies.	2022-05-16 15:10:56 -04:00
Sam	c01fe655f1	Added wood	2022-05-16 15:10:55 -04:00
Sam	d380a2dbaf	Quality is now propogated through modular items from the quality of the components.	2022-05-16 15:10:55 -04:00
Monty Marz	c5b79021f8	Fix wrapping for ingredients text	2022-05-16 15:10:54 -04:00
Sam	405b9b2448	Modular weapons now have programmatically generated names.	2022-05-16 15:10:53 -04:00
Sam	4e89bc7485	Added test functions to assist in fixing unit tests that broke from changed functionality.	2022-05-16 15:10:52 -04:00
Sam	6620c1dd1f	Added HandsKind to automatically resolve handedness of modular weapons.	2022-05-16 15:10:51 -04:00
Sam	85b7382487	Added handedness requirements to recipes and components.	2022-05-16 15:10:50 -04:00
Sam	77934c9214	Made changes to crafting to allow modular weapons to work as intended.	2022-05-16 15:10:48 -04:00
IsseW	bd53d0b354	fix wrong spelling	2022-05-16 00:06:57 +02:00
IsseW	fb7aa07b01	site command completion	2022-05-15 23:57:21 +02:00
Cheuk Yin Ng	0962d3d67e	Add chat window opacity value alongside slider	2022-05-15 08:30:30 -07:00
holychowders	be0e322219	Remove "(Items)" from stealth stat descriptions.	2022-05-14 09:34:57 -05:00
holychowders	63f829be66	Add icon to stealth stat in Bag UI. ... - Thanks to Toaster for making the icon.	2022-05-12 20:28:23 -05:00
holychowders	ff905fab95	Add stealth stat to Bag UI. NOTE: Needs icon.	2022-05-12 20:26:43 -05:00
Joshua Barretto	e02f8aee65	Merge branch 'zesterer/lod-objects' into 'master' ... LoD Objects (inc. Trees) See merge request veloren/veloren!3367	2022-05-11 14:56:12 +00:00
Joshua Barretto	01e1cb34b0	Fixed minor LoD issues	2022-05-11 15:00:44 +01:00
Joshua Barretto	9ac84c0a3a	Improved LoD models	2022-05-11 12:20:42 +01:00
Joshua Barretto	5e1f16fb7a	Better tree colours	2022-05-11 00:15:05 +01:00
Joshua Barretto	907ba3dcbc	Added giant trees to LoD	2022-05-10 20:30:48 +01:00
Joshua Barretto	d4fd9d2d0e	Added LoD houses	2022-05-10 19:19:46 +01:00
Joshua Barretto	7382aab13a	Upped default LoD distance	2022-05-10 17:12:12 +01:00
Joshua Barretto	c7e51a6c59	Added frustum culling for LoD objects	2022-05-10 16:21:14 +01:00
Joshua Barretto	19d19df63c	Flush LoD distance on login	2022-05-10 15:43:53 +01:00
Joshua Barretto	06300bc75f	Updated changelog	2022-05-10 12:56:24 +01:00
Joshua Barretto	f35c98d1a1	Added LoD distance setting	2022-05-10 12:40:06 +01:00
Joshua Barretto	2d7aa1aaa3	Added no terrain pop experimental shader	2022-05-10 12:40:06 +01:00
Joshua Barretto	596ae73117	Added NoLodVoxels option	2022-05-10 12:40:06 +01:00
Joshua Barretto	2df01385d2	Voxelise trees	2022-05-10 12:38:37 +01:00
Joshua Barretto	1db7cc7fde	LoD trees in snow are white	2022-05-10 12:38:36 +01:00
Joshua Barretto	cf346d05c1	Different kinds of tree	2022-05-10 12:38:36 +01:00
Joshua Barretto	ac0e7a7724	Use dedicated fragment shader	2022-05-10 12:38:36 +01:00
Joshua Barretto	b3126ca687	Initial implementation of LoD trees	2022-05-10 12:38:36 +01:00
holychowders	1ebbf335e1	Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve.	2022-05-06 19:25:03 -05:00
holychowders	dc9dbc30b4	- Adjust Stats Diary UI to show stealth as a percentage from armor items. ... - `(Max)` is also shown when stealth from items is maxed out (currently 30%). Notes: - FIXME: Someone more familiar with the different armor types may want to adjust their stealths. - In addition, the current max stealth sum from armor is `0.3`, beyond which no stealth effect is caused.	2022-05-06 13:15:46 -05:00
Marcel Märtens	697673bcca	update toolchain to nightly-2022-04-25	2022-05-03 15:22:28 +02:00
Marcel Märtens	fa49248c31	switch to upstream vek again	2022-04-28 09:10:55 +02:00
Youssef Fahmy	aec866e5ec	Balance tweaks	2022-04-23 14:54:01 +00:00
Marcel	967d151312	Merge branch 'aerialfiddle/be_BY' into 'master' ... Fixed an error where '{amount} Exp' floater did not use existing localizations See merge request veloren/veloren!3332	2022-04-19 17:02:19 +00:00
Anton Katsuba	d37db03270	Fixed an error where '{amount} Exp' floater was displayed only in English despite localizations being available	2022-04-19 18:28:15 +03:00
aflying pumpkin	c7f7e63495	Added Lionesses	2022-04-16 16:57:59 +00:00
Leonid Toshchev	860af759a4	# Fix 994: fix panic when hotloading figure manifests	2022-04-14 15:53:39 +00:00
Marcel Märtens	64b9602760	update further dependencies, including strum and get rid of old strum_macro	2022-04-04 16:06:47 +02:00
Marcel Märtens	affdf3131f	update a bunch of dependencies, including clap3	2022-04-04 11:43:29 +02:00
jh0l	585bcda729	fix: 🐛 resolve issue where client spams TradeAction updates based on out of sync PendingTrade values	2022-03-27 20:25:22 +02:00
jh0l	32d4ddd4fd	style: 🎨 remove newline	2022-03-27 20:25:20 +02:00
Jack hollis-london	aeae94d31b	small refactor per code review	2022-03-27 20:25:19 +02:00
jh0l	403a523ec7	refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade	2022-03-27 20:24:23 +02:00
jh0l	de70ce61d8	feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing	2022-03-27 20:24:21 +02:00
jh0l	991cfcaa47	feat: 🌐 add i18n for trade amount input placeholder	2022-03-27 20:24:20 +02:00
jh0l	6f22f31376	feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing	2022-03-27 20:24:18 +02:00
Andrzej Drabarek	fa5555a348	Fixed Tutorial HUD being covered up by other HUD elements.	2022-03-20 19:05:10 +01:00
Mehmet-dev	903e216d32	fixing blood particles on bodies not supposed to bleed from gameplay perspective	2022-03-20 15:45:50 +00:00
Marcel	aa244b23c4	Merge branch 'Melonai/apply_mount_offset_to_weapon_trails' into 'master' ... Apply mount transform position to weapon trails Closes #1489 See merge request veloren/veloren!3279	2022-03-15 21:24:49 +00:00
Imbris	1ff8fffa1d	Merge branch 'olexorus/2021_cleanup' into 'master' ... Simplifications made possible by the 2021 Edition Closes #1447 See merge request veloren/veloren!3277	2022-03-15 21:05:53 +00:00
Mel	0ba3a806c0	Apply mount transform position to weapon trails	2022-03-15 21:47:17 +01:00
DaforLynx	e936a27d40	Small sound fixes	2022-03-15 16:23:10 +00:00
Olexorus	2212c3d70c	Remove borrow-checker appeasing code that's no longer necessary in Rust 2021	2022-03-15 16:49:03 +01:00
DaforLynx	7b6f424bb0	Loud rivers	2022-03-13 07:47:23 +00:00
DaforLynx	123fee2707	Fix swim sfx, fix glider sfx, add glide sfx	2022-03-13 05:44:07 +00:00
Marcel	d05cb99007	Merge branch 'unvariant/trading_fix' into 'master' ... prevent glider and sneak from triggering during trade See merge request veloren/veloren!3264	2022-03-08 10:25:16 +00:00
ninefox	115b2875b3	prevent glider and sneak from triggering during trade	2022-03-07 20:28:38 -08:00
Isidor Nielsen	a5ab36e6b5	Map marker fixes	2022-03-07 12:16:04 +00:00
Sam	89bf529a5e	Addressed review comments	2022-03-03 01:12:40 -05:00
Sam	f5e0cb0045	Addressed review comments	2022-03-03 01:11:18 -05:00
Sam	0a0fffd5ed	Addressed review comments	2022-03-03 01:11:17 -05:00
Sam	5a60562eee	Addressed review comments	2022-03-03 01:11:16 -05:00
Sam	ce70c512e2	Arrow trails	2022-03-03 01:11:15 -05:00
Sam	48c97cd829	Glider trails	2022-03-03 01:11:13 -05:00
Sam	eacd43be16	Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better.	2022-03-03 01:11:12 -05:00
jshipsey	6ba8af5434	anim additions	2022-03-03 01:11:11 -05:00
Sam	f3c5c2b5e3	Pointy trails	2022-03-03 01:11:10 -05:00
Sam	b3a19ebc00	Weapon trails now works with dual wielding	2022-03-03 01:11:08 -05:00
Sam	a967daa2f5	Trails now controlled and enabled from animation files.	2022-03-03 01:11:07 -05:00
Sam	fc1a9f3c61	Trail thinning is now smooth	2022-03-03 01:11:06 -05:00
Sam	87434c472c	Trails shrinks over time	2022-03-03 01:11:05 -05:00
Sam	ab4c5dac87	Reset vertices for trails in trail manager.	2022-03-03 01:11:04 -05:00
Sam	bee16001ed	Don't upload weapon trails to GPUs for entities that have only zero quds.	2022-03-03 01:11:03 -05:00
Sam	cfbb3a5bca	Changed to a single dynamic model	2022-03-03 01:11:02 -05:00
Monty Marz	82def16969	visuals	2022-03-03 01:11:00 -05:00
Sam	c6dc96b795	Settings button to turn off weapon trails.	2022-03-03 01:10:59 -05:00
Sam	f4abe4f275	More tweaks	2022-03-03 01:10:58 -05:00
Sam	1f2ede656e	Fixed tests	2022-03-03 01:10:57 -05:00
Sam	b558331b32	Finishing touches	2022-03-03 01:10:55 -05:00
Sam	d23dd6c9e9	Fixed a few errors	2022-03-03 01:10:54 -05:00
Sam	5018a9f476	Game now runs, still doesn't work	2022-03-03 01:10:53 -05:00
Sam	33419c7b4c	Trails are now hackily created.	2022-03-03 01:10:51 -05:00
Sam	05f53a5316	Changed to one dynamic model per entity.	2022-03-03 01:10:50 -05:00
Sam	d9028ec978	Dynamic model now used for trail.	2022-03-03 01:10:49 -05:00
Sam	0794f980fe	Mostly snaked through another rendering pipeline	2022-03-03 01:10:47 -05:00
Christof Petig	f347b9de11	Diversify price calculation for items by using multiple categories per item.	2022-03-03 02:32:34 +00:00
ubruntu	d18242a1df	Fix interactable HUD	2022-02-27 21:50:07 +00:00
Imbris	8742a37e0f	Changes based on review. Fix tests.	2022-02-27 14:43:08 -05:00
Imbris	e6c2239744	Fix typo. cargo fmt.	2022-02-27 13:47:13 -05:00
Imbris	e52159f638	Remove original character from game world when possessing to make persistence more robust.	2022-02-27 13:47:13 -05:00
Imbris	10803a9735	Stop using Character presence kind when possessing so that persistence doesn't get messed up.	2022-02-27 13:47:12 -05:00
Karl Werf	4dae579aca	Minimap draw order fix ... Minimap location marker and player indicator are no longer drawn on top of the main map if they overlap. Minimap location marker is no longer a button.	2022-02-27 15:41:12 +01:00
Imbris	4aa89fd6cc	Merge branch 'unvariant/center_item_drops' into 'master' ... Center item drops See merge request veloren/veloren!3232	2022-02-27 02:07:30 +00:00
ninefox	329051c6df	removed extra fields from item_drop_manifest.ron ... added TODO about applying non-random rotations in load.rs	2022-02-26 10:13:04 -08:00
Imbris	08f67a335f	Add experimental shader option that lowers glow strength for lights near the camera	2022-02-26 00:26:42 -05:00
ninefox	5aa98b7b3e	Applied review suggestions	2022-02-23 18:37:04 -08:00
ninefox	61913402a2	add code to center item drops ... reduce size of coins	2022-02-23 17:16:10 -08:00
Marcel	2a9f75340a	Merge branch 'spanish_translation' into 'master' ... apply changes from MR!2904 See merge request veloren/veloren!3224	2022-02-20 16:26:24 +00:00
Marcel	df7cd2da1a	Merge branch 'isse/shared-waypoints' into 'master' ... Shared and persistent waypoints See merge request veloren/veloren!3162	2022-02-20 10:10:18 +00:00
Isidor Nielsen	a685a353cb	Shared and persistent waypoints	2022-02-20 10:10:18 +00:00
Marcel	6a9924d6ca	Merge branch 'imbris/small-fixes' into 'master' ... Small bits of code cleanup See merge request veloren/veloren!3222	2022-02-20 09:41:21 +00:00
Marcel Märtens	e2648f6733	apply changes from MR!2904	2022-02-20 10:18:24 +01:00
Imbris	d8996a9b94	Remove unwrap in handling of the DeleteServer message in the main menu ui	2022-02-19 19:37:53 -05:00
Imbris	adec5905bd	Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted.	2022-02-19 19:05:04 -05:00
Marcel Märtens	802b9e7914	Change the version number to 0.12	2022-02-18 22:36:53 +01:00
Treeco	fdd7237dfc	Removed dead settings button from main menu	2022-02-18 16:11:30 +00:00
Monty Marz	9ca1693ef8	New login-screen bg image	2022-02-17 16:08:37 +00:00
Imbris	bdb10c4e14	Merge branch 'isse/minor-ux-improvements' into 'master' ... Minor inventory ux improvements Closes #1436 See merge request veloren/veloren!3157	2022-02-16 21:48:03 +00:00
Isidor Nielsen	67f2d05d3c	Minor inventory ux improvements	2022-02-16 21:48:03 +00:00
ShouvikGhosh2048	d72f43190b	Fixes #1452 - Prevents empty trades	2022-02-16 21:41:26 +00:00
Samuel Keiffer	6c7c0eefae	Merge branch 'gnarlings' into 'master' ... Gnarlings See merge request veloren/veloren!3194	2022-02-15 00:22:37 +00:00
Sam	f30e879cf5	Clippy fixes	2022-02-14 17:23:15 -05:00
Monty Marz	900fff7ba9	small UI fixes, new haste buff icon	2022-02-14 19:24:59 +01:00
Sam	3373985a5f	Comments	2022-02-13 23:35:18 -05:00
Sam	6dafacaa24	Addressed review comments	2022-02-13 21:49:46 -05:00
unvariant	9d98cd9e58	Render item drops instead of placeholder textures	2022-02-14 02:09:45 +00:00
Imbris	ddcee8448b	Merge branch 'persist_debug_checkbox' into 'master' ... Persist interface debug checkbox across sessions See merge request veloren/veloren!3147	2022-02-13 19:43:51 +00:00
Monty Marz	c7ce2b773c	new icons	2022-02-12 22:46:34 +01:00
jshipsey	2eee43865f	chieftain anims	2022-02-11 02:18:48 -05:00
Sam	4991f7ecea	Gnarlign site tweaks and chieftain buff	2022-02-11 01:23:09 -05:00
Sam	377906dfa0	Ground shockwave particle tweaks.	2022-02-10 22:40:26 -05:00
Sam	86a00e75bb	Tweaked fire particles	2022-02-10 14:58:37 -05:00
Sam	bf7e84c6ae	Initial particle work	2022-02-10 14:58:37 -05:00
Sam	0031aa6f5f	Chieftain AI and attacks	2022-02-10 14:58:35 -05:00
jshipsey	3a35dcc77f	brick texture colors	2022-02-10 14:58:34 -05:00
jshipsey	0c788997a4	anims	2022-02-10 14:58:34 -05:00
Sam	fcb0f8d8f0	Wood golem attacks and ai	2022-02-10 14:58:32 -05:00
Sam	e1f164d099	Initial AI for gnarling logger/mugger.	2022-02-10 14:58:27 -05:00
ninefox	2e902c1c5c	swapped show.debug for interface.toggle_debug	2022-02-09 18:31:46 -08:00
jshipsey	72f2b2eee8	clippy	2022-02-09 19:35:05 -05:00
jshipsey	7ae85aef50	tweaks	2022-02-09 19:34:24 -05:00
jshipsey	6d34a6b544	wallrunning	2022-02-09 19:34:23 -05:00
jshipsey	6f8cadc847	wall contact, run anim tweaks	2022-02-09 19:34:22 -05:00
Joshua Barretto	b2d6b06e2e	Merge branch 'zesterer/bare-minimum' into 'master' ... Added BareMinimum shader effect See merge request veloren/veloren!3188	2022-02-09 23:29:17 +00:00
Joshua Barretto	8888190eb4	Added BareMinimum shader effect	2022-02-09 12:56:21 +00:00
phoenix13032005	7a1f0d9fa1	Balance update ... + Make icons for Mino and Mindy dungeons with their faces + Adjust loot tables + Adjust names with respect to the lore of @Gemu	2022-02-09 12:13:42 +02:00
Imbris	18f6077321	Merge branch 'imbris/srgb-dither' into 'master' ... Dither in nonlinear srgb space and dithering related experimental shader options See merge request veloren/veloren!3160	2022-02-01 21:24:50 +00:00
Imbris	2325ac3d78	Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced)	2022-01-30 23:30:34 -05:00
Marcel Märtens	201a5ac2c7	stricten some rules and fix some clippy warnings	2022-01-30 20:16:21 +01:00
Avi Weinstock	f3f08936d8	Decrease too-many-arguments-threshold and type-complexity-threshold.	2022-01-30 20:16:21 +01:00
Avi Weinstock	5f8957d8ef	Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.	2022-01-30 20:16:20 +01:00
Imbris	21cad12272	Merge branch 'fix-ghost-item' into 'master' ... Fix ghost item when trade gets declined Closes #1429 See merge request veloren/veloren!3117	2022-01-30 17:31:15 +00:00
Imbris	89edd18787	Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options	2022-01-28 22:55:59 -05:00
juliancoffee	fba89517de	Move Veloren to 2021 edition	2022-01-26 16:46:40 +02:00
juliancoffee	6a0458ddf1	Move voxygen to 2021 edition	2022-01-26 15:47:39 +02:00
juliancoffee	9edd526279	Move voxygen-i18n to 2021 edition	2022-01-26 15:13:05 +02:00
Marcel	0ebff57a59	Merge branch 'Martin/remove-server-from-list' into 'master' ... Feature: Delete button in the servers menu See merge request veloren/veloren!3144	2022-01-26 10:20:15 +00:00
ninefox	e6ced0577e	Persist interface debug checkbox	2022-01-25 22:47:26 -08:00
Dominik Broński	ca7b048184	Merge branch 'SeaCrocodile' into 'master' ... Sea crocodile See merge request veloren/veloren!3146	2022-01-26 01:26:38 +00:00
Martin	700f709664	added delete button in the settings window which deletes a server from the list	2022-01-25 19:48:58 +02:00
Martin	a86ed49293	added message and event for deleting a server from the list	2022-01-25 19:48:19 +02:00
Imbris	432d78a232	Merge branch 'imbris/screenshot-format' into 'master' ... Support multiple texture formats for screenshots See merge request veloren/veloren!3134	2022-01-25 14:45:54 +00:00
Imbris	2bada7f02a	Don't send egui events when it is hidden and as a result these events are also never captured by egui. This fixes issues with the mouse clicks being captured if the mouse was hovered over the egui UI when it was toggled off.	2022-01-25 01:23:46 -05:00
Imbris	c320604a36	Support multiple texture formats for screenshots	2022-01-25 00:36:08 -05:00
InfRandomness	df6a0002e9	Move alpha values calculation to CPU	2022-01-24 19:24:51 +00:00
floppy	fb316e8f66	SeaCrocodile spawning in tropical Oceans	2022-01-24 19:36:13 +01:00
Justin Shipsey	05d5bca72d	Merge branch 'slipped/roll' into 'master' ... hold weapon while rolling See merge request veloren/veloren!3135	2022-01-24 09:56:00 +00:00
jshipsey	067f06561f	hold weapon while rolling	2022-01-24 03:55:00 -05:00
Imbris	57781eac27	Only toggle egui via F7 instead of needing to also have debug toggle on with F3	2022-01-24 01:40:55 -05:00
Imbris	086b4bece8	Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master' ... Kalikatz/tweak to chat scroll issue See merge request veloren/veloren!2962	2022-01-24 06:14:08 +00:00
Imbris	fc3da4bfce	Merge branch 'imbris/sobel' into 'master' ... Add experimental sobel filter See merge request veloren/veloren!3113	2022-01-24 02:42:54 +00:00
Imbris	7e5a3efd02	Add egui window to toggle experimental shaders.	2022-01-23 21:14:41 -05:00
Joshua Barretto	d18174e0d1	Revert "Merge branch 'infrandomness/remove_alpha' into 'master'" ... This reverts merge request !3128	2022-01-24 00:52:03 +00:00
Imbris	6cfadc4f65	Add sobel filter as experimental shader option	2022-01-23 16:32:26 -05:00
Joshua Barretto	470353e08c	Fix for translucency blocking clouds	2022-01-23 16:32:26 -05:00
Joshua Barretto	38832fadd3	Improved underwater lighting on low shader settings	2022-01-23 16:32:26 -05:00
Joshua Barretto	e6332c1cb5	Significantly improved underwater shaders	2022-01-23 16:32:25 -05:00
Dr. Dystopia	9306dc816f	Fix warnings	2022-01-23 16:32:25 -05:00
ubruntu	57d9283afb	Show HUD for campfires	2022-01-23 16:32:25 -05:00
Joshua Barretto	bdb0fc9c16	Merge branch 'zesterer/underwater' into 'master' ... Underwater shaders See merge request veloren/veloren!3127	2022-01-23 20:36:47 +00:00
Forest Anderson	d3aa224f15	Merge branch 'tygyh/Fix-warnings' into 'master' ... Fix warnings See merge request veloren/veloren!3051	2022-01-23 19:25:35 +00:00
Joshua Barretto	8504a8ab21	Merge branch 'ubruntu/campfire-hud' into 'master' ... Show HUD for campfires See merge request veloren/veloren!3097	2022-01-23 19:25:11 +00:00
ubruntu	ca2a81c20f	Show HUD for campfires	2022-01-23 19:25:11 +00:00
Forest Anderson	7c99f6eb5e	Merge branch 'unvariant/affix_remap_button' into 'master' ... Affixed remap/clear button to top of control settings window See merge request veloren/veloren!3119	2022-01-23 18:40:43 +00:00
Dr. Dystopia	bb48267827	Fix warnings	2022-01-23 19:03:47 +01:00
InfRandomness	69c3480fce	Move alpha values calculation	2022-01-23 17:16:22 +00:00
Joshua Barretto	8a684973b4	Merge branch 'zesterer/tiny-fixes' into 'master' ... Addressing criticisms See merge request veloren/veloren!3121	2022-01-22 16:44:01 +00:00
Joshua Barretto	b8df17080d	Merge branch 'infrandomness/waypoint_binding_customization' into 'master' ... Add waypoint binding customization code See merge request veloren/veloren!3122	2022-01-21 18:05:41 +00:00
InfRandomness	b33fda1e0c	Add waypoint binding customization code	2022-01-21 18:05:41 +00:00
Joshua Barretto	c0e3f0abef	Merge branch 'ubruntu/chest-sprite-names' into 'master' ... Fix chest display names See merge request veloren/veloren!3125	2022-01-21 18:05:39 +00:00
ubruntu	1d0c861e19	Fix chest display names	2022-01-21 18:05:39 +00:00
Joshua Barretto	31b9cd0565	Fix for translucency blocking clouds	2022-01-21 17:29:59 +00:00
Joshua Barretto	3b347a2aa3	Improved underwater lighting on low shader settings	2022-01-21 13:35:40 +00:00
Samuel Keiffer	a00ac11e25	Merge branch 'sam/fix-possess' into 'master' ... Fix possession bug See merge request veloren/veloren!3123	2022-01-21 07:40:23 +00:00
Joshua Barretto	5b606f0d50	Significantly improved underwater shaders	2022-01-21 00:42:20 +00:00
Sam	fe1db1e9e0	Can move around, so character state system runs ... Hotbar now visible Can't yet activate skillbar abilities, only M1 and M2	2022-01-20 15:26:35 -05:00
Joshua Barretto	4f181c936d	Merge branch 'name_areas_based_on_biome' into 'master' ... name_areas_based_on_biome See merge request veloren/veloren!3115	2022-01-20 19:50:57 +00:00
Joshua Barretto	5a7cd39625	Added point glow slider	2022-01-20 13:40:11 +00:00
Joshua Barretto	89cd58b1ac	Don't allow interaction with mounted entity	2022-01-20 11:25:53 +00:00
threadexception	2a65d4950d	Fix ghost item when trade gets declined	2022-01-20 09:07:47 +01:00
jshipsey	136555dbbe	fix crash	2022-01-20 02:14:49 -05:00
ninefox	3e198c5195	Affixed remap/clear button	2022-01-19 17:43:08 -08:00
Joshua Barretto	53574bb6ec	Tweaked lantern offsets	2022-01-19 20:08:13 -05:00
Joshua Barretto	fcd25648fe	Fixed point glow with no clouds	2022-01-19 20:08:13 -05:00
Joshua Barretto	7506dc2a41	Added procedural LoD detail shader	2022-01-19 19:59:14 -05:00
Joshua Barretto	dea540222f	Upped bloom default	2022-01-19 19:59:14 -05:00
Joshua Barretto	391d1f6bf4	Added point glow	2022-01-19 19:59:13 -05:00
Snowram	a6e396e29a	Stunned and jump anims, stats, spawns, more IA work	2022-01-20 00:53:29 +01:00
Snowram	f6d7ba33ef	Arthropods spawns and loots	2022-01-19 19:01:16 +01:00
jshipsey	82df5f23c3	spit anim	2022-01-19 19:01:16 +01:00
jshipsey	269b1fcd00	summon an	2022-01-19 19:01:15 +01:00
Snowram	fd3ed89899	More arthropod animations	2022-01-19 19:01:15 +01:00
Snowram	38bbd60fd2	Arthropod basic attack	2022-01-19 19:01:14 +01:00
Snowram	6da42e61ab	Arthropod jump attack, hitboxes	2022-01-19 19:01:14 +01:00
Snowram	1e6ead4005	Arthropod charge	2022-01-19 19:01:13 +01:00
Snowram	02ed6ffd60	More arthropod work	2022-01-19 19:01:13 +01:00
Snowram	ae71f2e4f0	Adds poisoned debuff (energy change over time)	2022-01-19 19:01:13 +01:00
Snowram	2871fa83bc	Arthropod run	2022-01-19 19:01:12 +01:00
Snowram	fa549eece7	Adds new arthropod species	2022-01-19 19:01:12 +01:00
Snowram	f67bf2a539	Adds arthropod skeleton	2022-01-19 19:01:11 +01:00
Samuel Keiffer	c3e92b6c7a	Merge branch 'sam/melee-constructor' into 'master' ... Melee Constructor See merge request veloren/veloren!3111	2022-01-19 06:36:51 +00:00
floppy	51356d5fad	in terrain.mod.rs, return name as Option in fn name	2022-01-18 19:53:20 +01:00
Joshua Barretto	b85aac6e23	Fixed minor shader issues, added curved world effect	2022-01-18 01:47:06 +00:00
Sam	b0644ca767	Melee attacks are now created through a melee constructor.	2022-01-17 20:41:24 -05:00
floppy	fd920cea1d	allow enabling/disabling biome names on map	2022-01-17 23:47:27 +01:00
floppy	a836b61190	allow enabling/disabling biome names on map	2022-01-17 23:45:51 +01:00
Joshua Barretto	cd428d9267	Added support for experimental shaders	2022-01-17 22:20:33 +00:00
Joshua Barretto	9c565dadc5	Merge branch 'zesterer/mount-everest' into 'master' ... Mount Everest See merge request veloren/veloren!3101	2022-01-17 13:21:38 +00:00
jshipsey	1d76d484bb	anim tweaks	2022-01-17 06:45:26 -05:00
Joshua Barretto	d0c101ed06	Remove redundant orientation	2022-01-17 09:25:46 +00:00
jshipsey	41ed0f284f	swivel, quadsmall/quadlow offsets	2022-01-17 03:42:56 -05:00
Kemper	6f0f43917d	Fix negative energy stat comparisons in item tooltips	2022-01-17 05:18:21 +00:00
Joshua Barretto	3b7ea72a9c	Fixed review comments	2022-01-16 21:13:13 +00:00
jshipsey	0ea1e6862e	animation tweaking	2022-01-16 15:46:17 -05:00
Joshua Barretto	7f3d9898db	More sensible turn rate in air	2022-01-16 19:43:13 +00:00
jshipsey	ed9de26f27	jump anim, quad med	2022-01-16 14:09:55 -05:00
Joshua Barretto	bde3aade2b	Updated changelog, fixed incorrect hint for mineable blocks	2022-01-16 17:53:51 +00:00
Joshua Barretto	043016a433	Don't try to mount unmountable entities, clippy fixes and fmt	2022-01-16 17:53:14 +00:00
Joshua Barretto	504e2a38d5	Added overhead hints, smoother mount movement	2022-01-16 17:53:14 +00:00
Joshua Barretto	f33c12e976	Remove unnecessary interpolation cruft	2022-01-16 17:53:14 +00:00
Joshua Barretto	157cd6cd14	Fixed unusual speech bubble placement	2022-01-16 17:53:14 +00:00
Joshua Barretto	5c37786185	Improved interpolation for riders	2022-01-16 17:53:13 +00:00
Joshua Barretto	6931514ae5	Made teleport commands redirect to mount	2022-01-16 17:53:13 +00:00
Joshua Barretto	537cc38b5e	Fixed lantern position when mounting	2022-01-16 17:53:13 +00:00
Joshua Barretto	b3e2d825ed	Overhauled mounting to make it more reliable	2022-01-16 17:53:13 +00:00
Sam	7ae8ed09f6	Addressed MR comments.	2022-01-15 21:50:27 -05:00
Sam	4d3b0736d0	Fixed bug with returning to general combat skill tree.	2022-01-15 21:49:30 -05:00
Sam	aaa33c6834	Fixed display of some stats in dary and changelog entry.	2022-01-15 21:49:29 -05:00
Sam	745cc20c66	Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode.	2022-01-15 21:49:28 -05:00
Sam	19a1a0adb2	Changed to using slot maker for ability slots	2022-01-15 21:49:25 -05:00
Monty Marz	6d0913bb5e	visuals	2022-01-15 21:46:57 -05:00
Sam	d1c5d3e020	If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand.	2022-01-15 21:46:56 -05:00
Sam	70d6f3a854	Scroll through all aiblities in the same pages.	2022-01-15 21:46:56 -05:00
Sam	3870688717	Pages to swap between weapon abilities.	2022-01-15 21:46:55 -05:00
Sam	ed38272d23	Diary stats now use real values.	2022-01-15 21:46:55 -05:00
Monty Marz	eb0bed39e8	stats window WIP	2022-01-15 21:46:54 -05:00
Monty Marz	7515c26d68	progress	2022-01-15 21:46:54 -05:00
Sam	714e080535	Abilities can now be dragged to slot to be equipped.	2022-01-15 21:46:53 -05:00
Sam	d0e487da8a	Ability sets now start with non-empty defaults.	2022-01-15 21:45:27 -05:00
Sam	d86692c4fe	Added in-memory persistence of ability sets per weapon kind pair.	2022-01-15 21:42:34 -05:00
Monty Marz	89bf41574c	diary section buttons	2022-01-15 21:42:33 -05:00
Sam	ee5293c64e	Abilities scrollable now.	2022-01-15 21:42:33 -05:00
Sam	cf724bd76c	Initial UI work	2022-01-15 21:42:32 -05:00
Sam	9b6c76bd3b	Removed health scaling that bypasses the skill system.	2022-01-15 11:58:28 -05:00
Tormod G. Hellen	3afa16bf03	Fix hotbar changing when sorting inventory. ... Previously the hotbar slots would refer to inventory slots. An unfortunate consequence of this was that when the contents of an inventory slot changed, so would the corresponding hotbar slot change. This commit fixes that.	2022-01-14 19:14:24 +01:00
Samuel Keiffer	589189315c	Merge branch 'slipped/gnarlingstuff' into 'master' ... gnarling depth See merge request veloren/veloren!3068	2022-01-14 07:22:11 +00:00
Imbris	1e24e4b8fb	Merge branch 'YuriMomo/Fix-Report-Message' into 'master' ... Fix-Report-Message See merge request veloren/veloren!3096	2022-01-14 06:17:55 +00:00
jshipsey	475fc1631f	akhlut	2022-01-13 23:20:58 -05:00
jshipsey	1fac6359de	more gnarling weapons	2022-01-13 23:20:56 -05:00
jshipsey	7f928d0bc0	woodengolem, chieftain, icedrake, blowgun	2022-01-13 23:20:52 -05:00
Sam	d1e1de3b14	Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage. ... Piercing damage now ignores an amount of protection equal to the piercing damage value. Crushing damage now does poise damage equal to the amount of mitigated damage. When poise damage is dealt while in a poise state, poise damage is instead converted to damage.	2022-01-12 22:18:58 -05:00
Dominik Bronski	38e4a41620	Fix-Report-Message	2022-01-11 20:42:05 +01:00
Monty Marz	bc1c84aa76	Merge branch 'pfau/smöl_fixes' into 'master' ... change merchant backpack visuals and add mining skill icons See merge request veloren/veloren!3089	2022-01-08 09:32:51 +00:00
Imbris	f948476f9f	Merge branch 'fetsorn-master-patch-26200' into 'master' ... Fix typo "incase"->"in case" See merge request veloren/veloren!3086	2022-01-08 04:07:33 +00:00
Monty Marz	d72d926341	change merchant backpack visuals and add mining skill icons	2022-01-08 01:57:52 +01:00
Joshua Barretto	3cba7e7f87	Merge branch 'zesterer/fix-nametags' into 'master' ... Fixed nametag logic bug See merge request veloren/veloren!3088	2022-01-07 22:38:59 +00:00
Joshua Barretto	bc7c942bc9	Fixed nametag logic bug	2022-01-07 21:54:14 +00:00
unvariant	71d2be5f76	support removing key bindings	2022-01-07 20:30:30 +00:00
fetsorn	338dec41ab	Fix typo "incase"->"in case"	2022-01-06 18:28:05 +00:00
voxal	7d07598370	Move comments and turn on by default	2022-01-05 20:07:05 -08:00
voxal	e75f569014	Refactor to avoid changing overhead struct	2022-01-05 20:07:05 -08:00
voxal	471e75d846	cargo fmt	2022-01-05 20:06:43 -08:00
voxal	41e7e25f16	Fix clippy::nonminimal-bool	2022-01-05 20:06:43 -08:00
voxal	e546a1d1a9	Allow players to see own speech bubbles.	2022-01-05 20:06:43 -08:00
Sam	2e09feb426	Tweaks to prompt dialog.	2022-01-03 19:55:06 -05:00
Sam	efbc5f9b75	UI notifying player that their skillset has been invalidated.	2022-01-03 19:55:06 -05:00
Sam	8221336587	Addressed some review.	2022-01-03 19:55:04 -05:00
Sam	64c8321626	Made skill groups remain locked if skill to unlock them not acquired.	2022-01-03 19:55:03 -05:00
Sam	c44c10718b	Split skillset and skills into separate files.	2022-01-03 19:55:00 -05:00
Sam	fe45a158ed	Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp.	2022-01-03 19:55:00 -05:00
DaforLynx	13e87375d6	River sounds and more	2022-01-03 22:40:31 +00:00
Samuel Keiffer	4d85ae4f60	Merge branch 'ubruntu/dagger-ux' into 'master' ... Dagger UX See merge request veloren/veloren!3072	2021-12-28 22:09:34 +00:00
ubruntu	65f9d18fb7	Dagger UX	2021-12-28 22:09:34 +00:00
DoctorKompot	0dba858ca9	fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files	2021-12-27 03:01:26 +02:00
DoctorKompot	1cc69bbca1	fixed Pfau's turbans and manually added back mod.rs files that got deleted previously	2021-12-27 03:01:19 +02:00
DoctorKompot	9eedb024fe	added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry	2021-12-27 03:01:18 +02:00
DoctorKompot	ccc1bdbf1c	updated the Common Quality item displays	2021-12-27 03:00:57 +02:00
Imbris	bf48bd5346	update toolchain to nightly-2021-12-19	2021-12-23 13:04:24 +01:00
DaforLynx	e44478736e	Music additions	2021-12-22 11:20:34 +00:00
Christof Petig	453c4c149e	fix more examples and satisfy code quality checks	2021-12-20 18:09:34 +00:00
Joshua Barretto	3b4fa6b328	Snow for ice	2021-12-20 18:06:53 +00:00
Joshua Barretto	6e97e3179d	Slippery ice	2021-12-20 18:03:52 +00:00
Ben Wallis	9a4e6b81d3	Merge branch 'Character-editting' into 'master' ... Character editing See merge request veloren/veloren!3059	2021-12-20 15:24:43 +00:00
ubruntu	59cb9ea7c2	Hide empty stats on item tooltips	2021-12-20 15:07:38 +00:00
Snowram	66a5f9fded	Fixes animation hot reloading (credit to Imbris)	2021-12-18 20:36:14 +01:00
Dr. Dystopia	1719ce8c16	Format	2021-12-18 15:58:17 +01:00
IsseW	65ab92eb78	button spacing	2021-12-18 15:41:11 +01:00
Dr. Dystopia	3329a8df61	Add 'pen' icons for edit buttons	2021-12-18 15:27:14 +01:00
Dr. Dystopia	9a7cc50898	Show current equipment during editing	2021-12-18 12:35:31 +01:00
Dr. Dystopia	48fd9e877d	Use 'confirm' button when finishing editing	2021-12-18 11:45:49 +01:00
Dr. Dystopia	62f9bc5059	Fix redundant pattern matching	2021-12-15 21:05:49 +01:00
Dr. Dystopia	e2f4499d45	Remove debug prints	2021-12-15 20:56:44 +01:00
IsseW	8b258e4e81	Non editable data	2021-12-15 20:40:01 +01:00
Joshua Barretto	dd95d69dc4	Fixed character editing	2021-12-13 00:55:25 +00:00
Dr. Dystopia	408fe1e6b6	Begin creating character editing	2021-12-13 01:13:33 +01:00
Benoît du Garreau	aca088388b	Update assets_manager to 0.7	2021-12-12 22:11:47 +01:00
James Melkonian	5f6d1c3438	Convert Armor Stats to Options	2021-12-12 00:25:35 +00:00
Jonathan Berglin	596307c9b7	Remove unused clippy suppressions	2021-12-05 17:59:02 +00:00
Dr. Dystopia	f4c5abf36b	Resolve all '#[allow(clippy::needless_range_loop)]' error supressions	2021-12-03 10:38:30 +01:00
Dr. Dystopia	a0dfb2e8ad	Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions	2021-11-30 13:57:47 +01:00
Avi Weinstock	cb4c3eb34e	Bodies of water no longer contain black chunks on the voxel minimap. ... The heuristic for pruning dungeon ceilings depended on detecting an air-to-not-air edge, which was not present for chunks whose topmost layer was water. Sampling 1 layer of the `above` block introduces such an edge, allowing the water surface to be detected.	2021-11-29 14:39:56 -05:00
Jonathan Berglin	d9dd49552b	Tygyh/resolve all '# allow(clippy needless update)]' error supressions	2021-11-29 09:32:55 +00:00
Imbris	7760210824	Remove redundant closures	2021-11-28 12:24:57 -05:00
Marcel Märtens	ef40ebe0c8	update toolchain to nightly-2021-11-24	2021-11-24 10:09:22 +01:00
Imbris	0beee17370	Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version	2021-11-21 09:51:39 -05:00
Marcel Märtens	7a8944ac71	remove additional restriction which is only necessary in egui 0.15	2021-11-20 20:22:45 +01:00
Marcel Märtens	7200cc4ad7	undo egui upgrade try	2021-11-20 20:18:03 +01:00
Marcel Märtens	e29ede7c97	updating dependencies, ... cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.	2021-11-20 20:17:49 +01:00
Marcel Märtens	086f9737e4	move server.voxel for airship to common	2021-11-15 16:39:39 +01:00
Joshua Barretto	b1915622b5	Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master' ... Added formatting to round tooltip values for consumables to 1 decimal place See merge request veloren/veloren!3004	2021-11-13 20:54:05 +00:00
Ben Wallis	022c1417b6	EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies). ... Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies. EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.	2021-11-13 20:46:45 +00:00
Ben Wallis	b4c7af1ad1	Added formatting to round tooltip values for consumables to 1 decimal place	2021-11-13 20:25:09 +00:00
Joshua Barretto	c0bf9503bd	Addressed review issues, added cloning docs to BodySpec::Manifests	2021-11-13 17:20:23 +00:00
Joshua Barretto	657ac45288	Updated changelog	2021-11-13 17:13:09 +00:00
Joshua Barretto	46ec4203a2	Arbitrary volume airships	2021-11-13 17:13:08 +00:00
Samuel Keiffer	6e57380735	Merge branch 'sam/ability-pool-and-hotbar' into 'master' ... Ability pool See merge request veloren/veloren!2996	2021-11-12 05:11:12 +00:00
Sam	b901b97191	Changed fallback ability icon.	2021-11-11 23:41:01 -05:00
Sam	040d70c750	Final fixes.	2021-11-11 23:11:17 -05:00
Sam	a288f9ee43	Addressed further review.	2021-11-11 22:37:37 -05:00
Sam	dfcb8c8519	Addressed review feedback.	2021-11-11 18:10:22 -05:00
Sam	b678f7f46e	Added some client methods for changing abilities to hook into.	2021-11-11 01:55:32 -05:00
Sam	da677e8ea6	Abilities can now be referred to by the asset id.	2021-11-10 17:30:19 -05:00
Sam	4309e1ff9b	Did voxygen stuff for ability pool.	2021-11-09 21:20:41 -05:00
Imbris	a7e1d3218f	Potential fix for leak when inventory is open	2021-11-09 01:21:45 -05:00
Jon Nettleton	836c948086	Update crate for keyboard-keynames ... This revision includes a fix for supporting Aarch64 platforms Signed-off-by: Jon Nettleton <jon@solid-run.com> (cherry picked from commit a5e64af199)	2021-11-02 08:49:17 +00:00
Joshua Barretto	80c4e3de19	Merge branch 'tijnvdheuvel/newSFX' into 'master' ... Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX See merge request veloren/veloren!2977	2021-11-01 21:15:35 +00:00
jshipsey	c2b7d3bb44	good hat rendering	2021-10-30 23:42:16 -04:00
jshipsey	a05c1ea4c5	switch to new matcell variant	2021-10-30 23:42:15 -04:00
jshipsey	3915aa7aac	support for hollow voxels ty zesterer	2021-10-30 23:42:14 -04:00
jshipsey	5cc54b34bd	headbands	2021-10-30 23:42:13 -04:00
Sam	15a8c31383	Hack to make salvage go away when leaving station.	2021-10-29 13:25:38 -04:00
tijnvdheuvel	a36106eb22	Update mod.rs missed a comma	2021-10-29 13:09:21 +00:00
tijnvdheuvel	3dbd553997	Fixed bug truffler quadruped small	2021-10-28 17:37:29 +00:00
tijnvdheuvel	d4df012835	Added mod.rs entries for truffler and Fungome	2021-10-28 13:48:22 +00:00
Kali	768911aebe	tweak chat scroll issue	2021-10-28 02:55:38 -07:00
Samuel Keiffer	fef9fd5893	Merge branch 'sam/crafting-tweaks' into 'master' ... Better salvaging and other crafting tweaks See merge request veloren/veloren!2903	2021-10-27 21:33:21 +00:00
Snowram	02930dd2ed	Uses a list for item tooltips	2021-10-27 17:02:36 -04:00
Sam	4b9e9c506b	Fixed opening salvaging station not showing salvage text.	2021-10-27 17:02:35 -04:00
Monty Marz	727295aec1	text and alignment WIP	2021-10-27 17:02:35 -04:00
Monty Marz	a97cc95496	crafting station model, explanatory text part 1	2021-10-27 17:02:34 -04:00
Sam	5707377565	Changed tooltips to take iterator. Tooltips also show original item as well as salvage output.	2021-10-27 17:02:34 -04:00
Snowram	2bf16aab63	Make item tooltip accept multiple items for salvage	2021-10-27 17:02:33 -04:00
Sam	e28ca15059	Salvaging now requires a salvaging station.	2021-10-27 17:02:33 -04:00
Monty Marz	7aae35f286	bench	2021-10-27 17:02:31 -04:00
Sam	5c3021bd0a	Inventory now highlights salvageable items when in salvage mode.	2021-10-27 17:02:31 -04:00
Sam	794b072d3e	Simple recipes now take a vec of slots to look in for the ingredients.	2021-10-27 17:02:30 -04:00
Sam	7a17863988	Salvage works by double clicking from inventory while salvage tab in crafting is open.	2021-10-27 17:02:30 -04:00
Sam	111abbc3bc	Added salvage tags to items, removed old salvage recipes from recipe book.	2021-10-27 17:02:29 -04:00
IsseW	2e27f7f84a	remove print	2021-10-27 23:01:41 +02:00
Joshua Barretto	30604788b9	Merge branch 'isse/loading-tip-fixes' into 'master' ... Loading screen tip fixes See merge request veloren/veloren!2961	2021-10-27 20:08:46 +00:00
Kemper	ff56804d8a	Show energy reward and speed as percentages in item tooltips	2021-10-26 23:07:37 +00:00
Joshua Barretto	37056e75f9	Merge branch 'demonic/shrubs' into 'master' ... Added new Spots, Shrubs and Ships. See merge request veloren/veloren!2953	2021-10-26 10:06:14 +00:00
IsseW	50d37bc2d4	run clippy	2021-10-26 01:30:27 +02:00
IsseW	3368f43a22	consider key layout	2021-10-26 00:42:30 +02:00
IsseW	047cda179f	Added keybinding shortcut in loading tips	2021-10-25 23:53:27 +02:00
Joshua Barretto	6362c0df32	Fixed non-character point lights	2021-10-25 12:00:02 +00:00
Forest Anderson	15185ef55e	Merge branch 'master' into 'master' ... Fixes #819 - Prevent lantern from turning off on death Closes #819 See merge request veloren/veloren!2955	2021-10-24 21:16:34 +00:00
Q-I-U	09028f3261	Add !health.is_dead() check to renderer	2021-10-24 22:28:23 +02:00
DemonicOnPc	b1476071b1	Added new Spots, Shrubs and Ships. ... Spots - Gnarling Tree - Troll Cave - Underwater Shipwreck second variation. Shrubs added to biomes - Savannah Shrubs - Taiga Shrubs - Temperate Shrubs Galleon ship added	2021-10-24 08:10:44 -04:00
antoniomuso	cf8d995af7	formatted some tooltips floats	2021-10-24 10:14:54 +02:00
Samuel Keiffer	f92c6fbd49	Merge branch 'ubruntu/sneakwield-state' into 'master' ... Sneak with weapons drawn See merge request veloren/veloren!2917	2021-10-18 20:27:02 +00:00
Bryant Deters	b2bd43f4d3	Sneak with weapons drawn	2021-10-18 14:53:55 -05:00
Samuel Keiffer	1e61a279cc	Merge branch 'kaedr/pretty_printing_error_messages' into 'master' ... Fixed obfuscation of error messages caused by previous MR (pretty printing error messages) See merge request veloren/veloren!2935	2021-10-18 03:35:03 +00:00
Samuel Keiffer	e6a4e53ef3	Merge branch 'MHK/auto_search_in_crafting_menu' into 'master' ... Add auto searching in crafting menu See merge request veloren/veloren!2932	2021-10-17 15:16:21 +00:00
MohammadHasanKargar	40073413ae	Add hover effect to auto search in crafting menu	2021-10-17 15:27:27 +03:30
kaedr	cd5aa2d1d8	Fixed redundant to_string() call.	2021-10-16 20:41:13 -04:00
kaedr	c8a1d821e7	Added handling for connection errors that occur before client leaves login screen	2021-10-16 20:17:40 -04:00
kaedr	cc98ccc371	Added localization for server error message display on client	2021-10-16 20:17:38 -04:00
kaedr	eb02a4733d	Fixed obfuscation of error messages caused by previous commits	2021-10-16 20:17:37 -04:00
Joshua Barretto	ef33b2e3ab	Better ambiance slider	2021-10-16 15:12:07 +01:00
Joshua Barretto	3322eeb365	Aurora light tint	2021-10-16 14:32:18 +01:00
Joshua Barretto	b1a1cdde34	Fixed 'Empty' collectable sprite	2021-10-16 14:31:46 +01:00
Joshua Barretto	3357008601	Merge branch 'zesterer/small-fixes' into 'master' ... Caverns See merge request veloren/veloren!2763	2021-10-16 09:33:57 +00:00
MohammadHasanKargar	1d7ba57de7	Add auto searching in crafting menu	2021-10-15 23:57:04 +03:30
Henry Corse	e01ce2dcf4	Kaedr/pretty printing error messages	2021-10-14 18:37:51 +00:00
Marcel	a4cf875a54	Merge branch 'isse/crafted-from-item' into 'master' ... use "input:____" for searching by recipe input See merge request veloren/veloren!2893	2021-10-10 15:44:44 +00:00
Isidor Nielsen	f0864a7b0a	use "input:____" for searching by recipe input	2021-10-10 15:44:43 +00:00
Marcel	94439a4240	Merge branch 'jtriantafylos/background_fps' into 'master' ... Fixes #1350 - Allow players to cap the game FPS when unfocused Closes #1350 See merge request veloren/veloren!2890	2021-10-10 15:33:38 +00:00
James Triantafylos	99776a6ebd	Fixes #1350 - Allow players to cap the game FPS when unfocused	2021-10-10 15:33:31 +00:00
Monty Marz	14ed73ec12	cavern sprites	2021-10-10 13:41:56 +01:00
Joshua Barretto	bfc55d7b17	More cavern details	2021-10-10 13:41:56 +01:00
Joshua Barretto	5c0026f4a7	Performance improvements for terrain watcher	2021-10-10 13:41:56 +01:00
Joshua Barretto	1cfad833c7	Added caverns, fixed chunk load performance issue	2021-10-10 13:41:56 +01:00
CapsizeGlimmer	a723406df7	Prevent "Error setting/centering cursor position" message spam	2021-10-06 21:25:14 +00:00
Imbris	26c028975e	Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it	2021-10-06 02:13:02 -04:00
Imbris	66076db7bb	Make map icons fade out quickly when near the edge of the map display	2021-10-06 01:37:11 -04:00
Treeco	305bdf94ef	Various map UI fixes for large worlds ... changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out	2021-10-06 02:26:58 +01:00
Marcel	a48b99560c	Merge branch 'imbris/fix-reset-scissor' into 'master' ... Make sure ui draw commands are cleared if the renderer's resolution changes Closes #1362 See merge request veloren/veloren!2898	2021-10-05 06:11:01 +00:00
ubruntu	0e2808a8fd	Interactable campfires	2021-10-05 00:55:29 +00:00
Joshua Barretto	bfbca3e517	Added sail boat	2021-10-05 00:02:03 +01:00
Imbris	645bd03142	Make sure ui draw commands are cleared if the renderer's resolution changes	2021-10-04 18:58:28 -04:00
Imbris	c8b55d3dcb	Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged).	2021-10-04 12:23:42 -04:00
Imbris	bb26008074	Remove explicit coreaudio-sys version since we no longer rely on having the older version pinned (in fact it was already updated to the latest version)	2021-10-04 11:15:26 -04:00
Joshua Barretto	4dca33a31f	Merge branch 'alphyr/update_assets_manager' into 'master' ... Update `assets_manager` to `0.6.0` See merge request veloren/veloren!2889	2021-10-04 11:40:41 +00:00
Imbris	f867991198	Merge branch 'imbris/credits' into 'master' ... Add credits screen Closes #1296 See merge request veloren/veloren!2872	2021-10-03 04:26:58 +00:00
Imbris	d2bd62733f	Add core devs to the contributors list in credits.ron and remove placeholder entries in empty art sections (in favor of displaying nothing)	2021-10-03 00:06:47 -04:00
Benoît du Garreau	ef1c51332d	Update assets_manager to 0.6.0	2021-10-01 21:13:01 +02:00
Imbris	4cfa6b71fc	Rework scaling to never use the logical size directly from the window as it can end up being inconsistent with the rendering target size (depending on timing)	2021-10-01 01:13:15 -04:00
Dominik Broński	382bc2f9da	Merge branch 'flo666/change-gamepad-mapping' into 'master' ... change gamepad mapping See merge request veloren/veloren!2841	2021-09-30 18:48:42 +00:00
flo	0f77ceaeef	change gamepad mapping	2021-09-30 18:48:42 +00:00
Imbris	ee42eaa515	Make gitlab hightlight syntax for ron files (using rust syntax highlighting). Update changelog for credits addition. Fix clippy large variant issue.	2021-09-30 03:01:24 -04:00
Imbris	691b61e22d	Add documentation to credits.ron and fill in fonts entries with actual data, add additional entries to Art credits for documenting information relevant to satifying attribution requirements for some licenses, add/rename license files for fonts, center credits text on the credits screen, added asset_path field to associate art credits with the actual asset files and wrote a unit test to ensure that these paths are valid.	2021-09-30 02:35:59 -04:00
Sylvain Migaud	9b41568881	Place date at the begining of the log file name	2021-09-30 06:09:30 +00:00
Imbris	40240a4005	Add basic credits screen to the main menu with some example data loaded from a ron file	2021-09-29 21:06:52 -04:00
Imbris	70f9134c3c	Deduplicate window resize events to remove redudant resizing of the swap chain and other render targets and to fix issues where resizing quickly can cause self reinforcing delays in tick completion	2021-09-29 10:25:59 -04:00
Imbris	44e526fbcc	Merge branch 'bafon/voxel-transparency' into 'master' ... Fix voxel transparency See merge request veloren/veloren!2885	2021-09-28 04:44:29 +00:00
Bafon	efb0e859f2	Fix voxel transparency	2021-09-28 04:44:29 +00:00
Imbris	ccbdbfe6aa	Make sure to regenerate textures when Ui::replace_graphic is used.	2021-09-27 23:35:14 -04:00
Snowram	91c7aef01a	Merge branch 'snowram/debug_background' into 'master' ... Add a background to debug infos See merge request veloren/veloren!2858	2021-09-26 22:15:52 +00:00
Snowram	95bc6e3b58	Add a background to debug infos	2021-09-26 23:58:38 +02:00
Marcel	cea927efb6	Merge branch 'xMAC94x/update-toolchain' into 'master' ... update toolchain to `nightly-2021-09-24` See merge request veloren/veloren!2862	2021-09-26 19:25:02 +00:00
Samuel Keiffer	ea2fa5f110	Merge branch 'sam/cr-weights' into 'master' ... Changed weights of cr calculation and exp from cr formula. See merge request veloren/veloren!2875	2021-09-26 18:21:56 +00:00
Imbris	67e3b87717	Add note on a clippy suppression pointing to relevant clippy issue	2021-09-26 11:24:30 -04:00
Sam	c62162c2d3	Changed weights of cr calculation and exp from cr formula.	2021-09-25 21:52:20 -04:00
Sam	942376f88c	Made poise a float at interface of module.	2021-09-25 14:07:47 -04:00
Samuel Keiffer	0af6969d19	Merge branch 'sam/energy-float' into 'master' ... Changed energy to a float See merge request veloren/veloren!2838	2021-09-25 06:51:21 +00:00
Marcel Märtens	e36eef99c8	apply some clippy fixes that comes with the new toolchain version	2021-09-24 23:18:18 +02:00
Marcel Märtens	2a82405df2	update toolchain to nightly-2021-09-24	2021-09-24 23:18:07 +02:00
Snowram	0b26f456f9	Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master' ... Add setting to disable hotkey hints See merge request veloren/veloren!2849	2021-09-24 16:03:06 +00:00
Bafon	d53d2300a6	Add setting to disable hotkey hints	2021-09-24 16:03:05 +00:00
João Capucho	34eb58cded	Fix dir is empty check when setting WGPU_TRACE_DIR	2021-09-24 15:07:12 +01:00
Imbris	83fed7a2bc	Merge branch 'imbris/tex-cleanup' into 'master' ... Remove old textures that aren't reused when calling replace_graphic See merge request veloren/veloren!2869	2021-09-24 02:38:27 +00:00
Imbris	f1c44e1f1d	Remove old textures that aren't reused when calling replace_graphic	2021-09-23 21:50:37 -04:00
Sam	0e5e2b46f2	Changed energy to internally use an integer with a high resolution, and externally to use a float.	2021-09-23 14:11:09 -04:00
Imbris	5217b5090c	Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass	2021-09-22 21:58:36 -04:00
Marcel	d5b4c5549b	Merge branch 'bafon/crafting-station-icons' into 'master' ... Add crafting station icon to crafting menu sidebar See merge request veloren/veloren!2848	2021-09-22 13:54:33 +00:00
Bafon	0375b973db	Add crafting station icon to crafting menu sidebar	2021-09-22 13:54:32 +00:00
Snowram	3c2de422db	Adds Xtilt to BirdLarge skeleton	2021-09-21 15:31:46 +02:00
Snowram	7a73e4240b	Bird large beam offset hack	2021-09-21 15:31:43 +02:00
jshipsey	1ad107f4a7	animation tweaks	2021-09-21 15:30:43 +02:00
Snowram	299ca581ea	Split wyvern anims from the other birdlarge anims	2021-09-21 15:30:43 +02:00
jshipsey	aedb2e9d2b	wyvern walk	2021-09-21 15:30:43 +02:00
Snowram	9acae9fca0	More wyvern anim work	2021-09-21 15:30:42 +02:00
Snowram	834749353a	Adds flame wyvern npc	2021-09-21 15:30:42 +02:00
Marcel Märtens	88685cc016	update crates	2021-09-20 14:39:01 +02:00
Ben Wallis	d665ce329d	* Added new Admin Commands window to egui, including Give Items and Kits sections ... * Added widgets.rs to egui for reusable widgets * Added filterable_list egui widget * Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests. * Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself * Removed /give_item limit for stackable items	2021-09-18 16:17:42 +01:00
anomaluridae	d0bd1ddb24	remove unneeded mut, provide default_select_pos to secondry key event handler, and use the is_filled() over the is_opaque() to be reader friendly	2021-09-17 10:34:20 -07:00
anomaluridae	82f3c3c3e8	is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer	2021-09-17 10:34:20 -07:00
anomaluridae	aa86c86cb6	choose nearest target, from a specific subset of targets, for scene highlighting vs interactable vs game primary/secondary key input	2021-09-17 10:34:20 -07:00
anomaluridae	6362df4ffc	keep MAX_TARGET_RANGE within voxygen	2021-09-17 10:34:20 -07:00
anomaluridae	b4d12b7995	intentional use of terrain targeting and select_pos as passed to the event handler. select_pos is None when not needed.	2021-09-17 10:34:20 -07:00
anomaluridae	42d5836cfa	properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds.	2021-09-17 10:34:20 -07:00
anomaluridae	5c66f73bb4	make the ContollerInputs.select_pos be explicitly the breakable blacks for mining	2021-09-17 10:34:20 -07:00
anomaluridae	c5d66192fc	add comment for future direction of Interactables.	2021-09-17 10:34:20 -07:00
anomaluridae	c20dbe17dd	build positions for place versus remove block are cleaner (less likely to fail) when apply the +0.01 modifier versus -0.01 modifier selectively. this is equivalent to current master, and is simply more explicit now	2021-09-17 10:34:20 -07:00
anomaluridae	f60bd80cc2	changes per MR feedback. simplier Option handling with zip, filter, and fewr unwraps. use kind keyword (not typed). if lets when possible. additional syntax cleanup	2021-09-17 10:34:20 -07:00
anomaluridae	8b83b48b9b	make Target generic, over the specific typed targets	2021-09-17 10:34:20 -07:00
anomaluridae	ba4af5ee8e	undo macro use for DRY on client event handler, and handle edge detection in mining so that we don't get Empty interactables.	2021-09-17 10:34:20 -07:00
anomaluridae	309447dced	MR review updates. Added back the 0.01 modifiers, update naming and comments, keep interactable construction in the interactables mod, remove unneeded curry, syntax updates. only cast for mining and build if enabled.	2021-09-17 10:34:20 -07:00
anomaluridae	84f19b408f	build is working. to add and remove blocks.	2021-09-17 10:34:20 -07:00
anomaluridae	48cc5d3b08	make Target into a typed struct. delineate the clear difference in Target versus Interactable. comments and naming cleanup, for more explicitness.	2021-09-17 10:34:20 -07:00
anomaluridae	51f38df169	clippy is a thing	2021-09-17 10:34:20 -07:00
anomaluridae	f20b5f0b49	make scene interaction be targeted exactly on mining blocks (removing abnormal Empty labels), and don't reset position to None in the middle of mining.	2021-09-17 10:34:20 -07:00
anomaluridae	ff91da8b52	make the concepts of targets (under cursor), separate from interactable. interactable is what is (1) indicated visually in gui as able to interact, or (2) is an entity, or (3) is a block capable of Interaction. whereas a target is what occurs under the cursor, regardless of other state and input (such as different InputKind). targets are determined first, then other factors are cosidered to determine interactable.	2021-09-17 10:34:20 -07:00
anomaluridae	582f578e61	breakout interactable into seperate file	2021-09-17 10:32:06 -07:00
juliancoffee	4e3fb87526	Adress review ... - Rename Collider::get_radius to bounding_radius - Check origin difference in CapsulePrism with EPSILON * 10.0 instead of magic 0.00001 - Add comments for closest_points, hardnened expression against NaNs - Add comments to try_e2e_collision function, renamed to resolve_e2e_collision, make it return whether collision was triggered. - Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism with p0=p1=Vec2::zero())	2021-09-17 13:28:34 +03:00
juliancoffee	c069a3523d	Fix beam offsets ... - Introduce notion of min and max radius for Body instead of old `radius()` function (which is renamed to `max_radius()`).	2021-09-17 13:28:34 +03:00
juliancoffee	44962958d8	Adress feedback ... - Rewrite 2 * PI to TAU - Some comment formatting	2021-09-17 13:28:34 +03:00
juliancoffee	d86c9f2678	Remove body::Shape enum, make npc use CapsulePrism	2021-09-17 13:28:34 +03:00
juliancoffee	3b308a3f6f	Add CapsulePrism collider variant ... + Add placeholder physics collision implementation as copy of cylinder Box collider. + Display it with debug hitboxes.	2021-09-17 13:28:34 +03:00
Imbris	a3ac3b51ce	Merge branch 'capucho/iced-checkbox' into 'master' ... Add checkbox rendering logic for iced See merge request veloren/veloren!2827	2021-09-15 17:30:57 +00:00
João Capucho	80190c408d	Improve naming of checkbox images related methods	2021-09-15 15:41:31 +01:00
João Capucho	f27a7853a3	Add option for a hovered and checked background	2021-09-15 15:15:03 +01:00
Monty Marz	0dfddb21b1	Merge branch 'bafon/always-show-bars-setting' into 'master' ... Add setting to always show energy bars See merge request veloren/veloren!2836	2021-09-15 12:04:44 +00:00
Bafon	b910c1dd9c	Add setting to always show energy bars	2021-09-15 12:04:44 +00:00
Marcel	d13391f16e	Merge branch 'bafon/map-mouse-events' into 'master' ... Fix HUD map mouse events See merge request veloren/veloren!2837	2021-09-14 22:19:31 +00:00
Bafon	eecab6e9ec	Fix HUD map mouse events ... Fixes dragging, scrolling, and setting the location marker when hovering player marker, location marker, group member markers, site icons, and peaks.	2021-09-14 23:42:04 +02:00
Sam	3d31248ced	Fixed health ui in few places and xp scaling from health.	2021-09-14 10:55:14 -04:00
Joshua Barretto	4118835fb3	Fixed incorrect winding order for debug cylinder triangles	2021-09-13 18:15:12 +00:00
Samuel Keiffer	73d3d3e4bb	Merge branch 'sam/health-float' into 'master' ... Turned Health into a Float See merge request veloren/veloren!2824	2021-09-13 15:23:18 +00:00
Sam	b26ceb6339	Removed a few unnecessary casts.	2021-09-13 10:41:55 -04:00
João Capucho	5323bb3ce8	Add checkbox rendering logic for iced	2021-09-10 21:17:06 +01:00
Sam	85f4e66337	Addressed MR 2824 comments	2021-09-10 15:20:14 -04:00
Marcel Märtens	7913e6a9ba	Change the version number to 0.11	2021-09-10 20:19:17 +02:00
Imbris	a77f981b15	Disable visuals that block seeing camera clipping since they cause flickering, raise max zoom cap with camera, fix overflow issue	2021-09-10 12:16:55 -04:00
Monty Marz	1d94adc2e1	0.11 Background images and more	2021-09-10 08:34:01 +00:00
Sam	42012fddcb	Overhauled health component, making it a float to outer interfaces.	2021-09-09 00:10:17 -04:00
Joshua Barretto	c442822885	Capped camera distance without privilege	2021-09-08 13:17:22 +01:00
Joshua Barretto	c3a0a1b8b5	Made the camera go dark if in a filled block and not moderator	2021-09-08 12:37:15 +01:00
Monty Marz	a23433b402	Bloom settings	2021-09-08 09:50:37 +00:00
Joshua Yanovski	5500435d2f	Revert "Replace shaderc with naga" ... This reverts commit 446d93dda0.	2021-09-04 11:59:18 -07:00
jshipsey	6187cb8d23	address comments	2021-09-04 13:17:56 -04:00
jshipsey	523a15e5cc	more spots	2021-09-04 00:18:58 -04:00
Marcel Märtens	02d6462858	disable mumble-link on macos	2021-09-04 00:32:16 +02:00
juliancoffee	6c1ecc9766	Add support for override asset folder ... - ASSETS_OVERRIDE environment variable with asset path which has higher priority.	2021-09-02 20:24:23 +03:00
Marcel	970d57f905	Merge branch 'juliancoffee/skill_boost_rework' into 'master' ... ECS & Diary info synchronization See merge request veloren/veloren!2771	2021-09-02 16:04:23 +00:00
Marcel Märtens	cf1a6b1806	switch to SharedLink and unset context	2021-09-02 12:29:01 +02:00
Imbris	16e2550e46	Merge branch 'capucho/naga' into 'master' ... Replace shaderc with naga See merge request veloren/veloren!2749	2021-08-31 22:38:17 +00:00
João Capucho	446d93dda0	Replace shaderc with naga	2021-08-31 22:53:10 +01:00
jshipsey	42a0dd785b	finished anim	2021-08-31 13:37:35 -04:00
Sam	44c3b0f153	Added attack hook event, attacks now cancel item use and sprite interaction.	2021-08-31 13:37:32 -04:00
Sam	513982ca43	Fixed compile error when importing sprite position.	2021-08-31 13:36:05 -04:00
jshipsey	3ddcde645f	anim basics	2021-08-31 13:36:04 -04:00
Joshua Barretto	171e329609	Merge branch 'xvar/fix-egui-toggle' into 'master' ... Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled See merge request veloren/veloren!2793	2021-08-31 17:07:13 +00:00
Ben Wallis	ad079377fb	Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled	2021-08-31 17:21:13 +01:00
Joshua Barretto	6f15233448	Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed	2021-08-31 13:31:52 +01:00
Monty Marz	13c15b3840	fix witch hut smoke	2021-08-30 12:03:13 +02:00
Joshua Barretto	8b8adcc1b8	More block particles, changes ore vein colour	2021-08-28 14:53:30 +01:00
juliancoffee	24569b544a	Rewrite multiplier_to_percentage to return f32	2021-08-28 02:36:26 +03:00
juliancoffee	75a0ce429f	Handle some skill description in special way	2021-08-26 14:49:52 +03:00
juliancoffee	758fe19ccb	Declarative skill icons	2021-08-26 14:49:52 +03:00
juliancoffee	9211b4a00a	Inline skills::Boost to voxygen code	2021-08-26 14:49:52 +03:00
juliancoffee	74183ae5ec	Inline redundant functions	2021-08-26 14:49:52 +03:00
juliancoffee	cc8b3c188e	Split skilltree window handling per tree	2021-08-26 14:49:52 +03:00
juliancoffee	39b02411e9	Use PositionSpecifier for skill position	2021-08-26 14:49:52 +03:00
juliancoffee	9aacc33495	Inline create_new_text	2021-08-26 14:49:52 +03:00
juliancoffee	d76f65fc5a	Diary refactoring	2021-08-26 14:49:52 +03:00
flo	3131c178d6	Making Block and Slots1-9 available for gamepad mapping	2021-08-23 10:38:35 +00:00
Ygor Souza	54c3adf9af	Use all armor stats to calculate combat rating ... - Added terms to account for poise (stun resistance), max energy bonus, energy reward bonus, and crit power. - The weights were chosen to yield roughly the same CR for each of the 3 types of armor in the same tier. - Weapon rating multiplied by a constant to keep in the same order of magnitude as the other terms.	2021-08-16 19:59:54 +02:00
Imbris	16fe011061	Merge branch 'master' into 'master' ... Add WGPU adapter selection using WGPU_ADAPTER See merge request veloren/veloren!2747	2021-08-14 18:09:51 +00:00
DanTheOne	de750e2f46	Refactor sound settings window	2021-08-14 14:24:06 +02:00
DanTheOne	9b555a52dc	Add music and sfx volume numbers	2021-08-14 12:25:21 +02:00
Daniil Nemtsev	a5ec81844f	Add WGPU adapter selection using WGPU_ADAPTER	2021-08-13 12:39:44 +00:00
Joshua Barretto	5e7e560c10	Merge branch 'min-persistent-world' into 'master' ... min-persistent-world See merge request veloren/veloren!2662	2021-08-13 12:30:28 +00:00
Xeriab Nabil	05df63dd79	Small fix for trade window headers	2021-08-12 21:56:38 +03:00
Joshua Barretto	c2498d81c7	Added feature flag for terrain persistence	2021-08-12 10:48:00 +01:00
Marcel	0dfc0d39dd	Merge branch 'fix-1278' into 'master' ... Fixes the issue mentioned in #1278 See merge request veloren/veloren!2760	2021-08-12 07:24:16 +00:00
Xeriab Nabil	8ce679766a	Fixes the issue mentioned in #1278	2021-08-12 03:23:31 +03:00
Marcel	add74cd0ea	Merge branch 'xMAC94x/fix_1165' into 'master' ... remove futures_executor from renderer and rather pass tokio runtime to it... See merge request veloren/veloren!2755	2021-08-11 15:26:08 +00:00
Marcel	0bedfde53e	Merge branch 'trade-window-improvements' into 'master' ... UI: Fixes and enhancements to the trading window See merge request veloren/veloren!2738	2021-08-11 09:25:17 +00:00
Marcel Märtens	bc821a46cd	code cleanup	2021-08-11 09:42:29 +02:00
Marcel Märtens	889a8d11f5	zest prefers this over await	2021-08-11 01:23:48 +02:00
Illia Denysenko	2a093a9991	Localization for sprite overitem (currenly only crafting stations)	2021-08-10 23:17:25 +00:00
Marcel Märtens	32e58c4b17	remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt	2021-08-11 00:38:03 +02:00
Tavo Annus	6114cbbcf3	Fix skybox jumping	2021-08-10 14:01:09 +02:00
Tavo Annus	5c5f172667	Use old strategy for far distances	2021-08-10 14:00:59 +02:00
Tavo Annus	06b8ad62d3	Minor tweaks to clipping, style fixes	2021-08-10 14:00:51 +02:00
Tavo Annus	ad075b55c9	Allow trees to pass between character and camera for bigger distances	2021-08-10 14:00:42 +02:00
Tavo Annus	e834711293	Fix character being too close in menu	2021-08-10 14:00:34 +02:00
Tavo Annus	a7aa37f7f6	Fix camera shaking & Style fixes	2021-08-10 14:00:13 +02:00
Tavo Annus	42dab09249	Improve camera clipping	2021-08-10 13:59:41 +02:00
Samuel Keiffer	d5feca45c5	Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' ... Consolidate redundant stage sections See merge request veloren/veloren!2748	2021-08-10 01:23:26 +00:00
Snowram	dddb47a385	Makes dungeons start at level 1 visually	2021-08-09 16:36:37 +02:00
Sam	52ee598cf1	Consolidated Use into Action as well.	2021-08-09 10:31:17 -04:00
pacmanmati	5f37509a78	#1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action	2021-08-09 10:27:53 -04:00
Treeco	2fc62bfe7f	Make each race's hitbox and weight scale linearly with their height ... This causes all humanoids to handle identically when falling, gliding, or swimming	2021-08-09 10:06:16 +01:00
Ludvig Böklin	ebf489984c	Improve gliding ... - make glider dimensions a factor of body height - increase glider dimensions across the board - remove delay from transition into glide - enable glider control while wielding glider - improve glide wield animation	2021-08-09 10:06:16 +01:00
Xeriab Nabil	8e7939a921	UI: Fixes and enhancements to trading window	2021-08-08 20:11:54 +03:00
Illia Denysenko	0858279810	Gliding Debug Info	2021-08-07 13:19:58 +00:00
juliancoffee	3411ccc7ee	Shift egui debug window right	2021-08-06 22:58:36 +03:00
juliancoffee	16c72b8667	Add hotkey to toggle Egui Debug	2021-08-06 22:58:36 +03:00
juliancoffee	abf5a7e136	Add option to toggle egui debug	2021-08-06 22:58:36 +03:00
Xeriab Nabil	ea5de81f9b	UI: Fixes and enhancements to trading window	2021-08-06 17:11:54 +03:00
Marcel Märtens	c956ca1863	write header only once	2021-08-06 12:02:22 +02:00
Marcel	c316960b3f	Merge branch 'umr1352/fix#1260' into 'master' ... fix issue #1260: give a warning if an error occurs on language files load Closes #1260 See merge request veloren/veloren!2724	2021-08-03 21:09:06 +00:00
Enrico Marconi	cae8005a18	fix issue #1260: give a warning if an error occurs on language files load	2021-08-03 21:09:05 +00:00
Yusuf Bera Ertan	aa371147e7	build: update keyboard-keynames	2021-08-03 18:16:55 +03:00
Imbris	427930081a	Add custom error message when there are no compatible graphics backends available	2021-08-03 00:00:30 -04:00
Monty Marz	a1e22df944	Merge branch 'transp---opacity-in-UI' into 'master' ... transparency -> opacity See merge request veloren/veloren!2714	2021-08-02 21:30:37 +00:00
Monty Marz	bceed44614	transp -> opacity	2021-08-02 22:49:10 +02:00
Marcel Märtens	ee704e171d	move translation check to seperate ci step ... note: TAGUUID is used to avoid sqlinjections by choosing a branch name	2021-08-02 20:11:02 +02:00
Dr. Dystopia	e62d903041	Add 'UpdateArgs import to 'buttons' file	2021-08-02 13:33:52 +02:00
Dr. Dystopia	323e3166f5	Create 'animation' file	2021-08-02 13:27:33 +02:00
Dr. Dystopia	dffc91045e	Move variables closer to usage in 'buttons' file	2021-08-02 13:27:28 +02:00
Imbris	a1026c36f5	Make bloom intensity configurable, make whether less blurred layers are added in toggleable, hold onto copy of pipeline modes instead of returning it from pipeline creation	2021-08-01 18:50:39 -04:00
Imbris	147e4f00f6	Enhance bloom::NUM_SIZES docs, add TODO, remove dbgs	2021-08-01 18:50:38 -04:00
Imbris	6cabd74871	Make bloom optional with a config option that is not exposed in the UI (to give artists time to refine bloom before exposing the option)	2021-08-01 18:50:38 -04:00
Imbris	7da064fb23	Add ability to edit shader to enable filtering dim values for experimentation	2021-08-01 18:50:38 -04:00
Imbris	29bfee26c0	Add bloom passes in character select screen, use proper source image for bloom after clouds are applied, add blurred and less blurred stages of bloom together (experimental could remove), add filtering downsample pass that is not yet used	2021-08-01 18:50:37 -04:00
Imbris	74e01f10e3	Fixes and extra bloom	2021-08-01 18:50:37 -04:00
Imbris	2d83ef1c0e	Initial bloom impl	2021-08-01 18:50:37 -04:00
Marcel	b8716e03a6	Merge branch 'xMAC94x/advanced_i18n' into 'master' ... xmac94x/advanced i18n See merge request veloren/veloren!2713	2021-08-01 19:46:09 +00:00
Ludvig Böklin	400734cc0a	Fix gliderwield downhill run jitter	2021-08-01 11:20:46 +00:00
Marcel Märtens	bb026ca21b	move vector map out of manifest and switch to new manifest format	2021-08-01 13:12:01 +02:00
Imbris	97e5ad02ff	Merge branch 'imbris/stamina-energy' into 'master' ... Replace stamina with energy Closes #1214 See merge request veloren/veloren!2704	2021-08-01 00:26:59 +00:00
Joshua Barretto	9426f72916	Merge branch 'imbris/tracy-mem' into 'master' ... Add small feature to profile memory allocation with Tracy See merge request veloren/veloren!2699	2021-07-31 21:54:28 +00:00
Monty Marz	f3d0d3f46a	fix i18n	2021-07-31 18:17:34 +02:00
Imbris	89eee332c9	Replace stamina -> energy in code, i18n keys, and asset names	2021-07-31 01:34:40 -04:00
Imbris	c4ec279121	Add feature to profile memory allocation with Tracy	2021-07-30 01:06:57 -04:00
Monty Marz	14eb0f9aa2	Remove sceptre, add swords	2021-07-29 22:38:35 +00:00
Marcel Märtens	c234f1d926	mark missing files as untranslated	2021-07-29 22:18:47 +02:00
Marcel Märtens	4c0b74150d	remove some reexports	2021-07-29 22:18:34 +02:00
Marcel Märtens	c3aa4c54a9	extract path logic	2021-07-29 20:15:23 +02:00
Marcel Märtens	bdda5ccd72	redo i18n git analysis completly and introduce a way to export csv data ... also improve the performance by caching git_graph_descendant	2021-07-29 20:15:14 +02:00
Marcel Märtens	a5696e83a9	experiment with a git cache	2021-07-29 20:12:30 +02:00
Dr. Dystopia	c501b2eb70	base framework to print csv	2021-07-29 20:12:18 +02:00
Marcel Märtens	c9c32eea65	add a argument for i18n to enable csv generation	2021-07-29 20:12:13 +02:00
Imbris	9fb6b84670	Merge branch 'juliancoffee/hud_refactor' into 'master' ... Skillbar hud refactoring (+ shortened key names) See merge request veloren/veloren!2663	2021-07-29 16:08:56 +00:00
juliancoffee	a6b7e93854	Improve ability descriptions	2021-07-29 18:27:18 +03:00
juliancoffee	4adc045627	Added comments on PositionSpecifier usage	2021-07-28 20:03:23 +03:00
juliancoffee	14ac9a8b4e	Improve terms of EntityConfig and LoadoutBuilder ... * rename LoadoutBuilder::new to LoadoutBuilder::empty * remove LoadoutBuilder::default as Default makes no sense here * move comments from template.ron to EntityConfig struct * add FIXME comments to split EntityConfig into EntityBase and EntityExtension	2021-07-28 19:19:10 +03:00
juliancoffee	4811ede2ea	Split Skillbar::update to separate stages	2021-07-28 10:33:51 +03:00
juliancoffee	930a156cab	display_shortened for keys	2021-07-28 10:33:51 +03:00
juliancoffee	034913a22d	Update skillbar ability text	2021-07-28 10:33:51 +03:00
juliancoffee	1bdab02aad	Deduplicate bar text	2021-07-28 10:33:51 +03:00
juliancoffee	e6c451ca4b	Prettify skillbar code	2021-07-28 10:33:50 +03:00
juliancoffee	e6f2dc314c	Deduplicate skillbar slots	2021-07-28 10:33:50 +03:00
Marcel Märtens	4328a45066	fixed map to zoom and drag correctly, fixed #1111	2021-07-27 01:15:06 +02:00
Imbris	d5b134e355	Merge branch 'chat-scrolling-hack' into 'master' ... Trying to fix chat hiding behind the chat window. See merge request veloren/veloren!2678	2021-07-26 04:41:15 +00:00
DanTheOne	18b5c1c35a	Add shortcut to toggle chat	2021-07-26 02:42:35 +02:00
Imbris	b984bf006f	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--match_single_binding)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::match_single_binding)]' error supressions See merge request veloren/veloren!2674	2021-07-25 17:24:22 +00:00
Avi Weinstock	516ad1c772	Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" ... This reverts commit 63eff216f0.	2021-07-25 12:28:25 -04:00
Jonathan Berglin	cd2992afd3	Tygyh/resolve clippy error supressions	2021-07-25 15:35:14 +00:00
KK	f473265fb0	This little hack, tries to fix the bad Behavior hiding the chat behind the chat window.	2021-07-24 22:43:32 -07:00
Joshua Barretto	37077b5703	Merge branch 'Resolve-unused-clippy-supressions' into 'master' ... Resolve unused clippy supressions See merge request veloren/veloren!2673	2021-07-24 20:44:06 +00:00
Dr. Dystopia	c79975dc5d	Resolve all '#[allow(clippy::match_single_binding)]' error supressions	2021-07-24 22:11:50 +02:00
Dr. Dystopia	04700982d3	Resolve unused '#[allow(clippy::option_map_unit_fn)]' error supressions	2021-07-24 20:35:13 +02:00
Dr. Dystopia	360bf860ac	Resolve unused '#[allow(clippy::manual_unwrap_or)]' error supressions	2021-07-24 20:26:15 +02:00
Dr. Dystopia	db48e30ea1	Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions	2021-07-24 20:22:05 +02:00
Dr. Dystopia	632eba0145	Resolve unused '#[allow(clippy::collapsible_if)]' error supressions	2021-07-24 20:16:18 +02:00
Dr. Dystopia	70d0840e96	Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions	2021-07-24 20:14:26 +02:00
Dr. Dystopia	1ac3d1b761	Resolve unused '#[allow(clippy::same_item_push)]' error supressions	2021-07-24 20:08:08 +02:00
Joshua Barretto	c7f14d300f	Merge branch 'zesterer/cmd' into 'master' ... Properly fixed command parsing See merge request veloren/veloren!2666	2021-07-24 15:15:58 +00:00
Joshua Barretto	6dfa233cc4	Fixed bad non-humanoid lantern offset	2021-07-24 15:05:36 +01:00
Joshua Barretto	0cb524d8d6	Properly fixed command parsing	2021-07-23 17:33:31 +01:00
schnippl0r	9e3b2a20d0	Moved GameInput to own module and made use of strum's EnumIter and AsRefStr.	2021-07-21 13:23:45 +02:00
schnippl0r	d1a1e29cd6	Fixed wrong filename of logfile in Voxygen's panic message. ... Moved the '<date>' component of the logfile name to the end of the filename string, as RollingFileAppender::new() appends the date to the provided file name prefix. Please see https://docs.rs/tracing-appender/0.1.2/tracing_appender/rolling/struct.RollingFileAppender.html#method.new	2021-07-21 03:33:13 +02:00
Marcel	5f38fb3c5b	Merge branch 'juliancoffee/deduplicate_bag_hud' into 'master' ... Deduplicate setting equipment tooltips See merge request veloren/veloren!2644	2021-07-20 14:01:29 +00:00
Dr. Dystopia	9abd066e53	Apply same member order as in trait	2021-07-20 09:43:52 +02:00
Imbris	6e6f73c971	Remove unused setting for whether to create a log file	2021-07-19 10:26:55 -04:00
Imbris	518ec1f54f	Revamp voxygen settings so that the config directory is externally specified, remove persistence of the selected logs folder, remove unused old meta.rs file from voxygen	2021-07-19 10:26:47 -04:00
juliancoffee	6f0aeecfca	Deduplicate setting equipment tooltips	2021-07-19 03:12:36 +03:00
Imbris	830b0f8fc1	Use mountee_offset for not yet animated mounting transforms (ie those that aren't quadruped_medium)	2021-07-18 15:09:36 -04:00
Imbris	3e6fd0ee1d	Setup animation mount points for quadruped medium, update offsets in ... common for new quadruped mediums, properly transform the offset in the mount system using ori, fix issue with composing in the base ori with the mounting bone ori in voxygen.	2021-07-18 15:09:36 -04:00
Imbris	32915f89a8	Extract scaling from all the animations	2021-07-18 15:09:36 -04:00
Imbris	6a15501b27	Add Body as a parameter to compute_matrices and start to pull whole body scaling out of the animation files	2021-07-18 15:09:34 -04:00
Imbris	b2bf83e200	Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs	2021-07-18 15:04:02 -04:00
Snowram	09cbb90f61	Make the mounter animations dependant of the mountee animation	2021-07-18 15:03:57 -04:00
Jonathan Berglin	b15f426ee5	Resolve all approved error supressions	2021-07-18 17:11:46 +00:00
Imbris	ec342a2338	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_pattern_matching)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions See merge request veloren/veloren!2622	2021-07-18 12:26:44 +00:00
Imbris	251c201604	Merge branch 'revert-eb08b6a1' into 'master' ... Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant See merge request veloren/veloren!2639	2021-07-18 08:00:43 +00:00
Marcel	6004a10a1a	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--needless_return)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::needless_return)]' error supressions See merge request veloren/veloren!2632	2021-07-18 02:00:03 +00:00
Marcel	6e36c8b65c	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--len_zero)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::len_zero)]' error supressions See merge request veloren/veloren!2633	2021-07-18 01:24:28 +00:00
Imbris	30119a6afc	Re-address approx_constant lint without using fractional constants and ... re-add a few blank lines	2021-07-17 20:41:09 -04:00
Imbris	9c72333741	Revert "Merge branch..." ... This reverts merge request !2608	2021-07-17 22:04:59 +00:00
Dr. Dystopia	29e034fa5e	Resolve all '#[allow(clippy::op_ref)]' error supressions	2021-07-17 21:53:33 +02:00
Dr. Dystopia	6480cbd784	Resolve all '#[allow(clippy::len_zero)]' error supressions	2021-07-17 21:49:37 +02:00
Dr. Dystopia	dd84c320a3	Resolve all '#[allow(clippy::needless_return)]' error supressions	2021-07-17 21:47:17 +02:00
Joshua Barretto	7686023430	Merge branch 'aweinstock/hats' into 'master' ... Basic implementation of hat visuals. See merge request veloren/veloren!2485	2021-07-17 19:42:26 +00:00
Jonathan Berglin	121d87d87a	Resolve all '#[allow(clippy::redundant_clone)]' error supressions	2021-07-17 18:04:01 +00:00
Dr. Dystopia	9c6cdbba71	Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions	2021-07-17 17:12:29 +02:00
Forest Anderson	54eb2a3ff7	Merge branch 'aylana/asp-sfx' into 'master' ... Princess-Lana - Add asp sound effects for the game See merge request veloren/veloren!2611	2021-07-17 01:49:20 +00:00
Avi Weinstock	13fc4de561	Add per-species head offsets.	2021-07-16 19:22:28 -04:00
Avi Weinstock	0a33c98268	Basic implementation of hat visuals.	2021-07-16 18:49:40 -04:00
Samuel Keiffer	f38cde9d40	Merge branch 'knightresspaladin/healing-aura' into 'master' ... Knightresspaladin/healing aura See merge request veloren/veloren!2587	2021-07-16 21:32:03 +00:00
Monty Marz	01c9d6d6d0	icon	2021-07-16 18:39:14 +02:00
Aylana	a3da5b31d6	Add asp sound effects	2021-07-15 20:15:36 +02:00
Jonathan Berglin	c1c331d59e	Resolve all '#[allow(clippy::approx_constant)]' error supressions	2021-07-15 16:56:55 +00:00
Marcel	583cc38889	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_format)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::useless_format)]' error supressions See merge request veloren/veloren!2609	2021-07-15 13:03:02 +00:00
Dr. Dystopia	5cc2fc8182	Resolve all '#[allow(clippy::or_fun_call))]' error supressions	2021-07-15 13:49:59 +02:00
Dr. Dystopia	2ff74f5cc9	Resolve all '#[allow(clippy::useless_format)]' error supressions	2021-07-15 13:46:53 +02:00
Dr. Dystopia	fdee2d4a62	Resolve all '#[allow(clippy::unused_unit)]' error supressions	2021-07-14 21:42:29 +02:00
Sam	997da21001	Particles for healing aura	2021-07-13 20:54:43 -05:00
Monty Marz	e379aacf8c	char selection frames, adjustments	2021-07-13 13:31:01 +02:00
Marcel Märtens	5f780aa0ee	add biome and site info to F3 debug menu	2021-07-12 18:44:54 +02:00
Marcel Märtens	468cfe84e7	clippy fixes in tests	2021-07-12 13:35:26 +02:00
Marcel Märtens	db8aedd363	fmt after applying clippy fixes after toolchain update	2021-07-12 12:09:27 +02:00
Marcel Märtens	9b3b21f368	fix clippy warnings	2021-07-12 12:09:09 +02:00
Samuel Keiffer	2633e9d70c	Merge branch 'sam/buff-stat' into 'master' ... Added buff strength stat to weapons. See merge request veloren/veloren!2586	2021-07-11 19:06:13 +00:00
ubruntu	6bb47b447e	Replace "Player 1" with an NPC name when trading with an NPC	2021-07-11 18:27:34 +00:00
Sam	be8b12845a	Added buff strength stat to weapons.	2021-07-11 12:50:38 -05:00
Samuel Keiffer	7cf5bc4bb7	Merge branch 'sam/rename-poise-stat' into 'master' ... Renamed poise_strength to effect_power to allow it to be used more generally... See merge request veloren/veloren!2589	2021-07-11 15:13:00 +00:00
Dr. Dystopia	01a118efc5	Replace deprecated constant in 'loot_scroller'	2021-07-11 13:13:36 +02:00
Knightress Paladin	146f86be2c	Removed references to Healing Beam, which Healing Aura is replacing	2021-07-10 21:39:11 -07:00
Sam	fbcc774911	Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.	2021-07-10 23:22:00 -05:00
Knightress Paladin	42c3872528	Added healing aura duration skill to voxygen UI	2021-07-10 20:02:36 -07:00
Samuel Keiffer	351a68944b	Merge branch 'juliancoffee/skill_truth' into 'master' ... Move skill boost modifiers to skills module See merge request veloren/veloren!2540	2021-07-09 23:05:48 +00:00
Jonathan Berglin	00434b25c0	Replace deprecated constant in 'chat'	2021-07-09 21:00:15 +00:00
Caleb	ffeb936601	Prevent chat from scrolling with new messages if not already at the bottom to allow players to read history	2021-07-08 20:01:07 -05:00
Marcel	8bb5fb6c14	Merge branch 'xMAC94x/dependencies' into 'master' ... update dependencies See merge request veloren/veloren!2577	2021-07-08 16:40:37 +00:00
Dr. Dystopia	7ded50a668	Convert 'prepare_tab_completion' to ternary operation in 'chat' file	2021-07-08 16:38:27 +02:00
Marcel Märtens	98800c5424	update depednencies	2021-07-08 12:21:02 +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
Joshua Barretto	ad1f6a5304	Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" ... This reverts merge request !2566	2021-07-07 22:07:00 +00:00
juliancoffee	67f22baed5	Add support for splicing numbers into skill desc	2021-07-07 17:51:30 +03:00
Marcel	fc835f675e	Merge branch 'xvar/wgpu-0.9' into 'master' ... Updated wgpu to 0.9.0 and egui to 0.13.0 See merge request veloren/veloren!2566	2021-07-06 07:27:45 +00:00
Ben Wallis	88bb160336	Updated wgpu to 0.9.0 and egui to 0.13.0	2021-07-06 07:32:27 +01:00
Benoît du Garreau	110b9742b7	Add a feature to optionnally disable hot-reloading	2021-07-06 00:27:09 +02:00
Marcel	c86118ee2c	Merge branch 'aweinstock/fix-keyedjobs-warning' into 'master' ... Fix spurious warning in KeyedJobs. See merge request veloren/veloren!2561	2021-07-05 21:41:00 +00:00
Avi Weinstock	86f5564dc7	Fix spurious warning in KeyedJobs.	2021-07-05 13:52:34 -04: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	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
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	6ba512efc8	Add some tracy plots about network usage to the client.	2021-07-02 12:40:52 -04:00
Jonathan Berglin	fc618b2222	Extract 'create_new_button' function from 'update'	2021-07-01 14:39:02 +00:00
Joshua Barretto	61edae79ae	Merge branch 'zesterer/keyboard' into 'master' ... Improve default keybindings and Key names See merge request veloren/veloren!2532	2021-06-30 17:33:17 +00:00
Joshua Barretto	cf01dd7df7	Improved consistency of default controls	2021-06-30 13:39:37 +01:00
Joshua Barretto	a7f7ea6327	Improved key names and platform support	2021-06-30 13:14:17 +01:00
DaforLynx	a757bf3dbd	Sfx fixes and new test	2021-06-30 11:43:00 +00:00
Samuel Keiffer	0151e5aeed	Merge branch 'potion-animations' into 'master' ... Consumable Animations See merge request veloren/veloren!2512	2021-06-29 16:36:41 +00:00
Sam	4cdf081a40	Removed potential for accessing OOB index and panicking in animations for combo melee. ... Made only entities with a character state component emit a death outcome on death.	2021-06-29 06:20:26 -05:00
jshipsey	37c6fe9ee8	anims	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
Imbris	20a9a420c6	Merge branch 'imbris/bind-order' into 'master' ... Ensure bind groups are ordered with the most frequently changed ones in later slots See merge request veloren/veloren!2496	2021-06-28 15:39:31 +00:00
Marcel	f4f6138d3d	Merge branch 'master' into 'master' ... Update `coreaudio-sys` to v0.2.8 to fix build failure on M1 Macs See merge request veloren/veloren!2505	2021-06-28 07:47:50 +00:00
Yusuf Bera Ertan	b8249cc64c	build(nix): fix audio resource patching	2021-06-27 23:23:01 +03:00
DrunkOnHotCoco	ea41f9ab39	Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs	2021-06-27 18:18:01 +00: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
Alex Ryapolov	be75a31c39	Update coreaudio-sys to v0.2.8	2021-06-26 18:39:53 +00:00
juliancoffee	12b5d655cf	Split Material and Dismantle crafting tabs	2021-06-26 21:37:13 +03:00
juliancoffee	123b2814cf	Sort tabs in logical sequence	2021-06-26 21:37:13 +03:00
juliancoffee	3b6d6b9393	Improve Dismantle UX ... - Change `Any {}` to `Any {} item` so for example when you want to dismantle something into linen, you will see `Any linen item` which points you that you need to get some item which is made from linen, and not some generic linen.	2021-06-26 21:37:13 +03:00
Ben Wallis	da319e71ec	Added default-publish feature and updated build scripts.	2021-06-26 17:48:48 +01:00
Benoît du Garreau	1cba7db9b6	Update assets_manager to 0.5	2021-06-26 12:05:40 +02:00
Snowram	ef6d6563ea	Ajust new npcs from feedback	2021-06-25 03:26:32 +02:00
Snowram	d7f25627ab	Ajustments to new npcs	2021-06-24 19:31:21 +02:00
Snowram	8760b69345	Husk brute animations	2021-06-24 19:31:19 +02:00
Snowram	58b95d12d4	Adds alpaca and llama npcs	2021-06-24 19:30:15 +02:00
Snowram	fef0f407d3	Removes warlord and warlock armours	2021-06-24 19:30:11 +02:00
Snowram	87ca00fac0	Adds new species	2021-06-24 19:29:44 +02:00
Imbris	58f237eaf5	Ensure bind groups are ordered with the most frequently changed ones in later slots	2021-06-24 00:47:59 -04:00
Sam	aac24ad601	Added ensnared debuff icon.	2021-06-23 22:38:16 -05:00
Snowram	47cc040301	Adds SpriteSummon animation	2021-06-23 22:38:16 -05:00
Sam	0a32b676c8	Vines now ensnare you by applying a buff.	2021-06-23 22:38:16 -05:00
Sam	763461ebef	Ensnaring vines now ensnare you.	2021-06-23 22:38:16 -05:00
Snowram	15a2fbc555	3 attack anims done	2021-06-23 22:38:16 -05:00
Joshua Barretto	b84708ca75	Added chat toggle	2021-06-21 20:16:03 +01:00
Joshua Barretto	288f2c13d4	Enable strafing in first-person mode	2021-06-21 13:27:19 +01:00
Imbris	83c49895ae	Improve rendering spans for tracy	2021-06-19 04:27:51 -04:00
Imbris	315ab872f5	add prof_span to hud elements	2021-06-19 04:27:51 -04:00
Imbris	659b42e813	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04:00
Imbris	380c58b6fc	Merge branch 'imbris/init-error' into 'master' ... Log the raw client error at the ERROR level and include the dates in the... See merge request veloren/veloren!2464	2021-06-19 07:53:16 +00:00
Joshua Barretto	bb6e8582a6	Merge branch 'zesterer/no-cmd-santisation' into 'master' ... Made dealing with chat vs commands safer for clients, made /alias require moderator permissions See merge request veloren/veloren!2472	2021-06-18 10:55:57 +00:00
DaforLynx	c85238014a	More npc sfx	2021-06-18 06:24:57 +00:00
Imbris	15bf815750	Fix error message when no connection attempts succeed	2021-06-17 23:29:49 -04:00
Imbris	247606f8d5	Log the raw client error at the ERROR level and include the dates in the message displayed in the UI	2021-06-17 22:20:40 -04:00
Joshua Barretto	96cbf60c3f	Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients	2021-06-17 19:55:21 +01:00
DaforLynx	9a5b95bc16	Added npc hurt sfx	2021-06-17 05:49:09 +00:00
Forest Anderson	6097bf0b1d	Merge branch 'capucho/gpu-poll' into 'master' ... cleanup gpu resources on maintain See merge request veloren/veloren!2466	2021-06-16 20:30:30 +00:00
João Capucho	9454c34cc2	Submit queue when maintaining and minimized	2021-06-16 20:22:33 +01:00
Joshua Barretto	b8749dc219	Added more cow noises, prepare for merge	2021-06-16 17:23:54 +01:00
Joshua Barretto	9510869870	Significantly more efficient sound effect processing, more NPC sounds	2021-06-16 17:23:22 +01:00
Joshua Barretto	e3c44ba7fe	More voice kinds, more opportunities for sounds	2021-06-16 17:23:22 +01:00
Joshua Barretto	0ef29a6989	VoiceKind for better sound effect specs	2021-06-16 17:23:22 +01:00
Joshua Barretto	559311e1b0	Chasing sounds	2021-06-16 17:23:22 +01:00
João Capucho	cb55676bb9	poll device to cleanup resources	2021-06-16 14:07:23 +01:00
Imbris	a9229e3625	Merge branch 'imbris/small-fixes' into 'master' ... Small fixes See merge request veloren/veloren!2461	2021-06-16 08:18:45 +00:00
Imbris	1483c2be74	Reset the slot 1 bind group to shadows when dropping the DebugDrawer	2021-06-16 03:24:10 -04:00
Imbris	2d7b82c2f4	Do some checks to make sure WGPU_TRACE_DIR is useable if set and exit early if it isn't to avoid the user not being aware that they are failing to collect a trace	2021-06-16 03:24:10 -04:00
Imbris	19f741b33f	Show the graphics backend in the hud debug info and include the adapter info when panicking in the wgpu error handler	2021-06-16 03:24:10 -04:00
Imbris	09a914aa84	Log format used for the swapchain	2021-06-16 03:24:10 -04:00
Imbris	8f429d532a	Add note on the reasoning for the visual position interpolation rate value in voxygen	2021-06-16 03:24:10 -04:00
Imbris	345add91db	Eliminate panics when .current_monitor() returns None	2021-06-16 01:36:59 -04:00
Imbris	b7162ac15c	Upgrade to winit 0.25	2021-06-15 22:59:54 -04:00
Imbris	3e79972061	Merge branch 'capucho/wgpu-format-fixes' into 'master' ... Update wgpu and check for best swap chain format See merge request veloren/veloren!2454	2021-06-16 01:24:05 +00:00
Snowram	b82dde2332	Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'" ... This reverts merge request !2457	2021-06-15 22:12:11 +00:00
Snowram	4d3362586f	Double the speed factor of pos interp	2021-06-15 22:11:57 +02:00
Imbris	1ed6a04a34	Merge branch 'zakru/fix/1193' into 'master' ... Avoid saving settings if maps are not updating Closes #1193 See merge request veloren/veloren!2456	2021-06-15 19:55:14 +00:00
Imbris	343b35b9cd	Merge branch 'rodio014' into 'master' ... bump rodio to 0.14 See merge request veloren/veloren!2443	2021-06-15 19:04:28 +00:00
Zakru	afc04ae22f	Fix settings not saving when zooming map with keys	2021-06-15 21:20:10 +03:00
Zakru	52c965fb6d	Avoid saving settings if maps are not updating ... Fixes #1193	2021-06-15 21:19:52 +03:00
Snowram	84080607cd	Truncates consumables value to the first decimal place	2021-06-15 19:36:20 +02:00
juliancoffee	3f176ca068	Panic if can't parse file	2021-06-15 19:15:17 +03:00
Snowram	8fde002189	Merge branch 'snowram/more-trolls' into 'master' ... Add more trolls npcs, and roc npc with tornado attack See merge request veloren/veloren!2384	2021-06-15 08:35:30 +00:00
Imbris	a41c7a9a5b	Merge branch 'imbris/resize-tweaks' into 'master' ... Resize related tweaks See merge request veloren/veloren!2448	2021-06-15 07:53:12 +00:00
Snowram	f2c7836161	Makes summon range inclusive	2021-06-15 09:49:13 +02:00
Avi Weinstock	cb0566299a	Make tornado (and empty models in general) work on WGPU.	2021-06-15 09:49:13 +02:00
Snowram	3ba0500b90	Tornado summoning attack	2021-06-15 09:49:13 +02:00
Snowram	97ce50e5d4	Add troll variants and roc npcs	2021-06-15 09:49:13 +02:00
Imbris	f3657903c9	[iced renderer] Skip content processing if the clip intersection is zero sized or invalid	2021-06-15 02:02:10 -04:00
Imbris	cbf0a6baf1	Fix trying to create a zero sized shadow texture when resizing window down to a small size	2021-06-15 01:53:00 -04:00
Samuel Keiffer	fec328a617	Merge branch 'juliancoffee/swing_fix' into 'master' ... Introduce hit_timing for combo_melee See merge request veloren/veloren!2426	2021-06-15 02:38:23 +00:00
asumface	8568dfb38e	Bump rodio to 0.14	2021-06-14 22:04:23 +02:00
Avi Weinstock	c5f82b241d	Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.	2021-06-14 13:39:50 -04:00
Monty Marz	45f79059d0	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00
Avi Weinstock	9d4a65e8ac	Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange.	2021-06-13 14:34:42 -04:00
Monty Marz	01a04a80fa	icons and naming	2021-06-13 14:34:42 -04:00
Avi Weinstock	0e394029de	Mining skill tree.	2021-06-13 14:34:42 -04:00
Marcel Märtens	34f5ff62d4	implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling	2021-06-13 17:42:28 +02:00
juliancoffee	62eaabfe88	Introduce hit_timing for combo_melee ... bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing poise damage of hammer from 25 to 20	2021-06-12 14:10:19 +03:00
Marcel Märtens	4167621f5d	Change the version number to 0.10	2021-06-12 10:14:07 +02:00
Forest Anderson	f578c56db7	Merge branch 'juliancoffee/small_fixes' into 'master' ... Ranged, Tidal Warrior, spears, assets See merge request veloren/veloren!2416	2021-06-11 17:46:56 +00:00
Cr0ss0vr	8e0891e3b1	Fix incorrect tooltip on Staff Damage skill - Update diary.rs	2021-06-11 11:59:09 +00:00