fetsorn
|
338dec41ab
|
Fix typo "incase"->"in case"
|
2022-01-06 18:28:05 +00:00 |
|
Imbris
|
e12390b08b
|
Merge branch 'voxal/self_chat_bubbles' into 'master'
Allow players to see own speech bubbles.
Closes #1291
See merge request veloren/veloren!3081
|
2022-01-06 04:54:04 +00:00 |
|
voxal
|
7d07598370
|
Move comments and turn on by default
|
2022-01-05 20:07:05 -08:00 |
|
voxal
|
e75f569014
|
Refactor to avoid changing overhead struct
|
2022-01-05 20:07:05 -08:00 |
|
voxal
|
39e3d5c163
|
Move changelog entry to bottom
|
2022-01-05 20:07:05 -08:00 |
|
voxal
|
471e75d846
|
cargo fmt
|
2022-01-05 20:06:43 -08:00 |
|
voxal
|
41e7e25f16
|
Fix clippy::nonminimal-bool
|
2022-01-05 20:06:43 -08:00 |
|
voxal
|
0b4446ad81
|
Add changes to changelog
|
2022-01-05 20:06:43 -08:00 |
|
voxal
|
e546a1d1a9
|
Allow players to see own speech bubbles.
|
2022-01-05 20:06:43 -08:00 |
|
Samuel Keiffer
|
7364c5a31e
|
Merge branch 'sam/safe-make-npc' into 'master'
Make npc command no longer crashes server
See merge request veloren/veloren!3085
|
2022-01-05 00:43:40 +00:00 |
|
Sam
|
b82aa621d5
|
Gracefully handle asset not existing.
|
2022-01-04 18:07:33 -05:00 |
|
Samuel Keiffer
|
380265bec2
|
Merge branch 'sam/skill-persistence-fixes' into 'master'
Skill persistence fixes
See merge request veloren/veloren!3006
|
2022-01-04 01:57:24 +00:00 |
|
Sam
|
2e09feb426
|
Tweaks to prompt dialog.
|
2022-01-03 19:55:06 -05:00 |
|
Sam
|
efbc5f9b75
|
UI notifying player that their skillset has been invalidated.
|
2022-01-03 19:55:06 -05:00 |
|
Sam
|
0a9f3381f5
|
Skill points now attempt to be earned as experience is added.
|
2022-01-03 19:55:05 -05:00 |
|
Sam
|
da78800047
|
Changed skill groups to be a hashmap instead of a vec.
|
2022-01-03 19:55:05 -05:00 |
|
Sam
|
6d2496b7de
|
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
|
2022-01-03 19:55:04 -05:00 |
|
Sam
|
8221336587
|
Addressed some review.
|
2022-01-03 19:55:04 -05:00 |
|
Sam
|
64c8321626
|
Made skill groups remain locked if skill to unlock them not acquired.
|
2022-01-03 19:55:03 -05:00 |
|
Sam
|
8feb9fb67b
|
Hash value now stored as a blob instead of a json string.
|
2022-01-03 19:55:03 -05:00 |
|
Sam
|
903c57b862
|
Persitence now tracks spent_exp as an additional point to potentially invalidate skills.
|
2022-01-03 19:55:03 -05:00 |
|
Sam
|
c8675eaf45
|
Added hash value to decide if we should invalidate persited skills and allow a respec.
|
2022-01-03 19:55:02 -05:00 |
|
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 |
|