Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 12, 2010, 1:08:58 PM (14 years ago)
Author:
scheusso
Message:
  • merged network2 branch into presentation3 branch (lots of network traffic and cpu load improvements)
  • fixed network related bugs in BigExplosion
Location:
code/branches/presentation3
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation3

  • code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc

    r7075 r7153  
    130130        registerVariable(this->shieldAbsorption_, VariableDirection::ToClient);
    131131        registerVariable(this->bReload_,          VariableDirection::ToServer);
    132         registerVariable(this->aimPosition_,      Bidirectionality::ServerMaster, 0, true);
     132        registerVariable(this->aimPosition_,      VariableDirection::ToServer);  // For the moment this variable gets only transfered to the server
    133133    }
    134134

  • code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h

    r7075 r7153  
    5050            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5151            virtual void tick(float dt);
    52             void registerVariables();
    5352
    5453            inline bool isAlive() const
    … …  
    166165
    167166        private:
     167            void registerVariables();
    168168            inline void setWeaponSystem(WeaponSystem* weaponsystem)
    169169                { this->weaponSystem_ = weaponsystem; }

  • code/branches/presentation3/src/orxonox/worldentities/pawns/SpaceShip.h

    r6711 r7153  
    4747            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    4848            virtual void tick(float dt);
    49             void registerVariables();
    5049            void setConfigValues();
    5150
    … …  
    9998
    10099        private:
     100            void registerVariables();
    101101            virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
    102102
    103         private:
    104103            void loadEngineTemplate();
    105104

  • code/branches/presentation3/src/orxonox/worldentities/pawns/Spectator.h

    r6417 r7153  
    4444
    4545            void setConfigValues();
    46             void registerVariables();
    4746            virtual void tick(float dt);
    4847
    … …  
    6362
    6463        private:
     64            void registerVariables();
    6565            void changedGreeting();
    6666            void changedFlareVisibility();
Note: See TracChangeset for help on using the changeset viewer.