7275 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	81206d5e13	New site work	2021-03-07 14:25:00 +00:00
Joshua Barretto	68b0aa5c50	sync	2021-03-07 14:25:00 +00:00
Joshua Barretto	9cf13ac3b2	Simple coral	2021-03-07 14:25:00 +00:00
Joshua Barretto	3766a77de1	Better tree parameterisation, improved pines	2021-03-07 14:25:00 +00:00
Joshua Barretto	953d8841b4	Procedural pines (first attempt), more tree parameters	2021-03-07 14:25:00 +00:00
Joshua Barretto	24773afe76	Better parameterisation of trees	2021-03-07 14:25:00 +00:00
Joshua Barretto	5e7c231788	Switched to recursive tree generation and recursive culling algorithm for massive performance wins	2021-03-07 14:25:00 +00:00
Joshua Barretto	6f11c4c5c7	Added tree benchmarks	2021-03-07 14:25:00 +00:00
ccgauche	2f68a565d4	Fixed branch flattening	2021-03-07 14:25:00 +00:00
ccgauche	cf91358f40	Fixed canopy problem + Added iteration constant	2021-03-07 14:25:00 +00:00
ccgauche	0eaf8492a5	Removed unsafe from finvsqrt	2021-03-07 14:25:00 +00:00
ccgauche	454d9d0b75	Quite a lot of optimisations	2021-03-07 14:25:00 +00:00
ccgauche	37f9fba023	Simplified generation and fixed some tree cliping issues	2021-03-07 14:25:00 +00:00
ccgauche	bbc64b4ead	New generation for trees	2021-03-07 14:25:00 +00:00
Joshua Barretto	9d1a03504c	Fixed clipping issues, faster generation	2021-03-07 14:25:00 +00:00
ccgauche	7f3ba0eaca	New generation for trees	2021-03-07 14:25:00 +00:00
Joshua Barretto	0745514174	Prevented trees from being too sparse	2021-03-07 14:25:00 +00:00
Joshua Barretto	4bcf9e7a63	More sparse, faster trees	2021-03-07 14:25:00 +00:00
Joshua Barretto	6dd0f73c2d	Fixed clipping issues, faster generation	2021-03-07 14:25:00 +00:00
Joshua Barretto	82a25e49ef	Began integrating procgen trees	2021-03-07 14:25:00 +00:00
Joshua Barretto	23f0dfb078	Began work on new sites	2021-03-07 14:25:00 +00:00
Joshua Barretto	272ca41b9e	Reduced bridge artifacts	2021-03-07 14:25:00 +00:00
Sarra	ab12df50cc	added white firework	2021-03-07 03:59:04 -05:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Joshua Barretto	6cfb4bd74d	Merge branch 'aweinstock/recursive-fireworks' into 'master' ... Make fireworks recursively shoot more fireworks (95% average replication). See merge request veloren/veloren!1855	2021-03-06 23:36:21 +00:00
Avi Weinstock	c4f7c9b951	Make the probabilities data to assert that the expected value is less than 1.	2021-03-06 15:11:19 -05:00
Avi Weinstock	22fcc6417c	Make fireworks recursively shoot more fireworks (95% average replication).	2021-03-06 14:05:51 -05:00
Samuel Keiffer	e6f5f04c8e	Merge branch 'aweinstock/chase_dist_quickfix' into 'master' ... Increase MAX_CHASE_DIST from 20 to 250, so enemies don't ignore you if you're... See merge request veloren/veloren!1853	2021-03-06 17:59:44 +00:00
Avi Weinstock	ae37b71ab6	Increase MAX_CHASE_DIST from 20 to 250, so enemies don't ignore you if you're fireballing them from a hallway.	2021-03-06 10:50:04 -05:00
Imbris	575301c763	Merge branch 'Quibble/item-buff-tooltips' into 'master' ... Tooltips use item stats for buff information See merge request veloren/veloren!1820	2021-03-05 22:00:24 +00:00
Joshua Barretto	8b88df7219	Merge branch 'ccgauche/fix-tracy' into 'master' ... Fixed tracy See merge request veloren/veloren!1852	2021-03-05 22:00:22 +00:00
ccgauche	077659be9d	Fixed tracy	2021-03-05 19:02:33 +01:00
Imbris	e724ac072e	Merge branch 'sarrakitty/fireworks' into 'master' ... made firework explosions colorful See merge request veloren/veloren!1851	2021-03-05 17:48:56 +00:00
Imbris	726cfcb8c9	Merge branch 'cargo-override' into 'master' ... Cargo.nix override instead of requiring manual intervention See merge request veloren/veloren!1647	2021-03-05 17:04:29 +00:00
Snowram	e2d4799f7d	Merge branch 'vfoulon80/convert-fr-translations' into 'master' ... Split the french translation into multiple files See merge request veloren/veloren!1672	2021-03-05 12:23:08 +00:00
Vincent Foulon	6e66cecce7	Split the french translation into multiple files	2021-03-05 12:23:08 +00:00
Sarra	4284ce0411	made firework explosions colorful	2021-03-05 01:22:29 -05:00
Marcel	cb305536e8	Merge branch 'vfoulon80/skilltree-icons' into 'master' ... implement the new skilltree icons See merge request veloren/veloren!1794	2021-03-04 18:37:33 +00:00
Vincent Foulon	fb953cc7f4	implement the new skilltree icons	2021-03-04 18:37:32 +00:00
Marcel	875bdd8d71	Merge branch 'sam/asset-validation-tests' into 'master' ... Added Item Validation Test See merge request veloren/veloren!1849	2021-03-04 15:46:12 +00:00
Marcel	a68afa1fad	Merge branch 'aweinstock/stack-trading' into 'master' ... Allow using stack splitting into or out of a trade. See merge request veloren/veloren!1850	2021-03-04 14:34:05 +00:00
Joshua Yanovski	7146ff2676	Merge branch 'sharp/bump-vek' into 'master' ... Bring vek up to date so we can bump rustc (hopefully). See merge request veloren/veloren!1848	2021-03-04 12:56:05 +00:00
Marcel	a1405f7ec6	Merge branch 'Rotsuoy/SavannaGrass' into 'master' ... Rotsuoy/SavannaGrassUpdate See merge request veloren/veloren!1725	2021-03-04 10:32:58 +00:00
Joshua Yanovski	2dd7089e52	Bring vek up to date so we can bump rustc (hopefully).	2021-03-04 05:46:59 +01:00
Avi Weinstock	0472956b5c	Allow using stack splitting into or out of a trade.	2021-03-03 18:19:10 -05:00
Sam	39a580b5ee	Added test that all items are properly formatted and valid. Fixed items that were broken.	2021-03-03 16:45:36 -05:00
Lippy13	d9d3c1f55b	Make the BuffKind match expression exhaustive	2021-03-03 21:10:41 +00:00
Lippy13	59594a8b60	Check if duration exists instead of defaulting to zero and clean up code	2021-03-03 20:39:14 +00:00
Samuel Keiffer	dd2097ac75	Merge branch 'armor-org-fix-3' into 'master' ... Fixed debug back armor. Removed leather_3 item. See merge request veloren/veloren!1847	2021-03-03 20:13:39 +00:00
Sam	ae856edb31	Fixed debug back armor. Removed leather_3 item.	2021-03-03 15:05:51 -05:00