Merge remote-tracking branch 'origin/master' into lip-sync

This commit is contained in:
Jáchym Toušek
2018-01-27 18:09:46 +01:00
14 changed files with 184 additions and 90 deletions

View File

@@ -4854,7 +4854,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("onik001", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("text/onik001", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );