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

# Conflicts:
#	Update/onik_001.txt
#	Update/onik_009.txt
#	Update/onik_009_02.txt
This commit is contained in:
Jáchym Toušek
2018-03-18 20:31:07 +01:00
12 changed files with 24 additions and 26 deletions

View File

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