Changeset 6994 for code/branches/presentation3
- Timestamp:
- May 27, 2010, 10:31:25 PM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 7 edited
- 9 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/skybox2 (added) merged: 6559,6616,6619,6673,6771-6772,6804,6806,6858,6861,6936,6972-6974,6988-6989
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/libraries/core/Core.cc
r6746 r6994 79 79 SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file"); 80 80 SetCommandLineSwitch(noIOConsole).information("Use this if you don't want to use the IOConsole (for instance for Lua debugging)"); 81 81 82 #ifdef ORXONOX_PLATFORM_WINDOWS 82 83 SetCommandLineArgument(limitToCPU, 1).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is the first core (faster than off)"); -
code/branches/presentation3/src/modules/CMakeLists.txt
r6524 r6994 33 33 ADD_SUBDIRECTORY(questsystem) 34 34 ADD_SUBDIRECTORY(weapons) 35 ADD_SUBDIRECTORY(designtools) -
code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc
r5781 r6994 30 30 31 31 #include "util/Convert.h" 32 #include "core/ConsoleCommand.h" 32 33 #include "core/CoreIncludes.h" 33 34 #include "infos/GametypeInfo.h" … … 38 39 namespace orxonox 39 40 { 40 CreateFactory(GametypeStatus); 41 CreateFactory(GametypeStatus); 42 43 /*static*/ bool GametypeStatus::noCaption_s = false; 44 SetConsoleCommand(GametypeStatus, setGametypeStatus, true); 41 45 42 46 GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator) … … 59 63 const GametypeInfo* gtinfo = this->owner_->getGametypeInfo(); 60 64 ControllableEntity* ce = this->owner_->getControllableEntity(); 65 66 if(GametypeStatus::noCaption_s) // No captions are displayed. 67 { 68 this->setCaption(""); 69 return; 70 } 61 71 62 72 if (!gtinfo->hasStarted() && !gtinfo->isStartCountdownRunning()) … … 88 98 this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner()); 89 99 } 100 101 /** 102 @brief 103 Sets whether the gametype status is displayed. 104 @param bValue 105 If true captions are displayed, if false, not. 106 */ 107 /*static*/ void GametypeStatus::setGametypeStatus(bool bValue) 108 { 109 GametypeStatus::noCaption_s = !bValue; 110 } 111 90 112 } -
code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h
r5781 r6994 46 46 virtual void changedOwner(); 47 47 48 static void setGametypeStatus(bool bValue); //!< Toggles whether the gametype status is displayed. 49 48 50 private: 49 51 PlayerInfo* owner_; 52 static bool noCaption_s; 53 50 54 }; 51 55 } -
code/branches/presentation3/src/orxonox/controllers/AIController.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h
r6417 r6994 137 137 inline float getMouseLookSpeed() const 138 138 { return this->mouseLookSpeed_; } 139 inline CameraPosition* getCurrentCameraPosition() 140 { return this->currentCameraPosition_; } 139 141 140 142 inline Controller* getXMLController() const
Note: See TracChangeset
for help on using the changeset viewer.