12732 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	9285e48ff0	Don't reflect rain	2022-10-23 01:42:01 +01:00
Joshua Barretto	8dd63940b0	Fixed SSR at distance	2022-10-23 01:42:01 +01:00
Joshua Barretto	bc4c93bc5e	More accurate SSR	2022-10-23 01:42:00 +01:00
Joshua Barretto	0561a168de	Added tracing to SSR	2022-10-23 01:42:00 +01:00
Joshua Barretto	387d7e65d2	Improved SSR quality	2022-10-23 01:42:00 +01:00
Joshua Barretto	daef86d813	Make screen-space reflections an experimental shader	2022-10-23 01:42:00 +01:00
Joshua Barretto	f00cc5f2de	The worst SSR	2022-10-23 01:42:00 +01:00
Joshua Barretto	81ac4f9125	Various water-related lighting fixes	2022-10-23 01:42:00 +01:00
Joshua Barretto	b45586902a	Made cheap water display velocity	2022-10-23 01:42:00 +01:00
Joshua Barretto	ce7dda3e2f	Substantially faster water shaders	2022-10-23 01:42:00 +01:00
Joshua Barretto	30de7b4fb8	Better attenuation	2022-10-23 01:42:00 +01:00
Joshua Barretto	db4cc21ec3	Fixed seams	2022-10-23 01:42:00 +01:00
Joshua Barretto	3f2efea4f2	Experimental river velocity in shaders	2022-10-23 01:42:00 +01:00
Joshua Barretto	8d8d9309b0	Merge branch 'floppy_instruments_foot_animation_fix' into 'master' ... floppy_instruments_foot_animation_fix See merge request veloren/veloren!3665	2022-10-22 22:47:26 +00:00
flo	050150e7e8	floppy_instruments_foot_animation_fix	2022-10-22 22:47:25 +00:00
Joshua Barretto	ed5e9b4aa9	Merge branch 'floppy_savannah_pit' into 'master' ... savannah_pit See merge request veloren/veloren!3624	2022-10-22 19:48:50 +00:00
flo	698a00bae3	savannah_pit	2022-10-22 19:48:50 +00:00
Marcel	938fd77b5a	Merge branch 'floppy_instrument_samples' into 'master' ... floppy_instrument_samples See merge request veloren/veloren!3664	2022-10-21 07:58:41 +00:00
flo	1d04c9ba8c	floppy_instrument_samples	2022-10-21 07:58:41 +00:00
Samuel Keiffer	60be658518	Merge branch 'fix_gnarling_mask_drop_visual' into 'master' ... fix drop model for chieftain mask See merge request veloren/veloren!3663	2022-10-20 22:57:06 +00:00
Monty Marz	3a63f210b2	fix drop model for chieftain mask	2022-10-21 00:20:15 +02:00
Isse	712db9adea	Merge branch 'hot-fix' into 'master' ... Hot-fix for sword See merge request veloren/veloren!3660	2022-10-19 22:03:42 +00:00
Youssef Fahmy	44e19d7c54	Hot-fix for sword	2022-10-19 22:03:42 +00:00
Samuel Keiffer	dbc1872016	Merge branch 'sam/armor-nerf' into 'master' ... Armor nerf See merge request veloren/veloren!3651	2022-10-19 14:08:45 +00:00
Sam	b1f45ea241	Sword triple strike tweaks.	2022-10-19 09:36:20 -04:00
Sam	69bb7d9047	Changelog	2022-10-19 09:34:11 -04:00
Timothy Finnegan	fc026dacf9	Updated enum names for consistency	2022-10-16 20:13:03 -07:00
Timothy Finnegan	724bde4306	Updated the changelog to include the changes.	2022-10-16 19:58:17 -07:00
Timothy Finnegan	a9add7012e	Added support for multiple timers, conditions, and counters in a single action node.	2022-10-16 19:48:27 -07:00
UncomfySilence	f21082fa76	minor stat tweaks and cleanup	2022-10-16 14:12:37 +02:00
Sam	8eb89adb61	Fixed unintentional overbuff to speed focused secondary components	2022-10-16 14:06:42 +02:00
UncomfySilence	c432a0b719	rings and necks	2022-10-16 14:06:42 +02:00
Sam	3222fb88b0	Nerfed melee combo melee skills	2022-10-16 14:06:42 +02:00
UncomfySilence	fe87f8c38d	induv hat stat changes	2022-10-16 14:06:42 +02:00
Sam	2735d3403c	Nerfed other sets	2022-10-16 14:06:41 +02:00
Sam	46daa6bfa9	Armor nerf	2022-10-16 14:06:41 +02:00
Monty Marz	2d8627c29b	Add gnarling chieftain mask	2022-10-15 11:05:21 +00:00
Marcel	471b5996c3	Merge branch 'pfau/things' into 'master' ... Add gnarling chieftain mask See merge request veloren/veloren!3657	2022-10-15 11:05:21 +00:00
Imbris	0c05fe54d3	Merge branch '4ydx/overflow-fix' into 'master' ... Fix int overflows causing crash when using /goto See merge request veloren/veloren!3656	2022-10-13 13:58:03 +00:00
4ydx	4ae332b8d1	Fix int overflows causing crash when using /goto	2022-10-13 13:58:02 +00:00
Joshua Barretto	b677051ef8	Merge branch 'zesterer/perf2' into 'master' ... Various terrain-related performance improvements See merge request veloren/veloren!3655	2022-10-12 14:46:13 +00:00
Joshua Barretto	3c54e63592	Various minor optimisations	2022-10-12 13:57:14 +01:00
Joshua Barretto	8800bdbef6	Updated missed changelog entry	2022-10-11 23:57:48 +01:00
Isse	536bb9b71c	Merge branch 'zesterer/citadel' into 'master' ... Two new tree types and disabled citadel site. See merge request veloren/veloren!3652	2022-10-10 16:19:48 +00:00
Samuel Keiffer	51b679928a	Merge branch 'james/recipes' into 'master' ... Add unit test to validate recipe keys See merge request veloren/veloren!3653	2022-10-10 05:03:37 +00:00
James Melkonian	99d547c7c6	Add unit test to validate recipe keys	2022-10-09 20:50:09 -07:00
IsseW	2ba5b33868	fmt	2022-10-10 00:15:57 +02:00
IsseW	c8a08b4794	fix warnings	2022-10-09 23:42:38 +02:00
Joshua Barretto	0a6ac5f5f1	sync	2022-10-09 23:25:40 +02:00
Joshua Barretto	68df88a721	Added redwoods	2022-10-09 23:23:43 +02:00