- Timestamp:
- May 29, 2008, 12:15:08 AM (17 years ago)
- Location:
- code/branches/network/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/src/core/InputManager.cc
r1465 r1468 576 576 marginalsMin_[i] = INT_MAX; 577 577 } 578 COUT( 1) << "Move all joy stick axes in all directions a few times. "578 COUT(0) << "Move all joy stick axes in all directions a few times. " 579 579 << "Then put all axes in zero state and hit enter." << std::endl; 580 580 … … 1125 1125 { 1126 1126 setInputState(IS_NODETECT); 1127 COUT( 1) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;1127 COUT(0) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl; 1128 1128 CommandExecutor::execute("config KeyBinder " + name + " " + bindingCommmandString_s, false); 1129 1129 } … … 1133 1133 bindingCommmandString_s = command; 1134 1134 setInputState(IS_DETECT); 1135 COUT( 1) << "Press any button/key or move a mouse/joystick axis" << std::endl;1135 COUT(0) << "Press any button/key or move a mouse/joystick axis" << std::endl; 1136 1136 } 1137 1137 -
code/branches/network/src/orxonox/console/InGameConsole.cc
r1455 r1468 299 299 { 300 300 float top = this->consoleOverlayContainer_->getTop(); 301 float timePassed = scrollTimer_; 301 302 this->scrollTimer_ = 0; 302 303 if (this->scroll_ != 0) 303 304 { 304 305 // scroll 305 top = top + 0.02* this->scroll_;306 top = top + timePassed * this->scroll_; 306 307 this->consoleOverlayContainer_->setTop(top); 307 308 } -
code/branches/network/src/orxonox/console/InGameConsole.h
r1454 r1468 42 42 namespace orxonox 43 43 { 44 class _OrxonoxExport InGameConsole : public Tickable , public ShellListener44 class _OrxonoxExport InGameConsole : public TickableReal, public ShellListener 45 45 { 46 46 public:
Note: See TracChangeset
for help on using the changeset viewer.