9912 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Snowram	91c7aef01a	Merge branch 'snowram/debug_background' into 'master' ... Add a background to debug infos See merge request veloren/veloren!2858	2021-09-26 22:15:52 +00:00
Snowram	95bc6e3b58	Add a background to debug infos	2021-09-26 23:58:38 +02:00
Marcel	cea927efb6	Merge branch 'xMAC94x/update-toolchain' into 'master' ... update toolchain to `nightly-2021-09-24` See merge request veloren/veloren!2862	2021-09-26 19:25:02 +00:00
Marcel	37e298e73a	Merge branch 'update-cz_CZ' into 'master' ... update-cz_CZ See merge request veloren/veloren!2881	2021-09-26 19:02:45 +00:00
Samuel Keiffer	ea2fa5f110	Merge branch 'sam/cr-weights' into 'master' ... Changed weights of cr calculation and exp from cr formula. See merge request veloren/veloren!2875	2021-09-26 18:21:56 +00:00
Sam	aa7c183862	Condense assignment of variables	2021-09-26 13:51:27 -04:00
Jakub Janeček	8713e56c02	Update assets/voxygen/i18n/cz_CZ/hud/bag.ron, assets/voxygen/i18n/cz_CZ/hud/crafting.ron, assets/voxygen/i18n/cz_CZ/hud/char_window.ron, assets/voxygen/i18n/cz_CZ/hud/chat.ron, assets/voxygen/i18n/cz_CZ/hud/map.ron, assets/voxygen/i18n/cz_CZ/hud/misc.ron, assets/voxygen/i18n/cz_CZ/hud/sct.ron, assets/voxygen/i18n/cz_CZ/hud/settings.ron, assets/voxygen/i18n/cz_CZ/hud/skills.ron, assets/voxygen/i18n/cz_CZ/buff.ron, assets/voxygen/i18n/cz_CZ/char_selection.ron, assets/voxygen/i18n/cz_CZ/common.ron, assets/voxygen/i18n/cz_CZ/gameinput.ron, assets/voxygen/i18n/cz_CZ/main.ron files	2021-09-26 17:15:31 +00:00
Imbris	67e3b87717	Add note on a clippy suppression pointing to relevant clippy issue	2021-09-26 11:24:30 -04:00
Ben Wallis	ac823835b5	Merge branch 'reduce-duplication-in-asset-identifiers' into 'master' ... Reduce duplication in glider asset identifiers Closes #942 See merge request veloren/veloren!2876	2021-09-26 13:49:50 +00:00
Seth	d42d9166a1	Reduce duplication in glider asset identifiers	2021-09-26 13:49:49 +00:00
Samuel Keiffer	e70bbcb4f8	Merge branch 'sam/poise-float' into 'master' ... Made poise a float See merge request veloren/veloren!2878	2021-09-26 04:35:50 +00:00
Sam	c62162c2d3	Changed weights of cr calculation and exp from cr formula.	2021-09-25 21:52:20 -04:00
Imbris	746a6efb7f	Bump to fresh CI image with the new toolchain	2021-09-25 14:58:34 -04:00
Sam	942376f88c	Made poise a float at interface of module.	2021-09-25 14:07:47 -04:00
Samuel Keiffer	0af6969d19	Merge branch 'sam/energy-float' into 'master' ... Changed energy to a float See merge request veloren/veloren!2838	2021-09-25 06:51:21 +00:00
Marcel Märtens	e36eef99c8	apply some clippy fixes that comes with the new toolchain version	2021-09-24 23:18:18 +02:00
Marcel Märtens	2a82405df2	update toolchain to nightly-2021-09-24	2021-09-24 23:18:07 +02:00
Marcel Märtens	42eadb715b	update toolchain to nightly-2021-09-24	2021-09-24 23:17:54 +02:00
Snowram	0b26f456f9	Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master' ... Add setting to disable hotkey hints See merge request veloren/veloren!2849	2021-09-24 16:03:06 +00:00
Bafon	d53d2300a6	Add setting to disable hotkey hints	2021-09-24 16:03:05 +00:00
Samuel Keiffer	e7ca19b614	Merge branch 'juliancoffee/loot_table_fix' into 'master' ... Don't drop quad_low loot from quad_small fur See merge request veloren/veloren!2874	2021-09-24 15:59:26 +00:00
juliancoffee	f82a26e9c5	Don't drop quad_low loot from quad_small fur	2021-09-24 18:03:26 +03:00
Imbris	d3acb9a654	Merge branch 'capucho/wgpu-trace' into 'master' ... Fix dir is empty check when setting WGPU_TRACE_DIR See merge request veloren/veloren!2873	2021-09-24 14:38:41 +00:00
João Capucho	34eb58cded	Fix dir is empty check when setting WGPU_TRACE_DIR	2021-09-24 15:07:12 +01:00
Imbris	83fed7a2bc	Merge branch 'imbris/tex-cleanup' into 'master' ... Remove old textures that aren't reused when calling replace_graphic See merge request veloren/veloren!2869	2021-09-24 02:38:27 +00:00
Imbris	f1c44e1f1d	Remove old textures that aren't reused when calling replace_graphic	2021-09-23 21:50:37 -04:00
Sam	0e5e2b46f2	Changed energy to internally use an integer with a high resolution, and externally to use a float.	2021-09-23 14:11:09 -04:00
Samuel Keiffer	3091c970f3	Merge branch 'heydabop/1339-attack-cancel-interaction' into 'master' ... Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction Closes #1339 See merge request veloren/veloren!2864	2021-09-23 16:28:49 +00:00
heydabop	e2f9237f05	Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction	2021-09-23 10:05:12 -05:00
Joshua Barretto	bb0b5defec	Merge branch 'zesterer-master-patch-65668' into 'master' ... Fixed crash caused by invalid health, stated current <= maximum invariant more clearly See merge request veloren/veloren!2871	2021-09-23 12:18:36 +00:00
Joshua Barretto	bee5b232e6	Fixed crash caused by invalid health, stated current <= maximum invariant more clearly	2021-09-23 12:36:03 +01:00
Joshua Barretto	785ba500c6	Merge branch 'imbris/bloom-suppress-nans' into 'master' ... Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels See merge request veloren/veloren!2870	2021-09-23 10:47:03 +00:00
Imbris	5217b5090c	Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass	2021-09-22 21:58:36 -04:00
Joshua Barretto	0332902349	Merge branch 'snowram/omit-rtsim-wyvern' into 'master' ... Removes flame wyvern from RTsim pool until proper introduction See merge request veloren/veloren!2868	2021-09-22 19:50:22 +00:00
Snowram	76d41aa340	Removes flame wyvern from RTsim pool until proper introduction	2021-09-22 20:59:04 +02:00
Marcel	d5b4c5549b	Merge branch 'bafon/crafting-station-icons' into 'master' ... Add crafting station icon to crafting menu sidebar See merge request veloren/veloren!2848	2021-09-22 13:54:33 +00:00
Bafon	0375b973db	Add crafting station icon to crafting menu sidebar	2021-09-22 13:54:32 +00:00
Joshua Barretto	a74a40854e	Merge branch 'revert-f27a0df8' into 'master' ... Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'" See merge request veloren/veloren!2867	2021-09-22 12:31:49 +00:00
Joshua Barretto	4e61e5a04f	Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'" ... This reverts merge request !2866	2021-09-22 11:45:54 +00:00
Samuel Keiffer	0b477ec9af	Merge branch 'snowram/projectile-offsets' into 'master' ... Set projectile offsets in states instead of globally See merge request veloren/veloren!2855	2021-09-22 01:55:39 +00:00
Snowram	5838a84568	Consolidates projectile offsets into utils	2021-09-22 03:05:57 +02:00
Joshua Barretto	f27a0df884	Merge branch 'ubruntu/trade-fix-part3' into 'master' ... Trade Fix III: Revolutions See merge request veloren/veloren!2866	2021-09-21 23:16:01 +00:00
ubruntu	33526afe5a	Trade Fix III: Revolutions	2021-09-21 23:16:00 +00:00
Snowram	9c2ce83430	Set projectile offsets in states instead of globally	2021-09-22 01:07:09 +02:00
Samuel Keiffer	576f2a6e9f	Merge branch 'wolfshaman/fixing_1328_set_waypoint_when_on_ground_and_not_going_down' into 'master' ... fixing_1328_set_waypoint_when_on_ground_and_not_going_down See merge request veloren/veloren!2832	2021-09-21 22:16:08 +00:00
Justin Shipsey	2c3640b527	Merge branch 'snowram/wyvern' into 'master' ... Snowram/wyvern See merge request veloren/veloren!2847	2021-09-21 14:20:33 +00:00
Marcel	daa93a6d16	Merge branch 'juliancoffee/aim_bombs' into 'master' ... Aimed bombs See merge request veloren/veloren!2865	2021-09-21 14:18:31 +00:00
Marcel	a3452af599	Merge branch 'kimtinh/add-vietnamese' into 'master' ... Add Vietnamese translation See merge request veloren/veloren!2856	2021-09-21 14:10:40 +00:00
Snowram	3c2de422db	Adds Xtilt to BirdLarge skeleton	2021-09-21 15:31:46 +02:00
Snowram	cf6bf74f7a	Set beam offset depending on body dimensions	2021-09-21 15:31:46 +02:00