| 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9656
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the proxy bache back with no conflicts
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9494
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        merged the proxy back
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9406
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the proxy back
merged with commandsvn merge …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9235
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        merged the presentation back
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9110
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the Presentation back
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9059
                         
                     | 
                    19 years | 
                    patrick | 
                    
                        merged the network branche with the trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @9008
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the network bak to the trunk
merged with …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8708
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        merged network back
merged with command:
svn merge -r8625:HEAD …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8623
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the network branche back here
merged with …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8362
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: removed stupid included in base_object.h
this should …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8228
                         
                     | 
                    19 years | 
                    patrick | 
                    
                        trunk: merged the network branche back to trunk with command: svn …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8147
                         
                     | 
                    19 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the network branche back here
merged with …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @8068
                         
                     | 
                    19 years | 
                    patrick | 
                    
                        trunk: merged the network branche back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7954
                         
                     | 
                    19 years | 
                    patrick | 
                    
                        trunk: merged the network branche back to trunk.
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7354
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        orxonox: only a small change to the net manager
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7349
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        orxonox: news adjusted and network game manager cleaned from playable
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7193
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: new style for resources (prework/movement)
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7078
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        trunk: player group handling
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7074
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        trunk: the network players are spawned at the right places
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @7071
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        patches: network load level and md2 death
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6994
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the Network branche back here
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6985
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        trunk: rename of setControllable
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6959
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        trunk: merged network branche into trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6868
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the Network back to the trunk.
merged with …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6815
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: merged branches/network back to the trunk.
merged with …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6737
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        trunk: merged network back to trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6695
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        merged the network branche to the trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6634
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the network-branche back to the trunk
merged …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6498
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        trunk: merged the network branche into the trunk
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6424
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the branche network back to the trunk
merged …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6341
                         
                     | 
                    20 years | 
                    bensch | 
                    
                        orxonox/trunk: merged the network branche back to the trunk, so we do …
                     | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6139
                         
                     | 
                    20 years | 
                    patrick | 
                    
                        trunk: merged branche network with trunk using command: svn merge …
                     | 
                
                
                   | 
                  
                    copied from branches/network/src/lib/network/network_game_manager.cc:
                   | 
                
                
                  | 
                    
                    
                   | 
                    
                      
                        
                        
                      
                     | 
                    
                      
                        @6116
                         
                     | 
                    20 years | 
                    rennerc | 
                    
                        renamed EntityManager to NetworkGameManager
                     |