8307 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dr. Dystopia	cea8f55fb3	Format 'mod' file	2021-06-02 20:16:33 +02:00
Dr. Dystopia	217ce74187	Add 'col' and 'wpos2d' parameters to 'new_method2'	2021-06-02 20:10:29 +02:00
Dr. Dystopia	dea6ebfff0	Extract 'new_method5' from 'apply_paths_to'	2021-06-01 23:38:05 +02:00
Dr. Dystopia	adbd582240	Extract 'new_method4' from 'apply_paths_to'	2021-06-01 23:33:32 +02:00
Dr. Dystopia	34e66829df	Extract 'new_method3' from 'apply_paths_to'	2021-06-01 22:43:50 +02:00
Dr. Dystopia	e4373ff62e	Extract 'new_method2' from 'apply_paths_to'	2021-06-01 22:35:50 +02:00
Dr. Dystopia	df6fac3cbe	Remove redundant 'inset' variable	2021-06-01 22:35:49 +02:00
Dr. Dystopia	50098ac072	Move 'info' variable declaration closer to usage	2021-06-01 22:35:48 +02:00
Dr. Dystopia	4cf6f7ce85	Move 'noisy_color' declaration closer to usage	2021-06-01 22:35:48 +02:00
Dr. Dystopia	431af9aa45	Move 'surface_z' declaration closer to usage	2021-06-01 22:35:47 +02:00
Dr. Dystopia	22bcc00313	Extract 'new_method1' from 'apply_paths_to'	2021-06-01 22:35:46 +02:00
Dr. Dystopia	c63b01e4f1	Extract 'new_method' from 'apply_paths_to'	2021-06-01 22:35:46 +02:00
Imbris	2c279c02d1	Merge branch 'imbris/update-toolchain' into 'master' ... Update toolchain See merge request veloren/veloren!2322	2021-06-01 18:49:30 +00:00
Imbris	32ab0860ca	delete all incremental things for clippy CI	2021-06-01 14:15:01 -04:00
Imbris	1a092be2a1	Re-disable incremental for veloren-network-protocol, switch back to ... `veloren-docker` tagged runners	2021-06-01 13:35:03 -04:00
Imbris	3a1a65b134	Remove stabilized or_patterns feature	2021-06-01 13:19:20 -04:00
Imbris	1db0e2a15c	Use new multi image cache scheme in the CI and consolidate runner tag specification so that it is easier to modify	2021-06-01 13:19:12 -04:00
Imbris	23eca4c3f6	Re-disable incremental just for common-systems, small fix in plugin ... crate, more new clippy fixes	2021-05-31 20:44:57 -04:00
Imbris	48ebb10d50	Update toolchain	2021-05-31 20:44:57 -04:00
Samuel Keiffer	9637d874ab	Merge branch 'adam/frozen-debuff' into 'master' ... Frozen Debuff See merge request veloren/veloren!2357	2021-05-30 22:39:11 +00:00
Adam Whitehurst	77cb2ae783	fix: commas	2021-05-30 14:47:42 -07:00
Samuel Keiffer	58dcec79b5	Merge branch 'ygor/fix-glider-stuck-inside-wall' into 'master' ... Reset on_ceiling when not on ceiling See merge request veloren/veloren!2247	2021-05-30 21:09:31 +00:00
Adam Whitehurst	daa18dd92a	fix: remove limit	2021-05-30 13:42:47 -07:00
Adam Whitehurst	2e74348813	refactor: variable names	2021-05-30 13:40:25 -07:00
Adam Whitehurst	9e7937d98f	refactor: BuffKind::Frozen comment	2021-05-30 13:39:18 -07:00
Adam Whitehurst	98fdf5c3e1	fix: more succinct checked_tick_attack	2021-05-30 13:36:18 -07:00
Adam Whitehurst	6dc1c05089	fix: better scaling	2021-05-30 13:06:01 -07:00
Adam Whitehurst	66cf4ab74c	fix: name	2021-05-30 12:56:26 -07:00
Ygor Souza	d890a58b93	Reset on_ceiling state ... Previously, the on_ceiling state would remain true for the entire lifetime of the entity after it touched the ceiling once.	2021-05-30 21:49:11 +02:00
Adam Whitehurst	6b1351bdc3	feat: impl attack speed modifier	2021-05-30 12:39:30 -07:00
Adam Whitehurst	0b92cc5732	feat: tick_attack utils	2021-05-30 12:39:00 -07:00
Adam Whitehurst	eea7eead2e	wip: impl Stats::attack_speed_modifier	2021-05-30 09:40:11 -07:00
Marcel	a8fb168315	Merge branch 'aweinstock/terrain-entity-physics-20210528' into 'master' ... Fixed entities with voxel colliders being off by one physics tick for collision. See merge request veloren/veloren!2355	2021-05-30 16:25:44 +00:00
Adam Whitehurst	e06bd0eaa3	feat: BuffKind::Frozen	2021-05-30 08:51:47 -07:00
Adam Whitehurst	9eefa89f90	feat: add frozen debuff icon, en strings	2021-05-30 08:49:32 -07:00
Avi Weinstock	d38db15411	Fixed entities with voxel colliders being off by one physics tick for collision.	2021-05-28 20:25:57 -04:00
Marcel	f8b642ce86	Merge branch 'aweinstock/economy-20210528' into 'master' ... Fix economy data not properly being used to price trades, resulting in default... See merge request veloren/veloren!2353	2021-05-28 22:05:24 +00:00
Avi Weinstock	5380fc4eac	Clear the economy database when creating it.	2021-05-28 16:14:31 -04:00
Avi Weinstock	3684cf0454	Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. ... Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).	2021-05-28 15:09:29 -04:00
Marcel	2771c29d54	Merge branch 'sam/torvus-fix' into 'master' ... Fixed torvus See merge request veloren/veloren!2351	2021-05-28 12:01:45 +00:00
Sam	9db8406e4c	Fixed torvus	2021-05-27 19:56:16 -05:00
Samuel Keiffer	a0fc75ad18	Merge branch 'sam/small-fixes' into 'master' ... Fixed bow AI and inactive weapon exp gain See merge request veloren/veloren!2349	2021-05-28 00:45:45 +00:00
Sam	01f82314dc	Fixed a few oddities with the AI	2021-05-26 21:34:21 -05:00
Sam	b826d5cb2b	Fixed exp splitting in inactive equip slots.	2021-05-26 21:13:16 -05:00
Sam	42c8c08145	Fixed bow AI	2021-05-26 20:53:29 -05:00
Monty Marz	99cf533a8a	Merge branch 'aweinstock/bow-zoom-charge-master' into 'master' ... Make the camera zoom as the bow (or any ChargedRanged attack) is charging. See merge request veloren/veloren!2339	2021-05-26 17:34:47 +00:00
Avi Weinstock	d6442dbd3b	Change the ChargedRanged zoom distance from 0.0 to 2.0, and add a delay after the mouse click before the zoom starts (i.e. hold to zoom, spam click will not zoom).	2021-05-26 11:51:29 -04:00
Avi Weinstock	7a97fbb5cf	Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards.	2021-05-26 09:34:08 -04:00
Avi Weinstock	4d7828ec94	Make the camera zoom as the bow (or any ChargedRanged attack) is charging.	2021-05-26 09:34:07 -04:00
Justin Shipsey	d7c7f6bf5d	Merge branch 'sam/rework-bow' into 'master' ... Bow Rework See merge request veloren/veloren!2310	2021-05-26 04:44:09 +00:00