589189315c
Merge branch 'slipped/gnarlingstuff' into 'master'
...
gnarling depth
See merge request veloren/veloren!3068
2022-01-14 07:22:11 +00:00
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
475fc1631f
akhlut
2022-01-13 23:20:58 -05:00
1fac6359de
more gnarling weapons
2022-01-13 23:20:56 -05:00
7f928d0bc0
woodengolem, chieftain, icedrake, blowgun
2022-01-13 23:20:52 -05:00
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
38e4a41620
Fix-Report-Message
2022-01-11 20:42:05 +01:00
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
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
d72d926341
change merchant backpack visuals and add mining skill icons
2022-01-08 01:57:52 +01:00
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
bc7c942bc9
Fixed nametag logic bug
2022-01-07 21:54:14 +00:00
71d2be5f76
support removing key bindings
2022-01-07 20:30:30 +00:00
338dec41ab
Fix typo "incase"->"in case"
2022-01-06 18:28:05 +00:00
7d07598370
Move comments and turn on by default
2022-01-05 20:07:05 -08:00
e75f569014
Refactor to avoid changing overhead struct
2022-01-05 20:07:05 -08:00
471e75d846
cargo fmt
2022-01-05 20:06:43 -08:00
41e7e25f16
Fix clippy::nonminimal-bool
2022-01-05 20:06:43 -08:00
e546a1d1a9
Allow players to see own speech bubbles.
2022-01-05 20:06:43 -08:00
2e09feb426
Tweaks to prompt dialog.
2022-01-03 19:55:06 -05:00
efbc5f9b75
UI notifying player that their skillset has been invalidated.
2022-01-03 19:55:06 -05:00
8221336587
Addressed some review.
2022-01-03 19:55:04 -05:00
64c8321626
Made skill groups remain locked if skill to unlock them not acquired.
2022-01-03 19:55:03 -05:00
c44c10718b
Split skillset and skills into separate files.
2022-01-03 19:55:00 -05:00
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
13e87375d6
River sounds and more
2022-01-03 22:40:31 +00:00
4d85ae4f60
Merge branch 'ubruntu/dagger-ux' into 'master'
...
Dagger UX
See merge request veloren/veloren!3072
2021-12-28 22:09:34 +00:00
65f9d18fb7
Dagger UX
2021-12-28 22:09:34 +00:00
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
1cc69bbca1
fixed Pfau's turbans and manually added back mod.rs files that got deleted previously
2021-12-27 03:01:19 +02:00
9eedb024fe
added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry
2021-12-27 03:01:18 +02:00
ccc1bdbf1c
updated the Common Quality item displays
2021-12-27 03:00:57 +02:00
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
e44478736e
Music additions
2021-12-22 11:20:34 +00:00
453c4c149e
fix more examples and satisfy code quality checks
2021-12-20 18:09:34 +00:00
3b4fa6b328
Snow for ice
2021-12-20 18:06:53 +00:00
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
9a4e6b81d3
Merge branch 'Character-editting' into 'master'
...
Character editing
See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
66a5f9fded
Fixes animation hot reloading (credit to Imbris)
2021-12-18 20:36:14 +01:00
1719ce8c16
Format
2021-12-18 15:58:17 +01:00
65ab92eb78
button spacing
2021-12-18 15:41:11 +01:00
3329a8df61
Add 'pen' icons for edit buttons
2021-12-18 15:27:14 +01:00
9a7cc50898
Show current equipment during editing
2021-12-18 12:35:31 +01:00
48fd9e877d
Use 'confirm' button when finishing editing
2021-12-18 11:45:49 +01:00
62f9bc5059
Fix redundant pattern matching
2021-12-15 21:05:49 +01:00
e2f4499d45
Remove debug prints
2021-12-15 20:56:44 +01:00
8b258e4e81
Non editable data
2021-12-15 20:40:01 +01:00
dd95d69dc4
Fixed character editing
2021-12-13 00:55:25 +00:00
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01:00
