3063 Commits

Author SHA1 Message Date
hqurve
1b3536a5f5 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +00:00
James Melkonian
7bb62615df Add topographic option to map 2021-04-06 09:16:17 -07:00
James Melkonian
9c7bfb72ea Map icon scaling 2021-04-06 08:42:09 -07:00
James Melkonian
44715100c1 Add layers to minimap 2021-04-06 08:42:08 -07:00
James Melkonian
3578116eee Added map layers 2021-04-06 08:42:07 -07:00
James Melkonian
5d3acb0c2e Topographic map 2021-04-06 08:42:06 -07:00
Joshua Barretto
b419ed6905 Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Joshua Barretto
28fc121458 Added auto camera setting 2021-04-05 23:24:31 +01:00
Marcel
b767256d65 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Hunter Parks
7dd7c29c53 Change cursor lock location to be center of screen
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
Hunter Parks
d9c862a083 Fixes #520 and #840 - locks cursor to screen when menu is not open
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
Monty
a8b619bbef More cheese is less cheese
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
Marcel
d7ed57ca7e Merge branch 'login-trim-username' into 'master'
login trim username, improve validation, social ordering #1040

Closes #1040

See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Avi Weinstock
2b3aa57b72 Add a cheese counter in the bag display. 2021-04-04 11:14:25 -04:00
Monty Marz
c0b7952eb9 Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
DaforLynx
5ee9108e0d Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Snowram
9cc6ff3711 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Avi Weinstock
0a6461f2b9 Add colors for buy/sell tooltips based on site prices. 2021-04-02 17:44:02 -04:00
Marcel
eeb9e76902 Revert "Merge branch 'animtweaks' into 'master'"
This reverts merge request !2039
2021-04-01 18:45:03 +00:00
aljazerzen
697d4a52d9 login trim username, improve validation, social ordering 2021-04-01 16:43:27 +02:00
jshipsey
99930f13c8 small anim tweaks 2021-04-01 03:08:33 -04:00
Avi Weinstock
19ac0b2245 Allow fast stacking into and out of a trade with {ctrl,shift} click.
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel Märtens
7afa77a06f move tracing code to own crate 2021-03-30 16:35:36 +02:00
Joshua Barretto
bb88d42295 Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites

See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
Joshua Barretto
97e5c26838 Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
Joshua Barretto
6ca8cd9bb2 Fixed training dummy hitbox 2021-03-29 21:52:05 +01:00
Joshua Barretto
8ecc0d5231 Improved hit particles 2021-03-29 21:52:05 +01:00
Joshua Barretto
6f72e53295 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
843f295eef Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
58b5e5fcee Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
a7064fdbbd Skillbar uses item tooltip 2021-03-29 18:34:45 +02:00
Snowram
2fe2d91ab0 Add several new i18n lines 2021-03-29 18:34:45 +02:00
Snowram
a5c125fdef Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
Snowram
6451caf15b Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Snowram
f6715c8217 Use a dummy item for the new() function 2021-03-29 18:34:45 +02:00
Snowram
a3f0589dcc Kinda working tooltip height but not really 2021-03-29 18:34:45 +02:00
Snowram
12c1e47b89 More item tooltip UI layout 2021-03-29 18:34:45 +02:00
Snowram
71fabb1637 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
Snowram
763cf70b70 New tooltip 2021-03-29 18:34:45 +02:00
Marcel Märtens
1db475e1dc do a clear teardown of tokio runtime 2021-03-29 10:34:33 +02:00
Marcel Märtens
ac9734bee5 display error when rodio panic is fixed 2021-03-28 20:40:07 +02:00
Sam
d5c44cd2a2 Fixed offset of decayed health 2021-03-27 21:06:21 -04:00
Monty
8d0b1e201a decay display for groups and overhead bars 2021-03-27 21:05:17 -04:00
Sam
1df8260208 Removed experimental group health decay 2021-03-27 21:05:17 -04:00
jshipsey
094fb4ee95 flayer anims 2021-03-27 21:05:16 -04:00
Sam
c40ad922de Particles for summoned minions 2021-03-27 21:05:15 -04:00
Monty Marz
25f4f15c37 decayed health texture 2021-03-27 21:05:14 -04:00
Monty Marz
ee0214317f WIP animation 2021-03-27 21:05:13 -04:00
Sam
42ca607eab Initial work to show decayed health in healthbars 2021-03-27 21:05:13 -04:00
Sam
75c0e3f4eb Added particles for lifesteal effect 2021-03-27 21:05:12 -04:00