10949 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
floppy	b5dfe74d41	-add more biome specific namegen functions ... -introduce random choice between engl and custom naming -add namegen section for site/theme based naming	2022-02-04 15:45:11 +01:00
Dominik Broński	19c764dde6	Merge branch 'christof/econfix' into 'master' ... Small economy cleanup See merge request veloren/veloren!3164	2022-02-03 21:48:01 +00:00
Joshua Barretto	ac13d07443	Merge branch 'crafting_stations_in_site2_towns' into 'master' ... add crafting stations to workshop in site2 towns See merge request veloren/veloren!3174	2022-02-03 17:16:30 +00:00
floppy	74bf89077f	use const CARDINALS to generate spawn positions for crafting_stations.	2022-02-03 17:40:26 +01:00
Samuel Keiffer	924dd2993c	Merge branch 'juliancoffee/fix_husks' into 'master' ... Add weapons to Husk loadout See merge request veloren/veloren!3177	2022-02-03 16:36:09 +00:00
juliancoffee	0682bfbe14	Add weapons to Husk loadout	2022-02-03 18:02:51 +02:00
floppy	595e6ee076	- randomize distribution of crafting_stations to static positions	2022-02-02 22:15:04 +01:00
Marcel	afda04e1eb	Merge branch 'command_access' into 'master' ... Removal of /home See merge request veloren/veloren!3171	2022-02-02 08:50:23 +00:00
Youssef Fahmy	fdfd2c99ff	Removal of /home	2022-02-02 08:50:23 +00:00
Justin Shipsey	f6510dfab0	Merge branch 'infrandomness/site2/add_giant_trees' into 'master' ... Implement giant trees in site2 See merge request veloren/veloren!3136	2022-02-02 02:33:37 +00:00
InfRandomness	54b69e37a5	Implement giant trees in site2	2022-02-02 02:33:37 +00:00
floppy	ddc35d8b7d	- add crafting stations to workshop in site2 towns ... - TODO: connect Painter rng when implemented	2022-02-01 23:53:18 +01:00
Imbris	18f6077321	Merge branch 'imbris/srgb-dither' into 'master' ... Dither in nonlinear srgb space and dithering related experimental shader options See merge request veloren/veloren!3160	2022-02-01 21:24:50 +00:00
Joshua Barretto	0ceef00b40	Merge branch 'james/site2-util' into 'master' ... More CSG primitives See merge request veloren/veloren!3154	2022-02-01 09:16:38 +00:00
James Melkonian	2aab277d0b	Add doc comments to PrimitiveRef methods	2022-01-31 18:39:03 -08:00
Joshua Barretto	fb7433a5cf	Merge branch 'determanistic-naming' into 'master' ... Fix biome naming See merge request veloren/veloren!3173	2022-02-01 00:51:26 +00:00
IsseW	0f7f0ace93	Use DHashMap	2022-02-01 01:20:00 +01:00
James Melkonian	b445bd494e	Bezier curve prisms	2022-01-31 16:13:45 -08:00
James Melkonian	04bdcf2924	Add cubic bezier curve function	2022-01-31 16:13:45 -08:00
James Melkonian	b41f86ab99	More CSG primitives	2022-01-31 16:13:45 -08:00
IsseW	0ba4a3a409	Use DHashSet	2022-02-01 01:07:36 +01:00
Christof Petig	42faef9ab0	clippy is right, ... but I don't want to rearrange print_sorted (test). so reduce overall strictness	2022-01-31 22:25:38 +01:00
Christof Petig	080444fc8b	juliancoffee prefers this style	2022-01-31 22:19:21 +01:00
Christof Petig	f4f1b5c77b	more stable sorting	2022-01-31 22:00:23 +01:00
Christof Petig	dc92d0ab12	fix multiple calls of init	2022-01-31 21:31:08 +01:00
Christof Petig	d8edd70837	create a nice csv table for comparison	2022-01-31 21:19:23 +01:00
Christof Petig	47aba3e4cd	clean up double rescaling	2022-01-31 20:52:25 +01:00
Christof Petig	6b9180bba6	separate amount from probability	2022-01-31 19:45:39 +01:00
Christof Petig	12fedef98f	fix some test cases	2022-01-31 19:45:39 +01:00
juliancoffee	45ba21796c	Add test cases	2022-01-31 19:45:39 +01:00
Christof Petig	8230323a76	fix code quality	2022-01-31 19:45:39 +01:00
Christof Petig	66c431ba86	cargo fmt	2022-01-31 19:45:39 +01:00
Christof Petig	a98b9ad049	normalize loot tables before combining them, take current values for a start	2022-01-31 19:45:38 +01:00
Christof Petig	8228437b22	load loot table only once, add utility function and test cases	2022-01-31 19:45:38 +01:00
Justin Shipsey	612f084831	Merge branch 'slipped/bipeds' into 'master' ... Slipped/bipeds See merge request veloren/veloren!3163	2022-01-31 17:08:01 +00:00
Imbris	201a7485c2	Merge branch 'imbris/fix-shoot-ori' into 'master' ... Use ori as fallback for look_dir so that other entities will turn properly See merge request veloren/veloren!3170	2022-01-31 05:07:01 +00:00
Imbris	2325ac3d78	Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced)	2022-01-30 23:30:34 -05:00
Samuel Keiffer	a37d221f6b	Merge branch 'sam/particle-fix' into 'master' ... Fixed lifesteal particles See merge request veloren/veloren!3169	2022-01-31 00:24:07 +00:00
Sam	097d6cf07c	Extend green	2022-01-30 18:50:18 -05:00
Sam	0c44a7d1ab	More tweaking	2022-01-30 18:37:11 -05:00
Joshua Barretto	1b9488186e	Merge branch 'treeco/realign-workshop' into 'master' ... Realign workshops See merge request veloren/veloren!3168	2022-01-30 23:27:50 +00:00
Sam	bfa9c1ce3a	Fixed lifesteal particles	2022-01-30 18:11:41 -05:00
Marcel	72e270368d	Merge branch 'aweinstock/resolve-clippy-lints' into 'master' ... Globally allow more clippy lints and reconfigure complexity to be less verbose See merge request veloren/veloren!3052	2022-01-30 22:53:36 +00:00
Treeco	ba7251c7e3	Realign workshops	2022-01-30 22:45:56 +00:00
Marcel	a41a766356	Merge branch 'james/guard-menacing' into 'master' ... Fix guards menacing instead of defending villagers See merge request veloren/veloren!3166	2022-01-30 22:40:35 +00:00
James Melkonian	44865d99ff	Fix guards menacing instead of defending villagers	2022-01-30 13:14:24 -08:00
Marcel	12f00696ba	Merge branch 'tygyh/Simplify-parameters' into 'master' ... Tygyh/simplify parameters See merge request veloren/veloren!3053	2022-01-30 19:42:44 +00:00
Marcel Märtens	201a5ac2c7	stricten some rules and fix some clippy warnings	2022-01-30 20:16:21 +01:00
Avi Weinstock	f3f08936d8	Decrease too-many-arguments-threshold and type-complexity-threshold.	2022-01-30 20:16:21 +01:00
Avi Weinstock	5f8957d8ef	Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.	2022-01-30 20:16:20 +01:00