3ef4af0195
Various tweaks:
...
* Store result of large condition expression in a variable before using
in if statement (improves readability of code).
* Buff doc comment improvements. Adding periods is neccessary since
these will be merged into one line in the generated docs.
* Add note on AbilityContext that AbilityContext::None is intended to be
used rather than AbilityContext::Stance(Stance::None) perhaps in the
future we can add some serde shenanigans to make this work better, but
it is probably best to wait to see how this type evolves first.
2023-04-07 23:56:55 -04:00
2cc2aa86f4
Synchronize DiveMelee checks
2023-04-07 01:59:41 -04:00
e20cf5f14f
Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs
2023-04-07 01:59:41 -04:00
564530f5e2
Merge branch 'hudson/fix_loot_scroller_bug' into 'master'
...
fixed a visual ui bug when picking up items
See merge request veloren/veloren!3860
2023-04-06 20:44:02 +00:00
e03406b103
fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one
2023-04-06 13:43:11 -05:00
4881d2fd8b
fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one
2023-04-06 12:40:08 -05:00
73cd4e5136
Merge branch 'christof/wasmer_update' into 'master'
...
update wasmer
See merge request veloren/veloren!3857
2023-04-06 07:22:24 +00:00
49e734fa0b
Merge branch 'christof/multi_model_vox' into 'master'
...
Support multiple models in one vox file, e.g. for figures
See merge request veloren/veloren!3830
2023-04-06 07:09:20 +00:00
7ab2bcd4e4
revert unwanted regressions as indicated by imbris
2023-04-06 08:30:49 +02:00
41e551f32d
Merge branch 'smol_sword_nerf' into 'master'
...
Teeny changes to crippling stance abilities
See merge request veloren/veloren!3855
2023-04-05 23:17:57 +00:00
7c85460f18
Teeny changes to crippling stance abilities
2023-04-05 23:17:57 +00:00
8fac5192cc
update wasmer
2023-04-05 22:19:28 +02:00
76bfae38a0
Merge branch 'imbris/update-conrod-copypasta' into 'master'
...
Update copypasta version used by conrod
See merge request veloren/veloren!3854
2023-04-05 07:19:16 +00:00
9dd1b6c785
Switch from ansi-parser to cansi, down to a single version of nom!
2023-04-05 02:38:58 -04:00
6ed75fa3aa
Update tynm dependency (had to update nom first)
2023-04-04 22:25:32 -04:00
15ada6f25e
Merge branch 'tony/patch_underwater_fall_damage_bug' into 'master'
...
Temporarily patch underwater fall damage bug
See merge request veloren/veloren!3853
2023-04-04 22:25:32 +00:00
e60aace448
realize zesterers proposal
2023-04-05 00:11:26 +02:00
8352e4efae
Update copypasta version used by conrod so that we can avoid dependence on old xcb that will fail to compile soon due to dependency on quick-xml 0.22.0
...
See https://gitlab.com/veloren/veloren/-/issues/1815
2023-04-04 18:07:09 -04:00
f4a87e9f0b
cargo fmt
2023-04-04 23:47:31 +02:00
8d2b9b9a9c
single file orichalcum armor
2023-04-04 23:46:20 +02:00
4da41b0dd0
move alchemist set to single file (with reduced hat size)
2023-04-04 23:46:20 +02:00
e26cbffa0c
correct offsets from animation settings
2023-04-04 23:46:20 +02:00
5cb974f770
cargo fmt
2023-04-04 23:46:20 +02:00
76baf491ec
support model indices for humanoids
2023-04-04 23:46:20 +02:00
fb06bb651b
a single llama file (smaller)
2023-04-04 23:46:20 +02:00
0b8bc507ac
fix clippy
2023-04-04 23:46:20 +02:00
9205da2298
cargo fmt
2023-04-04 23:46:20 +02:00
b1dc85dc0f
llama in one vox file
2023-04-04 23:46:20 +02:00
9b3bf4c3c8
initial support for multiple models in one vox file
2023-04-04 23:46:20 +02:00
34cdd2d7f5
fmt
2023-04-04 23:25:11 +02:00
d292026935
Added fix to changelog
2023-04-04 23:23:04 +02:00
093b1c924c
Refactored according to review
2023-04-04 23:16:00 +02:00
3adea9cdbb
Temporarily patch underwater fall damage bug
2023-04-04 19:16:58 +02:00
b3cd1c1e56
Merge branch 'inventory-list' into 'master'
...
Add a list mode to inventories to make it easier to see item names at merchants.
See merge request veloren/veloren!3755
2023-04-04 16:54:15 +00:00
914f93e18a
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3847
2023-04-03 21:40:32 +00:00
908b2a62fa
Change item color in details mode.
2023-04-03 15:40:34 -04:00
6899023fde
Sort merchant inventories lexicographically by (quality, name, quantity)
...
in details mode.
2023-04-03 14:43:14 -04:00
8facf7b58d
Add a list mode to inventories to make it easier to see item names at merchants.
2023-04-03 14:43:14 -04:00
494019ecc2
Merge branch 'sam/polymorph-buff-fix' into 'master'
...
Fix multiple polymorph buffs
See merge request veloren/veloren!3850
2023-04-02 22:45:54 +00:00
17cdd3e38d
Merge branch 'zesterer/choose-starting-site' into 'master'
...
Allow new players to choose their starting site
See merge request veloren/veloren!3848
2023-04-02 00:45:25 +00:00
ab5561df61
Removed redundant things
2023-04-02 01:09:12 +01:00
33e643fbfd
fmt
2023-04-02 01:21:10 +02:00
f2419e2920
Merge branch 'sam/fix-modular-craft' into 'master'
...
Fix modular output item showing an item for disallowed combinations
See merge request veloren/veloren!3852
2023-04-01 23:01:05 +00:00
d1f6db9da6
different site name col
2023-04-02 00:55:21 +02:00
6849f9fc21
Fix function name typo
2023-04-01 18:11:16 -04:00
33ebb0a4a3
Make clippy happy
2023-04-01 22:55:45 +01:00
19fc9ad52f
Merge branch 'sam/client-time' into 'master'
...
Tween client time to match with server time.
See merge request veloren/veloren!3851
2023-04-01 21:50:02 +00:00
352d34557e
Fix modular crafting window showing an item output when it is not possible to craft two components together.
2023-04-01 17:22:01 -04:00
2e6d55a78b
Use topographic map for town selection screen.
2023-04-01 17:10:44 -04:00
ab4e3d23e3
Make clippy happy
2023-04-01 22:03:24 +01:00
