1
0
Fork 0

Merge branch 'master' of git.gitorious.org:fg/fgdata

This commit is contained in:
Martin Spott 2011-06-04 17:36:32 +02:00
commit 803cb56c12
3 changed files with 6 additions and 5 deletions

View file

@ -72,7 +72,7 @@ in detail below:
<nasal>
... optional; Nasal code
</nasal>
<interval>10</inteval> optional; run loop next in this many seconds
<interval>10</interval> optional; run loop next in this many seconds
</init> (default: 5); doesn't change global
interval
@ -100,7 +100,7 @@ in detail below:
... optional; Nasal code that is executed when the
</nasal> step is entered
<interval>10</inteval> optional; run loop next in this many seconds
<interval>10</interval> optional; run loop next in this many seconds
<error> optional; allowed several times
<message>..</message> optional; text displayed/spoken
@ -114,7 +114,7 @@ in detail below:
... optional; Nasal code that is executed when the
</nasal> error condition was fulfilled
<interval>10</inteval> optional; run loop next in this many seconds
<interval>10</interval> optional; run loop next in this many seconds
</error>
<exit> optional; defines when to leave this <step>

View file

@ -203,7 +203,8 @@ var step_tutorial = func(id) {
{
# What's going on? Repeat last message.
last_messageN.setValue("");
is_first_step = 1;
step_start_time = time_elapsedN.getValue();
do_group(step, "Tutorial step " ~ current_step);
}
return continue_after(exit, step_interval);
}

View file

@ -1 +1 @@
2.0.0
2.3.0