| 
                Last change
                  on this file since 7394 was
                  6746,
                  checked in by rgrieder, 16 years ago
           | 
        
        
          | 
               
Merged gamestates2 branch back to trunk. 
This brings in some heavy changes in the GUI framework. 
It should also fix problems with triggered asserts in the InputManager. 
 
Note: PickupInventory does not seem to work —> Segfault when showing because before, the owner in GUIOverlay::setGUIName is already NULL. 
I haven't tested it before, so I can't tell whether it's my changes. 
 
           | 
        
        
          
            
              - 
                  Property svn:eol-style set to
                  
native
               
             
           | 
        
        | 
            File size:
            1.0 KB
           | 
      
      
        
  | Rev | Line |   | 
|---|
| [5746] | 1 | <?xml version="1.0" ?> | 
|---|
 | 2 | <GUILayout> | 
|---|
| [6746] | 3 |     <Window Type="MenuWidgets/StaticImage" Name="orxonox/QuestGUI/Background"> | 
|---|
| [5746] | 4 |     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/> | 
|---|
 | 5 |     <Property Name="Image" Value="set:MainMenuBackground image:Background"/> | 
|---|
 | 6 |     <Property Name="FrameEnabled" Value="set:true"/> | 
|---|
 | 7 |     <Property Name="BackgroundEnabled" Value="set:false"/> | 
|---|
| [6417] | 8 |     <Property Name="InheritsAlpha" Value="False" /> | 
|---|
| [5746] | 9 |  | 
|---|
| [6746] | 10 |         <Window Type="MenuWidgets/Titlebar" Name="orxonox/QuestGUI/Title"> | 
|---|
| [5746] | 11 |             <Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}"/> | 
|---|
 | 12 |             <Property Name="UnifiedSize" Value="{{0.9,0},{0.05,0}}"/> | 
|---|
 | 13 |             <Property Name="Text" Value="Your Quests"/> | 
|---|
 | 14 |         </Window> | 
|---|
 | 15 |  | 
|---|
| [6746] | 16 |         <Window Type="MenuWidgets/Listbox" Name="orxonox/QuestGUI/QuestsList"> | 
|---|
| [5746] | 17 |             <Property Name="UnifiedPosition" Value="{{0.07,0},{0.18,0}}" /> | 
|---|
 | 18 |             <Property Name="UnifiedSize" Value="{{0.86,0},{0.8,0}}" /> | 
|---|
 | 19 |             <Property Name="Alpha" Value="0.8" /> | 
|---|
 | 20 |         </Window> | 
|---|
 | 21 |  | 
|---|
 | 22 |     </Window> | 
|---|
 | 23 | </GUILayout> | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.