Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7645


Ignore:
Timestamp:
Nov 13, 2010, 9:10:57 PM (14 years ago)
Author:
dafrick
Message:

Small adjustments.

Location:
code/branches/releasetodo
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • code/branches/releasetodo/data/levels/Fight in our Back.oxw

    r7629 r7645  
    22  name = "Fight in our Back"
    33  description = "Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
    4   tags = "deathmatch, quests"
     4  tags = ""
    55/>
    66

  • code/branches/releasetodo/data/levels/Quest_PirateAttack.oxw

    r7629 r7645  
    22 name = "Pirate Attack"
    33 description = "Dani's Testlevel"
    4  tags = "test, quests"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/The Time Machine.oxw

    r7629 r7645  
    22 name = "The Time Machine"
    33 description = "A simple level. The only goal is to defeat as much enemies as you can."
    4  tags = "deathmatch"
     4 tags = ""
    55/>
    66

  • code/branches/releasetodo/data/levels/empty_level.oxw

    r7629 r7645  
    22 name = "Empty level"
    33 description = "A level with absolutely nothing in it."
    4  tags = "empty"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/fps_test.oxw

    r7629 r7645  
    22 name = "FPS testlevel"
    33 description = "Level to test First Person Shooter"
    4  tags = "test, FPS"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/notifications.oxw

    r7625 r7645  
    22 name = "Notifications showcase"
    33 description = "Level to test and showcase notifications."
    4  tags = "test, showcase, notifications"
     4 tags = "test, showcase"
    55/>
    66

  • code/branches/releasetodo/data/levels/pickups.oxw

    r7629 r7645  
    22 name = "Pickups showcase"
    33 description = "Level to test and showcase pickups."
    4  tags = "test, showcase, pickups"
     4 tags = "test, showcase"
    55/>
    66

  • code/branches/releasetodo/data/levels/presentation_FS10.oxw

    r7629 r7645  
    22 name = "Presentation XI FPS"
    33 description = "2nd Presentation level for Orxonox Convention XI, FPS"
    4  tags = "presentation, fps"
     4 tags = "presentation"
    55/>
    66

  • code/branches/releasetodo/data/levels/presentation_FS10_ed.oxw

    r7629 r7645  
    22 name = "Presentation XI FPS"
    33 description = "3rd Presentation level for Orxonox Convention XI, FPS"
    4  tags = "presentation, fps"
     4 tags = "presentation"
    55/>
    66

  • code/branches/releasetodo/data/levels/princessaeryn.oxw

    r7629 r7645  
    22 name = "The Tale of Princess Aeryn"
    33 description = "The Tale of the elusive but beautiful Princess Aeryn"
    4  tags = "quests"
     4 tags = ""
    55/>
    66

  • code/branches/releasetodo/data/levels/screenshot.oxw

    r7629 r7645  
    22 name = "Screenshot"
    33 description = "Level to make awesome screenshots in."
    4  tags = "test, screenshot"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/sound.oxw

    r7629 r7645  
    22 name = "Sound showcase"
    33 description = "Level to test and showcase sound."
    4  tags = "test, sound"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/teamdeathmatch.oxw

    r7629 r7645  
    22 name = "Team Deathmatch"
    33 description = "Fight against each other in teams."
    4  tags = "deathmatch"
     4 tags = ""
    55/>
    66

  • code/branches/releasetodo/data/levels/test_stars.oxw

    r7629 r7645  
    22 name = "Stars Testlevel"
    33 description = "Level to test stars"
    4  tags = "test, stars"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/test_swallow.oxw

    r7629 r7645  
    22 name = "Swallow Testlevel"
    33 description = "Level to test the swallow spaceship."
    4  tags = "test, swallow"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/data/levels/waypoints.oxw

    r7629 r7645  
    22 name = "Waypoints Testlevel"
    33 description = "Testing waypoings for AI controlled spaceships."
    4  tags = "test, waypoints"
     4 tags = "test"
    55/>
    66

  • code/branches/releasetodo/src/libraries/core/GUIManager.cc

    r7628 r7645  
    438438    }
    439439
     440    /**
     441    @brief
     442        Subscribe the input function to the input event for the input window.
     443        This is a helper to be used in lua, because subscribeScriptedEvent() doesn't work in lua.
     444    @param window
     445        The window for which the event is subscribed.
     446    @param event
     447        The type of event to which we subscribe.
     448    @param function
     449        The function that is called when the event occurs.
     450    */
    440451    void GUIManager::subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function)
    441452    {
    … …  
    443454    }
    444455
     456    /**
     457    @brief
     458        Set the input tooltip text for the input ListboxItem.
     459    @param item
     460        The ListboxItem for which the tooltip should be set.
     461    @param tooltip
     462        The tooltip text that should be set.
     463    */
    445464    void GUIManager::setTooltipTextHelper(CEGUI::ListboxItem* item, const std::string& tooltip)
    446465    {
    … …  
    448467    }
    449468
     469    /**
     470    @brief
     471        Set whether the tooltips for the input Listbox are enabled.
     472    @param listbox
     473        The Listbox for which to enable (or disable) tooltips.
     474    @param enabled
     475        Whether to enable or disabel the tooltips.
     476    */
    450477    void GUIManager::setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled)
    451478    {
    … …  
    453480    }
    454481
    455    
    456482}

  • code/branches/releasetodo/src/orxonox/LevelInfo.cc

    r7639 r7645  
    7777
    7878    }
    79    
    80     void LevelInfoItem::initializeTags(void)
     79
     80    /**
     81    @brief
     82        Initialize the set of allowed tags.
     83    */
     84    /*static*/ void LevelInfoItem::initializeTags(void)
    8185    {
    8286        if(!LevelInfoItem::initialized_s)
    … …  
    8791            LevelInfoItem::possibleTags_s.insert("showcase");
    8892            LevelInfoItem::possibleTags_s.insert("tutorial");
     93            LevelInfoItem::possibleTags_s.insert("presentation");
    8994        }
    9095    }

  • code/branches/releasetodo/src/orxonox/LevelInfo.h

    r7638 r7645  
    3838#include "OrxonoxPrereqs.h"
    3939
    40 #include <map>
    4140#include <set>
    4241#include <string>
    … …  
    121120        private:
    122121            void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
    123            
    124             static std::set<std::string> possibleTags_s;
    125             static const bool initialized_s = false;
    126             void initializeTags(void);
    127             bool validateTag(const std::string& tag)
    128                 { this->initializeTags(); return LevelInfoItem::possibleTags_s.find(tag) != LevelInfoItem::possibleTags_s.end(); }
     122
     123            static void initializeTags(void); //!< Initialize the set of allowed tags.
     124            /**
     125            @brief Check whether an input tag is allowed.
     126            @param tag The tag to check.
     127            @return Returns true if the input tag is allowed, false if not.
     128            */
     129            static bool validateTag(const std::string& tag)
     130                { LevelInfoItem::initializeTags(); return LevelInfoItem::possibleTags_s.find(tag) != LevelInfoItem::possibleTags_s.end(); }
     131
     132            static std::set<std::string> possibleTags_s; //!< The set of allowed tags.
     133            static const bool initialized_s = false; //!< Whether the set of allowed tags has been inizialized.
    129134
    130135            std::string name_; //!< The name of the Level.
    … …  
    140145        - @b name The name of the level.
    141146        - @b description The description of the level.
    142         - @b tags A comma-seperated string of tags.
     147        - @b tags A comma-seperated string of tags. Allowed tags are: <em>test</em>, <em>singleplayer</em>, <em>multiplayer</em>, <em>showcase</em>, <em>tutorial</em>, <em>presentation</em>.
    143148
    144149        An example would be:
Note: See TracChangeset for help on using the changeset viewer.