| Last change
                  on this file since 11701 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:
            476 bytes | 
      
      
        
  | Line |  | 
|---|
| 1 | <?xml version="1.0" ?> | 
|---|
| 2 | <GUILayout> | 
|---|
| 3 | <Window Type="DefaultGUISheet" Name="orxonox/TestWindow"> | 
|---|
| 4 | <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/> | 
|---|
| 5 |  | 
|---|
| 6 | <Window Type="MenuWidgets/Button" Name="orxonox/TestButton"> | 
|---|
| 7 | <Property Name="UnifiedPosition" Value="{{0.11,0},{0.528,0}}"/> | 
|---|
| 8 | <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/> | 
|---|
| 9 | <Property Name="Text" Value="NoFunction"/> | 
|---|
| 10 | </Window> | 
|---|
| 11 |  | 
|---|
| 12 | </Window> | 
|---|
| 13 | </GUILayout> | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.