10390 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jonathan Berglin	596307c9b7	Remove unused clippy suppressions	2021-12-05 17:59:02 +00:00
Samuel Keiffer	c265102367	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--eval_order_dependence)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::eval_order_dependence)]' error supressions See merge request veloren/veloren!3044	2021-12-03 19:19:20 +00:00
Dr. Dystopia	c002e5e749	Resolve all '#[allow(clippy::eval_order_dependence)]' error supressions	2021-12-03 19:44:41 +01:00
Joshua Barretto	7e50a7de94	Merge branch 'Resolve-all-'#-allow(clippy--redundant_static_lifetimes)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::redundant_static_lifetimes)]' error supressions See merge request veloren/veloren!3041	2021-12-03 16:14:24 +00:00
Joshua Barretto	d7b907a6bd	Merge branch 'Resolve-all-'#-allow(clippy--needless_range_loop)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::needless_range_loop)]' error supressions See merge request veloren/veloren!3042	2021-12-03 16:03:54 +00:00
Dr. Dystopia	5d1d510d54	Resolve all '#[allow(clippy::redundant_static_lifetimes)]' error supressions	2021-12-03 10:43:09 +01:00
Dr. Dystopia	f4c5abf36b	Resolve all '#[allow(clippy::needless_range_loop)]' error supressions	2021-12-03 10:38:30 +01:00
Imbris	dde1bacad7	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--manual_saturating_arithmetic)]'-error-supressions' into 'master' ... Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions See merge request veloren/veloren!3038	2021-11-30 20:41:39 +00:00
Dr. Dystopia	a0dfb2e8ad	Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions	2021-11-30 13:57:47 +01:00
Ben Wallis	636a24e8f2	Merge branch 'aweinstock/fix-lake-minimap' into 'master' ... Bodies of water no longer contain black chunks on the voxel minimap. See merge request veloren/veloren!3036	2021-11-29 20:28:15 +00:00
Avi Weinstock	cb4c3eb34e	Bodies of water no longer contain black chunks on the voxel minimap. ... The heuristic for pruning dungeon ceilings depended on detecting an air-to-not-air edge, which was not present for chunks whose topmost layer was water. Sampling 1 layer of the `above` block introduces such an edge, allowing the water surface to be detected.	2021-11-29 14:39:56 -05:00
Marcel	55be707c7b	Merge branch 'tygyh/Resolve-all-'#-allow(clippy--needless_update)]'-error-supressions' into 'master' ... Tygyh/resolve all '# allow(clippy needless update)]' error supressions See merge request veloren/veloren!3034	2021-11-29 09:32:55 +00:00
Jonathan Berglin	d9dd49552b	Tygyh/resolve all '# allow(clippy needless update)]' error supressions	2021-11-29 09:32:55 +00:00
Marcel	8613cdfe36	Merge branch 'imbris/redundant-closure' into 'master' ... Remove redundant closures See merge request veloren/veloren!3033	2021-11-28 18:13:01 +00:00
Imbris	7760210824	Remove redundant closures	2021-11-28 12:24:57 -05:00
Treeco	3a998ca5b9	Merge branch 'isse/primitive-fixes' into 'master' ... Primitive fixes See merge request veloren/veloren!3016	2021-11-27 19:02:12 +00:00
Marcel	724e3bcdfd	Merge branch 'capucho/tracing-bump' into 'master' ... Bump tracing-subscriber to 0.3.2 See merge request veloren/veloren!3032	2021-11-27 11:11:47 +00:00
João Capucho	8b89903d57	Bump tracing-subscriber to 0.3.2 ... We were pulling two versions of it. Causing some compilation errors	2021-11-26 17:41:51 +00:00
Marcel	3fa2dab3aa	Merge branch 'xMAC94x/update-toolchain' into 'master' ... xMAC94x/update toolchain See merge request veloren/veloren!3027	2021-11-26 16:52:51 +00:00
Marcel	8a3ec3e401	Merge branch 'Swedish-translation' into 'master' ... Translate to swedish See merge request veloren/veloren!3029	2021-11-26 14:16:10 +00:00
Jonathan Berglin	58881d4cfc	Translate to swedish	2021-11-26 14:16:10 +00:00
Samuel Keiffer	8998869395	Merge branch 'james/merchant-percentages' into 'master' ... Floor merchant cost percentages and display as whole numbers See merge request veloren/veloren!3028	2021-11-25 01:32:20 +00:00
James Melkonian	ab99126a7b	Floor merchant cost percentages and display as whole numbers	2021-11-25 01:32:20 +00:00
Marcel Märtens	dde6404af8	update cache_image_tag	2021-11-24 22:17:08 +01:00
Marcel Märtens	ef40ebe0c8	update toolchain to nightly-2021-11-24	2021-11-24 10:09:22 +01:00
Imbris	f9089ac084	Merge branch 'aarch64' into 'master' ... Aarch64 See merge request veloren/veloren!3013	2021-11-24 02:55:28 +00:00
Imbris	3bf0ac1971	Switch to new CI image set with aarch64 support and update changelog	2021-11-23 21:27:23 -05:00
Imbris	a54e4c5dd0	Make sure to copy binaries from the right location in aarch CI	2021-11-23 21:27:23 -05:00
Imbris	0816624d23	Try with: export PKG_CONFIG	2021-11-23 21:27:23 -05:00
Imbris	30df174c3d	Fix order of env var and time command in aarch CI script, remove duplicate release flag, reorder target flag to be in the same order as the target flag for windows	2021-11-23 21:27:23 -05:00
Imbris	d137623dba	Add aarch64 build to the gitlab CI yml	2021-11-23 21:27:23 -05:00
Imbris	4bbf5c7483	Apply Add-CI-build-script-for-cross-compiling-Aarch64.patch from @linux4kix	2021-11-23 21:27:21 -05:00
Imbris	73531f771f	Merge branch 'imbris/allow-incremental' into 'master' ... Remove incremental disabling for crates that still had it disabled, the issues should be fixed See merge request veloren/veloren!3025	2021-11-22 22:52:34 +00:00
Imbris	4250a310fa	Merge branch 'imbris/avoid-ci-incremental-delete' into 'master' ... Remove deletion of incremental folder from the CI scripts See merge request veloren/veloren!3026	2021-11-22 22:52:32 +00:00
Imbris	79128e1e4b	Remove deletion of incremental folder from the CI scripts, the rustc incremental issue should be fixed	2021-11-22 02:04:19 -05:00
Imbris	6feb2d53ca	Remove incremental disabling for crates that still had it disabled, the issues should be fixed	2021-11-22 01:46:01 -05:00
Imbris	6e168f186b	Merge branch 'imbris/pin-cmake' into 'master' ... Pin cmake crate to 0.1.45 See merge request veloren/veloren!3024	2021-11-21 15:21:32 +00:00
Imbris	0beee17370	Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version	2021-11-21 09:51:39 -05:00
Marcel	ecbe58eaab	Merge branch 'xMAC94x/update-deps' into 'master' ... updating dependencies, See merge request veloren/veloren!3021	2021-11-20 22:29:16 +00:00
Marcel Märtens	7a8944ac71	remove additional restriction which is only necessary in egui 0.15	2021-11-20 20:22:45 +01:00
Marcel Märtens	aa93b4b53c	update other binaries	2021-11-20 20:19:48 +01:00
Marcel Märtens	7200cc4ad7	undo egui upgrade try	2021-11-20 20:18:03 +01:00
Marcel Märtens	e29ede7c97	updating dependencies, ... cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.	2021-11-20 20:17:49 +01:00
Samuel Keiffer	5274bf9eb3	Merge branch 'scaling_lower_tier_dungeons' into 'master' ... Scaling dungeons See merge request veloren/veloren!2991	2021-11-20 15:57:18 +00:00
IsseW	7eaddcafad	Ok just call it without	2021-11-20 13:13:21 +01:00
UncomfySilence	5dca7f9515	+ T1 & T4 chest loot table fix	2021-11-20 07:44:23 +01:00
Treeco	3018942291	Merge branch 'juliancoffee/resizeable_map' into 'master' ... Add size parameter to map_file opts See merge request veloren/veloren!2975	2021-11-19 22:50:24 +00:00
IsseW	88840fe58d	Change "and_not" and "diff" to "subtract"	2021-11-19 23:38:33 +01:00
Marcel	933b313927	Merge branch 'xMAC94x/harden_network_tests' into 'master' ... those sleeps cannot be easily included in the code, as they simulate 2... See merge request veloren/veloren!3020	2021-11-19 13:23:24 +00:00
Joshua Barretto	0d779a754a	Merge branch 'kemper/hitboxes' into 'master' ... Adjust hitboxes of husk and medium birds See merge request veloren/veloren!3019	2021-11-19 13:22:48 +00:00