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
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
7f928d0bc0
woodengolem, chieftain, icedrake, blowgun
2022-01-13 23:20:52 -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
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
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
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
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
e546a1d1a9
Allow players to see own speech bubbles.
2022-01-05 20:06:43 -08: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
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
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
DaforLynx
13e87375d6
River sounds and more
2022-01-03 22:40:31 +00: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
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
ccc1bdbf1c
updated the Common Quality item displays
2021-12-27 03:00:57 +02:00
Imbris
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
DaforLynx
e44478736e
Music additions
2021-12-22 11:20:34 +00:00
Joshua Barretto
3b4fa6b328
Snow for ice
2021-12-20 18:06:53 +00:00
Joshua Barretto
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3
Merge branch 'Character-editting' into 'master'
...
Character editing
See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
ubruntu
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
Snowram
66a5f9fded
Fixes animation hot reloading (credit to Imbris)
2021-12-18 20:36:14 +01:00
Dr. Dystopia
1719ce8c16
Format
2021-12-18 15:58:17 +01:00
IsseW
65ab92eb78
button spacing
2021-12-18 15:41:11 +01:00
Dr. Dystopia
3329a8df61
Add 'pen' icons for edit buttons
2021-12-18 15:27:14 +01:00
Dr. Dystopia
9a7cc50898
Show current equipment during editing
2021-12-18 12:35:31 +01:00
Dr. Dystopia
48fd9e877d
Use 'confirm' button when finishing editing
2021-12-18 11:45:49 +01:00
Dr. Dystopia
62f9bc5059
Fix redundant pattern matching
2021-12-15 21:05:49 +01:00
Dr. Dystopia
e2f4499d45
Remove debug prints
2021-12-15 20:56:44 +01:00
IsseW
8b258e4e81
Non editable data
2021-12-15 20:40:01 +01:00
Joshua Barretto
dd95d69dc4
Fixed character editing
2021-12-13 00:55:25 +00:00
Dr. Dystopia
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438
Convert Armor Stats to Options
2021-12-12 00:25:35 +00:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
f4c5abf36b
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
2021-12-03 10:38:30 +01:00
