Changeset 10609 for code/branches/SciptableControllerFS15/data/gui/scripts

Timestamp:

Oct 4, 2015, 11:51:01 AM (9 years ago)

Author:

landauf

Message:

merged r10499 from presentationFS15 into this branch

Location:

code/branches/SciptableControllerFS15

Files:

• . (modified) (1 prop)
• data/gui/scripts/presentation.lua (copied) (copied from code/branches/presentationFS15/data/gui/scripts/presentation.lua)
• data/gui/scripts/testscript.lua (modified) (1 diff)

code/branches/SciptableControllerFS15/data/gui/scripts/testscript.lua

@@ -39 +39 @@
 
 end
-
--- Output the newctrlid variable we set from the C++ code
-if newctrlid ~= nil then
-  orxonox.execute("orxout message test " .. newctrlid)
-end
-
---orxonox.execute("setPause 1")