Commit Graph

3171 Commits

Author SHA1 Message Date
7128c3d3f6 Asset reorganization + removed some unused and duplicates + reduce size of some images 2021-04-11 16:35:17 +02:00
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
8b034ed56f Merge branch 'sharp/sprites-in-background' into 'master'
Mesh sprites in background.

See merge request veloren/veloren!2098
2021-04-10 20:34:35 +00:00
adb18ef645 Merge branch 'mdx97/default-names' into 'master'
Use username as default character name in multiplayer character creation.

See merge request veloren/veloren!2085
2021-04-10 16:41:47 +00:00
eb4fb33f45 Use username as default character name in multiplayer character creation. 2021-04-10 16:41:46 +00:00
1bdf3b13a8 Mesh sprites in the background.
This makes the delay afetr selecting a character before logging into the
game much shorter, in the common case.  It still doesn't handle things
perfectly (it blocks creating Terrain::new if it's not finished, and it
could be faster due to working in the background), but it's still a lot
better than it was before.

To improve sprite meshing performance, we also apply the terrain
flat_get optimizations to sprites.  Though I didn't initially know how
much of an impact it would have, it feels significantly faster to me,
though being able to parallelize it would be ideal.
2021-04-10 17:51:42 +02:00
655a35d128 update deps 2021-04-10 15:53:00 +02:00
af94753ad9 Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
be42cc60c4 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
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
f2ebbb7f7f Map icon scaling 2021-04-06 08:42:09 -07:00
8ee1fc4a0f Add layers to minimap 2021-04-06 08:42:08 -07:00
bacda06dba Added map layers 2021-04-06 08:42:07 -07:00
70ede7f34d Topographic map 2021-04-06 08:42:06 -07:00
de9ad0942f 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
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
4dde9f84b0 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
6af9662b03 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
7df0413be4 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
b8c474057c More cheese is less cheese
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
69891f0b70 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
78f130a3b2 Add a cheese counter in the bag display. 2021-04-04 11:14:25 -04:00
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
9a3f6d8261 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
b7dbadc32f Add colors for buy/sell tooltips based on site prices. 2021-04-02 17:44:02 -04:00
42463d1fe0 Revert "Merge branch 'animtweaks' into 'master'"
This reverts merge request !2039
2021-04-01 18:45:03 +00:00
08146f6a3a login trim username, improve validation, social ordering 2021-04-01 16:43:27 +02:00
030e14f333 small anim tweaks 2021-04-01 03:08:33 -04:00
0122dca3c3 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
ccb78eeb5c move tracing code to own crate 2021-03-30 16:35:36 +02:00
3c19713e63 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
bed863c50c Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
85237c7a32 Fixed training dummy hitbox 2021-03-29 21:52:05 +01:00
8f3233365d Improved hit particles 2021-03-29 21:52:05 +01:00
b0acbda236 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
6adaac8106 Addresses comments 2021-03-29 18:35:12 +02:00
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
5b99b7ca18 Skillbar uses item tooltip 2021-03-29 18:34:45 +02:00
508e35ca17 Add several new i18n lines 2021-03-29 18:34:45 +02:00
d1e734b9b1 Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
2c09180189 Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
b7dd2d6685 Use a dummy item for the new() function 2021-03-29 18:34:45 +02:00
955008c3c1 Kinda working tooltip height but not really 2021-03-29 18:34:45 +02:00
0405f04d53 More item tooltip UI layout 2021-03-29 18:34:45 +02:00
aa71dcb9c7 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
4786f84afd New tooltip 2021-03-29 18:34:45 +02:00
e7452aa7ab do a clear teardown of tokio runtime 2021-03-29 10:34:33 +02:00
614a0aac13 display error when rodio panic is fixed 2021-03-28 20:40:07 +02:00
Sam
0c19679406 Fixed offset of decayed health 2021-03-27 21:06:21 -04:00