Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 9, 2017, 4:22:19 PM (7 years ago)
Author:
patricwi
Message:

space race merged

Location:
code/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/orxonox/controllers/HumanController.h

    r11353 r11358  
    9292            //friend class, for mouselook
    9393            friend class Map;
     94            static HumanController* localController_s;
    9495
    9596        protected:
    96             static HumanController* localController_s;
    9797            bool controlPaused_;
    9898

  • code/trunk/src/orxonox/gametypes/Gametype.cc

    r11071 r11358  
    9696        }
    9797    }
    98 
     98   
    9999    /**
    100100     * @brief Initializes sub-objects of the Gametype. This must be called after the constructor.

  • code/trunk/src/orxonox/infos/Bot.cc

    r9667 r11358  
    6868        static const std::string names[] =
    6969        {
    70             "Dr. Julius No",
    71             "Rosa Klebb",
    72             "Auric Goldfinger",
    73             "Emilio Largo",
    74             "Ernst Stavro Blofeld",
    75             "Dr. Kananga",
    76             "Francisco Scaramanga",
    77             "Karl Stromberg",
    78             "Sir Hugo Drax",
    79             "Aris Kristatos",
     70            "Berkay Berabi",
     71            "Louis  Meile"
     72            "Muten Roshi",
     73            "Abradolf Lincler",
     74            "Lionel Messi",
    8075            "Kamal Khan",
    81             "General Orlov",
    82             "Max Zorin",
    83             "Brad Whitaker",
    84             "General Georgi Koskov",
    85             "Franz Sanchez",
    86             "Alec Trevelyan",
    87             "Elliot Carver",
    88             "Elektra King",
    89             "Viktor Zokas",
    90             "Gustav Graves",
    91             "Le Chiffre",
    92             "Mr. White",
    93             "Dominic Greene"
     76            "Karl the Llama",
     77            "Thomas the Tankengine",
     78            "Rick",
     79            "Morty",
     80            "Charlie the Unicorn",
     81            "Kung Fury",
     82            "Postman Pat"
    9483        };
    9584        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));

  • code/trunk/src/orxonox/infos/GametypeInfo.h

    r9667 r11358  
    8383            inline bool isStartCountdownRunning() const
    8484                { return this->bStartCountdownRunning_; }
     85           
    8586            void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
    8687
    … …  
    132133            void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
    133134            void dispatchFadingMessage(const std::string& message) const;
     135            void setStartCountdown(float countdown); // Set the start countdown to the input value.
     136
    134137
    135138        protected:
    136139            void start(void); // Inform the GametypeInfo that the game has started.
    137140            void end(void); // Inform the GametypeInfo that the game has ended.
    138             void setStartCountdown(float countdown); // Set the start countdown to the input value.
    139141            void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
    140142            void countDown(); // Count down the start countdown counter.

  • code/trunk/src/orxonox/sound/WorldAmbientSound.cc

    r11071 r11358  
    5858        soundList_.emplace_back("Ganymede.ogg");
    5959        soundList_.emplace_back("luke_grey_-_hypermode.ogg");
     60        soundList_.emplace_back("racetheme.ogg");
     61
    6062
    6163    }
Note: See TracChangeset for help on using the changeset viewer.