Sam
d1e1de3b14
Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.
...
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
2022-01-12 22:18:58 -05:00
Ben Wallis
c6fc42be82
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3094
2022-01-10 08:45:47 +00:00
Jonathan Berglin
5fcbd1e743
Update swedish translations
2022-01-10 08:45:47 +00:00
Ben Wallis
e70173bc32
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3092
2022-01-09 16:37:53 +00:00
Jonathan Berglin
d3f0fa810e
Update swedish translations
2022-01-09 16:37:53 +00:00
Samuel Keiffer
a600d4ca94
Merge branch 'FreeFull/intel_uvec3_fix' into 'master'
...
Avoid Intel graphics ivec3/uvec3 bug.
See merge request veloren/veloren!3091
2022-01-09 01:14:48 +00:00
Imbris
753de239d7
Merge branch 'YuriMomo/Fix-black-sprites' into 'master'
...
Fixes NaN in shader code which produced black sprites visible through blocks
See merge request veloren/veloren!3090
2022-01-09 01:03:06 +00:00
Dominik Broński
cc36a14407
Fixes NaN in shader code which produced black sprites visible through blocks
2022-01-09 01:03:05 +00:00
Filip Szczepański
053e28a33a
Avoid Intel graphics ivec3/uvec3 bug.
2022-01-09 00:04:35 +01:00
Monty Marz
bc1c84aa76
Merge branch 'pfau/smöl_fixes' into 'master'
...
change merchant backpack visuals and add mining skill icons
See merge request veloren/veloren!3089
2022-01-08 09:32:51 +00:00
Imbris
f948476f9f
Merge branch 'fetsorn-master-patch-26200' into 'master'
...
Fix typo "incase"->"in case"
See merge request veloren/veloren!3086
2022-01-08 04:07:33 +00:00
Monty Marz
d72d926341
change merchant backpack visuals and add mining skill icons
2022-01-08 01:57:52 +01:00
Joshua Barretto
3cba7e7f87
Merge branch 'zesterer/fix-nametags' into 'master'
...
Fixed nametag logic bug
See merge request veloren/veloren!3088
2022-01-07 22:38:59 +00:00
Joshua Barretto
bc7c942bc9
Fixed nametag logic bug
2022-01-07 21:54:14 +00:00
Imbris
9555f3ed4d
Merge branch 'unvariant/support_removing_key_bindings' into 'master'
...
support removing key bindings
Closes #1298
See merge request veloren/veloren!3083
2022-01-07 20:30:31 +00:00
unvariant
71d2be5f76
support removing key bindings
2022-01-07 20:30:30 +00:00
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
