8744 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	bdff88ab7c	Add note on the reasoning for the visual position interpolation rate value in voxygen	2021-06-16 03:24:10 -04:00
Justin Shipsey	431755aaf2	Merge branch 'karmicknight/swordspin_poise_damage' into 'master' ... lowered spin.ron base poise damage to 13 from 25 See merge request veloren/veloren!2462	2021-06-16 06:17:30 +00:00
donovanlank	1c57a114f5	lowered spin.ron base poise damage to 13 from 25	2021-06-15 22:26:45 -07:00
Imbris	0e5e964413	Merge branch 'imbris/winit-0.25' into 'master' ... Upgrade to winit 0.25 See merge request veloren/veloren!2449	2021-06-16 05:21:13 +00:00
Imbris	bf6f624c7f	Upgrade to winit 0.25	2021-06-15 22:59:54 -04:00
Imbris	d60c7a0c2d	Merge branch 'imbris/release-tweak' into 'master' ... Add debug line tables and avoid building unwinding landing pads in release builds See merge request veloren/veloren!2446	2021-06-16 02:17:49 +00:00
Imbris	36821e5575	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
Imbris	e89c6a80e2	Add debug line tables and avoid building unwinding landing pads in release builds	2021-06-15 21:14:49 -04:00
Joshua Barretto	c86c776ef4	Merge branch 'revert-1a2f1127' into 'master' ... Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'" See merge request veloren/veloren!2459	2021-06-15 22:51:32 +00:00
Snowram	1a073cb964	Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'" ... This reverts merge request !2457	2021-06-15 22:12:11 +00:00
Marcel	741623ac69	Merge branch 'snowram/snappier-pos-interp' into 'master' ... Double the speed factor of pos interp See merge request veloren/veloren!2457	2021-06-15 20:52:22 +00:00
Snowram	e927d835ce	Double the speed factor of pos interp	2021-06-15 22:11:57 +02:00
Imbris	bf9e5f6e11	Merge branch 'zakru/fix/1193' into 'master' ... Avoid saving settings if maps are not updating Closes #1193 See merge request veloren/veloren!2456	2021-06-15 19:55:14 +00:00
Imbris	4bd50bb768	Merge branch 'rodio014' into 'master' ... bump rodio to 0.14 See merge request veloren/veloren!2443	2021-06-15 19:04:28 +00:00
Zakru	3c42eb3666	Fix settings not saving when zooming map with keys	2021-06-15 21:20:10 +03:00
Zakru	323b03e406	Avoid saving settings if maps are not updating ... Fixes #1193	2021-06-15 21:19:52 +03:00
Marcel	f4bf5f4de7	Merge branch 'snowram/fix-consumables-desc' into 'master' ... Truncates consumables value to the first decimal place See merge request veloren/veloren!2455	2021-06-15 18:13:27 +00:00
Snowram	4f835c3741	Truncates consumables value to the first decimal place	2021-06-15 19:36:20 +02:00
Marcel	f225366970	Merge branch 'juliancoffee/i18n_tests' into 'master' ... Panic in tests if can't parse i18n file See merge request veloren/veloren!2453	2021-06-15 17:26:16 +00:00
Marcel	179230c31d	Merge branch 'veloren/veloren/master' into 'master' ... Veloren/veloren/master See merge request veloren/veloren!2452	2021-06-15 16:36:41 +00:00
K. Kisa	55e5d9e544	Veloren/veloren/master	2021-06-15 16:36:41 +00:00
juliancoffee	3dfae1c664	Panic if can't parse file	2021-06-15 19:15:17 +03:00
Snowram	0c802077d7	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	748b135446	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	e2b26dc0ef	Addresses comments about roc AI	2021-06-15 09:50:23 +02:00
Snowram	e32c103e9a	Makes summon range inclusive	2021-06-15 09:49:13 +02:00
Avi Weinstock	a5ff4be601	Make tornado (and empty models in general) work on WGPU.	2021-06-15 09:49:13 +02:00
Snowram	aa62ad8bc0	Tornado summoning attack	2021-06-15 09:49:13 +02:00
Snowram	3df69ba11d	Add troll variants and roc npcs	2021-06-15 09:49:13 +02:00
Imbris	6f5eab4896	[iced renderer] Skip content processing if the clip intersection is zero sized or invalid	2021-06-15 02:02:10 -04:00
Imbris	4535de21cd	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
Imbris	4188b23cc8	Merge branch 'imbris/userdata-tweak' into 'master' ... Fallback to executable strategy for the userdata rather than panicking when... See merge request veloren/veloren!2445	2021-06-15 03:22:51 +00:00
Samuel Keiffer	2218018177	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
Imbris	1be7a62d63	Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder	2021-06-14 21:42:50 -04:00
asumface	a63e839bfa	Bump rodio to 0.14	2021-06-14 22:04:23 +02:00
Marcel	93557ac9c5	Merge branch 'aweinstock/hotfix-pick-icon' into 'master' ... Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller. See merge request veloren/veloren!2442	2021-06-14 18:02:56 +00:00
Avi Weinstock	3267765e85	Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.	2021-06-14 13:39:50 -04:00
Marcel	c0fec35f7a	Merge branch 'dungeon_voxel_export' into 'master' ... Add dungeon shape to MagicaVoxel export example See merge request veloren/veloren!2412	2021-06-14 15:07:25 +00:00
Marcel	6225666050	Merge branch 'aweinstock/forcemove-no-pushback' into 'master' ... Don't apply e2e pushback during a forced movement character state. See merge request veloren/veloren!2429	2021-06-14 14:42:01 +00:00
Marcel	27e0b17651	Merge branch 'aweinstock/mining-skill-tree' into 'master' ... Mining skill tree. See merge request veloren/veloren!2406	2021-06-14 14:19:06 +00:00
Marcel	f41bedc02c	Merge branch 'juliancoffee/asset_entity' into 'master' ... EntityInfo assetization. See merge request veloren/veloren!2382	2021-06-14 12:56:28 +00:00
Vincent Junge	f724123694	Added dungeon shape to MagicaVoxel export example	2021-06-14 14:43:00 +02:00
juliancoffee	ec6bcea8f1	Responding to review ... - make `skillset_builder::Preset` void enum and left comment about how to extend it - add `.with_default_equipment()` in case if preset is missing to `basic_summon` loadout creation to match old `build_loadout()` behaviour	2021-06-14 15:40:02 +03:00
Avi Weinstock	37730a0993	Move force-movement e2e check so that it doesn't confer immunity to arrows.	2021-06-13 20:38:03 -04:00
Marcel	76b12eb93d	Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' ... Не полный перевод навыков, исправлены оригинальные описания и названия. See merge request veloren/veloren!2432	2021-06-13 21:55:57 +00:00
Marcel	e8d0e8a222	Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' ... Полный перевод на русский язык See merge request veloren/veloren!2434	2021-06-13 21:55:55 +00:00
Marcel	78ba8cd34d	Merge branch 'Veloren_Kisa-master-patch-17326' into 'master' ... Upload New File See merge request veloren/veloren!2435	2021-06-13 21:55:53 +00:00
Monty Marz	0d8db1b417	Merge branch 'pfau/cactus_drink' into 'master' ... Cactus Colada See merge request veloren/veloren!2431	2021-06-13 20:03:58 +00:00
Avi Weinstock	4f8fa1fb6d	Move changelog entry for mining to 0.10 section.	2021-06-13 14:35:44 -04:00
Monty Marz	8466df5078	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00