2364 Commits

Author	SHA1	Message	Date
Imbris	9dbabff887	Add for<'b> lifetime annotation (almost worked)	2020-11-11 03:02:20 -05:00
Imbris	a1f59cb2ea	Implement text renderering with glyph_brush (lifetime error)	2020-11-11 03:02:20 -05:00
Imbris	3f6faecbb5	Add support for Space widget, refine main menu ui, misc fixes and improvements.	2020-11-11 03:02:20 -05:00
Imbris	aeff910120	Revamp BackgroundContainer with scale specific padding, and use in main menu attempt	2020-11-11 03:02:20 -05:00
Imbris	43139873d5	Add Stack and CompoundGraphic widgets	2020-11-11 03:02:20 -05:00
Imbris	568795fe6f	Begin implementing container widget with an image background	2020-11-11 03:02:20 -05:00
Imbris	3b644a4014	Start experimenting with replicating main menu	2020-11-11 03:02:20 -05:00
Imbris	e64f8aec60	Get resizing working	2020-11-11 03:02:20 -05:00
Imbris	a4dc47bc2c	Initial setup to use iced	2020-11-11 03:02:20 -05:00
Marcel	d188b12084	Merge branch 'xMAC94x/clock' into 'master' ... massivly switch clock algorithm. See merge request veloren/veloren!1499	2020-11-10 22:12:12 +00:00
Monty Marz	b4f160d0e3	frost cleaver ... velorite mage set offsets armor stats	2020-11-10 21:43:45 +00:00
Marcel Märtens	f831df5064	massivly switch clock algorithm. ... - before we had a Clock that tried to average multiple ticks and predict the next sleep. This system is massivly bugged. a) We know exactly how long the busy time took, so we dont need to predict anything in the first place b) Preduction was totally unrealistic after a single lag spike c) When a very slow tick happens, we dont benefit from 10 fast ticks. - Instead we just try to keep the tick time exact what we expect. If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.	2020-11-10 18:31:42 +01:00
jshipsey	11abacda69	adjust to comments	2020-11-09 18:47:52 -05:00
Sam	91082b3167	Slight balance tweaks.	2020-11-08 19:33:24 -06:00
jshipsey	c665c1b268	hammer keyframes	2020-11-08 19:54:46 -05:00
Sam	ee014e3079	Minor tweaks.	2020-11-08 18:11:53 -06:00
jshipsey	28180c5c5d	rebase	2020-11-08 19:02:48 -05:00
jshipsey	84586ef085	ranged	2020-11-08 18:52:22 -05:00
jshipsey	85a38d6f7a	axe basic	2020-11-08 18:51:35 -05:00
jiminycrick	81e77aa2ee	Initial combo melee for axe M1	2020-11-08 18:48:48 -05:00
AlKabir	435c2b9bda	centering assets	2020-11-08 00:35:11 -06:00
AlKabir	f5e5511057	added two meat assets for mobs to drop	2020-11-07 23:34:20 -06:00
Imbris	db6eeaeb6c	Use item_definition_id for weapon asset mapping	2020-11-07 16:44:11 -06:00
Sam	13be252f58	Fix audio tests.	2020-11-07 15:53:19 -06:00
Sam	e392e37c47	Yeeted from code files.	2020-11-07 15:53:10 -06:00
AlKabir	ee64934c94	Minor combat fixes (see issue 785)	2020-11-07 18:00:07 +00:00
TheBoredProgrammer64	d195eaf701	Revert "Removed toolCategory" ... This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.	2020-11-06 15:33:20 +00:00
Marcel Märtens	77bbc44051	ci cleanup, dependency update	2020-11-06 14:34:42 +01:00
Samuel Keiffer	df8567c5a9	Merge branch 'sam/make-roll-great-again' into 'master' ... Roll overhaul See merge request veloren/veloren!1484	2020-11-06 03:25:18 +00:00
Sam	bd6acca55c	Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.	2020-11-05 20:40:20 -06:00
Snowram	4f6aae5459	fmt	2020-11-06 01:08:35 +01:00
Monty Marz	8da2871897	potion buff	2020-11-06 01:08:34 +01:00
Snowram	a2671123e5	Addresses some comments	2020-11-06 01:08:31 +01:00
Snowram	1b1e322a1a	Allow for an arbitrary array of effects and buffs for consumables	2020-11-06 01:08:30 +01:00
Sam	34156f2cfa	Fixed audio tests. Added changelog line.	2020-11-05 18:01:46 -06:00
jshipsey	5ede5e0116	roll anim speedup	2020-11-05 16:40:30 -05:00
Sam	90e8b1f504	Addressed comments.	2020-11-04 19:22:08 -06:00
Sam	e34f5f09e9	Addressed comments.	2020-11-04 19:22:05 -06:00
Sam	be2f376176	Separated out health from stats component.	2020-11-04 19:22:04 -06:00
Snowram	2156701dfd	Fix animations regressions for biped_large	2020-11-04 02:12:43 +01:00
jshipsey	b5c308c53e	convert humanoid anims, warnings	2020-11-04 01:48:06 +01:00
Snowram	ad775963c3	More biped_large work	2020-11-04 01:48:05 +01:00
jshipsey	6f294e8663	cleanup 4	2020-11-04 01:48:05 +01:00
unknown	8bb0592f9c	starting to wire in new wield setup for bipedlarge	2020-11-04 01:48:05 +01:00
jshipsey	770db614d3	setup for axe/bow wield	2020-11-04 01:48:05 +01:00
jshipsey	021f7478f5	setup for staff, more anim conversions	2020-11-04 01:48:05 +01:00
Snowram	d4c2ebedf6	Bones scaling cleanup	2020-11-04 01:48:05 +01:00
jshipsey	39a2fd6e5a	starting to wire in new wield setup	2020-11-04 01:48:05 +01:00
Snowram	95285d05d0	More new style keyframe translation	2020-11-04 01:48:05 +01:00
jshipsey	030c8730c8	cleanup 3	2020-11-04 01:48:05 +01:00