Changeset 8196

Timestamp:

Apr 6, 2011, 4:39:29 PM (13 years ago)

Author:

dafrick

Message:

Merging old dockingsystem branch into new one.
Do
svn switch ​https://svn.orxonox.net/game/code/branches/dockingsystem2
in your old branch.

Location:

code/branches/dockingsystem2

Files:

• . (modified) (1 prop)
• data/levels/docking.oxw (copied) (copied from code/branches/dockingsystem/data/levels/docking.oxw)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/docking (copied) (copied from code/branches/dockingsystem/src/modules/docking)
• src/modules/docking/CMakeLists.txt (copied) (copied from code/branches/dockingsystem/src/modules/docking/CMakeLists.txt)
• src/modules/docking/Dock.cc (copied) (copied from code/branches/dockingsystem/src/modules/docking/Dock.cc)
• src/modules/docking/Dock.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/Dock.h)
• src/modules/docking/DockToShip.cc (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockToShip.cc)
• src/modules/docking/DockToShip.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockToShip.h)
• src/modules/docking/DockingEffect.cc (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingEffect.cc)
• src/modules/docking/DockingEffect.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingEffect.h)
• src/modules/docking/DockingPrecompiledHeaders.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h)
• src/modules/docking/DockingPrereqs.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h)
• src/orxonox/infos/HumanPlayer.h (modified) (1 diff)
• src/orxonox/infos/PlayerInfo.cc (modified) (1 diff)

code/branches/dockingsystem2/src/modules/CMakeLists.txt

@@ -34 +34 @@
 ADD_SUBDIRECTORY(questsystem)
 ADD_SUBDIRECTORY(weapons)
+ADD_SUBDIRECTORY(docking)

code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h

@@ -48 +48 @@
             float getPing() const;
             float getPacketLossRatio() const;
+
+            inline const std::string& getNick() const
+                { return this->nick_; }
 
             void setClientID(unsigned int clientID);

code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc

@@ -224 +224 @@
 
         this->controllableEntity_->setController(0);
-        
+
         this->controllableEntity_ = this->oldControllableEntity_;
         this->controllableEntityID_ = this->controllableEntity_->getObjectID();