Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7013 for code


Ignore:
Timestamp:
May 30, 2010, 2:10:13 PM (14 years ago)
Author:
dafrick
Message:

Added some config value to the menu and greyed-out the reset button, since that doesn't work, yet.
Also removed some debug output from RocketController.

Location:
code/branches/presentation3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua

    r7012 r7013  
    1818
    1919    P.commandList = {}
     20    table.insert(P.commandList, "KeyBinder mouseSensitivity_")
     21    table.insert(P.commandList, "KeyBinder mouseSensitivityDerived_")
     22    table.insert(P.commandList, "KeyBinder bDeriveMouseInput_")
     23    table.insert(P.commandList, "KeyBinder mouseWheelStepSize_")
     24    table.insert(P.commandList, "Shell maxHistoryLength_")
     25    table.insert(P.commandList, "Core bStartIOConsole_")
     26    table.insert(P.commandList, "Game fpsLimit_")
     27    table.insert(P.commandList, "Spectator speed_")
     28    table.insert(P.commandList, "SpaceShip bInvertYAxis_")
     29    table.insert(P.commandList, "LevelManager defaultLevelName_")
     30    table.insert(P.commandList, "Gametype initialStartCountdown_")
     31    table.insert(P.commandList, "Gametype bAutoStart_")
     32    table.insert(P.commandList, "Gametype numberOfBots_")
     33    table.insert(P.commandList, "UnderAttack gameTime_")
     34    table.insert(P.commandList, "TeamDeathmatch teams_")
     35    table.insert(P.commandList, "HumanPlayer nick_")
    2036    table.insert(P.commandList, "ChatOverlay displayTime_")
    2137
    2238    P.nameList = {}
    23     table.insert(P.nameList, "ChatOverlay: display time")
     39    table.insert(P.nameList, "Mouse sensitivity")
     40    table.insert(P.nameList, "Mouse acceleration")
     41    table.insert(P.nameList, "Derive mouse input")
     42    table.insert(P.nameList, "Mouse wheel stepsize")
     43    table.insert(P.nameList, "Shell: max. History length")
     44    table.insert(P.nameList, "Start IOConsole")
     45    table.insert(P.nameList, "FPS limit")
     46    table.insert(P.nameList, "Spectator speed")
     47    table.insert(P.nameList, "Invert Y-axis")
     48    table.insert(P.nameList, "Default level")
     49    table.insert(P.nameList, "Start countdown")
     50    table.insert(P.nameList, "Autostart")
     51    table.insert(P.nameList, "Number of Bots")
     52    table.insert(P.nameList, "UnderAttack: game time")
     53    table.insert(P.nameList, "TeamDeathmatch: Numer of teams")
     54    table.insert(P.nameList, "Playername")
     55    table.insert(P.nameList, "Chat: display time")
    2456
    2557    P.linesList = {}
     
    95127    orxonox.GUIManager:subscribeEventHelper(reset, "Clicked", P.name .. ".MiscConfigReset_clicked")
    96128    line:addChildWindow(reset)
     129    reset:setEnabled(false)
    97130    offset = offset + P.resetWidth + P.spaceWidth
    98131
     
    134167    local window = winMgr:getWindow("orxonox/MiscConfigMenu/MiscConfigPane/ConfigCommand" .. commandNr .. "/Configvalue")
    135168
    136     -- TODO: tconfig or permanent?
    137     orxonox.CommandExecutor:execute("tconfig " .. P.commandList[commandNr] .. " " .. window:getText())
     169    orxonox.CommandExecutor:execute("config " .. P.commandList[commandNr] .. " " .. window:getText())
    138170    orxonox.CommandExecutor:execute("getConfig " .. P.commandList[commandNr])
    139171    local value = orxonox.CommandExecutor:getReturnValueString()
  • code/branches/presentation3/src/modules/weapons/RocketController.cc

    r6999 r7013  
    9494    {
    9595        this->target_ = target;
    96         COUT(0)<<"got target\n";
    9796    }
    9897
Note: See TracChangeset for help on using the changeset viewer.