Imbris
cbb701f30d
Temp fix for the home command
2020-11-15 20:40:12 -05:00
Samuel Keiffer
c83fd48e13
Merge branch 'knarkzel/persist-combo-roll' into 'master'
...
added persistent combo after roll when rolling mid-combo, Closes #826
Closes #826
See merge request veloren/veloren!1524
2020-11-16 00:10:18 +00:00
David Fisher
b93d4bf85c
Add simple tests to utils description functions
...
I initially ended up in this file looking to take on issue #707
which I realized had been already done. Having touched the file though
I thought it good to add some basic tests to get used to the workflow
on the project and how things are setup here.
This commit adds some basic requests and cleans up some comments
which appear to have been left as placeholders for work which appears
to have been completed already.
I attempted to test the tool_desc and armor_desc functions, but realized
I wasn't sure how to best create an instance of Armor or Tool without
modifying other files to make more things public.
This is my first commit on the project, and was intentionally kept
simple accordingly.
2020-11-15 18:53:20 -05:00
Marcel
c65bb82c8c
Merge branch 'xvar/fix-network-tests-firewall-prompts' into 'master'
...
Replaced usage of 0.0.0.0 with 127.0.0.1 in network tests to prevent firewall prompts when running tests on Windows
See merge request veloren/veloren!1525
2020-11-15 22:50:22 +00:00
Odd-Harald Lillestø Myhren
774ef72344
Merge branch 'master' into 'knarkzel/persist-combo-roll'
...
# Conflicts:
# CHANGELOG.md
2020-11-15 22:37:30 +00:00
Knarkzel
64da99a4d7
add new was_combo field to test
2020-11-15 23:49:01 +01:00
Joshua Barretto
d219c88407
Merge branch 'zesterer/resolution-scaling' into 'master'
...
Upscaling support
See merge request veloren/veloren!1523
2020-11-15 22:18:35 +00:00
Joshua Barretto
171ef1d7b9
Upscaling support
2020-11-15 22:18:35 +00:00
Knarkzel
b678915b6e
added persistent combo roll entry to changelog
2020-11-15 23:12:05 +01:00
Ben Wallis
639281bc32
Replaced usage of 0.0.0.0 with 127.0.0.1 in network tests to prevent firewall prompt on Windows when running tests
2020-11-15 22:10:31 +00:00
Knarkzel
917ae5a0b5
added persist combo counter on roll when mid-combo
2020-11-15 23:08:14 +01:00
Samuel Keiffer
7ffb3b91fa
Merge branch 'sam/knockback-fix' into 'master'
...
Campfire knockback fix
See merge request veloren/veloren!1522
2020-11-15 18:12:21 +00:00
Sam
69bb54b4a2
Campfires can no longer be yeeted by arrows.
2020-11-15 11:13:03 -06:00
Imbris
4872d285c3
Merge branch 'imbris/fix-font-selection' into 'master'
...
Properly use localization specified fonts, fix swedish translation by adding...
Closes #834
See merge request veloren/veloren!1521
2020-11-15 03:18:29 +00:00
Imbris
03c96a7c7b
Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list
2020-11-14 21:31:31 -05:00
Joshua Barretto
d72c981808
Merge branch 'treeco/home-removes-waypoint' into 'master'
...
Made home command reset waypoint to world spawn
See merge request veloren/veloren!1520
2020-11-15 02:12:12 +00:00
Imbris
891e81cf58
Merge branch 'imbris/save-selected-char' into 'master'
...
Save the selected character, deselect character when deleting, auto select newly created character
See merge request veloren/veloren!1516
2020-11-15 01:40:44 +00:00
Treeco
48c9e9fb27
Made home command reset waypoint to world spawn
2020-11-15 01:06:27 +00:00
Imbris
4f2512f126
Save the selected character, deselect character when deleting, auto select newly created character
2020-11-14 19:17:42 -05:00
Imbris
dd2b8a143f
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
2072929a5a
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
2c2e4813fd
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
40e9c4a3e2
Fixed character data not being persisted on character switch
2020-11-14 13:36:54 +00:00
Samuel Keiffer
0c7cd3d8fb
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
5dbb1aeae7
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
ff5b152525
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
1d2ccd5762
Make Axe Spin More Realistic
2020-11-13 21:49:12 -05:00
Imbris
a044981fd7
Fix panic on minimizing window before the game starts up
2020-11-13 21:09:19 -05:00
Imbris
1373b752ff
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
51dd5110d0
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
cff5439796
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
1952785af2
Remove randomization of species and body_type with the randomize button in char creation
2020-11-13 19:43:32 -05:00
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
Imbris
27d4310498
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
