4512 Commits

Author	SHA1	Message	Date
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
juliancoffee	25cbff68d3	remove meaningless variables	2021-06-11 11:44:48 +03:00
juliancoffee	2e5f868f31	Make bow zoom less intense	2021-06-11 01:46:32 +03:00
juliancoffee	edc4af8023	fix Wet debuff image	2021-06-11 01:45:02 +03:00
João Capucho	cc566abe5c	Update wgpu and check for best swap chain format	2021-06-09 21:15:37 +01:00
Marcel	f255f01ac0	Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master' ... Extract 'get_duration_image' function from 'update' See merge request veloren/veloren!2407	2021-06-09 14:08:38 +00:00
Dr. Dystopia	cead9a019b	Extract 'create_new_text' function from 'update'	2021-06-09 13:35:41 +02:00
Dr. Dystopia	e31cb062a2	Extract 'get_duration_image' function from 'update'	2021-06-09 13:09:31 +02:00
jshipsey	7cb5323eb6	small tweaks ... t	2021-06-09 01:58:08 -04:00
juliancoffee	df2c3a4950	Fix find_root() search in case if .git isn't dir	2021-06-08 13:34:46 +03:00
Marcel	7e8bebdfa1	Merge branch 'xMAC94x/hashbrown' into 'master' ... switch to hashbrown 0.11 and specs 0.16.2 See merge request veloren/veloren!2390	2021-06-07 14:31:58 +00:00
Monty	dd0368eed4	3d icon shading	2021-06-07 14:27:49 +02:00
Marcel Märtens	7185dcee68	switch to hashbrown 0.11 and specs 0.16.2	2021-06-07 13:01:01 +02:00
Snowram	279d3ade83	Item tooltip refactor and fixed related to new stats	2021-06-07 11:06:32 +02:00
Sam	0488b2fcd0	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	76ca99ece4	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	9034d0f25d	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
jshipsey	5fdb2ac01d	migration	2021-06-07 11:01:04 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	3fa7d0b6d4	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
jshipsey	74fbe9a123	cloth/metallic armor	2021-06-07 10:56:54 +02:00
Imbris	95bfcde6d1	Remove unused velocity field in the Hud and remove unused fields from ... the image slider widget code	2021-06-07 02:49:35 -04:00
Monty	336d83fc49	new bgs	2021-06-06 19:30:37 +02:00
Marcel	521e1eacf3	Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371	2021-06-06 16:56:21 +00:00
Marcel	45741b0dbd	Merge branch 'hqurve/crafting-sorting2' into 'master' ... Widened recipe list in crafting menu and added quality indicators to names in the list See merge request veloren/veloren!2378	2021-06-06 15:55:11 +00:00
hqurve	39fc48ac17	Widened recipe list in crafting menu and added quality indicators to names in the list	2021-06-06 15:55:11 +00:00
Jonathan Berglin	38c0e02114	Extract 'create_unlock_skill_button' function from 'update' in diary.rs	2021-06-06 14:14:53 +00:00
Snowram	edfe713076	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00
Samuel Keiffer	85b8d4e7c0	Merge branch 'sam/yeti' into 'master' ... Yeti Rework See merge request veloren/veloren!2359	2021-06-05 23:15:20 +00:00
Snowram	864f230a3c	Yeti combat anims	2021-06-06 00:17:23 +02:00
João Capucho	a148d4d01a	Fix scissor panics when window height is 1	2021-06-05 20:36:27 +01:00
Ben Wallis	7b8a398234	Merge branch 'xvar/title-screen-fps-cap' into 'master' ... Added 60 FPS framerate cap for title/menu screens See merge request veloren/veloren!2377	2021-06-05 14:00:57 +00:00
Ben Wallis	1a93e3d84f	Added 60 FPS framerate cap for title/menu screens	2021-06-05 14:13:53 +01:00
Ben Wallis	e9a5fe1b4d	Merge branch 'capucho/wgpu-outdated-swapchain' into 'master' ... Rebuild swapchain on Outdate error See merge request veloren/veloren!2376	2021-06-05 10:27:32 +00:00
Sam	93f90d514c	Particles for ice spikes	2021-06-04 18:17:15 -05:00
Sam	81f7e690fd	Snowball attack.	2021-06-04 18:17:15 -05:00
Sam	a82984b925	Added base ability set	2021-06-04 18:17:14 -05:00
João Capucho	b647cd35f1	Don't draw when window size is minimized	2021-06-04 23:37:33 +01:00
Ben Wallis	059dfd2602	Merge branch 'hqurve/fix-lootscrller' into 'master' ... Fixed loot scroller collisions and cleaned up previous changes See merge request veloren/veloren!2358	2021-06-04 20:00:18 +00:00
João Capucho	36c28af46d	Regenerate the swapchain if the frame is outdated	2021-06-04 20:37:39 +01:00
Sam	f066f844b6	Fmt and clippy from toolchain rebase.	2021-06-03 21:39:18 -05:00
jshipsey	ca43a0058a	some animation	2021-06-03 21:39:17 -05:00
Sam	35876411cd	Fixed tests	2021-06-03 21:39:16 -05:00
Sam	5bf99eac11	Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.	2021-06-03 21:39:15 -05:00
Sam	c81e1534f7	First 3 abilities for tidal warrior functional. Added bubble particles.	2021-06-03 21:39:13 -05:00
Avi Weinstock	05c699878f	Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.	2021-06-03 19:24:34 -04:00
Yusuf Bera Ertan	05cbaff682	build(nix): add new dependencies to nix build and dev env for wgpu	2021-06-04 00:08:02 +03:00
Imbris	6ffdad173d	Switch to using block_on directly from futures-executor instead of the umbrella crate	2021-06-03 14:28:28 -04:00
Imbris	be5ee8e205	Properly calculate the necessary length of the index buffers for checks that ensure they are large enough	2021-06-03 00:45:11 -04:00
Imbris	7fd952e139	Remove stabilized or_patterns feature	2021-06-03 00:10:07 -04:00
Imbris	538677263b	Enable since naga currently has issues translating our SPIRV -> metal	2021-06-03 00:10:07 -04:00
Imbris	2b8eaae572	Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code	2021-06-03 00:10:06 -04:00
Imbris	8db11cce37	Use expect to document potential panic when starting a new frame recording, fix clippy warning	2021-06-03 00:10:06 -04:00
Imbris	01aa6af1fd	Address various TODOs introduced in wgpu transition	2021-06-03 00:10:06 -04:00
Imbris	8403e4c483	address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)	2021-06-03 00:10:06 -04:00
Joshua Yanovski	38d2d46165	Fix shadows for wgpu. ... In the process, we also fix our n_e / f_e calculation to actually compute plane intersections properly.	2021-06-03 00:10:06 -04:00
Avi Weinstock	a1326d0734	Address MR 2253 review comments.	2021-06-03 00:10:06 -04:00
Avi Weinstock	cf6717ac90	Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it.	2021-06-03 00:10:06 -04:00
Avi Weinstock	7b04599a3b	Implement a Debug pipeline for hitboxes and pathfinding lines. ... - Implements mesh generation for cylinders and lines. - Implements an Id-allocator so that clients can mutate positions efficiently. - Is split into pipeline and scene modules. - Contains simple shaders that just pass through a position and color.	2021-06-03 00:10:06 -04:00
Imbris	99998b9870	Use profling to get spans from wgpu, update wpgu & its deps for various ... fixes	2021-06-03 00:10:06 -04:00
Imbris	ffdf7012bc	Update wgpu to fix dx11 issue	2021-06-03 00:10:06 -04:00
Imbris	2da58029b9	Make models require a non-zero amount of vertices	2021-06-03 00:10:06 -04:00
Imbris	5749983868	Make shadow vert shaders always contain their content but ensure they are never used when shadow maps are disabled, remove uneeded shadow frag shader	2021-06-03 00:10:06 -04:00
Imbris	9ec4fd5b4b	Remove commented out sprite code, including the code for getting verts for sprites with a texture rather than a storage buffer	2021-06-03 00:10:06 -04:00
Imbris	81939b4e4e	Remove uneeded commented out gfx rendering code	2021-06-03 00:10:06 -04:00
Imbris	1647c9d607	Update wgpu to latest version and improve error formating	2021-06-03 00:10:06 -04:00
Imbris	d5f4a4443a	Fix all clippy warnings	2021-06-03 00:10:05 -04:00
Imbris	9be424de53	Remove unused waves texture	2021-06-03 00:10:05 -04:00
Imbris	93ad05d237	Fix most of the cargo check warnings	2021-06-03 00:10:05 -04:00
Imbris	972a6f3605	Replace default wgpu error handler with one that includes the error in the panic message	2021-06-03 00:10:05 -04:00
Imbris	7f9ba17dee	Remove unused shadow bind group from the cloud pipeline	2021-06-03 00:10:05 -04:00
Imbris	c381059e28	Require WGPU_TRACE_DIR to be set manually instead of having a default value	2021-06-03 00:10:05 -04:00
Imbris	30f02af6a4	Wait for ingame pipelines to build before entering char select, show pipeline rebuilding status text in the graphics settings tab	2021-06-03 00:10:04 -04:00
Imbris	9c3e3ea638	wgpu rebase fix: crossbeam -> crossbeam_channel	2021-06-03 00:09:55 -04:00
Imbris	f2fed72785	Fix bug in sprite pipeline creation & misc other pipeline creation fixes	2021-06-02 23:59:51 -04:00
Imbris	1830a591f6	Make Drawer work with background pipeline creation	2021-06-02 23:59:51 -04:00
Imbris	c2da81cf18	Move pipeline creation into the background, still needs Drawer modications and UI to display status	2021-06-02 23:59:51 -04:00
Imbris	5b4c60c4ec	Fix wrong intermediate target texture format	2021-06-02 23:59:51 -04:00
Imbris	77689d1420	Comment out lod depth tweaks not designed for reverse depth, convert waves image to rgba before constructing a texture, misc fix after rebase	2021-06-02 23:59:50 -04:00
Imbris	72cb3d0124	Clear textures that will be partially written to work around Dx12 bug on AMD	2021-06-02 23:59:50 -04:00
Imbris	76c7161364	Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue	2021-06-02 23:59:50 -04:00
Imbris	aa2c7721fe	Add env vars to set wgpu backend and wgpu api trace save dir (api trace still needs feature to be set ofc)	2021-06-02 23:59:50 -04:00
Imbris	ceaa20c668	Update wgpu	2021-06-02 23:59:50 -04:00
João Capucho	aaa397a52a	Fix panic on zero sized scissor	2021-06-02 23:59:50 -04:00
João Capucho	04eff56523	Fix resizing using the wrong value	2021-06-02 23:59:50 -04:00
Imbris	390048263a	Allow setting env var to only use the vulkan backend, deactivate profiling if the feature is not available	2021-06-02 23:59:50 -04:00
Imbris	577caa3047	Implement screenshots	2021-06-02 23:59:50 -04:00
Imbris	7723ce265e	Update wgpu-profiler, smol rebase fix	2021-06-02 23:59:50 -04:00
Imbris	0e0c8fbfc8	wgpu branch rebase fixes	2021-06-02 23:59:50 -04:00
Imbris	89cb00907a	Display gpu timing info in the HUD when enabled	2021-06-02 23:59:50 -04:00
Imbris	64398f6c0a	Try out using storage buffer for sprite vertices	2021-06-02 23:59:50 -04:00
Imbris	b9931588e4	Fix bugs with sprite rendering	2021-06-02 23:59:50 -04:00
Imbris	a90373604e	Fix sprite vertex lookup, normalize sprite ... normals in vert shader	2021-06-02 23:59:50 -04:00
Imbris	8d63446300	Almost implement instance merging for sprites (validation error), rebase ... fix	2021-06-02 23:59:50 -04:00
Imbris	0f1c4080c4	Start sprite refactor	2021-06-02 23:59:49 -04:00
João Capucho	d96f5a07e2	Fix winit returning wrong window size ... It seems like waiting for wgpu to create a instance is enough to make winit return the correct window size	2021-06-02 23:59:49 -04:00
João Capucho	e04970addd	Fix scissor panic ... Removes the Scale::physical_resolution method as it could become desynced from the renderer resolution causing the panic	2021-06-02 23:59:49 -04:00
João Capucho	f5dc871c59	Update to the most recent wgpu	2021-06-02 23:59:49 -04:00
Imbris	a8851b6561	Switch to index rendering for most quad-like things	2021-06-02 23:59:49 -04:00
Imbris	e204a58be2	Small fixes to gpu profiling	2021-06-02 23:59:49 -04:00
Imbris	22d67d4cc1	Update to the latest wgpu git	2021-06-02 23:59:49 -04:00
Imbris	7a67ce87e7	Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes	2021-06-02 23:59:49 -04:00
Imbris	8c21023500	WIP gpu timer thing (not for squashing!)	2021-06-02 23:59:49 -04:00
Imbris	0a60fb2d72	Update wgpu to fix segfault	2021-06-02 23:59:49 -04:00
Imbris	f01d59c1df	Fix char select shadows by clearing shadow textures	2021-06-02 23:59:49 -04:00
Imbris	e1af485e5f	Add setting for the PresentMode	2021-06-02 23:59:49 -04:00
Imbris	2f69c41b00	fix nametag depth culling as well as a tweak to maybe make the main menu not flicker on intel iGPU	2021-06-02 23:59:49 -04:00
Imbris	261fd24dfd	Fix lod alt texture filtering	2021-06-02 23:59:49 -04:00
Imbris	6f6167cd90	Resolve validation errors with trying to use unsupported filtering modes	2021-06-02 23:59:49 -04:00
Joshua Barretto	ae6c5a5c54	Corrected shadow cull mode	2021-06-02 23:59:49 -04:00
Imbris	843529c7bb	Update to latest wgpu git (around 0.7), temporarily disable shader validation due to naga bug, rebase fixes!!	2021-06-02 23:59:49 -04:00
Imbris	c532f50e64	Remove wgpu patch/update wgpu, rebase fixes, remove use of deprecated ... vek functions for left, right, up, down, forward_rh, forward_lh	2021-06-02 23:59:49 -04:00
Imbris	fc5e8cb18d	Comment out secondary backends	2021-06-02 23:59:49 -04:00
Imbris	fce14fbaa9	Avoid extra set_pipeline calls	2021-06-02 23:59:48 -04:00
Imbris	7012e16706	Properly rebind shadow textures when they are changed	2021-06-02 23:59:48 -04:00
Joshua Yanovski	93568754a0	Inverse depth planes. ... Also added a function that has extensive details about what the projection options mean, and set our near plane much closer (0.25 to 0.0625) and far plane much farther (100000.25 to 524288.0625). In the future we may completely remove the far plane (opting for an infinite one) and may possibly improve accuracy elsewhere using analysis of other floating point values.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	adf3f83b4b	Fix point shadows.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	363c55c521	Fix directed shadows, mostly.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	868293a802	More frustration with shadows.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	c97a42fdb7	Various fixes for shadows.	2021-06-02 23:59:48 -04:00
Capucho	23f1144fe2	Fix the shadow drawing code ... Very poorly optimized	2021-06-02 23:59:48 -04:00
Capucho	7389f8893d	Re enable the skybox rendering in char select	2021-06-02 23:59:48 -04:00
Capucho	672ac0dbf3	Fix the buffer slicing in the submodel ... Fixes the void figures	2021-06-02 23:59:48 -04:00
Capucho	b6c37be299	Re enable sprite rendering	2021-06-02 23:59:48 -04:00
Capucho	c22dc6697c	Reenable non-player figure drawing	2021-06-02 23:59:48 -04:00
Imbris	fe6cf0396f	Draw water	2021-06-02 23:59:48 -04:00
Imbris	97bed5752b	Fix clouds	2021-06-02 23:59:48 -04:00
Imbris	bae0310cc7	Somewhat fix lod, prevent particles spamming new buffers when disabled	2021-06-02 23:59:48 -04:00
Imbris	99d74147e5	No cube spam	2021-06-02 23:59:48 -04:00
Imbris	aa17132f9d	Start lod, update wgpu to fix viewport count validation error	2021-06-02 23:59:48 -04:00
Imbris	553c1c18a9	Add skybox	2021-06-02 23:59:48 -04:00
Capucho	14f683d403	Fix wrong color format in col light	2021-06-02 23:59:48 -04:00
Capucho	1083d04c73	Reenable terrain rendering ... Refractor col lights	2021-06-02 23:59:48 -04:00
Capucho	0db2a35955	Fix the orientation of the rendering ... Reenable the rendering of the player	2021-06-02 23:59:47 -04:00
Capucho	b8d560a882	Pass format to particle pipeline	2021-06-02 23:59:47 -04:00
Capucho	1668e834f8	Renable the figure and terrain drawing code (not working yet)	2021-06-02 23:59:47 -04:00
Imbris	7e0fe83335	Fix culling of postprocess/cloud triangles	2021-06-02 23:59:47 -04:00
Imbris	b3ca2f6870	Particles compiles and runs (no visuals yet)	2021-06-02 23:59:47 -04:00
Capucho	4c83e19c83	Remove the depth buffer from the Third drawer	2021-06-02 23:59:47 -04:00
Capucho	2c7d49b69f	Shader fixes	2021-06-02 23:59:47 -04:00
Capucho	a97ba961a4	Update dependencies	2021-06-02 23:59:47 -04:00
Imbris	da0423ab2a	Almost make clouds/postproccess run	2021-06-02 23:59:47 -04:00
Imbris	1e2d956106	Render the UIs	2021-06-02 23:59:47 -04:00
Imbris	628d9391d3	Add generic Bound<T> type for grouping consts/other bindable things with bind groups	2021-06-02 23:59:47 -04:00
Imbris	124d69d7ad	Render Ui	2021-06-02 23:59:45 -04:00
Imbris	f7efbd8bc7	Color!	2021-06-02 23:56:43 -04:00
Imbris	97ca278d89	fixed validation errors when creating pipelines	2021-06-02 23:56:43 -04:00
Imbris	760f21b4f3	No crash on startup	2021-06-02 23:56:43 -04:00
Imbris	f540366676	Made shaders compile by adding locations and bindings and splitting textures and samplers out into two things and adding guards for double including shaders	2021-06-02 23:56:43 -04:00
Imbris	6a84109ece	Improve shader errors by showing shader file name, reduce repetitive shader construction code	2021-06-02 23:56:43 -04:00
Imbris	fd0c4c166a	migrate cloud pipeline, migrate iced renderer, rebase fixes	2021-06-02 23:56:43 -04:00
Imbris	d9c523ba0d	Make compile through various changes, update wgpu to latest git	2021-06-02 23:56:43 -04:00
Capucho	8c3995298b	More fixes	2021-06-02 23:56:43 -04:00
Capucho	8c6e43572f	Switched from zerocopy to bytemuck ... Fixing errors	2021-06-02 23:56:40 -04:00
Capucho	89d09baab4	Made the layouts more compact	2021-06-02 23:55:59 -04:00
Capucho	9ee71d6369	Finished porting all pipelines	2021-06-02 23:55:59 -04:00
Capucho	c4bec2500f	Began porting pipeline creation	2021-06-02 23:55:59 -04:00
Capucho	1b5ae9c926	ported all pipelines	2021-06-02 23:55:59 -04:00
Capucho	121f001b17	Ported most of the textures and models related methods	2021-06-02 23:55:59 -04:00
Capucho	806f240eb5	Started the report of wgpu	2021-06-02 23:55:59 -04:00
Marcel	f988584337	Merge branch 'revert-c6e200a3' into 'master' ... Add a configuration Option to opt-in Quic backend See merge request veloren/veloren!2318	2021-06-02 14:27:13 +00:00
Avi Weinstock	42dc86788e	Address further MR 2301 comments.	2021-06-02 00:39:58 -04:00
Avi Weinstock	9c4453508e	Address many of Imbris's comments on MR 2301.	2021-06-02 00:39:58 -04:00
Avi Weinstock	5aa98d18e3	Depend on crossbeam-utils and crossbeam-channel instead of crossbeam in voxygen.	2021-06-02 00:39:58 -04:00
Avi Weinstock	8b21ed540c	Use a single HashMap with the entry API and a KeyedJobTask enum for KeyedJobs.	2021-06-02 00:39:58 -04:00
Avi Weinstock	6d3dcc3835	Address MR 2301 review comments. ... - Replace tabs with spaces in map-related i18n. - Use `retain` in `remove_unloaded_chunks`.	2021-06-02 00:39:58 -04:00
Avi Weinstock	e509a4207b	Make the minimap UI not exposed via checkbox yet (still configurable via settings.ron).	2021-06-02 00:39:58 -04:00
Avi Weinstock	9d60a7f533	Make the chunks above dungeons/caves default to black when the ceiling is below them.	2021-06-02 00:39:58 -04:00
Avi Weinstock	523bf2be58	Fix memory leak in KeyedJobs threadpool helper.	2021-06-02 00:39:58 -04:00
Avi Weinstock	7115b1c899	Performance and aesthetic improvements to the voxel minimap. ... Performance: - don't do anything when it's inactive - only process chunks within minimap-VD - remove chunks outside of VD - higher thread pool fraction specified Aesthetics: - different water color - wood and leaves no longer count as ceilings	2021-06-02 00:39:58 -04:00
Avi Weinstock	cbe7521259	Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry.	2021-06-02 00:39:04 -04:00
Avi Weinstock	1214715c21	Use a threadpool to speed up minimap chunk rendering. Also fix ceiling height calculations and color water blue.	2021-06-02 00:39:04 -04:00
Avi Weinstock	59e93d23c1	Improve ceiling detection for the voxel minimap.	2021-06-02 00:39:04 -04:00
Avi Weinstock	d878a2050a	Composite the layers on chunk load, and try to add an overhead mode.	2021-06-02 00:39:04 -04:00
Avi Weinstock	6df2e96d25	Improve the efficiency of the voxel minimap by only updating it when crossing a chunk boundary or changing z-level. Allows making the 9 chunks nearest to the player fancier by compositing multiple z levels.	2021-06-02 00:39:04 -04:00
Avi Weinstock	937815d8c3	Make all the offsets for voxel minimap work properly for arbitrary sizes, and fix the memory leak.	2021-06-02 00:39:04 -04:00
Avi Weinstock	7980230b7f	Add a minimap overlay based on voxel data.	2021-06-02 00:39:04 -04:00
Imbris	23eca4c3f6	Re-disable incremental just for common-systems, small fix in plugin ... crate, more new clippy fixes	2021-05-31 20:44:57 -04:00
Imbris	48ebb10d50	Update toolchain	2021-05-31 20:44:57 -04:00
hqurve	cd13db3f5f	Fixed loot scroller collisions and moved/cleaned up previous changes	2021-05-31 15:29:35 -04:00
Adam Whitehurst	e06bd0eaa3	feat: BuffKind::Frozen	2021-05-30 08:51:47 -07:00
Adam Whitehurst	9eefa89f90	feat: add frozen debuff icon, en strings	2021-05-30 08:49:32 -07:00
Avi Weinstock	d6442dbd3b	Change the ChargedRanged zoom distance from 0.0 to 2.0, and add a delay after the mouse click before the zoom starts (i.e. hold to zoom, spam click will not zoom).	2021-05-26 11:51:29 -04:00
Avi Weinstock	7a97fbb5cf	Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards.	2021-05-26 09:34:08 -04:00
Avi Weinstock	4d7828ec94	Make the camera zoom as the bow (or any ChargedRanged attack) is charging.	2021-05-26 09:34:07 -04:00
Justin Shipsey	d7c7f6bf5d	Merge branch 'sam/rework-bow' into 'master' ... Bow Rework See merge request veloren/veloren!2310	2021-05-26 04:44:09 +00:00
jshipsey	ae43102a5b	anim	2021-05-26 00:04:15 -04:00
hqurve	854930bc1a	Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up	2021-05-22 20:47:08 +00:00
Sam	1014ac45bf	Made new skills for reworked bow. ... Created migration to reset bow skills.	2021-05-22 12:33:21 -05:00
Sam	3f16d15bbb	Reworked bow	2021-05-22 12:33:20 -05:00
Samuel Keiffer	a0599ac046	Merge branch 'sam/extra-equip-slots' into 'master' ... Added Extra Loadout Slots See merge request veloren/veloren!2295	2021-05-21 20:28:53 +00:00
Marcel	ee93803f4a	Merge branch 'lboklin/auto-glide' into 'master' ... Implement auto-glide See merge request veloren/veloren!2321	2021-05-21 09:02:59 +00:00
Marcel Märtens	cf3188b412	remove Protocol from Quic, cleanup code, fix some log spam	2021-05-21 10:41:19 +02:00
Marcel	99304ffddd	Revert "Merge branch 'sharp/revert-quinn' into 'master'" ... This reverts merge request !2315	2021-05-21 10:41:16 +02:00
Ludvig Böklin	eacc49a961	Prevent auto-glide from pitching too high up	2021-05-20 17:20:49 +02:00
Ludvig Böklin	270f89db6b	Disable glider input until keys are pressed again after deploy	2021-05-20 12:13:59 +02:00
Ludvig Böklin	fe186fb44d	Code quality	2021-05-20 10:46:39 +02:00
Ludvig Böklin	8da59bb8e8	Implement auto-glide	2021-05-20 09:27:41 +02:00
Joshua Yanovski	d87225d908	Various improvements to chunk load latency. ... Firstly, most importantly, improves the heuristic used for deciding which chunks to mesh (which matters more even at low view distances with meshing being so expensive now, but has an even more obvious improvement at large view distances). Essentially, instead of always prioritizing whatever chunk was fetched earliest from the server, instead we prioritize chunks *closest* to the player first, then chunk order. This greatly improves the apparent latency for things like picking up a sprite, as well as cases where the player moves out of the loaded range but (due to slow loading from the server or a large VD range) there are many remaining chunks left to be meshed still within the VD but nowhere near the player. By properly priotizing chunks near the player, we minimize the time / likelihood of a player being on or very near an unmeshed chunk, and make high VDs and faster travel speeds more viable. We make a few other minor improvements as well: Avoid duplicate meshing of neighbors when first inserting chunks, if they are already in the todo list and the chunk being inserted was not directly modified. Also avoid remeshing neighbors if only a solid block's color changed, which could sometimes be useful for non-sprite modifications (for example flame-induced changes to non-destructible terrain color).	2021-05-18 17:10:29 -07:00
Joshua Yanovski	978b7232db	Make meshing work properly for rapid changes. ... The previous fix accidentally caused meshing to not perform an update if a chunk was already actively meshing; this change fixes this behavior to go back to the old behavior. It also fixes a subtle bug where sprites would be using old lighting if a chunk was being actively meshed on the same tick that a sprite change happened (this should only affect things in a handful of circumstances and could be avoided if, e.g., only color was changing, but this can be addressed better at another time).	2021-05-18 12:43:38 -07:00
hqurve	6974ab9199	Added swap_equipped_weapons icon and resized inactive weapons	2021-05-17 15:35:27 -04:00
Joshua Yanovski	3679cb75bc	Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'" ... This reverts commit 04d8ddf25e, reversing changes made to 9dcf7a9d26.	2021-05-17 08:32:12 -07:00
Marcel	04d8ddf25e	Merge branch 'xMAC94x/quic_enablement' into 'master' ... Add a configuration Option to opt-in Quic backend See merge request veloren/veloren!2268	2021-05-17 12:02:55 +00:00
Sam	93b5e674f6	Fixed comments and some functionality.	2021-05-16 21:35:17 -05:00
Ben Wallis	fcf4ab7619	main/offhand weapon swap check refactor	2021-05-16 21:07:36 -05:00
hqurve	a4384b81c7	Add offhand weapons to bag ui	2021-05-16 20:43:19 -04:00
Sam	6b153bcf47	Enforced certain invariants in how an item was equipped into the loadout: ... - a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty - a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon - 2h weapons can never be equipped in an offhand slot Fixed some tests	2021-05-15 15:16:38 -05:00
Sam	9173dca03f	Added equip slots for other weapons.	2021-05-15 15:16:37 -05:00
Marcel	7d5ca0e7bf	Revert "Merge branch 'snowram/hacky-mount' into 'master'" ... This reverts merge request !2219	2021-05-14 13:43:20 +00:00
Marcel	7fe0db2261	Merge branch 'snowram/hacky-mount' into 'master' ... Allow for collars to make QuadMed npcs mountable See merge request veloren/veloren!2219	2021-05-14 12:27:19 +00:00
hqurve	95a6e35a3a	Added chat tabs	2021-05-14 12:27:15 +00:00
Snowram	8745fb803a	Use Body to determine mountee offsets	2021-05-14 00:11:54 +02:00
Snowram	b063ec5a8f	Clean unused mount offset	2021-05-14 00:11:46 +02:00
Snowram	486fbf940e	Anims export a transform for mounts	2021-05-14 00:11:37 +02:00
Snowram	026ba616ff	Expose the mounting bone to the mounter anims	2021-05-14 00:11:28 +02:00
Snowram	e4f3064b8a	Collar can make QuadMeds mountable, state + offsets	2021-05-14 00:11:15 +02:00
Joshua Yanovski	3869cdf1d2	Don't remesh chunk vertex data on sprite update. ... This results in an extremely visually noticeable improvement in latency when adding or removing sprite data and makes the game feel more responsive. This happens, for instance, when picking up a sprite like an apple or flower from the environment. We check to make sure that for items with lighting (like Velorite) or changes that otherwise affect meshing (like changing from fluid to nonfluid) this doesn't trigger.	2021-05-11 12:58:15 -07:00
James Melkonian	f76b61ac17	Make merchants /tell instead of /say	2021-05-11 17:26:22 +00:00
jshipsey	770d07ac90	anims	2021-05-10 18:54:03 -05:00
Sam	0d53e790fd	Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks.	2021-05-10 18:54:00 -05:00
Snowram	47a2bf7de8	Adds haniwa sentry object	2021-05-10 18:53:48 -05:00
Sam	5fa4358e74	Clay golem attacks done.	2021-05-10 18:53:01 -05:00
Illia Denysenko	f626d27955	Refactor i18n analysis code and improve UX of testing binary	2021-05-10 22:13:00 +00:00
Joshua Barretto	1478daecbc	Prevented low FPS from limiting chunk loading performance	2021-05-10 14:23:37 +01:00
Marcel Märtens	9e357dfa0c	remove ViewDistance from Client::new() and fix tests	2021-05-10 12:59:49 +02:00
Marcel Märtens	2ea5fd876b	cleanup error codes	2021-05-10 12:59:44 +02:00
Marcel Märtens	b443e4dd31	Add Quin support, as this is not yet very much tested it needs to be activated in the settings of SERVER and CLIENT. ... Server: provide a certificate file and key file via the settings. When provided it will then listen on TCP and QUIC, if not provided it will be TCP only. The certificate must be known by the client, so you might get problems with self-signed certificates. ```ron quic_files: Some(( cert: "/home/user/veloren_cert.pem", key: "/home/user/veloren_key.key", )), ``` Client: activate the voxygen settin `use_quic: true` to try to connect to the quic backend of a server.	2021-05-10 12:59:13 +02:00
Joshua Yanovski	0cf0f59fa7	Merge branch 'sharp/modtools' into 'master' ... Added non-admin moderators and timed bans. See merge request veloren/veloren!2276	2021-05-10 04:54:06 +00:00
Joshua Yanovski	e7587c4d9d	Added non-admin moderators and timed bans. ... The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.	2021-05-09 21:19:16 -07:00
Samuel Keiffer	a86c3af42b	Merge branch 'aweinstock/mindflayerfixes-202105' into 'master' ... Mindflayer AI improvments See merge request veloren/veloren!2285	2021-05-10 02:54:21 +00:00
Avi Weinstock	1dfcdce1c0	Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons.	2021-05-09 18:09:31 -04:00
juliancoffee	93b3d12478	remove ssh feature from git2	2021-05-10 00:49:45 +03:00
juliancoffee	5e598964b1	Downgrade git2 to compile on windows	2021-05-10 00:09:33 +03:00
juliancoffee	2035c041f9	add authors	2021-05-09 13:12:26 +03:00
juliancoffee	279d57658d	Fix paths and adding tests	2021-05-09 13:12:26 +03:00
juliancoffee	0a63b10f4c	rename i18n/src/i18n.rs to i18n/src/data.rs	2021-05-09 13:12:26 +03:00
juliancoffee	735e8ab4ec	Extract common/src/assets.rs to own crate ... This gives us ability to use assets-related code in i18n without depending on whole veloren-common	2021-05-09 13:12:26 +03:00
juliancoffee	0784c2a76a	Make fields more private	2021-05-09 13:12:26 +03:00
juliancoffee	c511028290	remove unneeded imports	2021-05-09 13:12:26 +03:00
juliancoffee	911bf974f3	Use hashbrown	2021-05-09 13:12:26 +03:00
juliancoffee	89b6111064	Remove unused dependencies	2021-05-09 13:12:26 +03:00
juliancoffee	5573fc33b9	Extract voxygen/src/i18n.rs into own crate ... - New crate (i18n), currently under voxygen directory - Updated CI to run localization test from i18n, not from voxygen	2021-05-09 13:12:26 +03:00
juliancoffee	50e992ed0d	use hashbrown instead of std::collections	2021-05-09 13:12:26 +03:00
juliancoffee	622101d3b1	Update instuction for using binary	2021-05-09 13:12:26 +03:00
juliancoffee	fd387bda7c	Add comments	2021-05-09 13:12:25 +03:00
juliancoffee	5f32b37768	Integrate verification from i18n_check	2021-05-09 13:12:25 +03:00
juliancoffee	f42e8aa147	Integrate changes and improving code style ... - Integrate voxygen/i18n-check to voxygnen/src/i18n.rs - Make `cargo clippy` happy	2021-05-09 13:12:25 +03:00
juliancoffee	57cddb3ee3	Extract localization test to binary ... - Implement `--all` option - Implement `--lang <code>` option - Implement `--verify` command	2021-05-09 13:12:25 +03:00
Monty Marz	9f0ca486f7	Merge branch 'aweinstock/small-fixes' into 'master' ... Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE. See merge request veloren/veloren!2277	2021-05-09 09:58:44 +00:00
Monty Marz	a17bb0ad73	Better inactive/active audio slider logic	2021-05-09 09:51:41 +00:00
Avi Weinstock	0f424ec95a	Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE.	2021-05-08 17:49:51 -04:00
Avi Weinstock	76da18da3c	Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity trade, and improve the distance merchants are visible at.	2021-05-07 15:24:55 -04:00
Avi Weinstock	e4cda4309e	Add DamageKind, and make piercing damage partially ignore damage resistence. ... - Tweak bow/staff M1 stats.	2021-05-06 17:39:06 -04:00
Marcel Märtens	4cfdbdd069	use a constant for recommended_threads	2021-05-05 14:35:06 +02:00
Marcel Märtens	0142cf37f0	limit tokio threads to 1/4 of num_cpus ... make sure that rayon has at least 2 threads even on 1cpu systems to increase stability	2021-05-04 21:06:11 +02:00
Marcel Märtens	6e3a74b476	rayon::join creates a global threadpool, which is only used in /world ... instead just use the same threadpool for everything helps with debugging problems with GDB using threadpool.install() to also be used when `into_par_iter()` is called	2021-05-04 21:06:07 +02:00
Sam	5521c886c0	Removed useless clippy allow, added todo.	2021-05-04 11:27:17 -04:00
Sam	062c290e49	Made buff commands exhaustive	2021-05-04 09:54:28 -04:00
Sam	d99623b298	Buff icons	2021-05-04 08:45:14 -04:00
Sam	5c241850f1	Added sfx. Addressed comments.	2021-05-04 08:45:12 -04:00
Sam	7ac1488181	Added kit for testing tier 4 dungeons.	2021-05-04 08:45:11 -04:00
Sam	164fd0de04	Particles for frenzy buff and ground cleave.	2021-05-04 08:45:10 -04:00
jshipsey	c886accaf1	anims	2021-05-04 08:45:08 -04:00
Sam	d1139c3b7c	Added frenzy ability to minotaur. ... Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.	2021-05-04 08:45:07 -04:00
Sam	160bd3ef0c	Crippling strike now functional. Crippled debuff added.	2021-05-04 08:45:05 -04:00
Illia Denysenko	f04a4f907a	Add possibility to translate buff outcomes	2021-05-03 23:02:59 +00:00
Samuel Keiffer	771a8db2a8	Merge branch 'slipped/oritweak' into 'master' ... ori tweaks, animal adjusts See merge request veloren/veloren!2234	2021-05-03 18:49:22 +00:00
Samuel Keiffer	610c529c42	Merge branch 'sam/ability-sets' into 'master' ... Allow Specification of Custom Ability Sets per Weapon See merge request veloren/veloren!2231	2021-05-03 17:50:11 +00:00
Avi Weinstock	be39054767	Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic.	2021-05-03 00:09:44 -04:00
James Melkonian	f553700e8c	Add map markers for lakes and mountains	2021-05-03 02:00:23 +00:00
jshipsey	dc5a38f1e8	ori addition to combomelee	2021-05-01 12:29:28 -04:00
Joshua Barretto	d0953fcab0	Added map marker	2021-05-01 16:26:13 +00:00
Sam	d500a00414	Made naming of fields more explicit.	2021-05-01 09:25:56 -04:00
Sam	d3d4ee8bb0	Formatting stuffs.	2021-05-01 09:25:53 -04:00
Sam	914d78b4a9	Removed clone in animations. Added GATs to animations to do so.	2021-05-01 09:25:53 -04:00
Sam	3cb0ee98c8	Removed all unique and simple tool kinds.	2021-05-01 09:25:51 -04:00
Sam	a35b8b4aad	Removed ability set as field on items.	2021-05-01 09:25:49 -04:00
DaforLynx	7334cce426	Poise (stun) SFX and fix for town music	2021-04-29 23:36:22 +00:00
DaforLynx	2e0272ce28	Town music	2021-04-28 05:07:59 +00:00
Marcel	aa963493e8	Merge branch 'james/sound-unwraps' into 'master' ... Remove an unwrap and move outcome sfx to ron See merge request veloren/veloren!2206	2021-04-27 21:01:06 +00:00
James Melkonian	2f00af83d8	Remove an unwrap and move outcome sfx to ron	2021-04-27 21:01:06 +00:00
Marcel	8af1b42dbf	Merge branch 'yusdacra/chore/nix' into 'master' ... build(nix): update flake deps, switch buildPlatform to use crate2nix See merge request veloren/veloren!2202	2021-04-27 20:55:55 +00:00
Ludvig Böklin	34660462e9	Glider physics	2021-04-27 14:41:48 +00:00
Yusuf Bera Ertan	685f4971ac	build(nix): switch to crate2nix	2021-04-27 05:18:12 +03:00
jshipsey	2c74a86170	skill adjustments, ori changes	2021-04-25 22:02:32 -04:00
Samuel Keiffer	3f451ef7b3	Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master' ... Fix campfire heal buff description See merge request veloren/veloren!2165	2021-04-25 23:06:48 +00:00
Illia Denysenko	efd54021a7	Fix campfire heal buff description	2021-04-25 23:06:47 +00:00
Marcel	35584d0344	Merge branch 'xMAC94x/reduce_deps' into 'master' ... remove some unused deps Yuri found See merge request veloren/veloren!2197	2021-04-25 20:22:31 +00:00
Marcel Märtens	1842b2d6eb	remove some unused deps Yuri found	2021-04-25 20:18:20 +02:00
Sam	6848851dc3	Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided.	2021-04-25 13:09:10 -04:00
Monty	2e24fcf165	Add i18n, change SCT Blocked col and string	2021-04-25 13:09:09 -04:00
Sam	372eff2a02	Initial SCT implementation to display blocks.	2021-04-25 13:09:09 -04:00
Sam	d2d8d43410	Addressed testing feedback. ... Particles better.	2021-04-25 13:09:08 -04:00
Sam	b9d6bd2fd2	Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.	2021-04-25 13:09:07 -04:00
alfy	9f79c80072	block and parry sounds added	2021-04-25 13:09:06 -04:00
Sam	288a6f3a82	Blocking now works if no weapon is equipped in main hand. ... Added temp sfx for blocking and parrying. Added temp particles for successful parry. Tweaked values of default block ability.	2021-04-25 13:09:02 -04:00
jshipsey	fad31bd7ab	anim	2021-04-25 13:08:43 -04:00
Sam	91c6288213	Melee weapons can now block.	2021-04-25 13:08:42 -04:00
Samuel Keiffer	f31feff1aa	Merge branch 'juliancoffee/fix_buff_bar' into 'master' ... Fix bug with missing Burning icon See merge request veloren/veloren!2195	2021-04-25 15:55:43 +00:00
juliancoffee	94bfbe37ea	Fix Bug with missing Burning icon	2021-04-25 10:44:22 +03:00
juliancoffee	8fd1037bf3	Update doc-strings	2021-04-25 09:12:15 +03:00
Snowram	c16ec43938	Body specific beam offsets	2021-04-25 04:07:12 +02:00
Snowram	8f54a0bf31	More phoenix AI work ... More phoenix AI work	2021-04-25 04:07:12 +02:00
Snowram	8cf8e51962	Phoenix npc + AI (WIP)	2021-04-25 04:07:11 +02:00
Snowram	ab26efa970	Improves bird_large anims	2021-04-25 04:07:09 +02:00
Snowram	fd177c9669	Breathe and stun anims	2021-04-25 02:14:50 +02:00
Snowram	eb98360183	Cockatrice bird_large conversion	2021-04-25 02:14:50 +02:00
Snowram	0f6b902924	Idle, run, vel/ori aware fly anims	2021-04-25 02:14:49 +02:00
Snowram	bc95484863	Swaps bird_small skeleton to a new bird_large	2021-04-25 02:14:49 +02:00
Samuel Keiffer	e4324a3481	Merge branch 'ygor/skillbar-account-for-skillset' into 'master' ... Make skillbar buttons account for energy cost reduction See merge request veloren/veloren!2185	2021-04-24 19:32:19 +00:00
Ada Lovegirls	01c30868eb	Add option to load English string as fallback if string missing	2021-04-24 14:39:35 +00:00
Ben Wallis	c6205875ee	Merge branch 'xvar/server-version-check' into 'master' ... Added client/server version mismatch warnings See merge request veloren/veloren!2184	2021-04-24 09:05:45 +00:00
Ben Wallis	2e08c2f76f	Added client/server version mismatch message when a network error is encountered during client init. ... Added warning banner on character select when successfully connected to a server with a mismatched version.	2021-04-24 09:08:30 +01:00
Ygor Souza	4f71c621f4	Make skillbar buttons account for energy cost reduction ... Previously, the buttons would compare the current energy to the base cost of the ability, so they would sometimes be grayed out while the ability was usable. Now they ajust the ability with the character skillset before getting the energy cost for the purposes of setting the skillbar icon color.	2021-04-24 03:45:58 +02:00
juliancoffee	dc8d306890	Fix off-by-one error in localization tests ... BlameHunk lines start counting from 1, not 0. Comparing with `line + 1` fix this.	2021-04-23 14:11:44 +03:00
Monty Marz	b69eb61e7b	Add handles to lanterns, fix cooking pot scale	2021-04-22 17:12:07 +00:00
Joshua Barretto	f987f4d628	Fixed broken crafting sprite requirement	2021-04-22 12:30:48 +01:00
jshipsey	19ce4ad531	comments	2021-04-22 00:04:39 -04:00
jshipsey	2f523f5aa0	formatting	2021-04-22 00:04:39 -04:00
jshipsey	0962fe72f2	fix for 1h on back	2021-04-22 00:04:39 -04:00
jshipsey	9d82b20891	remove 0.8, add snow's mixed_vel idea for other bodies	2021-04-22 00:04:39 -04:00
Imbris	1af4a04231	Revert "Merge branch 'revert-b10718c5' into 'master'" ... This reverts merge request !2172	2021-04-21 17:10:13 +00:00
Joshua Barretto	880236f223	Merge branch 'zesterer/lanterns' into 'master' ... Made characters carry lanterns higher when possible See merge request veloren/veloren!2169	2021-04-21 16:40:20 +00:00
Joshua Barretto	81ba200e48	Improve dynamic light reflection for hill climbing	2021-04-21 17:10:53 +01:00
Joshua Barretto	2c95165c82	Improvements to lantern holding when sitting	2021-04-21 16:54:03 +01:00
Joshua Barretto	ed7cc12213	Made characters carry lanterns higher when possible	2021-04-21 15:59:29 +01:00
Imbris	fd672980c4	Revert "Merge branch 'imbris/agent-opt' into 'master'" ... This reverts merge request !2024	2021-04-21 14:10:06 +00:00
Imbris	26222a0a2d	Rename common-sys to common-systems and rearrange common-state slightly	2021-04-20 15:25:04 -04:00
Ludvig Böklin	762c68cfbb	Basic fluid dynamics and physical properties for entities	2021-04-20 17:38:19 +02:00
Joshua Barretto	70c345eee9	Made crafting UI check exact crafting sprite	2021-04-20 15:23:52 +01:00
Monty Marz	abacdfc719	clippy	2021-04-20 02:48:17 +02:00
Monty	a4d56e7843	more sprite stuff and crafting UI update ... fix item images fix CR display	2021-04-20 02:46:06 +02:00
Joshua Barretto	1a0f6f03ef	Prevent crafting without station	2021-04-20 02:46:05 +02:00
Monty	a1fe7c12c3	fmt, add sprites	2021-04-20 02:46:04 +02:00
Joshua Barretto	5598d07944	Added crafting stations	2021-04-20 02:45:59 +02:00
Marcel Märtens	5862920f32	seperate sys/state	2021-04-20 01:30:17 +02:00
Imbris	8c9d4dc3dd	Merge branch 'capucho/inactive-master' into 'master' ... Lower volume of window on focus loss See merge request veloren/veloren!2150	2021-04-19 20:39:49 +00:00
João Capucho	7a9876760b	Voxygen: Allow zoom on minimap with kbd	2021-04-19 20:26:54 +01:00
João Capucho	f23b515dd8	Voxygen: Add master volume sliders to the settings	2021-04-19 19:58:14 +01:00
João Capucho	7589331785	Voxygen: Add support for map zoom with keybind	2021-04-19 11:56:58 +01:00
João Capucho	fd302b6975	Voxygen: Add inactive window volume	2021-04-19 10:24:31 +01:00
João Capucho	1d605c2dc8	Voxygen: Update ambient channels volume	2021-04-19 10:24:28 +01:00
João Capucho	05279872ce	Voxygen: Use the master volume setting	2021-04-19 10:20:42 +01:00
Samuel Keiffer	0b80e8ac5d	Merge branch 'capucho/stop-ambient' into 'master' ... Stop ambient sounds on logout See merge request veloren/veloren!2151	2021-04-18 23:38:10 +00:00
Sam	ce7581037c	Overhauled dash melee.	2021-04-18 18:36:12 -04:00
João Capucho	26c2738dc2	Voxygen: Stop ambient sounds on logout	2021-04-18 21:35:43 +01:00
Avi Weinstock	0404250300	Unlock dodge roll iframes and staff explosion by default.	2021-04-18 16:16:06 -04:00
Samuel Keiffer	bf6c22462f	Merge branch 'xvar/inventory-sorting' into 'master' ... Implemented inventory sorting See merge request veloren/veloren!2141	2021-04-17 22:57:56 +00:00
Ben Wallis	a4cdb89987	Implemented inventory sorting	2021-04-17 22:04:08 +01:00
Yusuf Bera Ertan	62844d816a	build(nix): switch to nix-cargo-integration	2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan	198545f219	build: use git keyboard-keynames to fix nix build error	2021-04-17 21:37:22 +03:00
Imbris	30e34aad44	Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining	2021-04-16 21:58:59 -04:00
Samuel Keiffer	a1d9ba15d9	Merge branch 'DaforLynx/normalize' into 'master' ... Normalize + shrink all sfx; tweaks to combat music; change footstep sounds See merge request veloren/veloren!2120	2021-04-16 00:35:15 +00:00
DaforLynx	f441c8c206	Normalize + shrink all sfx; tweaks to combat music; change footstep sounds	2021-04-16 00:35:13 +00:00
Samuel Keiffer	c962c5f12e	Merge branch 'gGmMsS/Burning' into 'master' ... Added burning debuff for Staff M2 See merge request veloren/veloren!2134	2021-04-15 23:51:33 +00:00
Imbris	85ee4c8cd1	Merge branch 'aweinstock/server-authoritative-physics' into 'master' ... Aweinstock/server authoritative physics See merge request veloren/veloren!2126	2021-04-15 22:24:00 +00:00
gGmMsS123	d5a887f195	m2 staff	2021-04-16 00:48:20 +03:00
gGmMsS123	e33961e1fa	M2 Staff Final Touch	2021-04-16 00:34:24 +03:00
Ben Wallis	1144eefa46	Fixed miscount in Overitem::prim_count causing the tutorial button to fly around when multiple overitem texts are drawn	2021-04-15 21:45:09 +01:00
gGmMsS123	0d956610ec	Added burning debuff for Staff M2	2021-04-15 23:34:28 +03:00
Justin Shipsey	803e67b1fb	Merge branch 'slipped/changes' into 'master' ... combat tweaks See merge request veloren/veloren!2131	2021-04-15 17:36:19 +00:00
jshipsey	8f20d17c9a	attacking movement tweaks	2021-04-15 12:13:50 -04:00
jshipsey	896d2a5b63	combat tweaks	2021-04-15 11:43:52 -04:00
Avi Weinstock	50d0314a75	Add a toggle to negotiate the use of server-authoritative physics.	2021-04-15 08:50:17 -04:00
Marcel	a386a27411	Merge branch 'hqurve/settings-cleanup' into 'master' ... Settings changes from the ui are now wrapped into a single enum and handling was moved to session/settings_change.rs, also settings.rs was split up See merge request veloren/veloren!2130	2021-04-15 09:06:10 +00:00
hqurve	6ac2b87006	Debug change visibility from settings_window works again	2021-04-14 19:24:28 -04:00
hqurve	9018ead8d0	Seem to have missed minimap again	2021-04-14 19:10:18 -04:00
hqurve	399795dbf1	simplified settings changing within hud and settings_window	2021-04-14 19:10:18 -04:00
hqurve	4503d5160c	forgot to add minimap to settings_change	2021-04-14 19:10:17 -04:00
hqurve	56deb5919f	cleaned up settings_change.rs	2021-04-14 19:10:17 -04:00
hqurve	df38dfbaf8	Wrapped settings changes from the ui into a single enum and handling moved to session/settings_change.rs	2021-04-14 19:10:17 -04:00
hqurve	732fe3bb40	Moved session.rs into session/mod.rs	2021-04-14 19:10:17 -04:00
hqurve	685eeb42d8	Split settings.rs into multiple files	2021-04-14 19:10:17 -04:00
hqurve	8effdb1773	Moved settings.rs to settings/mod.rs	2021-04-14 19:10:17 -04:00
Sam	c88df846a7	Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.	2021-04-14 17:38:37 -04:00
Samuel Keiffer	435b5d5912	Merge branch 'holychowders/resolve_issue_#978_extract_skillset_into_own_component' into 'master' ... Resolve Issue #978 - Extract SkillSet Into Its Own Component Closes #1065 and #978 See merge request veloren/veloren!2116	2021-04-14 15:35:35 +00:00
holychowders	568a8d9666	Resolve Issue #978 - Extract SkillSet Into Its Own Component	2021-04-14 15:35:34 +00:00
Ben Wallis	d6b3eb3784	Fixed initial creation of saves directory. Added path of old singleplayer saves directory to information logged when it is moved to the new userdata directory	2021-04-14 07:15:51 +01:00
jshipsey	808634aa75	addressing commments	2021-04-13 20:19:35 -04:00
jshipsey	a7f5b90f0e	2h/1h bug fix, staggers	2021-04-13 20:19:35 -04:00
jshipsey	ea9b871374	loot tables, clippy, animation tweaks	2021-04-13 20:18:59 -04:00
jshipsey	42460f7e65	spins, combos	2021-04-13 20:18:59 -04:00
jshipsey	97528b7954	leaps	2021-04-13 20:18:59 -04:00
jshipsey	529f8eb5a6	more setups. chargeswing/dash anims	2021-04-13 20:18:59 -04:00
jshipsey	9a26024acb	alpha attacks	2021-04-13 20:18:59 -04:00
Sam	0b10ffc715	You can now roll without a weapon equipped.	2021-04-13 20:18:58 -04:00
Sam	c594f67d47	Fixed offhand weapons, when nothing was in the mainhand	2021-04-13 20:18:58 -04:00
jshipsey	b53e1653f6	initial wield testing	2021-04-13 20:18:58 -04:00
Ben Wallis	1de94a9979	* Replaced diesel with rusqlite and refinery ... * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions	2021-04-13 22:05:47 +00:00
Adam Blanchet	0d7d069d41	Display keys based off of scancodes ... Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354	2021-04-13 11:16:47 +02:00
Samuel Keiffer	522e89d57f	Merge branch 'mdx97/fix-diary-toggle' into 'master' ... Fix diary toggling when escape menu is open. See merge request veloren/veloren!2109	2021-04-13 06:07:01 +00:00
Illia Denysenko	d42c03d57e	Fix localization test bug which produced bunch of Unknown states	2021-04-12 21:29:45 +00:00
Samuel Keiffer	e1020945dd	Merge branch 'aweinstock/combat-music' into 'master' ... Add combat music transitions based on number of enemies in player radius. See merge request veloren/veloren!2077	2021-04-12 06:01:19 +00:00
Monty Marz	f7c8389f77	Merge branch 'hqurve/settings-ui' into 'master' ... Cleanup of settings window: split each tab into its own file See merge request veloren/veloren!2108	2021-04-12 04:11:06 +00:00
Avi Weinstock	df4f44d946	Address MR 2077 review comments.	2021-04-11 22:08:42 -04:00
Avi Weinstock	d401d00d94	Address MR2077 review comments: add comment about group::ENEMY and remove trace statements, and fuse filtering loops.	2021-04-11 22:08:41 -04:00
Avi Weinstock	7c34a96934	Make fade timings configurable, and stop combat music on death.	2021-04-11 22:08:41 -04:00
Avi Weinstock	f1b022cdee	Add new version of combat soundtrack, and change details of how transitions between tracks work.	2021-04-11 22:08:41 -04:00
Avi Weinstock	0e16c23707	Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.	2021-04-11 22:08:41 -04:00
Avi Weinstock	5bfdd5f1af	Add combat music transitions based on number of enemies in player radius.	2021-04-11 22:08:40 -04:00
Marcel	54024ce401	Merge branch 'DaforLynx/more-music' into 'master' ... Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds See merge request veloren/veloren!2102	2021-04-12 00:43:08 +00:00
DaforLynx	9db290d4ea	Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds	2021-04-12 00:43:08 +00:00
mdx97	03abe234ee	Fix diary toggling when escape menu is open.	2021-04-11 18:53:45 -05:00
Marcel	5e7adc6767	Merge branch 'trade-help-tooltips' into 'master' ... Show ctrl-click and shift-click usage in item tooltips during trades. See merge request veloren/veloren!2101	2021-04-11 22:56:03 +00:00
Rickey Chamblee	8a25ebb59a	Show ctrl-click and shift-click usage in item tooltips during trades.	2021-04-11 22:56:02 +00:00
Joshua Yanovski	508dba61a1	Merge branch 'xMAC94x/deps' into 'master' ... update deps See merge request veloren/veloren!2095	2021-04-11 22:55:56 +00:00
hqurve	fd80a97f3d	Got rid of content setup macro	2021-04-11 17:36:02 -04:00
hqurve	690419ad90	Placed tabs in a loop and combined tab content chooser using macro	2021-04-11 17:36:02 -04:00
hqurve	469cb391d3	cleaned widget_ids	2021-04-11 17:36:02 -04:00
hqurve	04eea482ce	Moved settings window sections into separate files	2021-04-11 17:36:02 -04:00
hqurve	f2340105c1	Moved settings_window.rs to to settings_window/mod.rs	2021-04-11 17:36:02 -04:00
Vincent Foulon	de9d5b5e14	clean workspace ... clean workspace (2) clean workspace (2)	2021-04-11 16:35:24 +02:00
Vincent Foulon	7128c3d3f6	Asset reorganization + removed some unused and duplicates + reduce size of some images	2021-04-11 16:35:17 +02:00
Monty Marz	6772e71aaa	UI fixes and more	2021-04-11 03:49:47 +00:00
Joshua Yanovski	8b034ed56f	Merge branch 'sharp/sprites-in-background' into 'master' ... Mesh sprites in background. See merge request veloren/veloren!2098	2021-04-10 20:34:35 +00:00
Marcel	adb18ef645	Merge branch 'mdx97/default-names' into 'master' ... Use username as default character name in multiplayer character creation. See merge request veloren/veloren!2085	2021-04-10 16:41:47 +00:00
mdx97	eb4fb33f45	Use username as default character name in multiplayer character creation.	2021-04-10 16:41:46 +00:00
Joshua Yanovski	1bdf3b13a8	Mesh sprites in the background. ... This makes the delay afetr selecting a character before logging into the game much shorter, in the common case. It still doesn't handle things perfectly (it blocks creating Terrain::new if it's not finished, and it could be faster due to working in the background), but it's still a lot better than it was before. To improve sprite meshing performance, we also apply the terrain flat_get optimizations to sprites. Though I didn't initially know how much of an impact it would have, it feels significantly faster to me, though being able to parallelize it would be ideal.	2021-04-10 17:51:42 +02:00
Marcel Märtens	655a35d128	update deps	2021-04-10 15:53:00 +02:00
Joshua Yanovski	af94753ad9	Remove panics and unwraps, part 1. ... Also fixes various other miscellaneous bugs.	2021-04-10 10:03:21 +02:00
hqurve	be42cc60c4	Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window	2021-04-07 20:24:22 +00:00
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
James Melkonian	f2ebbb7f7f	Map icon scaling	2021-04-06 08:42:09 -07:00
James Melkonian	8ee1fc4a0f	Add layers to minimap	2021-04-06 08:42:08 -07:00
James Melkonian	bacda06dba	Added map layers	2021-04-06 08:42:07 -07:00
James Melkonian	70ede7f34d	Topographic map	2021-04-06 08:42:06 -07:00
Joshua Barretto	de9ad0942f	Merge branch 'zesterer/follow-cam' into 'master' ... Added auto camera setting See merge request veloren/veloren!2071	2021-04-06 04:23:40 +00:00
Joshua Barretto	60e2ed3e7d	Added auto camera setting	2021-04-05 23:24:31 +01:00
Marcel	4dde9f84b0	Merge branch 'huntertparks/fix-cursor-not-locking' into 'master' ... Fixes #520 and #840 - locks cursor to screen when menu is not open Closes #840 and #520 See merge request veloren/veloren!2069	2021-04-05 21:40:24 +00:00
Hunter Parks	6af9662b03	Change cursor lock location to be center of screen ... Changing the cursor coordinates to the middle of the screen had some side effects. When a user would close a menu and re-open it back up without moving the mouse, the cursor position would not change. This commit takes care of that by changing how the HUD handles closing menus via keyboard inputs.	2021-04-05 16:48:22 +02:00
Hunter Parks	7df0413be4	Fixes #520 and #840 - locks cursor to screen when menu is not open ... Rather than lock the cursor to the middle of the screen, the cursor will move to it's last known coordinates when a menu or the minimap is not open.	2021-04-05 16:37:40 +02:00
Monty	b8c474057c	More cheese is less cheese ... Update CHANGELOG.md fmt Update crafting.rs	2021-04-05 13:40:12 +02:00
Marcel	69891f0b70	Merge branch 'login-trim-username' into 'master' ... login trim username, improve validation, social ordering #1040 Closes #1040 See merge request veloren/veloren!2042	2021-04-04 22:09:16 +00:00
Avi Weinstock	78f130a3b2	Add a cheese counter in the bag display.	2021-04-04 11:14:25 -04:00
Monty Marz	06bbb7f0ff	Crafting Tabs and more item tags	2021-04-04 13:02:27 +00:00
DaforLynx	6734198104	Adds on-hit combat sfx	2021-04-04 03:04:02 +00:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Avi Weinstock	b7dbadc32f	Add colors for buy/sell tooltips based on site prices.	2021-04-02 17:44:02 -04:00
Marcel	42463d1fe0	Revert "Merge branch 'animtweaks' into 'master'" ... This reverts merge request !2039	2021-04-01 18:45:03 +00:00
aljazerzen	08146f6a3a	login trim username, improve validation, social ordering	2021-04-01 16:43:27 +02:00
jshipsey	030e14f333	small anim tweaks	2021-04-01 03:08:33 -04:00
Avi Weinstock	0122dca3c3	Allow fast stacking into and out of a trade with {ctrl,shift} click. ... Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.	2021-03-30 18:39:10 -04:00
Marcel Märtens	ccb78eeb5c	move tracing code to own crate	2021-03-30 16:35:36 +02:00
Joshua Barretto	3c19713e63	Merge branch 'zesterer/sprite-text' into 'master' ... Added text prompts to sprites See merge request veloren/veloren!2034	2021-03-30 11:41:14 +00:00
Joshua Barretto	bed863c50c	Added indicator text to terrain sprites	2021-03-30 01:04:23 +01:00
Joshua Barretto	85237c7a32	Fixed training dummy hitbox	2021-03-29 21:52:05 +01:00
Joshua Barretto	8f3233365d	Improved hit particles	2021-03-29 21:52:05 +01:00
Joshua Barretto	b0acbda236	Improved archery with feedback sfx and particles	2021-03-29 21:52:04 +01:00
Snowram	6adaac8106	Addresses comments	2021-03-29 18:35:12 +02:00
Snowram	b8ac90d049	Changelog, cleanup, clippy	2021-03-29 18:35:10 +02:00
Snowram	5b99b7ca18	Skillbar uses item tooltip	2021-03-29 18:34:45 +02:00
Snowram	508e35ca17	Add several new i18n lines	2021-03-29 18:34:45 +02:00
Snowram	d1e734b9b1	Tooltip now use ItemDesc instead of Item	2021-03-29 18:34:45 +02:00
Snowram	2c09180189	Set the item tooltip for every bag slots	2021-03-29 18:34:45 +02:00
Snowram	b7dd2d6685	Use a dummy item for the new() function	2021-03-29 18:34:45 +02:00
Snowram	955008c3c1	Kinda working tooltip height but not really	2021-03-29 18:34:45 +02:00
Snowram	0405f04d53	More item tooltip UI layout	2021-03-29 18:34:45 +02:00
Snowram	aa71dcb9c7	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
Snowram	4786f84afd	New tooltip	2021-03-29 18:34:45 +02:00
Marcel Märtens	e7452aa7ab	do a clear teardown of tokio runtime	2021-03-29 10:34:33 +02:00
Marcel Märtens	614a0aac13	display error when rodio panic is fixed	2021-03-28 20:40:07 +02:00
Sam	0c19679406	Fixed offset of decayed health	2021-03-27 21:06:21 -04:00
Monty	345ef1ca22	decay display for groups and overhead bars	2021-03-27 21:05:17 -04:00
Sam	06bd7bd929	Removed experimental group health decay	2021-03-27 21:05:17 -04:00
jshipsey	558c82ee54	flayer anims	2021-03-27 21:05:16 -04:00
Sam	91ddcaa155	Particles for summoned minions	2021-03-27 21:05:15 -04:00
Monty Marz	345b725478	decayed health texture	2021-03-27 21:05:14 -04:00
Monty Marz	cc70560027	WIP animation	2021-03-27 21:05:13 -04:00
Sam	c0c6ff3063	Initial work to show decayed health in healthbars	2021-03-27 21:05:13 -04:00
Sam	4ec387af82	Added particles for lifesteal effect	2021-03-27 21:05:12 -04:00
Sam	71b847cabb	Particles for blink	2021-03-27 21:05:09 -04:00
Snowram	39c8efe11f	Adds husk npc	2021-03-27 21:05:09 -04:00
Sam	720482d994	Gave mindflayer AI. ... Fixed particles and made them sync across network.	2021-03-27 21:05:06 -04:00
Sam	30da614e89	Added dimensional door ability for mindflayer	2021-03-27 21:05:05 -04:00
Sam	f1156c9ce5	Added necrotic vortex attack to mindflayer	2021-03-27 21:05:03 -04:00
Sam	0d3795112c	Added cursed flame attack to mindflayer	2021-03-27 21:05:03 -04:00
Marcel	79cc3af058	Merge branch 'swilliams/character-randomization-fix' into 'master' ... Character Creation Randomization Fix See merge request veloren/veloren!2004	2021-03-27 15:58:34 +00:00
Scott Williams	9ca0388561	Character Creation Randomization Fix	2021-03-27 15:58:34 +00:00
Louis Pearson	165065725e	Add build_area_list command ... * Reworks CanBuild to use HashSet * Removes player argument from build permission, use sudo instead	2021-03-27 07:54:02 -06:00
Louis Pearson	120a0cd9a7	Limit build mode to bounding box	2021-03-27 07:54:02 -06:00
Louis Pearson	eade0540b2	Add permit_build command ... This commit separates permission to build from building mode, allowing build to become a NoAdmin command (since players will first need permission from an Admin to enter build mode)	2021-03-27 07:54:02 -06:00
Marcel	da5c73c84b	Merge branch 'refactor-login' into 'master' ... refactor handling of duplicate login #1015 Closes #1015 See merge request veloren/veloren!1992	2021-03-27 13:49:09 +00:00
Marcel	843850a4b8	Merge branch 'aweinstock/tradepricing' into 'master' ... Get SitePricing information to clients, and use it to display coin-denominated... See merge request veloren/veloren!1991	2021-03-26 00:17:39 +00:00
aljazerzen	0ea102dc9c	refactor handling of duplicate login	2021-03-25 12:33:56 +01:00
Avi Weinstock	8d90548331	Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.	2021-03-25 02:11:58 -04:00
Snowram	0e259294d4	Allow Escape key to cancel trades	2021-03-25 01:42:14 +01:00
Avi Weinstock	6b343c2af9	Address MR 1962 review comments.	2021-03-23 18:41:13 -04:00
Avi Weinstock	4ec6b43693	Add a vertical camera clamp option and toggle to voxygen.	2021-03-23 18:22:32 -04:00
Joshua Barretto	21b20ea75e	Merge branch 'aweinstock/enable-rtsim-airships' into 'master' ... Enable RtSim Airships. See merge request veloren/veloren!1973	2021-03-23 14:29:43 +00:00
Avi Weinstock	49f39fb752	Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).	2021-03-23 10:44:32 +01:00
Sam	7ede94b4c9	Changelog	2021-03-22 23:53:00 -04:00
Marcel Märtens	6b23101fac	update toolchain to nightly-2021-03-22	2021-03-22 16:41:04 +01:00
Marcel Märtens	fdc40f52d9	give more threads a fixed name	2021-03-22 12:37:03 +01:00
Justin Shipsey	f57af6f776	Merge branch 'slipped/animtweaks' into 'master' ... airship movement bits See merge request veloren/veloren!1967	2021-03-22 08:49:04 +00:00
Joshua Barretto	6690854687	Merge branch 'zesterer/better-particle-emission' into 'master' ... Smoother particle emission for moving objects See merge request veloren/veloren!1965	2021-03-22 06:15:20 +00:00
Marcel	dc4570def5	Merge branch 'sharp/texture-atlases' into 'master' ... Enable allocation of new textures on atlas allocation failure. See merge request veloren/veloren!1949	2021-03-22 04:35:41 +00:00
jshipsey	31747d8ff1	airship movement bits	2021-03-21 21:43:49 -04:00
Joshua Barretto	7b736640f5	Smoother particle emission for moving objects	2021-03-22 00:23:25 +00:00
Joshua Barretto	7ae4230dc8	Merge branch 'zesterer/pick' into 'master' ... Pickaxe See merge request veloren/veloren!1959	2021-03-22 00:19:42 +00:00
Joshua Barretto	6ea5aa796b	Faster pick, less vibrant block selection	2021-03-21 20:38:08 +00:00
Joshua Barretto	fb3980e273	Outcome for block destruction, take select_pos from ControllerInputs	2021-03-21 20:10:05 +00:00
Sam	f342be71a1	Fixed pick animation	2021-03-21 15:29:17 -04:00
Marcel	983523c463	Merge branch 'vfoulon80/climbing-skill' into 'master' ... Add climbing speed and cost See merge request veloren/veloren!1950	2021-03-21 18:35:44 +00:00
Joshua Barretto	b1026296cb	Disabled block selection when not wielding	2021-03-21 16:29:13 +00:00
Joshua Barretto	347e1022a0	Initial implementation of pickaxe	2021-03-21 16:09:16 +00:00
Vincent Foulon	e06870702f	Add skill for swimming speed	2021-03-21 15:58:38 +01:00
RedlineTriad	606420c5e1	Sort the playerlist alphabetically	2021-03-21 10:22:33 +01:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Joshua Yanovski	866cc79d2e	Enable allocation of new textures on atlas allocation failure. ... This solves the problem of not being able to set the view distance too high, especially in pathological cases like giant trees. For simplicity, we just freeze any atlas where allocation failed and start allocating to a new texture and atlas, letting reference counting destroy the old one when there are no more references to it. Because of the spatial locality of chunk allocations, chunks allocated together will virtually always have similar lifetimes, so the odds of this causing significant fragmentation are very low, meaning this simple solution should not do much worse than a much fancier one.	2021-03-20 16:21:41 +01:00
Marcel Märtens	2733ba2e27	Change the version number to 0.9	2021-03-20 13:07:09 +01:00
Avi Weinstock	0ef42e3854	Address MR 1945 review comments.	2021-03-19 19:53:17 -04:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Vincent Foulon	80635004a4	Remove unwraps when asset loading fails	2021-03-18 12:56:17 +00:00
Vincent Foulon	eafa69ee4c	allow loading animations to be contributed from a manifest file	2021-03-17 23:41:28 +01:00
Vincent Foulon	62b945dab1	Add new random loading animations	2021-03-17 18:15:25 +01:00
Monty Marz	e9cbac387e	new loading bg, staff models ... item images fix paths loot tables, adjustments Update main.ron	2021-03-16 23:23:24 +00:00
Marcel Märtens	a286eb084a	create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it	2021-03-16 13:31:04 +01:00
Joshua Barretto	6f10a56589	Optimised entity sync code, increased animation throttling distance	2021-03-16 02:49:33 +00:00
James Melkonian	6ea43cfd75	Various RtSim and Agent Interaction Fixes	2021-03-16 01:30:35 +00:00
Joshua Barretto	0312c06295	Fixed sliding when wielding	2021-03-15 14:18:56 +00:00
Marcel	5b21ee7200	Merge branch 'aweinstock/airship-mvp-rebased' into 'master' ... Airships See merge request veloren/veloren!1888	2021-03-15 11:37:12 +00:00