Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 6, 2011, 2:23:39 PM (14 years ago)
Author:
landauf
Message:
  • removed console command shortcuts for InGameConsole openConsole and closeConsole - hope I adjusted all references to this command correctly
  • moved printFPS, printTickTime, and printRTT to "Stats" console command group (couldn't find any references to this, so hopefully nothing is broken)
Location:
code/branches/usability
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/usability/data/defaultConfig/keybindings.ini

    r7533 r8032  
    4242KeyF9=
    4343KeyG=greet
    44 KeyGrave="openConsole"
     44KeyGrave="InGameConsole openConsole"
    4545KeyH=
    4646KeyHome=
     
    127127KeyU=""
    128128KeyUP="scale 1 moveFrontBack"
    129 KeyUnassigned="openConsole"
     129KeyUnassigned="InGameConsole openConsole"
    130130KeyUnderline=
    131131KeyUnlabeled=
  • code/branches/usability/data/gui/scripts/KeyBindMenu.lua

    r7928 r8032  
    2626    table.insert(commandList, "NewHumanController changeMode")
    2727    table.insert(commandList, "switchCamera")
    28     table.insert(commandList, "openConsole")
     28    table.insert(commandList, "InGameConsole openConsole")
    2929    table.insert(commandList, "OverlayGroup toggleVisibility Debug")
    3030    table.insert(commandList, "OverlayGroup toggleVisibility Stats")
  • code/branches/usability/data/gui/scripts/SheetManager.lua

    r8023 r8032  
    245245            keyESC()
    246246        elseif code == "0"then
    247             orxonox.CommandExecutor:execute("openConsole")
     247            orxonox.CommandExecutor:execute("InGameConsole openConsole")
    248248        end
    249249    end
  • code/branches/usability/src/libraries/core/Game.cc

    r7993 r8032  
    6161    static void printFPS()
    6262        { COUT(0) << Game::getInstance().getAvgFPS() << std::endl; }
    63     SetConsoleCommand("printFPS", &printFPS);
     63    SetConsoleCommand("Stats", "printFPS", &printFPS);
    6464    static void printTickTime()
    6565        { COUT(0) << Game::getInstance().getAvgTickTime() << std::endl; }
    66     SetConsoleCommand("printTickTime", &printTickTime);
     66    SetConsoleCommand("Stats", "printTickTime", &printTickTime);
    6767
    6868    std::map<std::string, GameStateInfo> Game::gameStateDeclarations_s;
  • code/branches/usability/src/libraries/network/Host.cc

    r7801 r8032  
    3838namespace orxonox {
    3939
     40  static const std::string __CC_printRTT_group = "Stats";
    4041  static const std::string __CC_printRTT_name = "printRTT";
    4142
    4243  SetConsoleCommand("chat", &Host::Chat);
    43   SetConsoleCommand(__CC_printRTT_name, &Host::printRTT);
     44  SetConsoleCommand(__CC_printRTT_group, __CC_printRTT_name, &Host::printRTT);
    4445
    4546  // Host*               Host::instance_=0;
     
    5556  //   assert(instance_==0);
    5657    instances_s.push_back(this);
    57     ModifyConsoleCommand(__CC_printRTT_name).setObject(this);
     58    ModifyConsoleCommand(__CC_printRTT_group, __CC_printRTT_name).setObject(this);
    5859    this->bIsActive_ = false;
    5960  }
     
    6768    assert( std::find( instances_s.begin(), instances_s.end(), this )!=instances_s.end() );
    6869    instances_s.erase(std::find( instances_s.begin(), instances_s.end(), this ));
    69     ModifyConsoleCommand(__CC_printRTT_name).setObject(0);
     70    ModifyConsoleCommand(__CC_printRTT_group, __CC_printRTT_name).setObject(0);
    7071  }
    7172
  • code/branches/usability/src/orxonox/overlays/InGameConsole.cc

    r8013 r8032  
    6060    const float CHAR_WIDTH = 7.45f; // fix this please - determine the char-width dynamically
    6161
    62     SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole).addShortcut();
    63     SetConsoleCommand("InGameConsole", "closeConsole", &InGameConsole::closeConsole).addShortcut();
     62    SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole);
     63    SetConsoleCommand("InGameConsole", "closeConsole", &InGameConsole::closeConsole);
    6464
    6565    ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
Note: See TracChangeset for help on using the changeset viewer.