Imbris
71e6001994
Merge branch 'imbris/fix-torvus' into 'master'
...
Send ability map from the server to the client on connection instead of loading from the assets
See merge request veloren/veloren!1518
2020-11-14 22:15:03 +00:00
Imbris
a5a51b91ef
Send ability map from the server to the client on connection instead of loading from the assets
2020-11-14 16:07:07 -05:00
Joshua Barretto
f52ec169c2
Merge branch 'xvar/fix-character-switch-persistence' into 'master'
...
Fixed character data not being persisted on character switch
See merge request veloren/veloren!1515
2020-11-14 15:02:12 +00:00
Ben Wallis
896a703717
Fixed character data not being persisted on character switch
2020-11-14 13:36:54 +00:00
Samuel Keiffer
bc874905de
Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master'
...
Make Axe Spin More Realistic
Closes #827
See merge request veloren/veloren!1510
2020-11-14 04:15:50 +00:00
Imbris
797a115fad
Merge branch 'imbris/fix-7' into 'master'
...
Fix panic on minimizing window before the game starts up
See merge request veloren/veloren!1514
2020-11-14 03:30:13 +00:00
Imbris
201a6c6799
Merge branch 'imbris/fix-6' into 'master'
...
Fix issue where ui scale in the login menu was not updated when changed in-game
Closes #578
See merge request veloren/veloren!1513
2020-11-14 02:49:41 +00:00
Jason Lee
10189aad74
Make Axe Spin More Realistic
2020-11-13 21:49:12 -05:00
Imbris
521e54353c
Fix panic on minimizing window before the game starts up
2020-11-13 21:09:19 -05:00
Imbris
7d22d21877
Merge branch 'imbris/fix-5' into 'master'
...
Remove randomization of species and body_type with the randomize button in char creation
See merge request veloren/veloren!1512
2020-11-14 01:56:28 +00:00
Imbris
f2581eccdb
Merge branch 'imbris/fix-3' into 'master'
...
Tweak clock related things and fix voxygen tracy feature
See merge request veloren/veloren!1506
2020-11-14 01:39:33 +00:00
Imbris
c826a24075
Fix issue where ui scale in the login menu was not updated when changed in-game
2020-11-13 20:17:59 -05:00
Imbris
a2ba719ba2
Remove randomization of species and body_type with the randomize button in char creation
2020-11-13 19:43:32 -05:00
Samuel Keiffer
66c29633ac
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
479bda3895
Fixed tests. Addressed comments.
2020-11-13 10:41:34 -06:00
Monty Marz
9ed22dbcbf
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
6c3dc78bee
radio buttons for buff position in settings
2020-11-13 14:32:15 +01:00
Monty Marz
82395d45ec
bigger buff icons above skillbar
2020-11-13 14:20:33 +01:00
Imbris
5b7fd02ed6
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
4e9b311ee7
Handle window resizing properly to fix some bugs on startup
2020-11-12 23:56:36 -05:00
Imbris
63f7fd9f5a
Fix language and ui resolution in menus not updating when they are changed ingame
2020-11-12 23:03:44 -05:00
Sam
0752157935
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
c42bdc3641
Remove ability map from top level functions
2020-11-12 21:24:35 -06:00
Sam
275deabae9
Started moving loading of ability manifest to an ecs variable.
2020-11-12 21:24:34 -06:00
Sam
d948777176
Abilities are now loaded from .ron files.
2020-11-12 21:24:34 -06:00
Sam
fe8c634bbc
Created manifest file to tie abilities to a particular weapon kind.
2020-11-12 21:24:33 -06:00
Sam
838c62f56b
Added projectile constructor. Removed a bunch of cloning.
2020-11-12 21:24:32 -06:00
Sam
b4135ab3e2
Changed how buffs were constructed on projectiles.
2020-11-12 21:24:32 -06:00
Sam
84627cfe88
Added ron files for unique and WIP tools.
2020-11-12 21:24:31 -06:00
Sam
ddf426c74b
Created ron files for abilities of the base 6 weapons.
2020-11-12 21:24:31 -06:00
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
Joshua Barretto
54333b6735
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
490a396df6
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
3006788560
Fix offset issue in ui on startup
2020-11-11 23:47:07 -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
Imbris
293ebde892
Only limit negative z velocity by gravity instead of total negative z velocity
2020-11-11 20:09:07 -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
