Changes between Version 32 and Version 33 of pps/tutorial
- Timestamp:
- Mar 16, 2012, 3:27:17 PM (13 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
pps/tutorial
v32 v33 40 40 7. Enter to the appropriate folder and start the game. You will see a menu popping up, just press the ''Quickstart'' button. 41 41 {{{ 42 cd ~/ orxonox/tutorial/build42 cd ~/<your-username>-extra-0/orxonox/tutorial/build 43 43 ./run 44 44 }}} … … 157 157 1. Make sure you have a recent version of the branch (this is done by updating): 158 158 {{{ 159 ~/ orxonox/tutorial$ svn up159 ~/<your-username>-extra-0/orxonox/tutorial$ svn up 160 160 }}} 161 161 2. In order to avoid conflicts copy your file (''AutonomousDroneController.cc''): 162 162 {{{ 163 ~/ orxonox/tutorial$ svn cp src/orxonox/controllers/AutonomousDroneController.cc src/orxonox/controllers/AutonomousDroneController_myUserName.cc163 ~/<your-username>-extra-0/orxonox/tutorial$ svn cp src/orxonox/controllers/AutonomousDroneController.cc src/orxonox/controllers/AutonomousDroneController_myUserName.cc 164 164 }}} 165 165 3. Make sure you don't commit any changes of the original file, so revert your local changes on it: 166 166 {{{ 167 ~/ orxonox/tutorial$ svn revert src/orxonox/controllers/AutonomousDroneController.cc167 ~/<your-username>-extra-0/orxonox/tutorial$ svn revert src/orxonox/controllers/AutonomousDroneController.cc 168 168 }}} 169 169 4. Now commit: 170 170 {{{ 171 ~/ orxonox/tutorial$ svn ci -m "This is my version of the AutonomousDrone steering function" src/orxonox/controllers/AutonomousDroneController_myUserName.cc171 ~/<your-username>-extra-0/orxonox/tutorial$ svn ci -m "This is my version of the AutonomousDrone steering function" src/orxonox/controllers/AutonomousDroneController_myUserName.cc 172 172 }}}