12606 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Timothy Finnegan	1922d69154	Ran Cargo fmt	2022-10-24 19:52:37 -07:00
Timothy Finnegan	cd5ae96424	Undid accidental/unnecessary changelog changes	2022-10-23 18:44:11 -07:00
Timothy Finnegan	3be4cede30	Merge remote-tracking branch 'origin/flaffwaffle/action_state_concurrent_states' into flaffwaffle/action_state_concurrent_states	2022-10-23 18:38:31 -07:00
Tim Finnegan	a21a674ed1	Merge branch 'master' into 'flaffwaffle/action_state_concurrent_states' ... # Conflicts: # CHANGELOG.md	2022-10-24 01:35:25 +00:00
Timothy Finnegan	3677d27cbc	Merge branch 'flaffwaffle/action_state_concurrent_states' of https://gitlab.com/veloren/dev/veloren into flaffwaffle/action_state_concurrent_states	2022-10-23 18:32:24 -07:00
Timothy Finnegan	498cb86be9	Updated enum names for consistency	2022-10-23 18:31:09 -07:00
Timothy Finnegan	ab4e46c533	Updated the changelog to include the changes.	2022-10-23 18:31:09 -07:00
Timothy Finnegan	5e5e1066eb	Added support for multiple timers, conditions, and counters in a single action node.	2022-10-23 18:31:09 -07:00
Joshua Barretto	588ccd84ed	Merge branch 'zesterer/mini-fixes' into 'master' ... Moving water, SSR, water shader fixes, camera fixes See merge request veloren/veloren!3637	2022-10-23 23:19:38 +00:00
Joshua Barretto	428816c65e	Addressed review comments	2022-10-23 23:54:55 +01:00
Joshua Barretto	1521b6165f	Prettier cheap water	2022-10-23 21:41:45 +01:00
Joshua Barretto	40e47b4f3e	Added reflection mode settings	2022-10-23 20:03:21 +01:00
Joshua Barretto	b85fd11443	Added refraction	2022-10-23 15:15:25 +01:00
Joshua Barretto	c072dc4082	Place puddle details behind extra experimental shader	2022-10-23 01:42:01 +01:00
Joshua Barretto	d0894a189e	Added SSR to wet surfaces	2022-10-23 01:42:01 +01:00
Joshua Barretto	a7c24ed518	Added figure noise	2022-10-23 01:42:01 +01:00
Joshua Barretto	5c4090f099	Updated README	2022-10-23 01:42:01 +01:00
Joshua Barretto	0a5e257b77	Remove close-up camera jitter	2022-10-23 01:42:01 +01:00
Joshua Barretto	ae66432a1e	Make cheap water look better underwater	2022-10-23 01:42:01 +01:00
Joshua Barretto	764adb67c7	Fixed no SSR shaders	2022-10-23 01:42:01 +01:00
Joshua Barretto	51c3a25b9a	Handle obscured SSR elements better	2022-10-23 01:42:01 +01:00
Joshua Barretto	be8ef302bc	Make SSR water verticals behave better	2022-10-23 01:42:01 +01:00
Joshua Barretto	d40be0ea5f	Apply clouds more correctly	2022-10-23 01:42:01 +01:00
Joshua Barretto	d4c81cf8b8	Handle SSR transition better	2022-10-23 01:42:01 +01:00
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