Changeset 2492 for code/branches/presentation/src/orxonox
- Timestamp:
- Dec 17, 2008, 12:55:03 AM (16 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 1 added
- 51 edited
- 9 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/overlay (added) merged: 2117-2118,2120,2140,2152,2180-2181,2200,2222,2225,2320
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/CameraManager.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/CameraManager.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/OrxonoxPrereqs.h
r2485 r2492 201 201 class OverlayText; 202 202 class GametypeStatus; 203 class CreateLines; 204 class Scoreboard; 203 205 204 206 //gui -
code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc
r2485 r2492 35 35 #include "core/CoreIncludes.h" 36 36 #include "core/ConfigValueIncludes.h" 37 #include "core/Loader.h" 38 #include "core/XMLFile.h" 37 39 #include "objects/infos/PlayerInfo.h" 38 40 #include "objects/infos/Bot.h" … … 40 42 #include "objects/worldentities/SpawnPoint.h" 41 43 #include "objects/worldentities/Camera.h" 44 #include "Settings.h" 42 45 43 46 #include "network/Host.h" … … 64 67 65 68 this->addBots(this->numberOfBots_); 69 70 this->statsOverlay_ = 0; 71 72 setConfigValues(); 73 74 // load the corresponding score board 75 //this->statsOverlay_ = new XMLFile(Settings::getDataPath() + "overlay/" + this->statsOverlayName_); 76 //Loader::open(statsOverlay_); 77 //this->setGametype(this); 66 78 } 67 79 … … 72 84 SetConfigValue(bForceSpawn_, false); 73 85 SetConfigValue(numberOfBots_, 0); 86 SetConfigValue(statsOverlayName_, "stats.oxo"); 74 87 } 75 88 -
code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h
r2485 r2492 56 56 { 57 57 friend class PlayerInfo; 58 friend class ClassIdentifier<Gametype>; 58 59 59 60 public: … … 101 102 void killBots(unsigned int amount = 0); 102 103 104 inline unsigned int getNumberOfPlayers() const 105 { return this->players_.size(); } 106 107 inline std::string getPlayersName() const 108 { return "StatsBot77"; } 109 110 inline unsigned int getPlayersFrags() const 111 { return 123; } 112 103 113 private: 104 114 virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const; … … 124 134 std::set<SpawnPoint*> spawnpoints_; 125 135 SubclassIdentifier<ControllableEntity> defaultControllableEntity_; 136 137 XMLFile* statsOverlay_; 138 139 // Config Values 140 std::string statsOverlayName_; 126 141 }; 127 142 } -
code/branches/presentation/src/orxonox/objects/pickup/Usable.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/AddQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/AddReward.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/AddReward.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/FailQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/Quest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/Quest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestHint.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestItem.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/QuestManager.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/quest/Rewardable.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/Camera.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/src/orxonox/overlays/CMakeLists.txt
r2385 r2492 9 9 ADD_SOURCE_DIRECTORY(SRC_FILES hud) 10 10 ADD_SOURCE_DIRECTORY(SRC_FILES notifications) 11 ADD_SOURCE_DIRECTORY(SRC_FILES stats) 11 12 12 13 ADD_SOURCE_FILES(SRC_FILES) -
code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc
r2485 r2492 88 88 setPosition(Vector2(0.0f, 0.0f)); 89 89 setRotation(Degree(0.0)); 90 setAspectCorrection( true);90 setAspectCorrection(false); 91 91 setBackgroundMaterial(""); 92 92 }
Note: See TracChangeset
for help on using the changeset viewer.