| 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @10624
                         
                     | 
                    10 years | 
                    landauf | 
                    
                        merged branch core7 back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9667
                         
                     | 
                    12 years | 
                    landauf | 
                    
                        merged core6 back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9348
                         
                     | 
                    13 years | 
                    landauf | 
                    
                        merged branch presentation2012merge back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8858
                         
                     | 
                    14 years | 
                    landauf | 
                    
                        merged output branch back to trunk.
Changes:
 - you have to include …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8729
                         
                     | 
                    14 years | 
                    rgrieder | 
                    
                        Merged unity_build branch back to trunk.
Features:
- Implemented …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7801
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Merging presentation2 branch back to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7549
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Resolving some more 's.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7548
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Resolving some 's.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7547
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Documenting and cleanup.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7539
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Some cleanup in PickupManager.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7533
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Documenting in pickups module.
Cleaning up in PickupManager.
Removed …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7531
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Fixing bug, that caused segfault in pickups with multiplayer.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7504
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Pickups module is now (from what I can tell after some basic testing) …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7494
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Some documenting and cleaning up/re-organization in pickups module.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7284
                         
                     | 
                    15 years | 
                    landauf | 
                    
                        merged consolecommands3 branch back to trunk.
note: the console …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7209
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Fixed little "bug", will have to be reviewed, when the pickup module …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7206
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Cleaning up and documenting PickupManager.
Also discovered and fixed a …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7163
                         
                     | 
                    15 years | 
                    dafrick | 
                    
                        Merged presentation3 branch into trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6752
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Fixed PickupManager::getPawn() method against NULL pointers.
(Doesn't …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6746
                         
                     | 
                    16 years | 
                    rgrieder | 
                    
                        Merged gamestates2 branch back to trunk.
This brings in some heavy …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6728
                         
                     | 
                    16 years | 
                    dafrick | 
                    
                        No more seg faults with pickups (at least that's what I hope.  )
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6725
                         
                     | 
                    16 years | 
                    dafrick | 
                    
                        Resolved bug, that caused orxonox to crash whenever a level with …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6711
                         
                     | 
                    16 years | 
                    dafrick | 
                    
                        Merged pickup4 branch back to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6540
                         
                     | 
                    16 years | 
                    dafrick | 
                    
                        Removed some 's. Finished up documenting pickup module.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6524
                         
                     | 
                    16 years | 
                    dafrick | 
                    
                        Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, …
                     | 
                
                
                   | 
                  
                    copied from code/branches/pickup3/src/modules/pickup/PickupManager.cc:
                   | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6484
                         
                     | 
                    16 years | 
                    dafrick | 
                    
                        Cleanup and bug fixes.
                     |