jiminycrick
aa6b7cbb65
Bird calls from trees
2020-11-18 13:31:12 -08:00
jiminycrick
9e790f6cac
Really broken block sfx pushed so others can see
2020-11-18 13:31:12 -08:00
jiminycrick
3473347742
Sfx from blocks
2020-11-18 13:31:12 -08:00
jiminycrick
0689630d98
Fading music/ambient sounds decently upon biome transition
2020-11-18 13:31:11 -08:00
jiminycrick
b5aea464f3
Switch music at biome transitions
2020-11-18 13:31:11 -08:00
jiminycrick
46d3f6f6d2
Initial biome specific music and ambient sound channel
2020-11-18 13:31:11 -08:00
Joshua Barretto
26957d4fd4
Merge branch 'snowram/eye-sight' into 'master'
...
Move eye sight and scale in body.rs
See merge request veloren/veloren!1519
2020-11-18 00:13:14 +00:00
Snowram
950eb1976d
Addressed more comments
2020-11-17 23:54:01 +01:00
Snowram
83b2640e02
Makes basic beam Y offset depend on body scale
2020-11-17 23:27:13 +01:00
Snowram
7af561263d
Addressed comments
2020-11-17 23:27:13 +01:00
Snowram
93642428f2
Move eye sight and scale in body.rs, mounts tweaks
2020-11-17 23:27:13 +01:00
Imbris
43c81b3dd6
Merge branch 'xvar/move-waypoint-persistence-to-stats-table' into 'master'
...
Moved waypoint persistence to new waypoint column on stats table
See merge request veloren/veloren!1531
2020-11-17 09:02:42 +00:00
Ben Wallis
143ecd6e34
Moved waypoint persistence to new waypoint column on stats table
2020-11-17 07:51:50 +00:00
Samuel Keiffer
b308c6af46
Merge branch 'knarkzel/fix-op-hammer' into 'master'
...
Don't allow spamming hammer or bow special when stamina is 0
See merge request veloren/veloren!1530
2020-11-16 16:45:57 +00:00
Knarkzel
e0265012e8
added to changelog
2020-11-16 17:01:55 +01:00
Knarkzel
e0a814b3f8
dont allow spam op hammer when stamina is 0
2020-11-16 17:00:04 +01:00
Imbris
4b9bccd6b8
Merge branch 'imbris/temp-fix' into 'master'
...
Temp fix for the /home command
See merge request veloren/veloren!1528
2020-11-16 02:58:28 +00:00
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
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
