3608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	aab06794c4	Merge branch 'olexorus/fix_serverlist_panic' into 'master' ... Fix panic if default server index is out of bounds See merge request veloren/veloren!909	2020-04-14 17:06:51 +00:00
Olexorus	8c54b07fc0	Fix panic if default server index is out of bounds	2020-04-14 18:32:01 +02:00
Monty Marz	c26fb1d5ee	Merge branch 'imbris/slots' into 'master' ... Slots! Dragging, right-click to use, capes, lanterns, unequipping. Closes #526 See merge request veloren/veloren!904	2020-04-12 20:20:02 +00:00
Pfauenauge	51f5f9fee7	resolved comments	2020-04-12 21:45:19 +02:00
Imbris	75dc6bd455	Clarify todo comment	2020-04-12 15:35:43 -04:00
Imbris	2069c1aca4	fix example	2020-04-12 13:42:09 -04:00
Pfauenauge90	728158d27d	cleanup, slot background, scaling	2020-04-12 18:41:10 +02:00
Imbris	9bf7d7b15c	Changelog and small fix	2020-04-12 18:41:09 +02:00
Imbris	254ada45a0	Add backgound to hotbar slots	2020-04-12 18:41:09 +02:00
Imbris	f66681793b	Move item amount text to bottom right	2020-04-12 18:41:09 +02:00
Imbris	4a90c1cbea	tooltips for the skillbar	2020-04-12 18:41:08 +02:00
jshipsey	0d77be193a	lantern visuals, random cape flutter	2020-04-12 18:41:08 +02:00
Imbris	b5f1f5ebcc	Lantern tweaks, remove unused bones	2020-04-12 18:41:07 +02:00
Imbris	9c0dc15af9	Basic hotbar functionality	2020-04-12 18:41:07 +02:00
Imbris	fa18a51613	Add right click to use, latern is not armor tweaks	2020-04-12 18:41:07 +02:00
Imbris	215d7f2803	Fix selecting and remove amount text when dragging	2020-04-12 18:41:06 +02:00
Imbris	330b7f3c93	Enable unequipping as well as equipping to specific slots	2020-04-12 18:41:06 +02:00
Imbris	a994449f42	rework slot trait	2020-04-12 18:41:05 +02:00
jshipsey	70dbf99cae	cape work	2020-04-12 18:41:05 +02:00
Pfauenauge90	b86dca065b	Update de_DE.ron	2020-04-12 18:41:04 +02:00
Pfauenauge90	59e6be851e	translation fix	2020-04-12 18:41:04 +02:00
Pfauenauge90	735a3dbe24	hotbar text shadows	2020-04-12 18:41:04 +02:00
Pfauenauge90	249746abd2	7 dwarf accessories	2020-04-12 18:41:03 +02:00
Pfauenauge90	b2d04adc78	hotbar keybindings	2020-04-12 18:41:03 +02:00
Pfauenauge90	1c022d359b	fmt	2020-04-12 18:41:02 +02:00
Pfauenauge90	59766b4cb6	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge	2d2bf8b6f8	bag tooltips translation entries	2020-04-12 18:41:01 +02:00
Pfauenauge	8e73e5339e	german translation update	2020-04-12 18:41:01 +02:00
Pfauenauge90	b98e411fd7	starter armor in char creation	2020-04-12 18:41:01 +02:00
Pfauenauge90	fb96d3cb54	fix	2020-04-12 18:41:00 +02:00
Pfauenauge90	086e09ff58	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge	cb3a1f8609	smarter code	2020-04-12 18:40:59 +02:00
Pfauenauge	a4553f3d18	fmt	2020-04-12 18:40:59 +02:00
Pfauenauge	2dec3002c2	png item images, fix map cursor	2020-04-12 18:40:59 +02:00
Pfauenauge90	03ede010fe	item images	2020-04-12 18:40:58 +02:00
Pfauenauge90	1ea5019715	tooltips	2020-04-12 18:40:58 +02:00
Pfauenauge90	c9b8059f2e	item types	2020-04-12 18:40:57 +02:00
jshipsey	916c347d83	initial cape implementation	2020-04-12 18:40:57 +02:00
Pfauenauge90	60b8102f86	slot kinds	2020-04-12 18:40:56 +02:00
Pfauenauge90	d51858c875	more armour types	2020-04-12 18:40:56 +02:00
Pfauenauge90	1af1b1cf35	cape item	2020-04-12 18:40:56 +02:00
Pfauenauge90	edc0ba0f75	cape item	2020-04-12 18:40:55 +02:00
Imbris	dad932cd50	Drag things!	2020-04-12 18:40:55 +02:00
Imbris	15e98691ce	Make remove skin in armor item images	2020-04-12 18:40:54 +02:00
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