mmo-ref/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren synced 2026-08-16 16:26:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'DaforLynx/credit-update' into 'master'

Browse source 
Some audio credit updates

See merge request veloren/veloren!5423
This commit is contained in:
DaforLynx 2026-08-09 20:28:52 -07:00
commit 1eb92a76dc
2 changed files with 62 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

92
assets/credits.ron
View file

@ -181,8 +181,18 @@
sounds: [
(
authors: ["Ellinia"],
files: [],
notes: "Will fill out later. They made the greatest portion of contribution to Veloren's sounds, though.",
files: [
"abilities/swing_sword.ogg", "abilities/swing.ogg", "abilities/separated_second_swing.ogg", "abilities/separated_third_swing.ogg",
"footsteps/snow_step_1.ogg", "footsteps/snow_step_2.ogg", "footsteps/snow_step_3.ogg",
"character/level_up_sound_-_shorter_wind_up.ogg",
"abilities/fire_shot_1.ogg", "abilities/fire_shot_2.ogg",
"abilities/arrow_shot_1.ogg", "abilities/arrow_shot_2.ogg", "abilities/arrow_shot_3.ogg", "abilities/arrow_shot_4.ogg",
"ambient/fire.ogg",
"footsteps/water_splash_1.ogg", "footsteps/water_splash_2.ogg", "footsteps/water_splash_3.ogg", "footsteps/water_splash_4.ogg",
"weapon/shield_out.ogg", "abilities/sword_dash.ogg", "weapon/staff_in.ogg", "weapon/staff_out.ogg",
"abilities/sceptre_channeling.ogg",
"character/dive_roll_1.ogg", "character/dive_roll_2.ogg",
],
),
(
authors: ["DaforLynx"],
@ -254,14 +264,9 @@
"instrument/guitar/guitar_ded.ogg",
"instrument/guitar/guitar_ege.ogg",
"instrument/guitar/guitar_gag.ogg",
],
),
(
authors: ["Oolnokk", "DaforLynx"],
files: [
"weapon/sword_in.ogg", "weapon/sword_out.ogg",
],
notes: "Recordings by Oolnokk, edited by DaforLynx"
notes: "sword_in.ogg/sword_out.ogg - Recordings by Oolnokk, edited by DaforLynx"
),
(
authors: ["Eden"],
@ -275,8 +280,10 @@
authors: ["Zesterer"],
files: [
"character/arrow_hit.ogg", "character/arrow_miss.ogg",
"utterance/humanmale_greeting1.ogg",
"utterance/humanmale_greeting1.ogg", "utterance/humanmale_hurt1.ogg",
"vehicle/train_chugg.ogg", "vehicle/train_ambience.ogg", "vehicle/train_tracks.ogg", "vehicle/train_speed.ogg",
"utterance/bird_angry1.ogg",
"utterance/cow_calm1.ogg", "utterance/cow_calm2.ogg", "utterance/cow_calm3.ogg",
],
notes: "
vehicle/train_chugg.ogg - from Keith Burnett '4-6-0 Hall Class engine restored at Tyseley in the West Midlands'
@ -431,58 +438,69 @@
license: "CC BY 4.0",
license_link: "https://creativecommons.org/licenses/by/4.0/",
),
(
authors: ["Pfau"],
files: [
"footsteps/stepdirt_1.ogg", "footsteps/stepdirt_2.ogg", "footsteps/stepdirt_3.ogg", "footsteps/stepdirt_4.ogg", "footsteps/stepdirt_5.ogg",
],
),
(
authors: ["Robotnik"],
files: [
"utterance/lion_hurt1.ogg", "utterance/mandragora_hurt1.ogg", "utterance/maneater_hurt1.ogg",
"utterance/marlin_hurt1.ogg", "utterance/mindflayer_hurt1.ogg",
],
),
(
authors: ["alfy"],
files: [
"footsteps/stone_step_1.ogg", "footsteps/stone_step_2.ogg", "footsteps/stone_step_3.ogg", "footsteps/stone_step_4.ogg",
"footsteps/stone_step_5.ogg", "footsteps/stone_step_6.ogg", "footsteps/stone_step_7.ogg", "footsteps/stone_step_8.ogg",
"footsteps/stone_step_9.ogg", "footsteps/stone_step_10.ogg", "footsteps/stone_step_11.ogg", "footsteps/stone_step_12.ogg",
"character/block_1.ogg", "character/block_2.ogg", "character/block_3.ogg",
"utterance/adlet_angry1.ogg", "utterance/adlet_angry2.ogg", "utterance/adlet_hurt1.ogg", "utterance/adlet_hurt2.ogg",
"utterance/alligator_angry1.ogg", "utterance/alligator_angry2.ogg",
"utterance/antelope_angry1.ogg", "utterance/antelope_hurt1.ogg",
],
),
(
authors: ["Hannibal"],
files: [
"utterance/ogre_angry1.ogg", "utterance/ogre_angry2.ogg",
"utterance/ogre_hurt1.ogg",
"utterance/goat_calm1.ogg",
],
notes: "ogre_angry - Edited by feure"
),
// These files will be categorized with known authors eventually. DO NOT ADD NEW FILES TO THIS ENTRY.
(
authors: ["Unknown"],
files: [
"abilities/arrow_shot_1.ogg", "abilities/arrow_shot_2.ogg", "abilities/arrow_shot_3.ogg", "abilities/arrow_shot_4.ogg",
"abilities/bleep.ogg", "abilities/bloodmoon_heiress_summon.ogg", "abilities/cyclops_charge.ogg", "abilities/deep_laugh.ogg",
"abilities/fire_shot_1.ogg", "abilities/fire_shot_2.ogg", "abilities/flame_thrower.ogg", "abilities/fuse.ogg",
"abilities/bleep.ogg", "abilities/bloodmoon_heiress_summon.ogg", "abilities/cyclops_charge.ogg", "abilities/deep_laugh.ogg", "abilities/flame_thrower.ogg", "abilities/fuse.ogg",
"abilities/gigas_frost_roar.ogg", "abilities/heal_bomb.ogg", "abilities/heal.ogg", "abilities/hiss.ogg",
"abilities/ice_crack.ogg", "abilities/klonk.ogg", "abilities/laser_beam.ogg", "abilities/long_hiss.ogg",
"abilities/pickaxe_damage_broken.ogg", "abilities/pickaxe_damage_stronk.ogg", "abilities/pickaxe_damage.ogg",
"abilities/sceptre_channeling.ogg", "abilities/separated_second_swing.ogg", "abilities/separated_third_swing.ogg",
"abilities/shovel.ogg", "abilities/smashklonk.ogg", "abilities/steam.ogg", "abilities/strigoi_head.ogg",
"abilities/surprise_egg_0.ogg", "abilities/surprise_egg_1.ogg", "abilities/surprise_egg_2.ogg", "abilities/surprise_egg_3.ogg",
"abilities/swing_sword.ogg", "abilities/swing.ogg", "abilities/swoosh.ogg", "abilities/sword_dash.ogg",
"abilities/surprise_egg_0.ogg", "abilities/surprise_egg_1.ogg", "abilities/surprise_egg_2.ogg", "abilities/surprise_egg_3.ogg", "abilities/swoosh.ogg",
"abilities/whoosh.ogg", "abilities/yeet.ogg",
"ambient/bees_1.ogg", "ambient/fire.ogg", "ambient/frog_croak_1.ogg", "ambient/lightning_1.ogg",
"ambient/bees_1.ogg", "ambient/frog_croak_1.ogg", "ambient/lightning_1.ogg",
"ambient/owl_1.ogg", "ambient/portal_1.ogg", "ambient/portal_2.ogg",
"character/block_1.ogg", "character/block_2.ogg", "character/block_3.ogg",
"character/death_1.ogg", "character/death_2.ogg", "character/death_3.ogg",
"character/dive_roll_1.ogg", "character/dive_roll_2.ogg",
"character/dive_roll_cancel_1.ogg", "character/dive_roll_cancel_2.ogg",
"character/glider_close.ogg", "character/glider_open.ogg",
"character/level_up_sound_-_shorter_wind_up.ogg", "character/parry_1.ogg", "character/parry_2.ogg",
"footsteps/snow_step_1.ogg", "footsteps/snow_step_2.ogg", "footsteps/snow_step_3.ogg",
"footsteps/stepdirt_1.ogg", "footsteps/stepdirt_2.ogg", "footsteps/stepdirt_3.ogg", "footsteps/stepdirt_4.ogg", "footsteps/stepdirt_5.ogg",
"character/glider_close.ogg", "character/glider_open.ogg", "character/parry_1.ogg", "character/parry_2.ogg",
"footsteps/stepgrass_1.ogg", "footsteps/stepgrass_2.ogg", "footsteps/stepgrass_3.ogg",
"footsteps/stepgrass_4.ogg", "footsteps/stepgrass_5.ogg", "footsteps/stepgrass_6.ogg",
"footsteps/stone_step_1.ogg", "footsteps/stone_step_2.ogg", "footsteps/stone_step_3.ogg", "footsteps/stone_step_4.ogg",
"footsteps/stone_step_5.ogg", "footsteps/stone_step_6.ogg", "footsteps/stone_step_7.ogg", "footsteps/stone_step_8.ogg",
"footsteps/stone_step_9.ogg", "footsteps/stone_step_10.ogg", "footsteps/stone_step_11.ogg", "footsteps/stone_step_12.ogg",
"footsteps/water_splash_1.ogg", "footsteps/water_splash_2.ogg", "footsteps/water_splash_3.ogg", "footsteps/water_splash_4.ogg",
"footsteps/wood_step_1.ogg", "footsteps/wood_step_2.ogg", "footsteps/wood_step_3.ogg", "footsteps/wood_step_4.ogg",
"inventory/consumable/apple.ogg", "inventory/consumable/food.ogg", "inventory/consumable/liquid.ogg",
"inventory/add_failed.ogg", "inventory/add_item.ogg", "inventory/collect_gemstone.ogg", "inventory/drop_item.ogg",
"inventory/open_inventory.ogg", "inventory/pickup_staff.ogg", "inventory/pickup_sword.ogg",
"utterance/adlet_angry1.ogg", "utterance/adlet_angry2.ogg", "utterance/adlet_hurt1.ogg", "utterance/adlet_hurt2.ogg",
"utterance/alligator_angry1.ogg", "utterance/alligator_angry2.ogg",
"utterance/antelope_angry1.ogg", "utterance/antelope_hurt1.ogg",
"utterance/bird_angry1.ogg",
"utterance/cat_calm1.ogg", "utterance/cat_calm2.ogg",
"utterance/cow_calm1.ogg", "utterance/cow_calm2.ogg", "utterance/cow_calm3.ogg",
"utterance/dagon_hurt1.ogg", "utterance/dagon_hurt2.ogg",
"utterance/fungome_calm1.ogg", "utterance/goat_calm1.ogg", "utterance/humanmale_hurt1.ogg", "utterance/lion_hurt1.ogg",
"utterance/mandragora_hurt1.ogg", "utterance/maneater_hurt1.ogg", "utterance/marlin_hurt1.ogg", "utterance/mindflayer_hurt1.ogg",
"utterance/ogre_angry1.ogg", "utterance/ogre_angry2.ogg", "utterance/ogre_hurt1.ogg",
"utterance/phoenix_angry_0.ogg", "utterance/phoenix_angry_1.ogg", "utterance/phoenix_hurt_0.ogg", "utterance/phoenix_hurt_1.ogg",
"utterance/pig_angry1.ogg", "utterance/pig_angry2.ogg", "utterance/pig_calm1.ogg", "utterance/pig_calm2.ogg", "utterance/pig_calm3.ogg",
"utterance/saurok_angry1.ogg", "utterance/sea_crocodile_angry1.ogg", "utterance/sea_crocodile_angry2.ogg",
"utterance/sheep_calm1.ogg", "utterance/vampire_bat_angry.ogg", "utterance/vampire_bat_hurt.ogg",
"utterance/wyvern_angry.ogg", "utterance/wyvern_hurt.ogg",
"weapon/shield_out.ogg", "weapon/staff_in.ogg", "weapon/staff_out.ogg", "weapon/sword_in.ogg",
"weapon/sword_out.ogg", "weapon/weapon_in.ogg", "weapon/weapon_out.ogg",
"utterance/wyvern_angry.ogg", "utterance/wyvern_hurt.ogg", "weapon/weapon_in.ogg", "weapon/weapon_out.ogg",
"instrument/icy_talharpa/icy_talharpa_c.ogg", "instrument/icy_talharpa/icy_talharpa_g.ogg", "instrument/icy_talharpa/icy_talharpa_d.ogg",
"instrument/icy_talharpa/icy_talharpa_a.ogg", "instrument/icy_talharpa/icy_talharpa_e.ogg", "instrument/icy_talharpa/icy_talharpa_c1.ogg",
"instrument/icy_talharpa/icy_talharpa_c1ag.ogg", "instrument/icy_talharpa/icy_talharpa_cde.ogg", "instrument/icy_talharpa/icy_talharpa_d1c1a.ogg",

14
assets/voxygen/audio/soundtrack.ron
View file

@ -37,11 +37,11 @@
weather: None,
biomes: [
(Desert, 1),
],
],
sites: [Void],
music_state: Activity(Explore),
artist: ("Federico Orfanó", "https://soundcloud.com/federico-orfano-1336105"),
)),
)),
Individual((
title: "Legoom's Lament",
path: "voxygen.audio.soundtrack.overworld.legooms_lament",
@ -57,7 +57,7 @@
title: "Aventure Fantastic",
path: "voxygen.audio.soundtrack.overworld.aventure_fantastic",
length: 130.0,
timing: Day,
timing: Day,
weather: None,
biomes: [
(Grassland, 1),
@ -467,7 +467,7 @@
],
sites: [Void],
music_state: Activity(Explore),
artist: ("Eden", "https://soundcloud.com/usernumberuser"),
artist: ("Eden", "https://open.spotify.com/artist/0aSKYsf88JC91ilGXF9hj1"),
)),
Individual((
title: "A Solemn Quest",
@ -481,7 +481,7 @@
],
sites: [Void],
music_state: Activity(Explore),
artist: ("Eden", "https://soundcloud.com/usernumberuser"),
artist: ("Eden", "https://open.spotify.com/artist/0aSKYsf88JC91ilGXF9hj1"),
)),
Individual((
title: "Into The Dark Forest",
@ -886,7 +886,7 @@
)),
// Dungeon music
// TBD : Addition of specific tracks for teracotta dungeons and vampire castle
// TBD : Addition of specific tracks for teracotta dungeons and vampire castle
Individual((
title: "Still Heart's Coffin",
@ -1088,4 +1088,4 @@
// artist: ("Alfredo Pompa D & Rodriogo Plata", None),
// ),
]
)
)