Changeset 10076
- Timestamp:
- May 22, 2014, 3:59:14 PM (11 years ago)
- Location:
- code/branches/presentationFS14
- Files:
-
- 3 edited
- 9 copied
-
. (modified) (1 prop)
-
data/gui/scripts/testscript.lua (copied) (copied from code/branches/ScriptableController/data/gui/scripts/testscript.lua)
-
data/levels/levelTry.oxw (copied) (copied from code/branches/ScriptableController/data/levels/levelTry.oxw)
-
data/levels/michaelstestfile.lua (copied) (copied from code/branches/ScriptableController/data/levels/michaelstestfile.lua)
-
data/levels/scriptController.oxw (copied) (copied from code/branches/ScriptableController/data/levels/scriptController.oxw)
-
src/orxonox/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/controllers/ControllerDirector.cc (copied) (copied from code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc)
-
src/orxonox/controllers/ControllerDirector.h (copied) (copied from code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h)
-
src/orxonox/controllers/ScriptController.cc (copied) (copied from code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc) (1 diff)
-
src/orxonox/controllers/ScriptController.h (copied) (copied from code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h)
-
src/orxonox/controllers/testscript.lua (copied) (copied from code/branches/ScriptableController/src/orxonox/controllers/testscript.lua)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS14
- Property svn:mergeinfo changed
/code/branches/ScriptableController (added) merged: 9999,10006,10009-10010,10012-10016,10020,10024-10028,10030,10034-10035,10037-10038,10045-10048,10056-10057,10059,10064-10066,10075
- Property svn:mergeinfo changed
-
code/branches/presentationFS14/src/orxonox/CMakeLists.txt
r10073 r10076 65 65 infos/PlayerInfo.h 66 66 sound/SoundManager.h 67 controllers/ScriptController.h 67 68 PCH_FILE 68 69 OrxonoxPrecompiledHeaders.h -
code/branches/presentationFS14/src/orxonox/controllers/CMakeLists.txt
r9016 r10076 10 10 DroneController.cc 11 11 FormationController.cc 12 ControllerDirector.cc 12 13 ) -
code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc
r10075 r10076 250 250 { eventList.insert(it,tmp); 251 251 this->eventno += 1; 252 orxout()<<"new event added"<<endl;252 //orxout()<<"new event added"<<endl; 253 253 return; 254 254 }
Note: See TracChangeset
for help on using the changeset viewer.
