10735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sam	6ab2839eaa	Fixed migration, added field for hash value.	2022-01-03 19:55:02 -05:00
Sam	bf3bcd9213	Migration for skill persistence fixes (no hash yet).	2022-01-03 19:55:01 -05:00
Sam	356eae85a6	Skillsets now store an ordered vec of skills that is used to track order that skills were acquired in.	2022-01-03 19:55:01 -05:00
Sam	27dd7b4391	Refactored skills code.	2022-01-03 19:55:01 -05:00
Sam	c44c10718b	Split skillset and skills into separate files.	2022-01-03 19:55:00 -05:00
Sam	fe45a158ed	Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp.	2022-01-03 19:55:00 -05:00
Samuel Keiffer	0cf0399a47	Merge branch 'DaforLynx/new-music-dec' into 'master' ... River sounds and more See merge request veloren/veloren!3080	2022-01-03 22:40:32 +00:00
DaforLynx	13e87375d6	River sounds and more	2022-01-03 22:40:31 +00:00
Imbris	58b41bb2bb	Merge branch 'debug' into 'master' ... Use debug_map to implement Debug See merge request veloren/veloren!3048	2022-01-02 21:02:26 +00:00
Ben Wallis	fb083e8599	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Tygyh/update swedish translations See merge request veloren/veloren!3082	2022-01-01 18:26:37 +00:00
Dr. Dystopia	38246eefd3	Add missing 'new line' character	2022-01-01 17:56:42 +01:00
Dr. Dystopia	039f73be8f	Update swedish translations	2022-01-01 15:03:58 +01:00
Dr. Dystopia	fae2fcd3f1	More swedish translations	2022-01-01 10:33:10 +01:00
Dr. Dystopia	9ea6cea7cd	Update swedish translations and fix typo	2022-01-01 00:40:50 +01:00
Ben Wallis	7aa799e562	Merge branch 'christmas_cleanup' into 'master' ... Christmas Cleanup See merge request veloren/veloren!3079	2021-12-30 18:58:16 +00:00
Youssef Fahmy	9cd87b1af7	Christmas Cleanup	2021-12-30 18:58:15 +00:00
Marcel	b8b6192a70	Merge branch 'angel/update-mirror-ci' into 'master' ... Lock git-lfs to 2.X See merge request veloren/veloren!3078	2021-12-28 22:26:08 +00:00
Samuel Keiffer	4d85ae4f60	Merge branch 'ubruntu/dagger-ux' into 'master' ... Dagger UX See merge request veloren/veloren!3072	2021-12-28 22:09:34 +00:00
ubruntu	65f9d18fb7	Dagger UX	2021-12-28 22:09:34 +00:00
Forest Anderson	9078cc29f8	Lock lfs to 2.X	2021-12-28 16:11:58 -05:00
Marcel	d9ca0f4c0c	Merge branch 'flo666-update_german_translation_by_DD65' into 'master' ... update german translation by dd65 See merge request veloren/veloren!3077	2021-12-28 18:14:29 +00:00
flo	4e843cb0ff	update german translation by dd65	2021-12-28 18:14:29 +00:00
Imbris	415ec2cd8a	Merge branch 'doctorkompot/update_item_image_manifest' into 'master' ... DoctorKompot/Item display update See merge request veloren/veloren!2984	2021-12-27 03:45:38 +00:00
DoctorKompot	4ecdd8002d	updated changelog	2021-12-27 03:01:30 +02:00
DoctorKompot	cc6058889a	deleted unused PNG files	2021-12-27 03:01:29 +02:00
DoctorKompot	22b19e40e9	updated changelog, fixed lantern colors	2021-12-27 03:01:28 +02:00
DoctorKompot	0dba858ca9	fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files	2021-12-27 03:01:26 +02:00
DoctorKompot	5a196f1684	another shot at fixing turbans	2021-12-27 03:01:25 +02:00
DoctorKompot	d312452941	changed Magic Lantern kind: to "Magic"	2021-12-27 03:01:24 +02:00
DoctorKompot	439c6a9a3e	fixed cheese	2021-12-27 03:01:22 +02:00
DoctorKompot	44f6e3888b	updated mortar and pestle, fixed GR and cheese rotation, fixed offsets of Pfau's turbans	2021-12-27 03:01:21 +02:00
DoctorKompot	1cc69bbca1	fixed Pfau's turbans and manually added back mod.rs files that got deleted previously	2021-12-27 03:01:19 +02:00
DoctorKompot	9eedb024fe	added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry	2021-12-27 03:01:18 +02:00
DoctorKompot	e83446811a	fixed apple offset	2021-12-27 03:01:16 +02:00
DoctorKompot	bc07474f31	fixed grey and purple slots	2021-12-27 03:01:15 +02:00
DoctorKompot	ff71891821	brightened item backgrounds	2021-12-27 03:01:14 +02:00
DoctorKompot	ca93284294	updated sewing set, ice shard and sunflower tea models with the ones provided by Gemu	2021-12-27 03:01:13 +02:00
DoctorKompot	46fe40d5fc	fixed ice shard, sunflower tea and sewing kit	2021-12-27 03:01:11 +02:00
DoctorKompot	1060693d16	changed the scaling and offset of some items, replaced Raptor feather, sunflower tea, ice shard and sewing set PNGs with .vox files, updated the image manifest	2021-12-27 03:01:10 +02:00
DoctorKompot	7fb9ac121e	updated item models with the ones provided by Gemu, (bags and food), some leather items, and honey, then updated item_image_manifest and sprite_manifest accordingly	2021-12-27 03:01:09 +02:00
DoctorKompot	0242552492	added mushroom stick, changed apple and apple stick models, made phoenix feather legendary rarity	2021-12-27 03:01:07 +02:00
DoctorKompot	84b85d6ae5	fixed coconut, added apple stick	2021-12-27 03:01:06 +02:00
DoctorKompot	daad02ae60	changed the index from the highlight color of these necklaces, since the voxels were invisible in-game	2021-12-27 03:01:04 +02:00
DoctorKompot	ac15e556f5	added vox files for apple, coconut, collar, mushroom curry and admin tabard, update item image manifest accordingly	2021-12-27 03:01:02 +02:00
DoctorKompot	e5408c69b5	changed color of MF bag to a darker tone	2021-12-27 03:01:00 +02:00
DoctorKompot	d7ddb3ae04	updated bag displays	2021-12-27 03:00:59 +02:00
DoctorKompot	ccc1bdbf1c	updated the Common Quality item displays	2021-12-27 03:00:57 +02:00
DoctorKompot	3b6dc4dc50	reverted the previous Common items display changes	2021-12-27 03:00:56 +02:00
DoctorKompot	3c60bd1929	made lanterns slightly brighter, changed lantern color for green and red to match their names, changed display of Common items to fit the item frames of other qualities, updated item image manifest	2021-12-27 03:00:54 +02:00
Imbris	5b2aba80b5	Merge branch 'imbris/opt-entity-sync' into 'master' ... Parallelize loop over regions in entity sync system See merge request veloren/veloren!3073	2021-12-26 20:23:01 +00:00