Imbris 21cad12272 Merge branch 'fix-ghost-item' into 'master' ...

Fix ghost item when trade gets declined

Closes #1429

See merge request veloren/veloren!3117

2022-01-30 17:31:15 +00:00

..

settings_window

Merge branch 'unvariant/affix_remap_button' into 'master'

2022-01-23 18:40:43 +00:00

animation.rs

Create 'animation' file

2021-08-02 13:27:33 +02:00

bag.rs

Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.

2022-01-12 22:18:58 -05:00

buffs.rs

Remove unused clippy suppressions

2021-12-05 17:59:02 +00:00

buttons.rs

Add 'UpdateArgs import to 'buttons' file

2021-08-02 13:33:52 +02:00

chat.rs

Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master'

2022-01-24 06:14:08 +00:00

crafting.rs

updated the Common Quality item displays

2021-12-27 03:00:57 +02:00

diary.rs

Addressed MR comments.

2022-01-15 21:50:27 -05:00

esc_menu.rs

remove some reexports

2021-07-29 22:18:34 +02:00

group.rs

Changed weights of cr calculation and exp from cr formula.

2021-09-25 21:52:20 -04:00

hotbar.rs

Ability sets now start with non-empty defaults.

2022-01-15 21:45:27 -05:00

img_ids.rs

Merge branch 'name_areas_based_on_biome' into 'master'

2022-01-20 19:50:57 +00:00

item_imgs.rs

Update assets_manager to 0.7

2021-12-12 22:11:47 +01:00

loot_scroller.rs

updated the Common Quality item displays

2021-12-27 03:00:57 +02:00

map.rs

Add waypoint binding customization code

2022-01-21 18:05:41 +00:00

minimap.rs

in terrain.mod.rs, return name as Option in fn name

2022-01-18 19:53:20 +01:00

mod.rs

Merge branch 'fix-ghost-item' into 'master'

2022-01-30 17:31:15 +00:00

overhead.rs

Fixed review comments

2022-01-16 21:13:13 +00:00

overitem.rs

Don't try to mount unmountable entities, clippy fixes and fmt

2022-01-16 17:53:14 +00:00

popup.rs

in terrain.mod.rs, return name as Option in fn name

2022-01-18 19:53:20 +01:00

prompt_dialog.rs

Tweaks to prompt dialog.

2022-01-03 19:55:06 -05:00

skillbar.rs

Can move around, so character state system runs

2022-01-20 15:26:35 -05:00

slots.rs

Can move around, so character state system runs

2022-01-20 15:26:35 -05:00

social.rs

Remove unused clippy suppressions

2021-12-05 17:59:02 +00:00

trade.rs

updated the Common Quality item displays

2021-12-27 03:00:57 +02:00

util.rs

Adds poisoned debuff (energy change over time)

2022-01-19 19:01:13 +01:00