680 Commits

Author	SHA1	Message	Date
Joshua Barretto	75c1d44010	Merge branch 'zesterer/worldsim' into 'master' ... World simulation, generation, and pathfinding improvements (including castles and caves) See merge request veloren/veloren!1282	2020-08-12 21:40:56 +00:00
Joshua Barretto	9cefaaa7af	Improved spawn rates of castles and cave monsters	2020-08-12 21:16:14 +01:00
Joshua Barretto	15b1717295	Added decals to towns	2020-08-12 21:15:53 +01:00
Joshua Barretto	c547cdd72c	Fixed castle bug, better field RNG	2020-08-12 21:15:53 +01:00
Joshua Barretto	41229b4665	Added large caves, cave scatter, removed old caves	2020-08-12 21:15:53 +01:00
Monty Marz	fcdd875bff	UI fixes, assets update	2020-08-12 18:10:18 +00:00
Monty Marz	6789b7ae27	Add firework hues	2020-08-12 22:29:06 +08:00
scott-c	9aab296264	Add firework item	2020-08-12 22:25:28 +08:00
Monty Marz	28a8f847cc	timeout visuals, various small fixes and two new items	2020-08-08 01:15:58 +02:00
Monty Marz	1eb671e1a6	Update CHANGELOG.md, german locale	2020-08-08 01:15:58 +02:00
nepo	cb65070aba	nepo/dullahan	2020-08-07 03:56:59 +00:00
BottledByte	ab1c43be84	Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar ... Also fixed two wrong asset references and did some .ron formatting	2020-08-05 01:21:42 +02:00
BottledByte	a167ee98ee	De-enumerized armor variants	2020-08-03 03:41:32 +00:00
BottledByte	dc91209a7b	Removed fine-grained Item enums and replaced them with Strings ... This change allows to introduce new weapons and pair them with graphical assets without need to recompile.	2020-08-02 01:21:32 +00:00
Samuel Keiffer	f930f52df5	Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow.	2020-08-01 20:08:30 +00:00
Snowram	1421517f84	Add frog npc, tweak pig model	2020-08-01 02:19:45 -04:00
jshipsey	5d2be2240e	maneater and feed anim	2020-08-01 02:19:45 -04:00
Snowram	90d7485c38	Add troll, truffler and wendigo npcs	2020-08-01 02:19:45 -04:00
jshipsey	8991b60929	catoblepas, bonerattler, rabbit, improved anims	2020-08-01 02:19:44 -04:00
Samuel Keiffer	527e7a329e	Armor fixes	2020-07-25 23:57:04 +00:00
Monty Marz	31cfc05123	lots of things ... animation fixes by slipped new cultist item settings option for loading screen tips loot table adjustments	2020-07-23 12:10:13 +00:00
Samuel Keiffer	6cce09be85	Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.	2020-07-18 00:05:28 +00:00
Monty Marz	4facf1e3f3	Fix item images, cleanup debug items folder	2020-07-16 02:46:10 +00:00
Joshua Barretto	8d6b442193	Crafting	2020-07-14 20:11:39 +00:00
Piotr Korgól	d0b7958309	Fix loot table (again)	2020-07-05 18:52:34 +02:00
Joshua Barretto	fd39ee97bc	Added training dummies	2020-07-05 16:15:51 +01:00
Joshua Barretto	38c422bef7	Added bombs to loot table	2020-07-05 16:15:51 +01:00
Joshua Barretto	2f6a618d5a	Added bombs, throwable items, more block kinds, weaker explosions	2020-07-05 16:15:48 +01:00
jshipsey	ca9ae13527	more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets	2020-07-05 09:38:15 -04:00
jshipsey	94ab3665d5	pangolin and special pangolin variable	2020-07-05 09:38:14 -04:00
Snowram	648e140be3	Add wolf, frostfang and mouflon npcs	2020-07-05 09:38:14 -04:00
Snowram	c22d543dd2	Add rock snapper mob	2020-07-05 09:38:13 -04:00
Snowram	1be42a8f85	Add tortoise mob	2020-07-05 09:38:13 -04:00
unknown	4b493b196c	Add asp mob	2020-07-05 09:38:13 -04:00
Snowram	9fec5f3d14	Add tiger mob	2020-07-05 09:38:12 -04:00
Snowram	c527484597	Add alligator, salamander and monitor npcs	2020-07-05 09:38:12 -04:00
Snowram	00b3301d6a	Remove quad_low mobs from quad_medium	2020-07-05 09:38:12 -04:00
Snowram	72eb03ceb5	Add quadruped_low skeleton	2020-07-05 09:38:11 -04:00
Piotr Korgól	aefa7e2f11	Make chests and enemies use the basic loot table	2020-07-04 14:07:10 +02:00
unknown	9968398ea8	Added stuff to loot table	2020-07-04 12:40:28 +02:00
Piotr Korgól	d101d7f132	Implemented a lottery system	2020-07-04 12:40:27 +02:00
scott-c	d53b51954b	Added ability to use 2 x 1h weapons or shields	2020-07-01 17:51:06 +08:00
Delyth Williams	94164b7839	Welsh pixie/armour	2020-06-26 16:26:00 +00:00
Monty Marz	58bfa4f0ef	Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master' ... Added fluffy jackalope slippers See merge request veloren/veloren!1114	2020-06-25 22:07:47 +00:00
WelshPixie	2825b08bee	Added fluffy jackalope slippers	2020-06-25 22:47:17 +02:00
WelshPixie	9887e5d45d	added seven new shoulder armour types	2020-06-25 18:36:24 +02:00
Forest Anderson	c2beeef600	Added equip documentation and test	2020-06-14 13:56:17 -04:00
Monty Marz	6c0587393e	update german translation	2020-06-03 19:32:54 +00:00
Monty Marz	b34da9b07b	More item drops	2020-06-03 17:59:09 +00:00
Monty Marz	f7d6f76a04	Added 36 Swords ... I added 36 sword models to the code.	2020-05-29 18:23:00 +00:00
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
jshipsey	ef70949d5d	cyclops	2020-05-11 21:44:21 -04:00
Snowram	5b77c74497	Add cockatrice	2020-05-09 18:09:27 -04:00
Robin Gilh	40360ff149	Dragon work	2020-05-09 18:07:31 -04: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
Justin Shipsey	171e865f57	new animals	2020-04-28 03:13:23 +00:00
Monty Marz	6d7cb8654d	Merge branch 'pfau/ui-fixes' into 'master' ... UI Fixes See merge request veloren/veloren!946	2020-04-26 01:44:56 +00:00
Monty Marz	4521791591	UI Fixes	2020-04-26 01:44:56 +00:00
Justin Shipsey	6fa13bcb7e	body/anim tweaks	2020-04-26 01:09:03 +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	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
jshipsey	d4332c3138	eagle adjustments	2020-03-07 13:26:46 -05:00
timokoesters	d0439fdd84	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-24 21:34:17 +01:00
timokoesters	31f3aae75c	fix: make climbing cost stamina	2020-02-24 19:18:06 +01:00
Joshua Barretto	31449db578	Add a new name (to force the repo to update this file)	2020-02-16 15:11:34 +00:00
Joshua Yanovski	8a9d4012fa	Allow spawning individual species with /spawn. ... To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.	2020-02-14 03:12:37 +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
Joshua Yanovski	3fa21b3dc7	Per-speces NPC names! ... Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.	2020-01-29 04:41:32 +01:00
Justin Shipsey	64690279af	new mobs ... alligators	2020-01-26 00:22:48 +00:00
Monty Marz	a4274ef8aa	Charge Icon and flashing skillbar	2020-01-17 22:00:00 +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
Monty Marz	3a0131306f	Character assets Part 1	2019-09-18 16:46:12 +00:00
scorpion9979	7bfd9464c9	Added humanoid NPC type w/ names	2019-06-04 01:10:59 -04:00
scorpion9979	7919442d3d	Implemented asset system for caching json data	2019-06-04 01:10:59 -04:00