Changeset 5929 for code/trunk/src/orxonox/overlays/InGameConsole.cc
- Timestamp:
- Oct 12, 2009, 8:20:07 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core5 (added) merged: 5768-5769,5772,5775-5780,5783-5785,5791-5792,5795-5807,5809-5814,5816-5832,5836-5839,5842-5853,5855-5899,5904-5922,5924-5928
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/overlays/InGameConsole.cc
r5781 r5929 41 41 #include <OgreFont.h> 42 42 43 #include "util/Clock.h" 44 #include "util/Convert.h" 43 45 #include "util/Math.h" 44 #include "util/Convert.h"45 46 #include "util/UTFStringConversions.h" 46 #include "core/Clock.h"47 47 #include "core/CoreIncludes.h" 48 48 #include "core/ConfigValueIncludes.h" 49 49 #include "core/ConsoleCommand.h" 50 #include "core/ScopedSingletonManager.h" 50 51 #include "core/input/InputManager.h" 51 52 #include "core/input/InputState.h" … … 61 62 62 63 InGameConsole* InGameConsole::singletonPtr_s = 0; 64 ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false); 63 65 64 66 /** … … 85 87 86 88 this->setConfigValues(); 89 this->initialise(); 87 90 } 88 91
Note: See TracChangeset
for help on using the changeset viewer.