| 
                Last change
                  on this file since 11183 was
                  5695,
                  checked in by rgrieder, 16 years ago
           | 
        
        
          | 
               
Merged resource2 branch back to trunk. 
 
IMPORTANT NOTE: 
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk'). 
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository. 
UPDATE YOUR DATA DIRECTORY AS WELL!!! 
 
           | 
        
        
          
            
              - 
                  Property svn:eol-style set to
                  
native
               
             
           | 
        
        | 
            File size:
            240 bytes
           | 
      
      
        
  | Line |   | 
|---|
| 1 | Orxonox/LoadingScreenSample | 
|---|
| 2 | { | 
|---|
| 3 |    container Panel(Orxonox/LoadingScreenSample) | 
|---|
| 4 |    { | 
|---|
| 5 |       metrics_mode pixels | 
|---|
| 6 |       vert_align top | 
|---|
| 7 |       left 12 | 
|---|
| 8 |       top 12 | 
|---|
| 9 |       width 300 | 
|---|
| 10 |       height 300 | 
|---|
| 11 |       material Orxonox/LoadingScreenSample | 
|---|
| 12 |    } | 
|---|
| 13 | }  | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.