213 Commits

Author	SHA1	Message	Date
Justin Shipsey	9e5c0ce601	Merge branch 'silentium/arms-and-armor' into 'master' ... Added 2 sets of armour. See merge request veloren/veloren!951	2020-05-17 19:03:00 +00:00
Silentium	1673a25e8b	Added 2 sets of armour.	2020-05-17 19:02:59 +00:00
Monty Marz	ecb7963730	Pfau/0.6 bg	2020-05-16 12:48:29 +00:00
Joshua Barretto	aac28d04d5	Added dungeon bosses, boss loot, boss arenas	2020-05-15 16:05:50 +01:00
Monty Marz	b589c3fc71	Fix animals not attacking	2020-05-04 16:59:32 +00:00
CapsizeGlimmer	4e7f8c686a	Equipped lanterns now provide an illumination effect.	2020-05-04 15:15:31 +00:00
Monty Marz	c792cc05a9	Villagers and Cultists	2020-04-30 20:43:24 +00:00
Monty Marz	4521791591	UI Fixes	2020-04-26 01:44:56 +00:00
Joshua Barretto	cd5e4ef3b7	Better path colour on map, typo fixes	2020-04-23 18:19:41 +01:00
Joshua Barretto	f999edffaa	Fixed crop crash issues	2020-04-23 18:19:41 +01:00
Pfauenauge90	4b72a07e22	sprites	2020-04-23 18:19:41 +01:00
Imbris	77d13376d3	Add right click to use, latern is not armor tweaks	2020-04-12 18:41:07 +02:00
Pfauenauge90	eb7ded989f	7 dwarf accessories	2020-04-12 18:41:03 +02:00
Pfauenauge90	2263b9be95	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge90	85f9f80024	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge	d5128b751d	png item images, fix map cursor	2020-04-12 18:40:59 +02:00
Pfauenauge90	ca667fd02b	tooltips	2020-04-12 18:40:58 +02:00
Pfauenauge90	156b554023	item types	2020-04-12 18:40:57 +02:00
Pfauenauge90	771baaaae5	cape item	2020-04-12 18:40:55 +02:00
comfymattress	ae975a67f4	Fixed Flowers and Grass items	2020-03-28 14:13:55 -05:00
Imbris	6bd20c64f8	fix debug item rons	2020-03-28 14:50:05 -04:00
Imbris	d3b5b1e637	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
timokoesters	6fd3339b75	Make apples great again	2020-03-27 17:51:35 +01:00
timokoesters	8010e5afb4	Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants	2020-03-26 22:56:33 +01:00
timokoesters	b9c85b9beb	Balancing	2020-03-26 22:56:33 +01:00
Pfauenauge90	8b05dda1d9	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01:00
Pfauenauge90	060ebbc861	healing sceptre	2020-03-24 01:11:14 +01:00
Pfauenauge90	61e2a986f2	item images	2020-03-22 14:38:21 +01:00
Pfauenauge	f6731dc770	cloth armor	2020-03-22 00:21:11 +01:00
Pfauenauge90	6094e4b017	added chest drops	2020-03-20 01:11:02 +01:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01:00
timokoesters	49b0af10a9	Regular naming scheme for armor assets	2020-03-19 17:47:37 +01:00
Pfauenauge90	d863e12235	swift leather armour parts	2020-03-19 14:17:53 +01:00
Pfauenauge90	509615c15b	npc armour	2020-03-18 23:09:58 +01:00
Pfauenauge90	4d9327cef5	2 weapons	2020-03-18 21:05:20 +01:00
Pfauenauge90	d752501db1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-17 19:04:11 +01:00
Pfauenauge90	c9d09b8cdd	more slots	2020-03-17 19:04:06 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
timokoesters	1279f70184	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	1e9f081f10	include chest models	2020-03-15 19:53:58 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	6e2015957a	plate armour	2020-03-15 16:51:55 +01:00
Joshua Barretto	98e8c79b1c	Added armour items and equipping of armour	2020-03-15 16:51:54 +01:00
Pfauenauge90	3738fe45f7	better item desc	2020-03-15 16:42:09 +01:00
Pfauenauge90	bf1c46d596	item images	2020-03-15 16:42:09 +01:00
Pfauenauge90	913393963a	plate armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	6cb68fabea	more assa armour parts	2020-03-15 16:42:09 +01:00
Pfauenauge90	aa36082eed	more armour	2020-03-15 16:42:09 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
timokoesters	31f3aae75c	fix: make climbing cost stamina	2020-02-24 19:18:06 +01:00
timokoesters	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00
Joshua Barretto	faa86226c7	Collars	2020-01-29 12:01:28 +00:00
Adam Whitehurst	5959d2a5c7	Fix SFX and Assets	2020-01-16 05:28:45 -08:00
Adam Whitehurst	d82e93b39f	Merge master and build	2020-01-16 05:27:30 -08:00
Adam Whitehurst	8bf35a197b	Update weapon .ron	2020-01-05 11:26:22 -08:00
AdamWhitehurst	ba7ca785f6	Successful build	2019-12-30 05:56:42 -08:00
Monty Marz	8aff5faa83	assets update ... acacia trees updated help.png bigger map zone name npc levels from 0-10 boss levels from 20-50	2019-12-30 12:16:35 +00:00
AdamWhitehurst	9c6ce9babd	Begin implementing combat actions	2019-12-29 15:47:42 -08:00
Monty Marz	c38447a264	assets update ... map image human male hairstyles elf male hairstyle potion item cheese item removed admin items from inventory	2019-11-09 13:42:42 +00:00
Monty Marz	a0a8011d7e	Updated: Help Window, Map, Item Descriptions	2019-10-27 22:22:40 +00:00
timokoesters	0a1e12c9ad	improvement: make debug items of type ItemKind::Tool ... This way all items that can be held in a hand are tools	2019-10-24 23:55:24 +02:00
timokoesters	20248a4818	feat: store items as RON files ... When a new item is created, a ron file will be used as a template	2019-10-24 23:47:26 +02:00