Samuel Keiffer
1ed90bd0bf
Merge branch 'sam/ron-abilities' into 'master'
...
Move abilities to .ron files
Closes #821
See merge request veloren/veloren!1508
2020-11-13 17:55:57 +00:00
Sam
b5f59f9cf3
Fixed tests. Addressed comments.
2020-11-13 10:41:34 -06:00
Monty Marz
73077be5ba
Merge branch 'pfau/small-UI-fixes' into 'master'
...
Pfau/small ui fixes
See merge request veloren/veloren!1511
2020-11-13 14:47:38 +00:00
Monty Marz
7da8c71d89
radio buttons for buff position in settings
2020-11-13 14:32:15 +01:00
Monty Marz
691d1f5243
bigger buff icons above skillbar
2020-11-13 14:20:33 +01:00
Imbris
d8721e8dc5
Merge branch 'imbris/fix-4' into 'master'
...
Actually fix ui offset bug and fix issues where going back to the menus from ingame didn't propagate window size and language changes.
See merge request veloren/veloren!1509
2020-11-13 06:14:42 +00:00
Imbris
5fa2ac6e38
Handle window resizing properly to fix some bugs on startup
2020-11-12 23:56:36 -05:00
Imbris
f1ca3ccc69
Fix language and ui resolution in menus not updating when they are changed ingame
2020-11-12 23:03:44 -05:00
Sam
e2fe2fd532
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-12 21:24:36 -06:00
Imbris
37e4ea4669
Remove ability map from top level functions
2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961
Started moving loading of ability manifest to an ecs variable.
2020-11-12 21:24:34 -06:00
Sam
050ad82e55
Abilities are now loaded from .ron files.
2020-11-12 21:24:34 -06:00
Sam
4c6ee4b161
Created manifest file to tie abilities to a particular weapon kind.
2020-11-12 21:24:33 -06:00
Sam
770aaf6b93
Added projectile constructor. Removed a bunch of cloning.
2020-11-12 21:24:32 -06:00
Sam
abf7301a89
Changed how buffs were constructed on projectiles.
2020-11-12 21:24:32 -06:00
Sam
f4244ecbaf
Added ron files for unique and WIP tools.
2020-11-12 21:24:31 -06:00
Sam
a4bfe07fbc
Created ron files for abilities of the base 6 weapons.
2020-11-12 21:24:31 -06:00
Joshua Barretto
b0458bb21c
Merge branch 'imbris/large-fix-2' into 'master'
...
Only limit negative z velocity by gravity instead of total negative z velocity
See merge request veloren/veloren!1505
2020-11-12 09:31:24 +00:00
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
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
