3954 Commits

Author	SHA1	Message	Date
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
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
juliancoffee	681fd37429	style	2021-06-27 02:44:19 +03: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
Benoît du Garreau	1cba7db9b6	Update assets_manager to 0.5	2021-06-26 12:05:40 +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
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	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
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
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	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
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
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
Monty	dd0368eed4	3d icon shading	2021-06-07 14:27:49 +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
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
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
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
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	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	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	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
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
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
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	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	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	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
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
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	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
James Melkonian	2f00af83d8	Remove an unwrap and move outcome sfx to ron	2021-04-27 21:01:06 +00:00
Ludvig Böklin	34660462e9	Glider physics	2021-04-27 14:41:48 +00: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
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	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	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
Ben Wallis	a4cdb89987	Implemented inventory sorting	2021-04-17 22:04:08 +01: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
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	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
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
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
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
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	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
Avi Weinstock	0ef42e3854	Address MR 1945 review comments.	2021-03-19 19:53:17 -04: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
Forest Anderson	0049976da9	Merge branch 'aweinstock/tradefixes-20210314' into 'master' ... Client-side trade fixes: update recipe cache and always put client on the same... See merge request veloren/veloren!1904	2021-03-15 04:52:09 +00:00
Avi Weinstock	9304ecab3d	Address Imbris's MR 1888 comments, and add changelog entry. ... - Use Ori::{new,to_quat} and make the field private. - Update/capitalize/add various comments. - Implicitly drop scope guards where applicable. - Take !Copy colliders by reference instead of cloning. - s/cylinder_voxel_collision/box_voxel_collision/ - Unindent some physics code with a continue.	2021-03-14 23:21:46 -04:00
Avi Weinstock	a32be4ac5a	Address MR 1888 review comments. ... - Delete obsolete symbolic links. - Add suggested comments. - Remove dead code.	2021-03-14 23:17:28 -04:00
Avi Weinstock	aa56166c80	Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.	2021-03-14 23:17:26 -04:00
Joshua Barretto	afd99788b2	Made animations and friction ground-relative	2021-03-14 23:09:52 -04:00
Avi Weinstock	e9aab63a04	Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.	2021-03-14 23:09:52 -04:00
Avi Weinstock	bcd3799395	Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.	2021-03-14 23:09:51 -04:00
Avi Weinstock	5d85775dcf	Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).	2021-03-14 23:09:51 -04:00
Avi Weinstock	8b9e84972a	Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).	2021-03-14 23:09:49 -04:00
Avi Weinstock	95992ead4d	Client-side trade fixes: update recipe cache and always put client on the same side of the screen as their inventory.	2021-03-14 21:41:47 -04:00
Marcel	5570b57282	Merge branch 'sam/yeet-inputs' into 'master' ... Reworked Controller Inputs to use Control Actions See merge request veloren/veloren!1900	2021-03-15 01:32:02 +00:00
Imbris	a558d42da7	Merge branch 'snowram/new-npcs' into 'master' ... Snowram/new npcs See merge request veloren/veloren!1896	2021-03-15 00:10:46 +00:00
Sam	ecff675cc4	Wielding now works again ... Rolling now resumes combo states correctly again Cleanup	2021-03-14 17:26:55 -04:00
Sam	ac6e192db4	Completely purged old method of inputs	2021-03-14 17:26:55 -04:00
Sam	b5d501199d	Secondary input now fully functional	2021-03-14 17:26:53 -04:00
Sam	c6d8daaae3	Primary input now activated from control actions. ... Moved a lot of key_state to a HashSet so that it is handled automatically.	2021-03-14 17:26:51 -04:00
Snowram	60dd47cdea	Theropod charge attack	2021-03-14 18:10:40 +01:00
PersianKnight	b87514266d	Bug fix debug info hotkey and axe skill tree text	2021-03-14 20:16:54 +03:30
Snowram	9d7e8957bb	Add new npcs	2021-03-14 14:24:35 +01:00
Christof Petig	15b11d9154	Implement /price_list (work in progress), stub for /buy and /sell ... remove outdated economic simulation code remove old values, document add natural resources to economy Remove NaturalResources from Place (now in Economy) find closest site to each chunk implement natural resources (the distance scale is wrong) cargo fmt working distance calculation this collection of natural resources seem to make sense, too much Wheat though use natural resources and controlled area to replenish goods increase the amount of chunks controlled by one guard to 50 add new professions and goods to the list implement multiple products per worker remove the old code and rename the new code to the previous name correctly determine which goods guards will give you access to correctly estimate the amount of natural resources controlled adapt to new server API instrument tooltips Now I just need to figure out how to store a (reference to) a closure closures for tooltip content generation pass site/cave id to the client Add economic information to the client structure (not yet exchanged with the server) Send SiteId to the client, prepare messages for economy request Make client::sites a HashMap Specialize the Crafter into Brewer,Bladesmith and Blacksmith working server request for economic info from within tooltip fully operational economic tooltips I need to fix the id clash between caves and towns though fix overlapping ids between caves and sites display stock amount correctly handle invalid (cave) ids in the request some initial balancing, turn off most info logging less intrusive way of implementing the dynamic tool tips in map further tooltip cleanup further cleanup, dynamic tooltip not fully working as intended correctly working tooltip visibility logic cleanup, display labor value separate economy info request in a separate translation unit display values as well nicer display format for economy add last_exports and coin to the new economy do not allocate natural resources to Dungeons (making town so much larger) balancing attempt print town size statistics cargo fmt (dead code) resource tweaks, csv debugging output a more interesting town (and then all sites) fix the labor value logic (now we have meaningful prices) load professions from ron (WIP) use assets manager in economy loading professions works use professions from ron file fix Labor debug logic count chunks per type separately (preparing for better resource control) better structured resource data traders, more professions (WIP) fix exception when starting the simulation fix replenish function TODO: - use area_ratio for resource usage (chunks should be added to stock, ratio on usage?) - fix trading documentation clean up fix merge artifact Revise trader mechanic start Coin with a reasonable default remove the outdated economy code preserve documentation from removed old structure output neighboring sites (preparation) pass list of neighbors to economy add trade structures trading stub Description of purpose by zesterer on Discord remember prices (needed for planning) avoid growing the order vector unboundedly into_iter doesn't clear the Vec, so clear it manually use drain to process Vecs, avoid clone fix the test server implement a test stub (I need to get it faster than 30 seconds to be more useful) enable info output in test debug missing and extra goods use the same logging extension as water, activate feature update dependencies determine good prices, good exchange goods a working set of revisions a cozy world which economy tests in 2s first order planning version fun with package version buy according to value/priority, not missing amount introduce min price constant, fix order priority in depth debugging with a correct sign the trading plans start to make sense move the trade planning to a separate function rename new function reorganize code into subroutines (much cleaner) each trading step now has its own function cut down the number of debugging output introduce RoadSecurity and Transportation transport capacity bookkeeping only plan to pay with valuable goods, you can no longer stockpile unused options (which interestingly shows a huge impact, to be investigated) Coin is now listed as a payment (although not used) proper transportation estimation (although 0) remove more left overs uncovered by viewing the code in a merge request use the old default values, handle non-pileable stocks directly before increasing it (as economy is based on last year's products) don't order the missing good multiple times also it uses coin to buy things! fix warnings and use the transportation from stock again cargo fmt prepare evaluation of trade don't count transportation multiple times fix merge artifact operational trade planning trade itself is still misleading make clippy happy clean up correct labor ratio of merchants (no need to multiply with amount produced) incomplete merchant labor_value computation correct last commit make economy of scale more explicit make clippy happy (and code cleaner) more merchant tweaks (more pop=better) beginning of real trading code revert the update of dependencies remove stale comments/unused code trading implementation complete (but untested) something is still strange ... fix sign in trading another sign fix some bugfixes and plenty of debugging code another bug fixed, more to go fix another invariant (rounding will lead to very small negative value) introduce Terrain and Territory fix merge mistakes	2021-03-14 03:18:32 +00:00
Imbris	fcdd7f1c8b	Merge branch 'imbris/tracy-tweaks' into 'master' ... Improvements for tracy server analysis and other misc tweaks See merge request veloren/veloren!1891	2021-03-13 22:26:26 +00:00
Imbris	0127832172	Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode	2021-03-13 13:30:20 -05:00
PersianKnight	7c0fe70453	Improve default value of windows_size in Graphics and Help Windows in Interface Settings.	2021-03-13 19:09:38 +03:30
PersianKnight	42d57ccb92	The appearance of the reset buttons has improved.	2021-03-13 17:42:52 +03:30
PersianKnight	e3c0ceb9fa	Fixed Toggle Debug Info from Settings	2021-03-13 17:38:34 +03:30
Imbris	8d0b776f18	Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements ... - remove overwritten logging setting in server-cli - add server-cli command to load a random area for testing without a client - make admin add/remove commands modify ingame players instead of needing to reconnect - add spans to par_join jobs - added test command that loads up an area of the world - add tracy-world-server alias - set debug directives to info for logging	2021-03-13 02:28:59 -05:00
Samuel Keiffer	4022937da7	Merge branch 'PersianKnight/InterfaceSettings' into 'master' ... Separated InterfaceSettings from GameplaySettings See merge request veloren/veloren!1887	2021-03-13 01:55:18 +00:00
DaforLynx	99261bf105	Many small changes to audio code, mainly sfx - changelog in MR	2021-03-12 15:00:09 -08:00
PersianKnight	dcb32a7ff1	Separated InterfaceSettings from GameplaySettings	2021-03-12 22:45:44 +03:30
jshipsey	49f496e290	intitial values	2021-03-12 00:58:12 -05:00
Marcel	93cab075f8	Merge branch 'xMAC94x/non_blocking_register' into 'master' ... Auth requests are now done async, the register system is fetching it, via a PendingLogin component See merge request veloren/veloren!1875	2021-03-11 21:51:55 +00:00
Joshua Barretto	a9bcaf0a37	Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master' ... Add Reset to Default Buttons for Interface, Gameplay and Sound Settings See merge request veloren/veloren!1877	2021-03-11 21:29:11 +00:00
PersianKnight	3b3ffe30e9	Add Reset to Default Buttons for Interface, Gameplay and Sound Settings	2021-03-11 22:09:30 +03:30
Joshua Barretto	f479231b15	Merge branch 'glowy-shiny-pretty' into 'master' ... Glowy shiny pretty See merge request veloren/veloren!1874	2021-03-11 17:37:33 +00:00
Samuel Keiffer	9b198b5cda	Merge branch 'sam/sceptre-overhaul' into 'master' ... Overhaul sceptre Closes #768 See merge request veloren/veloren!1845	2021-03-11 16:47:50 +00:00
Marcel Märtens	728bff610b	Allow HTTP auth servers again. ... only `localhost` are allowed in a release build. when debug assertions are on, others are also allowed. This change undoes the changes to the settings, so compared to master, there is no effect	2021-03-11 17:24:52 +01:00
Marcel Märtens	381bb5eef0	fix tracy	2021-03-11 17:05:17 +01:00
Marcel Märtens	a98e72c391	Auth requests are now done async, the register system is fetching it, via a PendingLogin component ... The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`	2021-03-11 17:05:02 +01:00
Joshua Barretto	6e0807f3f5	Cheaper and less broken material reflection/glow	2021-03-11 13:56:11 +00:00
omm	ef7b215f07	File structure for lang es_ES aligned with EN	2021-03-11 12:08:37 +00:00
Joshua Barretto	09e32cb952	Initial implementation of glow/shininess	2021-03-10 18:58:25 +00:00
Sam	de5ef03ac4	Auras will now refresh buffs if a buff was already present that had a lesser duration. ... Attack effects can now have multiple requirements. Fix for sceptre heal not requiring energy. Nerfed warding aura protection. Added icon for warding aura. Changelog.	2021-03-09 18:03:06 -05:00
Sam	16222948a3	Sceptre skill tree and migration.	2021-03-09 18:02:07 -05:00
Sam	c13e84aff5	Aura duration separated from cast duration in aura state ... Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura	2021-03-09 18:02:00 -05:00
Sam	d711c77468	Aura particles.	2021-03-09 17:59:45 -05:00
Monty Marz	935aec743d	cleanup, icons	2021-03-09 17:59:45 -05:00
Monty	49fcd6ee13	adjusted combo counter anim	2021-03-09 17:59:43 -05:00
Sam	940b4b5de7	Combo counter now uses outcomes.	2021-03-09 17:59:42 -05:00
Monty	c29cb037e7	better combo indicator animation	2021-03-09 17:59:41 -05:00
Sam	398370ca51	Changed lifesteal beam particles to look better. ... Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.	2021-03-09 17:59:41 -05:00
Monty	53100b6f37	combo point display	2021-03-09 17:59:40 -05:00
Sam	c5f74e528d	Animation for cast aura, combo information passed to skillbar.	2021-03-09 17:59:40 -05:00
Sam	b6f4543a14	Fixed beam offsets, told healing beam to use beam animation.	2021-03-09 17:59:40 -05:00
Sam	c6a222340e	Particles for lifesteal beam. Changed how frontend recognized beams.	2021-03-09 17:59:39 -05:00
Marcel	ee0ab197da	Merge branch 'updated_spanish_es_strings' into 'master' ... Updated strings Added missing translations in Spanish es_ES and retrieving localized text See merge request veloren/veloren!1866	2021-03-09 12:59:03 +00:00
tukilo	cea895ea24	Updated strings Added missing translations in Spanish es_ES and retrieving localized text	2021-03-09 12:30:53 +01:00
Marcel	d229ab1eb9	Merge branch 'aweinstock/critical-stats' into 'master' ... Add critical chance and critical multiplier stats to weapons. See merge request veloren/veloren!1864	2021-03-09 10:55:36 +00:00
Marcel	8c868aebc7	Merge branch 'xMAC94x/common_ecs' into 'master' ... Move Specs code to own common_ecs create, put tracy and macros into common_base See merge request veloren/veloren!1863	2021-03-09 09:48:53 +00:00
Avi Weinstock	d8f0a1c426	Add critical chance and critical multiplier stats to weapons.	2021-03-08 23:27:25 -05:00
Marcel Märtens	4ebfbdde0f	Move Specs code to own common_ecs create, put tracy and macros into common_base	2021-03-09 00:54:01 +01:00
Adam Blanchet	16b66f9cd6	Add reset button to graphics settings	2021-03-08 18:48:38 +01:00
Marcel Märtens	f353f14703	change Name from VSystem to System	2021-03-08 13:15:00 +01:00
Marcel Märtens	6b88545481	restructure server metrics ... - get rid of old SysTimers for each system in favour of VSystem tracking - move metrics generation from lib.rs to own system - code cleanup - remove time tracking in common::sys	2021-03-08 11:51:13 +01:00
Marcel Märtens	c515fece28	Implement a VSystem trait that can be implemented by Systems. ... It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren	2021-03-08 11:51:04 +01:00
Marcel	e29964ead1	Merge branch 'sarrakitty/fireworks' into 'master' ... added a white firework See merge request veloren/veloren!1856	2021-03-07 18:37:35 +00:00
Joshua Barretto	36d20e6990	Better docs, faster terrain meshing	2021-03-07 14:25:07 +00:00
Joshua Barretto	911acdd9db	Fixed clippy warnings and fmt	2021-03-07 14:25:07 +00:00
Joshua Barretto	db573f6b2d	Turn giant trees into proper sites	2021-03-07 14:25:07 +00:00
Monty	b6ac4e46fb	tree icon UI works and hover icon	2021-03-07 14:25:07 +00:00
Joshua Barretto	862cd5fe49	fmt	2021-03-07 14:25:03 +00:00
Joshua Barretto	a229d65932	Static light improvements, fixed lighting update bug	2021-03-07 14:25:02 +00:00
Joshua Barretto	120cb86c0d	Switched back to simd repr	2021-03-07 14:25:02 +00:00
Joshua Barretto	427e0af73c	Reverted to repr_c vek	2021-03-07 14:25:02 +00:00
Joshua Barretto	1d16f14dd5	Small fixes	2021-03-07 14:25:02 +00:00
Joshua Barretto	f537f82b17	Updated vek, fixed house wall bugs	2021-03-07 14:25:02 +00:00
Joshua Barretto	7b807ed34c	Removed dead code	2021-03-07 14:25:02 +00:00
Monty	8214c9df82	PoI icon	2021-03-07 14:25:01 +00:00
Joshua Barretto	717bbbf23e	Better static light propagation between translucent objects	2021-03-07 14:25:01 +00:00
Joshua Barretto	9e09c96a2a	Fixed static light directionality	2021-03-07 14:25:01 +00:00
Joshua Barretto	31832e1245	Fixed wall leaking with dynamic light ambiance	2021-03-07 14:25:01 +00:00
Joshua Barretto	aabe1d7cfd	Point light ambiance for less harsh shadows	2021-03-07 14:25:01 +00:00
Joshua Barretto	100cafa91b	Directional baked lights for figures	2021-03-07 14:25:01 +00:00
Joshua Barretto	6fc7d2a906	Faster More interesting giant trees, better oaks, hives on branches	2021-03-07 14:25:01 +00:00
Joshua Barretto	7d526da735	Experimental giant mother trees	2021-03-07 14:25:01 +00:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Imbris	575301c763	Merge branch 'Quibble/item-buff-tooltips' into 'master' ... Tooltips use item stats for buff information See merge request veloren/veloren!1820	2021-03-05 22:00:24 +00:00
Marcel	cb305536e8	Merge branch 'vfoulon80/skilltree-icons' into 'master' ... implement the new skilltree icons See merge request veloren/veloren!1794	2021-03-04 18:37:33 +00:00
Vincent Foulon	fb953cc7f4	implement the new skilltree icons	2021-03-04 18:37:32 +00:00
Marcel	a68afa1fad	Merge branch 'aweinstock/stack-trading' into 'master' ... Allow using stack splitting into or out of a trade. See merge request veloren/veloren!1850	2021-03-04 14:34:05 +00:00
Joshua Yanovski	2dd7089e52	Bring vek up to date so we can bump rustc (hopefully).	2021-03-04 05:46:59 +01:00
Avi Weinstock	0472956b5c	Allow using stack splitting into or out of a trade.	2021-03-03 18:19:10 -05:00
Lippy13	d9d3c1f55b	Make the BuffKind match expression exhaustive	2021-03-03 21:10:41 +00:00
Lippy13	59594a8b60	Check if duration exists instead of defaulting to zero and clean up code	2021-03-03 20:39:14 +00:00
Marcel Märtens	a55ec20c74	fix #46 🥳	2021-03-03 12:37:09 +01:00
Lippy13	48f974bf01	Address comments on passing effects	2021-03-03 00:25:15 +00:00
Lippy13	a7c30b6721	Account for no duration being possible	2021-03-03 00:25:14 +00:00
Lippy13	ffd0c01bbd	Fix Clippy errors ... Fix code formatting Add descriptions for other potential buffs for consumables	2021-03-03 00:25:13 +00:00
Lippy13	5e3a1b203f	Add buff information to item tooltips	2021-03-03 00:25:11 +00:00
ccgauche	7f4411ba1f	Merge branch 'master' into 'ccgauche/plugin-player-join-event' ... # Conflicts: # CHANGELOG.md	2021-03-02 09:45:15 +00:00
Ben Wallis	0f7ff21c20	Merge branch 'item-stacking-and-splitting' into 'master' ... Implement stacking and splitting Closes #904 See merge request veloren/veloren!1802	2021-03-02 00:08:47 +00:00
Jesus Bracho	c0573cca44	Implement stacking and splitting	2021-03-02 00:08:46 +00:00
heydabop	bfc82f7236	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
ccgauche	9628dfaf99	Fixed comments	2021-03-01 21:29:18 +01:00
ccgauche	dbd4d70b79	Lots of improvement in pointer management (switched from i32 to u64) + New event implemented	2021-03-01 19:00:44 +01:00
Samuel Keiffer	0497a437a4	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
Samuel Keiffer	537efdd47e	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	6ab4e2264e	Buff icon	2021-02-28 17:31:35 -05:00
Sam	531c38c3ad	Factored formatting of buff text out to a single function.	2021-02-28 16:04:33 -05:00
Sam	a88ad7b971	Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.	2021-02-28 15:02:03 -05:00
Imbris	b7bd0306e6	Merge branch 'Lerg/Issue_#976' into 'master' ... Issue #976 Some inputs are missing the ability to be rebound See merge request veloren/veloren!1832	2021-02-28 18:23:30 +00:00
Justin Shipsey	13df691f69	Merge branch 'heydabop/966-controller-y-invert' into 'master' ... #966 - Setting to invert controller Y axis See merge request veloren/veloren!1817	2021-02-28 18:02:04 +00:00
Lerg	94bd1f2605	Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator	2021-02-28 19:02:32 +03:00
Avi Weinstock	7e458ecd40	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
Samuel Keiffer	cb267ac3ee	Merge branch 'sam/combo-comp' into 'master' ... Combo now persists as a compnent, rather than a field on a state See merge request veloren/veloren!1828	2021-02-28 02:42:40 +00:00