11090 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Dr. Dystopia	7b5d9508b6	Create 'ColliderData' struct and implement it in 'resolve_e2e_collision' function	2022-01-30 19:50:32 +01:00
Imbris	21cad12272	Merge branch 'fix-ghost-item' into 'master' ... Fix ghost item when trade gets declined Closes #1429 See merge request veloren/veloren!3117	2022-01-30 17:31:15 +00:00
jshipsey	7cac4b4001	myrmidon fix	2022-01-30 02:02:23 -05:00
jshipsey	7827797106	weapon tweaks	2022-01-30 01:10:13 -05:00
Marcel	3120a64be2	Merge branch 'swilliams/entity-drops-csv-names' into 'master' ... Changed entity drops csv export to export names instead of asset paths See merge request veloren/veloren!3161	2022-01-29 17:37:45 +00:00
Scott Williams	21fd296407	Changed entity drops csv export to export names instead of asset paths	2022-01-29 17:37:45 +00:00
Imbris	89edd18787	Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options	2022-01-28 22:55:59 -05:00
Samuel Keiffer	fe532cf536	Merge branch 'isse/repeat-primitive' into 'master' ... Repeat CSG primitive and float line segment See merge request veloren/veloren!3158	2022-01-28 20:04:45 +00:00
Isidor Nielsen	6f99e70cca	Repeat CSG primitive and float line segment	2022-01-28 20:04:45 +00:00
Joshua Barretto	d8c4284a32	Merge branch 'zesterer/worldgen' into 'master' ... Improvements to site2 See merge request veloren/veloren!3159	2022-01-28 17:14:07 +00:00