1692 Commits

Author	SHA1	Message	Date
Imbris	9d63e74da6	Scale content image based on slot size, fix weapon images not showing, stop selection of empty slots	2020-04-12 18:40:54 +02:00
Imbris	9bf23c66d1	Don't show icon when slot is filled and have a separate image for filled ... slot backgrounds	2020-04-12 18:40:54 +02:00
Pfauenauge	14991cd309	armor slot visuals	2020-04-12 18:40:53 +02:00
Imbris	ce619c2aff	Use new slot widget for armor slots	2020-04-12 18:40:53 +02:00
Imbris	a3f56cae83	Restore slot interaction functionality	2020-04-12 18:40:52 +02:00
Imbris	b3c1c02d55	Setup basic generic slot system and used it for the inventory slots	2020-04-12 18:40:52 +02:00
Olexorus	edc871b002	Allow passwords with up to 35 characters	2020-04-12 13:52:39 +02:00
Carbonhell	5d18857ef3	Fixes mouse_input event not being pushed everytime	2020-04-09 18:43:12 +02:00
Carbonhell	4ff63345d8	Fixes mouseinput event ignoring cursor_grabbed being true	2020-04-08 23:46:42 +02:00
Capucho	5a3ca149b4	Fixed the player being rendered after dying	2020-04-08 21:28:33 +01:00
Carbonhell	2a93c57fb0	Carbonhell/keybindings	2020-04-08 17:36:37 +00:00
Capucho	74eae70662	Fix the problems of players walking over water with dithering	2020-04-07 22:50:01 +00:00
Monty Marz	a0a1402a9e	Merge branch 'pfau/small_ui_fixes' into 'master' ... Small UI fixes See merge request veloren/veloren!888	2020-04-04 21:51:06 +00:00
Monty Marz	721c7e50e1	Small UI fixes	2020-04-04 21:51:06 +00:00
Imbris	ed5ef03952	Merge branch 'imbris/fix' into 'master' ... Remove newline from password when pressing enter See merge request veloren/veloren!887	2020-04-04 21:45:30 +00:00
Capucho	9b85882f9a	Add player transparency and silhouette	2020-04-04 19:36:55 +00:00
Imbris	d6004d7cdc	Trim newlines from password when pressing enter	2020-04-04 13:55:25 -04:00
Songtronix	039355c0f8	Merge branch 'shandley/fix-sfx' into 'master' ... Fix run SFX See merge request veloren/veloren!880	2020-04-02 07:05:33 +00:00
Shane Handley	0f71fe2bdc	fix: Restore run SFX when the character is using a weapon other than the sword.	2020-04-02 14:47:26 +11:00
Imbris	053ec2d874	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
Imbris	baf973a32a	Merge branch 'master' into 'combat' ... # Conflicts: # CHANGELOG.md	2020-04-01 20:42:27 +00:00
Imbris	bfa85e427a	Fix tests	2020-04-01 11:41:26 -04:00
Marli Frost	74e9adac39	feat: configure audio output using an enum	2020-03-31 22:29:30 +01:00
Marli Frost	b5d4e7c89b	fix: avoid rodio API when audio is disabled	2020-03-31 21:28:09 +01:00
Marli Frost	dd673a3bcc	allow the game to start without an audio device	2020-03-31 21:27:55 +01:00
Imbris	37a39ac38d	Merge branch 'capucho/resume-do-not-eject-cursor' into 'master' ... Don't eject mouse on resume Closes #307 See merge request veloren/veloren!873	2020-03-31 16:50:45 +00:00
Imbris	c85ae65219	Merge branch 'capucho/password_cursor_fix' into 'master' ... Fix the cursor lagging behind on the password field See merge request veloren/veloren!859	2020-03-31 16:39:56 +00:00
Imbris	2a126fff83	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00
Capucho	b99f63a621	Make so that the resume button doesn't eject the mouse	2020-03-30 22:00:46 +01:00
Capucho	eb7b1a2ff4	Added a portuguese translation	2020-03-30 22:57:26 +02:00
AdamWhitehurst	1a239ad035	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-29 13:40:08 -07:00
AdamWhitehurst	1b2b0786e6	remove unused timed_combo	2020-03-29 13:40:03 -07:00
jshipsey	f0eb63f18b	fireball damage tweaks/staff shooting anim	2020-03-29 14:00:05 -04:00
jshipsey	504814674b	cleanup, tweak to triplestrike stage 1	2020-03-29 03:53:52 -04:00
Pfauenauge90	a1c342edf0	small fix	2020-03-28 18:06:00 +01:00
Imbris	26c4341b97	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
Imbris	8a71452135	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
jshipsey	83dd70af26	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 23:59:45 -04:00
jshipsey	2924d6dd6b	proper bow animation	2020-03-27 23:59:05 -04:00
Imbris	94f44b0b32	Create Dir type for better enforcement of non NaN, normalized representations of directions	2020-03-27 22:02:07 -04:00
Capucho	41b6404806	Fix the wrong default keybind change	2020-03-27 19:36:20 +00:00
Capucho	bba43dc9c8	Added an option for hold and added everything to the settings	2020-03-27 18:35:52 +00:00
AdamWhitehurst	298e28b7d9	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
Pfauenauge90	38eae21ade	fire bolt visuals	2020-03-27 18:31:45 +01:00
timokoesters	d32ec6ea40	Fix char selection not showing tools	2020-03-27 18:17:41 +01:00
Pfauenauge90	369e58d807	update help screen	2020-03-27 17:50:34 +01:00
Pfauenauge90	7de2fdcf09	remapped default look key, removed unused keys	2020-03-27 16:09:51 +01:00
jshipsey	d3cfd120f7	third attack for triple strike	2020-03-27 01:57:30 -04:00
jshipsey	06d65ac72b	small animation tweaks	2020-03-26 23:51:55 -04:00
Pfauenauge90	51ce452e92	asset cleanup, map visuals	2020-03-27 04:06:27 +01:00