Merge branches 'level' and 'master' into level
This commit is contained in:
		
						commit
						c283049246
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
					@ -431,7 +431,7 @@ while not globals.die:
 | 
				
			||||||
	# reinitializing moving objects list
 | 
						# reinitializing moving objects list
 | 
				
			||||||
	#globals.moving_objects = pygame.sprite.RenderUpdates()
 | 
						#globals.moving_objects = pygame.sprite.RenderUpdates()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# transition(0)
 | 
					#transition(0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
print "frames : %d" % nbframe
 | 
					print "frames : %d" % nbframe
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue