Commit Graph

5728 Commits

Author SHA1 Message Date
Imbris
1e0b01d509 Merge branch 'imbris/large-fix-1' into 'master'
Fix offset issue in ui on startup

See merge request veloren/veloren!1504
2020-11-12 05:59:01 +00:00
Imbris
fffd5d0ef0 Fix offset issue in ui on startup 2020-11-11 23:47:07 -05:00
Imbris
c0e8298ac3 Display averaged busy dt 2020-11-11 23:26:13 -05:00
Imbris
d5dd126724 Add tracy feature that randomly disappeared back into voxygen 2020-11-11 22:33:02 -05:00
Imbris
a97b188bea Make fps display and specification more precise 2020-11-11 21:47:22 -05:00
Imbris
ba042c76c8 Only limit negative z velocity by gravity instead of total negative z velocity 2020-11-11 20:09:07 -05:00
Samuel Keiffer
c8357842af 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
bed3a5c70a Adds a speed variable to charged states 2020-11-11 22:06:05 +01:00
Snowram
512fe52e5f Changelog 2020-11-11 22:06:02 +01:00
Snowram
af346806de Addressed comments 2020-11-11 22:03:54 +01:00
Snowram
fe977f0a6c Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Joshua Barretto
509436f138 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
7bce8b9615 More resiliant settings, better key defaults 2020-11-11 17:37:26 +00:00
Imbris
d8ce666a9e 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
865482d768 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
61c0780872 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
64d885a192 Clippy fixes 2020-11-11 03:02:51 -05:00
Imbris
b84815cc0b Shink file size of some image assets 2020-11-11 03:02:51 -05:00
Imbris
eec6d68585 Update changelog 2020-11-11 03:02:49 -05:00
Imbris
584824d405 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
9df8368c88 Add some tracing spans 2020-11-11 03:02:23 -05:00
Imbris
d2166fed3d Make iced ui use scale from the settings 2020-11-11 03:02:22 -05:00
Imbris
eda7b380dd Change glyph cache position tolerance to match changes in master 2020-11-11 03:02:22 -05:00
Imbris
469b048de9 Update iced 2020-11-11 03:02:22 -05:00
Imbris
90bfafc469 Fix tooltip positioning for tooltipped elements inside Scrollable widgets 2020-11-11 03:02:22 -05:00
Imbris
cd1a134c26 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
7aa8412556 Add tooltips in iced char creation to species, tools, randomize button, and create button 2020-11-11 03:02:22 -05:00
Imbris
fe7d65843b 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
3b664d2efb Fix tooltip border images, fade tooltips properly, improve tooltip positioning 2020-11-11 03:02:22 -05:00
Imbris
d8854e9300 Add a tooltip to the char select screen to test 2020-11-11 03:02:22 -05:00
Imbris
5c85a29111 Create Tooltip widget in iced 2020-11-11 03:02:22 -05:00
Imbris
0361272746 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
0ab1a1ebb0 Loading screen: show animated gears instead of status message, show tips 2020-11-11 03:02:22 -05:00
Imbris
489a8a8f9e 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
bae7f56393 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
52479fec2f 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
12abd64a01 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
5af6757de0 add language selection menu to main menu screen 2020-11-11 03:02:22 -05:00
Imbris
c247263258 Update to the latest git iced 2020-11-11 03:02:22 -05:00
Imbris
42c6550a0b Add more parts of the character selection screen, add mouse detector widget, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
de770694d8 Basic structure of character selection 2020-11-11 03:02:22 -05:00
Imbris
bc42f3f229 Add tabbing between fields in login screen 2020-11-11 03:02:22 -05:00
Imbris
586bdddc9e Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
3baac6aeba Update to latest iced git, rebase fixes 2020-11-11 03:02:22 -05:00
Imbris
545f3bd44b Start rewrite of character selection with iced 2020-11-11 03:02:21 -05:00
CapsizeGlimmer
34f92c7076 Implement renderer for slider 2020-11-11 03:02:21 -05:00
Imbris
10c046be2f Delete conrod main menu code!!!!!!, small tweaks 2020-11-11 03:02:21 -05:00
Imbris
ba573d2065 Add error message box (is the main menu finished?) 2020-11-11 03:02:21 -05:00
Imbris
e29364eedf Add border styling to container 2020-11-11 03:02:21 -05:00
Imbris
a94bc4b725 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