6729 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	1edee02788	sync	2021-02-28 12:19:31 +00:00
Joshua Barretto	fdf3ab6a78	Simple coral	2021-02-28 12:19:30 +00:00
Joshua Barretto	a548769c6f	Better tree parameterisation, improved pines	2021-02-28 12:19:30 +00:00
Joshua Barretto	927c5d515e	Procedural pines (first attempt), more tree parameters	2021-02-28 12:19:30 +00:00
Joshua Barretto	c11924476b	Better parameterisation of trees	2021-02-28 12:19:30 +00:00
Joshua Barretto	752d695bc4	Switched to recursive tree generation and recursive culling algorithm for massive performance wins	2021-02-28 12:19:30 +00:00
Joshua Barretto	b5e0b074dd	Added tree benchmarks	2021-02-28 12:19:30 +00:00
ccgauche	33b7fea6de	Fixed branch flattening	2021-02-28 12:19:30 +00:00
ccgauche	205c625498	Fixed canopy problem + Added iteration constant	2021-02-28 12:19:30 +00:00
ccgauche	b3e49fe19a	Removed unsafe from finvsqrt	2021-02-28 12:19:30 +00:00
ccgauche	59a5d44c8f	Quite a lot of optimisations	2021-02-28 12:19:30 +00:00
ccgauche	68788e0885	Simplified generation and fixed some tree cliping issues	2021-02-28 12:19:30 +00:00
ccgauche	7ae36a1be2	New generation for trees	2021-02-28 12:19:30 +00:00
Joshua Barretto	f04424b40e	Fixed clipping issues, faster generation	2021-02-28 12:19:30 +00:00
ccgauche	85c4eeee64	New generation for trees	2021-02-28 12:19:30 +00:00
Joshua Barretto	2e170d4ad5	Prevented trees from being too sparse	2021-02-28 12:19:30 +00:00
Joshua Barretto	dac231e994	More sparse, faster trees	2021-02-28 12:19:30 +00:00
Joshua Barretto	c69a91804d	Fixed clipping issues, faster generation	2021-02-28 12:19:30 +00:00
Joshua Barretto	f472e88c6d	Began integrating procgen trees	2021-02-28 12:19:30 +00:00
Joshua Barretto	0098086b8f	Began work on new sites	2021-02-28 12:19:30 +00:00
Joshua Barretto	f6e44d2f06	Reduced bridge artifacts	2021-02-28 12:19:30 +00:00
Samuel Keiffer	cb267ac3ee	Merge branch 'sam/combo-comp' into 'master' ... Combo now persists as a compnent, rather than a field on a state See merge request veloren/veloren!1828	2021-02-28 02:42:40 +00:00
Joshua Barretto	b9b36e0bf5	Merge branch 'zesterer-master-patch-28400' into 'master' ... Fix jump routes not being pathed See merge request veloren/veloren!1706	2021-02-28 00:41:38 +00:00
Justin Shipsey	8b3aabfe7a	Merge branch 'snowram/f64-anim-cleanup' into 'master' ... Reduces the instances of f64 in anims See merge request veloren/veloren!1827	2021-02-28 00:40:51 +00:00
Sam	b25a376995	Re-allowed for what stage you were on to persist through a roll	2021-02-27 19:24:18 -05:00
Sam	404c7f0905	Combo melee now checks combo	2021-02-27 18:24:28 -05:00
Joshua Barretto	6051c06462	fmt	2021-02-27 23:21:01 +00:00
Snowram	7f2276324e	Reduces the instances of f64 in anims	2021-02-27 23:21:03 +01:00
Justin Shipsey	04c698be5e	Merge branch 'slipped/animtweaks' into 'master' ... look-anims, first experiments (bow, staff, wield) See merge request veloren/veloren!1826	2021-02-27 21:20:36 +00:00
jshipsey	b4627dfe19	look-based anims	2021-02-27 16:19:33 -05:00
Sam	f24433c8cf	Added combo component	2021-02-27 14:55:06 -05:00
Monty Marz	5589a7b714	Merge branch 'pfau/tutorial_mvp' into 'master' ... Initial tutorial MVP See merge request veloren/veloren!1825	2021-02-27 19:02:27 +00:00
Monty Marz	e5273e3a8e	reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button	2021-02-27 19:02:26 +00:00
Justin Shipsey	d2fffa1a92	Merge branch 'slipped/gremlins' into 'master' ... dungeon enemy overhaul part 1 See merge request veloren/veloren!1697	2021-02-27 17:00:52 +00:00
Samuel Keiffer	fa809fc292	Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master' ... Issue #836 - Declutter the scrolling combat text See merge request veloren/veloren!1823	2021-02-27 16:18:18 +00:00
jshipsey	16720a6826	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
Lerg	3fe5f4484e	Issue #836 - Declutter the scrolling combat text	2021-02-27 15:10:47 +03:00
Sam	238fcaf5f1	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	8d316aac8c	feedback adjustments	2021-02-27 01:42:47 -05:00
jshipsey	0a353576dc	address comments	2021-02-27 01:42:47 -05:00
Snowram	17112926e7	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	51bc74b2a5	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	16a44cd532	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	417f4638ed	balance pass 2	2021-02-27 01:42:47 -05:00
jshipsey	79ec9115f5	rebase, yeti in dungeon	2021-02-27 01:42:47 -05:00
jshipsey	e06ebf3507	initial balance	2021-02-27 01:42:47 -05:00
Snowram	858fbe1a6c	Adds yeti npc	2021-02-27 01:42:46 -05:00
jshipsey	30af3a4493	dash, spin, jump changes	2021-02-27 01:42:46 -05:00
Snowram	1b9815dc34	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	53b0ba286a	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00