Commit Graph

6292 Commits

Author SHA1 Message Date
Knarkzel
7a917f87e1 added norwegian 2020-11-20 16:49:32 +01:00
Marcel
d369e8a7c9 Merge branch 'james/audio-fix' into 'master'
Fix audio disabling

See merge request veloren/veloren!1534
2020-11-20 00:39:39 +00:00
jiminycrick
3ef00c4e76 Fix audio disabling 2020-11-19 10:46:31 -08:00
Justin Shipsey
ea72e0952d Merge branch 'snowram/new-npcs' into 'master'
Adds new npcs

See merge request veloren/veloren!1496
2020-11-19 06:04:42 +00:00
jiminycrick
9272eee55b Switched out wind sfx 2020-11-18 17:07:40 -08:00
Snowram
d98bfa72ad Improves bipedlarge and theropod anims, balance tweaks 2020-11-19 00:56:50 +01:00
Snowram
a773fd602a Makes mindflayers spawn in dungeons 2020-11-19 00:53:21 +01:00
Snowram
b48de84f8c Adds 3 new npcs 2020-11-19 00:53:17 +01:00
Snowram
44fe398ba3 Adds 2 new npcs, some models tweaks 2020-11-19 00:53:13 +01:00
Snowram
42d2108c39 Adds mindflayer npc 2020-11-19 00:53:09 +01:00
Snowram
9bfccd42d3 Adds new animals 2020-11-19 00:53:02 +01:00
Joshua Barretto
08c12b99f8 Merge branch 'james/biome-specific-music' into 'master'
Biome/site specific music and ambient sfx

See merge request veloren/veloren!1488
2020-11-18 22:53:33 +00:00
jiminycrick
1ce3827e22 Address comment 2020-11-18 13:31:13 -08:00
jiminycrick
2d2f267907 Addressed comments and fixed pipeline 2020-11-18 13:31:13 -08:00
jiminycrick
3b47add55a Fully move sfx away from ECS event bus 2020-11-18 13:31:13 -08:00
jiminycrick
b3aa454f8e Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
77d624f640 Made level up sounds use outcomes instead of emitting an event 2020-11-18 13:31:12 -08:00
jiminycrick
9c87345135 Moved functions to client out of audio and generalized non-positional ambient sfx 2020-11-18 13:31:12 -08:00
jiminycrick
a9711eea01 Beginning to address comments 2020-11-18 13:31:12 -08:00
jiminycrick
c44a9092d3 Biome definition tweaks and more sfx 2020-11-18 13:31:12 -08:00
jiminycrick
f0d14ebe20 fix rebase 2020-11-18 13:31:12 -08:00
jiminycrick
a684bc90fd Quadraped footsteps and songs in biomes 2020-11-18 13:31:12 -08:00
jiminycrick
27dc43fe18 Audio test fixes 2020-11-18 13:31:12 -08:00
jiminycrick
ddd970b986 Even more clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
bc1059610b More clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
c2a2361c22 Fix rebase 2020-11-18 13:31:12 -08:00
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