| 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9348
                         
                     | 
                    13 years | 
                    landauf | 
                    
                        merged branch presentation2012merge back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8079
                         
                     | 
                    15 years | 
                    landauf | 
                    
                        merged usability branch back to trunk
incomplete summary of the …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7879
                         
                     | 
                    15 years | 
                    landauf | 
                    
                        moved compositor unloading to avoid crashes in rare cases
disabled …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7284
                         
                     | 
                    15 years | 
                    landauf | 
                    
                        merged consolecommands3 branch back to trunk.
note: the console …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6417
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Merged presentation2 branch back to trunk.
Major new features:
- …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @5929
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Merged core5 branch back to the trunk.
Key features include clean …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @5781
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Reverted trunk again. We might want to find a way to delete these …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @5738
                         
                     | 
                    16 years | 
                    landauf | 
                    
                        merged libraries2 back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3370
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Merged resource branch back to the trunk. Changes:
- Automated …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3280
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Merged most of the core4 revisions back to the trunk except for:
- …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3196
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Merged pch branch back to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3110
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Removed old msvc specific support for precompiled header files.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3068
                         
                     | 
                    16 years | 
                    landauf | 
                    
                        removing svn:mergeinfo again after sound2 merge
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3060
                         
                     | 
                    16 years | 
                    scheusso | 
                    
                        merged sound2 back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @3028
                         
                     | 
                    16 years | 
                    landauf | 
                    
                        removed svn:mergeinfo properties
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2911
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        Merged r1-2096 of questsystem5 back to trunk
I hope there weren't …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2896
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        Merged gui branch back to trunk.
I did 2 small changes in …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2893
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        merged weaponsystem branch back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2826
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        merged miniprojects branch back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2710
                         
                     | 
                    17 years | 
                    rgrieder | 
                    
                        Merged buildsystem3 containing buildsystem2 containing Adi's …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2662
                         
                     | 
                    17 years | 
                    rgrieder | 
                    
                        Merged presentation branch back to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2261
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        merged questsystem2 back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2171
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        merged revisions 2111-2170 from objecthierarchy branch back to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2103
                         
                     | 
                    17 years | 
                    rgrieder | 
                    
                        Merged r2101 (objecthierarchy) to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2087
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        merged objecthierarchy branch back to trunk
                     | 
                
                
                   | 
                  
                    copied from code/branches/objecthierarchy/src/orxonox/CameraManager.cc:
                   | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @2073
                         
                     | 
                    17 years | 
                    landauf | 
                    
                        renamed CameraHandler as CameraManager
                     |