ninefox
889a593b13
cargo fmt
2022-01-16 16:32:03 -08:00
ninefox
fc012b4989
Lantern color will now change when swapping lanterns while lantern is activated
2022-01-16 16:24:31 -08:00
Samuel Keiffer
7b7ad62be9
Merge branch 'sam/remove-fake-health' into 'master'
...
Removed health scaling from generation
Closes #1354
See merge request veloren/veloren!3100
2022-01-15 22:34:48 +00:00
Sam
9b6c76bd3b
Removed health scaling that bypasses the skill system.
2022-01-15 11:58:28 -05:00
Dominik Broński
a6d1bfa6a0
Merge branch 'isse/site2-util' into 'master'
...
Site2 util
See merge request veloren/veloren!3037
2022-01-15 13:06:18 +00:00
Isidor Nielsen
5642680687
Site2 util
2022-01-15 13:06:18 +00:00
Imbris
4b1900d3ea
Merge branch 'fix-hotbar-bug' into 'master'
...
Fix hotbar bug
See merge request veloren/veloren!3066
2022-01-15 01:37:27 +00:00
Tormod G. Hellen
3afa16bf03
Fix hotbar changing when sorting inventory.
...
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Tormod G. Hellen
a33e6df303
Remove unused code.
2022-01-14 18:23:42 +01:00
Samuel Keiffer
589189315c
Merge branch 'slipped/gnarlingstuff' into 'master'
...
gnarling depth
See merge request veloren/veloren!3068
2022-01-14 07:22:11 +00:00
Imbris
1e24e4b8fb
Merge branch 'YuriMomo/Fix-Report-Message' into 'master'
...
Fix-Report-Message
See merge request veloren/veloren!3096
2022-01-14 06:17:55 +00:00
jshipsey
0e9d50162b
last fixes
2022-01-14 00:19:32 -05:00
jshipsey
475fc1631f
akhlut
2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de
more gnarling weapons
2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0
woodengolem, chieftain, icedrake, blowgun
2022-01-13 23:20:52 -05:00
Samuel Keiffer
87769e7e55
Merge branch 'sam/damage-types' into 'master'
...
Physical damage types now have effects
See merge request veloren/veloren!3087
2022-01-13 03:55:44 +00:00
Sam
a882cb6af4
Changelog
2022-01-12 22:21:55 -05:00
Sam
8c2a484ee5
Addressed review comments.
2022-01-12 22:19:00 -05:00
Sam
c8f8ccdc55
Buffed spin for whatever strange reason
2022-01-12 22:18:59 -05:00
Sam
e98edbcc7a
Conversion of poise damage to health damage now scales depending on the poise state the target is in.
...
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
2022-01-12 22:18:59 -05:00
Sam
2e2e56661f
Tweaked poise effects and thresholds.
2022-01-12 22:18:59 -05:00
Sam
f182eec611
Fixed bugs in piercing penetration and crushing poise damage calculations.
2022-01-12 22:18:58 -05:00
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
Dominik Bronski
38e4a41620
Fix-Report-Message
2022-01-11 20:42:05 +01: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
