Commit Graph

1158 Commits

Author SHA1 Message Date
fd80a97f3d Got rid of content setup macro 2021-04-11 17:36:02 -04:00
690419ad90 Placed tabs in a loop and combined tab content chooser using macro 2021-04-11 17:36:02 -04:00
469cb391d3 cleaned widget_ids 2021-04-11 17:36:02 -04:00
04eea482ce Moved settings window sections into separate files 2021-04-11 17:36:02 -04:00
f2340105c1 Moved settings_window.rs to to settings_window/mod.rs 2021-04-11 17:36:02 -04:00
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
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
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
b7dbadc32f Add colors for buy/sell tooltips based on site prices. 2021-04-02 17:44:02 -04:00
08146f6a3a login trim username, improve validation, social ordering 2021-04-01 16:43:27 +02: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
bed863c50c Added indicator text to terrain sprites 2021-03-30 01:04:23 +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
Sam
0c19679406 Fixed offset of decayed health 2021-03-27 21:06:21 -04:00
345ef1ca22 decay display for groups and overhead bars 2021-03-27 21:05:17 -04:00
Sam
06bd7bd929 Removed experimental group health decay 2021-03-27 21:05:17 -04:00
345b725478 decayed health texture 2021-03-27 21:05:14 -04:00
cc70560027 WIP animation 2021-03-27 21:05:13 -04:00
Sam
c0c6ff3063 Initial work to show decayed health in healthbars 2021-03-27 21:05:13 -04:00
843850a4b8 Merge branch 'aweinstock/tradepricing' into 'master'
Get SitePricing information to clients, and use it to display coin-denominated...

See merge request veloren/veloren!1991
2021-03-26 00:17:39 +00:00
8d90548331 Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
0e259294d4 Allow Escape key to cancel trades 2021-03-25 01:42:14 +01:00
6b343c2af9 Address MR 1962 review comments. 2021-03-23 18:41:13 -04:00
4ec6b43693 Add a vertical camera clamp option and toggle to voxygen. 2021-03-23 18:22:32 -04:00
49f39fb752 Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky). 2021-03-23 10:44:32 +01:00
6b23101fac update toolchain to nightly-2021-03-22 2021-03-22 16:41:04 +01:00