5676 Commits

Author SHA1 Message Date
Imbris
2dfebb8978 Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds 2020-11-12 19:18:54 -05:00
Imbris
ebaa35ea79 Display averaged busy dt 2020-11-11 23:26:13 -05:00
Imbris
73c0a7a751 Add tracy feature that randomly disappeared back into voxygen 2020-11-11 22:33:02 -05:00
Imbris
69d019e5ac Make fps display and specification more precise 2020-11-11 21:47:22 -05:00
Samuel Keiffer
f761781e30 Merge branch 'snowram/weapons-speedstat' into 'master'
Adds a speed stat to weapons

See merge request veloren/veloren!1486
2020-11-11 22:17:38 +00:00
Snowram
49ab17ce8c Adds a speed variable to charged states 2020-11-11 22:06:05 +01:00
Snowram
ec1952007f Changelog 2020-11-11 22:06:02 +01:00
Snowram
2eebc29e21 Addressed comments 2020-11-11 22:03:54 +01:00
Snowram
71e35a6f02 Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Joshua Barretto
5735803ca9 Merge branch 'zesterer/more-resiliant-settings' into 'master'
More resiliant settings, better key defaults

See merge request veloren/veloren!1503
2020-11-11 17:37:26 +00:00
Joshua Barretto
a183e49281 More resiliant settings, better key defaults 2020-11-11 17:37:26 +00:00
Imbris
28d346848a Merge branch 'imbris/icing' into 'master'
Iced

Closes #831, #518, #529, #644, #709, #627, #739, and #734

See merge request veloren/veloren!1467
2020-11-11 09:28:15 +00:00
Imbris
6bbb4a243f ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom 2020-11-11 03:02:51 -05:00
Imbris
ed821fd80f Remove uneeded commented code, add notes to remaining commented code, use source rect calculations from conrod backend code 2020-11-11 03:02:51 -05:00
Imbris
4d236c9c0f Clippy fixes 2020-11-11 03:02:51 -05:00
Imbris
af8fd6a88d Shink file size of some image assets 2020-11-11 03:02:51 -05:00
Imbris
16a2934261 Update changelog 2020-11-11 03:02:49 -05:00
Imbris
1b65a86772 Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups 2020-11-11 03:02:23 -05:00
Imbris
49d1709341 Add some tracing spans 2020-11-11 03:02:23 -05:00
Imbris
343cdfa1ea Make iced ui use scale from the settings 2020-11-11 03:02:22 -05:00
Imbris
36a404a764 Change glyph cache position tolerance to match changes in master 2020-11-11 03:02:22 -05:00
Imbris
1de4c950cd Update iced 2020-11-11 03:02:22 -05:00
Imbris
466793a4e8 Fix tooltip positioning for tooltipped elements inside Scrollable widgets 2020-11-11 03:02:22 -05:00
Imbris
8cf9121e6b Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style 2020-11-11 03:02:22 -05:00
Imbris
6aec322e99 Add tooltips in iced char creation to species, tools, randomize button, and create button 2020-11-11 03:02:22 -05:00
Imbris
35a7c32180 Highlight button of selected character, enter the world if character is selected when enter key is pressed 2020-11-11 03:02:22 -05:00
Imbris
61a0aa2055 Fix tooltip border images, fade tooltips properly, improve tooltip positioning 2020-11-11 03:02:22 -05:00
Imbris
acb7ba98f9 Add a tooltip to the char select screen to test 2020-11-11 03:02:22 -05:00
Imbris
a811148ee8 Create Tooltip widget in iced 2020-11-11 03:02:22 -05:00
Imbris
20096e8a09 Update to reflect changes in master ui: switched daggers with sceptre, added background at the bottom of the loading screen, added randomize button in the char creation screen 2020-11-11 03:02:22 -05:00
Imbris
ecf3d0d190 Loading screen: show animated gears instead of status message, show tips 2020-11-11 03:02:22 -05:00
Imbris
fcc95d4136 Remove background banner from login screen input boxes and move logo to right corner 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
79ee8dcc2a add padding to language select and server select menu buttons so that the scrollbar doesn't overlap them 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
cc4c6b746a add title to server select menu, don't use unneeded Container in language select menu 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
319c744611 change the text arrows in language select and server select with proper ui elements 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
de7c9a9858 add language selection menu to main menu screen 2020-11-11 03:02:22 -05:00
Imbris
9348f5915a Update to the latest git iced 2020-11-11 03:02:22 -05:00
Imbris
09fc05db66 Add more parts of the character selection screen, add mouse detector widget, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
5e913d46c7 Basic structure of character selection 2020-11-11 03:02:22 -05:00
Imbris
1583929e00 Add tabbing between fields in login screen 2020-11-11 03:02:22 -05:00
Imbris
803a5ecea6 Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
c4eb90d6f8 Update to latest iced git, rebase fixes 2020-11-11 03:02:22 -05:00
Imbris
84d09ac92e Start rewrite of character selection with iced 2020-11-11 03:02:21 -05:00
CapsizeGlimmer
aa726f56e1 Implement renderer for slider 2020-11-11 03:02:21 -05:00
Imbris
78fc52b9ec Delete conrod main menu code!!!!!!, small tweaks 2020-11-11 03:02:21 -05:00
Imbris
c04d2102e1 Add error message box (is the main menu finished?) 2020-11-11 03:02:21 -05:00
Imbris
1e82f4ff41 Add border styling to container 2020-11-11 03:02:21 -05:00
Imbris
cc76b8ef8f Make cancel button in connecting screen visble again, don't save username & server for singleplayer login, make iced version go back to login screen properly. 2020-11-11 03:02:21 -05:00
Yusuf Bera Ertan
39a2fe1315 Implemented server selection screen 2020-11-11 03:02:21 -05:00
Imbris
1ae4bb6963 Add Scrollable widget support, implement disclaimer screen, rearrangements of main menu ui code 2020-11-11 03:02:21 -05:00