mirror of
https://github.com/MartinKral/Slash-The-Hordes
synced 2024-12-26 03:38:58 +00:00
merge fix
This commit is contained in:
commit
5fb7ce5da6
BIN
assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg
Normal file
BIN
assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg
Normal file
Binary file not shown.
14
assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg.meta
Normal file
14
assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg.meta
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "2cdf2e52-ca81-493b-a694-3a746f06a99d",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
Binary file not shown.
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "54afc48e-5d15-4f1e-8b54-1cea20f16025",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
Binary file not shown.
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "9e3817fd-494b-4d98-99ab-a529124adf67",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
BIN
assets/Media/Audio/Game/Sound/Headbutt v2.ogg
Normal file
BIN
assets/Media/Audio/Game/Sound/Headbutt v2.ogg
Normal file
Binary file not shown.
14
assets/Media/Audio/Game/Sound/Headbutt v2.ogg.meta
Normal file
14
assets/Media/Audio/Game/Sound/Headbutt v2.ogg.meta
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "94356aff-2a75-43b2-8258-4f18b3006ef6",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
Binary file not shown.
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "72661b76-bef4-4ed8-9cb6-dd38d839f1b9",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
BIN
assets/Media/Audio/Game/Sound/Magnet v3.ogg
Normal file
BIN
assets/Media/Audio/Game/Sound/Magnet v3.ogg
Normal file
Binary file not shown.
14
assets/Media/Audio/Game/Sound/Magnet v3.ogg.meta
Normal file
14
assets/Media/Audio/Game/Sound/Magnet v3.ogg.meta
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "baf95420-77c5-4747-80ed-6f05b14e8777",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
Binary file not shown.
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "41d1d0d3-b915-46cc-bdaa-ac443d0b8dd8",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
BIN
assets/Media/Audio/Game/Sound/Sword Combo v3.ogg
Normal file
BIN
assets/Media/Audio/Game/Sound/Sword Combo v3.ogg
Normal file
Binary file not shown.
14
assets/Media/Audio/Game/Sound/Sword Combo v3.ogg.meta
Normal file
14
assets/Media/Audio/Game/Sound/Sword Combo v3.ogg.meta
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ver": "1.0.0",
|
||||
"importer": "audio-clip",
|
||||
"imported": true,
|
||||
"uuid": "2ca33a43-08af-44e8-ac28-28e051838892",
|
||||
"files": [
|
||||
".json",
|
||||
".ogg"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"downloadMode": 0
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user