Commit Graph

5964 Commits

Author SHA1 Message Date
jiminycrick
e1fcb3744e Comment out audio device picker 2020-11-18 13:31:12 -08:00
jiminycrick
ea1bc2941b Clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
d47e0bbb73 Getting merge ready minus device picker 2020-11-18 13:31:12 -08:00
jiminycrick
2d088faea4 Wind transition smoothing 2020-11-18 13:31:12 -08:00
jiminycrick
f182002e38 Underwater and cave reverb 2020-11-18 13:31:12 -08:00
jiminycrick
695cc7f5cb Broken wind implementation 2020-11-18 13:31:12 -08:00
jiminycrick
9b759efe41 Snow footsteps 2020-11-18 13:31:12 -08:00
jiminycrick
09a1974974 River water sfx 2020-11-18 13:31:12 -08:00
jiminycrick
8f5a22671d Re-added device selector to settings with new rodio 2020-11-18 13:31:12 -08:00
jiminycrick
decb0e3e24 Hackily upgraded rodio and cpal to 0.13 2020-11-18 13:31:12 -08:00
jiminycrick
d0bd5118bf Made biome probabilities neater 2020-11-18 13:31:12 -08:00
jiminycrick
e880654f2e Probability for biome play 2020-11-18 13:31:12 -08:00
jiminycrick
c8d79b0b0e Dungeon and cave specific music 2020-11-18 13:31:12 -08:00
jiminycrick
0a9f1ee11c Remove ambient channel system in favor of sfx system 2020-11-18 13:31:12 -08:00
jiminycrick
39d4ee8a96 Owls, campfires, and better bird sfx handling 2020-11-18 13:31:12 -08:00
jiminycrick
c6a443ac0f fixed false audio track lengths 2020-11-18 13:31:12 -08:00
jiminycrick
3169562a80 Night time sfx and swimming 2020-11-18 13:31:12 -08:00
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
Imbris
7427367d96 Fix issues with not being able to grab highlighted apples by unifying distance checking 2020-11-17 23:06:02 -05: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