8069 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
juliancoffee	2d9f4d4a95	Add comments	2021-05-09 13:12:25 +03:00
juliancoffee	684f7f6e0a	Integrate verification from i18n_check	2021-05-09 13:12:25 +03:00
juliancoffee	0611b166ed	Integrate changes and improving code style ... - Integrate voxygen/i18n-check to voxygnen/src/i18n.rs - Make `cargo clippy` happy	2021-05-09 13:12:25 +03:00
juliancoffee	6bc6f6bbba	Extract localization test to binary ... - Implement `--all` option - Implement `--lang <code>` option - Implement `--verify` command	2021-05-09 13:12:25 +03:00
Monty Marz	e5613603e4	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	d161d63184	Merge branch 'pfau/tiny_ui_fix' into 'master' ... Better inactive/active audio slider logic See merge request veloren/veloren!2278	2021-05-09 09:51:42 +00:00
Monty Marz	0aa2c129b8	Better inactive/active audio slider logic	2021-05-09 09:51:41 +00:00
Avi Weinstock	1580fbe339	Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE.	2021-05-08 17:49:51 -04:00
Marcel	7a0f4f1dec	Merge branch 'aweinstock/heightmap_visualization' into 'master' ... Add heightmap visualization to world/examples. See merge request veloren/veloren!2246	2021-05-08 16:02:11 +00:00
Marcel	7e85e35ff9	Merge branch 'aweinstock/fix-bow-20210507' into 'master' ... Make projectiles function properly if they hit a wall in the same tick as an entity. See merge request veloren/veloren!2275	2021-05-08 15:47:12 +00:00
Marcel	274655c45f	Merge branch 'juliancoffee/preset_cmd' into 'master' ... /skill_preset command See merge request veloren/veloren!2274	2021-05-08 15:47:10 +00:00
Illia Denysenko	ac1b01c636	/skill_preset command	2021-05-08 15:47:09 +00:00
Avi Weinstock	bb2c5ce5d3	Add max-convolution to heightmap visualization, and specify required-features for it to make CI work.	2021-05-08 11:19:37 -04:00
Avi Weinstock	be8a509ef2	Make projectiles function properly if they hit a wall in the same tick as an entity.	2021-05-07 23:20:57 -04:00
Snowram	3ab4ace814	Merge branch 'snowram/craftmats-ron-fix' into 'master' ... Fixes object manifest See merge request veloren/veloren!2273	2021-05-07 21:06:37 +00:00
Samuel Keiffer	f9216df5bd	Merge branch 'update_pt_BR_20210507' into 'master' ... Update pt br 20210507 See merge request veloren/veloren!2272	2021-05-07 20:07:16 +00:00
Nícolas Wildner	1954070b52	Update pt br 20210507	2021-05-07 20:07:14 +00:00
Samuel Keiffer	b39489bc3f	Merge branch 'aweinstock/tradeuifixes-20210506' into 'master' ... Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity... See merge request veloren/veloren!2265	2021-05-07 20:07:12 +00:00
Snowram	cfae6a52b3	Fixes object manifest	2021-05-07 22:04:57 +02:00
Avi Weinstock	8dc20d0dd5	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
Justin Shipsey	a629936686	Merge branch 'snowram/craft-mats' into 'master' ... Snowram/craft mats See merge request veloren/veloren!2269	2021-05-07 17:03:45 +00:00
Snowram	9d4d6a066a	Snowram/craft mats	2021-05-07 17:03:45 +00:00
Marcel	9cfee155e4	Merge branch 'juliancoffee/update-uk_UA' into 'master' ... Update uk_UA See merge request veloren/veloren!2267	2021-05-07 14:32:03 +00:00
Illia Denysenko	06ba69653e	Update uk_UA	2021-05-07 14:32:03 +00:00
Justin Shipsey	0eb50bf316	Merge branch 'juliancoffee/animal_trainer_transfer' into 'master' ... Transer Animal Trainers to lvl5 dungeons See merge request veloren/veloren!2266	2021-05-07 14:13:10 +00:00
juliancoffee	8dc032db4b	Transer Animal Trainers to lvl5 dungeons	2021-05-07 14:50:03 +03:00
Samuel Keiffer	67eff3d351	Merge branch 'aweinstock/damage-types' into 'master' ... Add `DamageKind`, and make piercing damage partially ignore damage resistence. See merge request veloren/veloren!2262	2021-05-06 22:22:49 +00:00
Avi Weinstock	ff83cf752b	Add DamageKind, and make piercing damage partially ignore damage resistence. ... - Tweak bow/staff M1 stats.	2021-05-06 17:39:06 -04:00
Samuel Keiffer	16ff698e91	Merge branch 'james/agent-tactic-refactor' into 'master' ... Move weapon tactics to functions and take target body into attack radius consideration See merge request veloren/veloren!2263	2021-05-06 21:17:10 +00:00
James Melkonian	d849bf7d29	Move weapon tactics to functions and take target body into attack radius consideration	2021-05-06 21:17:05 +00:00
Samuel Keiffer	82e09290e7	Merge branch 'duelsik/wiring-turing-complete' into 'master' ... (Wiring) Logic - make wiring turing complete See merge request veloren/veloren!2261	2021-05-06 19:43:37 +00:00
Daniel Mizerski	e740b4a2a9	(Wiring) Logic - make wiring turing complete	2021-05-06 19:53:12 +02:00
Marcel	864468a891	Merge branch 'xMAC94x/fixcrashes' into 'master' ... revert Client drop to be correct again and also stop network properly See merge request veloren/veloren!2250	2021-05-06 12:15:45 +00:00
Marcel	8e4fb87500	Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' ... instead of manually trying to sync disconnect metrics we now pass a Reason to... See merge request veloren/veloren!2259	2021-05-06 11:32:37 +00:00
Marcel Märtens	ab33b8cc3d	instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect. ... There we make sure that the disconnect only happens once and decrease the respective Metrics. Also added more reasons	2021-05-06 11:43:10 +02:00
Marcel	fd43e7bccd	Merge branch 'duelsik/wiring-on-death' into 'master' ... (Wiring) OnDeath See merge request veloren/veloren!2256	2021-05-06 09:00:50 +00:00
Samuel Keiffer	1313dd68dc	Merge branch 'sam/mindflayer-balance' into 'master' ... Mindflayer Balance Tweaks See merge request veloren/veloren!2257	2021-05-05 22:12:01 +00:00
Marcel	9473889b3f	Merge branch 'juliancoffee/fix_dropall' into 'master' ... Don't drop Debug item with /dropall Closes #1059 See merge request veloren/veloren!2236	2021-05-05 20:35:57 +00:00
Illia Denysenko	1d66c94aa5	Don't drop Debug item with /dropall	2021-05-05 20:35:57 +00:00
Sam	a29b3dfcfa	Rebalancing	2021-05-05 14:43:56 -04:00
Daniel Mizerski	4b5934c29a	(Wiring) OnDeath	2021-05-05 19:08:18 +02:00
Marcel	4cfd1854d6	Merge branch 'duelsik/wiring-switch-to-maybes' into 'master' ... (Wiring) Switch to using maybes See merge request veloren/veloren!2255	2021-05-05 16:21:19 +00:00
Daniel Mizerski	3405a72bde	(Wiring) Switch to using maybes	2021-05-05 16:59:17 +02:00
Marcel	db123be0b8	Merge branch 'xMAC94x/get_rid_of_useless_threadpool' into 'master' ... rayon::join creates a global threadpool, which is only used in /world See merge request veloren/veloren!2251	2021-05-05 13:43:18 +00:00
Marcel Märtens	af7091182e	use a constant for recommended_threads	2021-05-05 14:35:06 +02:00
Marcel Märtens	615ab4c1db	revert Client drop to be correct again and also stop network properly, reduce timeout to 10s	2021-05-04 22:34:19 +02:00
Marcel Märtens	a289391cec	cleanup some unused functions, which were exported but never used	2021-05-04 22:13:04 +02:00
Marcel Märtens	87cf347377	limit tokio threads to 1/4 of num_cpus ... make sure that rayon has at least 2 threads even on 1cpu systems to increase stability	2021-05-04 21:06:11 +02:00
Marcel Märtens	9fefdcbbca	rayon::join creates a global threadpool, which is only used in /world ... instead just use the same threadpool for everything helps with debugging problems with GDB using threadpool.install() to also be used when `into_par_iter()` is called	2021-05-04 21:06:07 +02:00
Samuel Keiffer	101fb498a5	Merge branch 'sam/minotaur' into 'master' ... Overhauled Minotaur See merge request veloren/veloren!2193	2021-05-04 16:26:08 +00:00