| 
						
					 | 
					
						
						
							
						
						451dd9cba7
					 | 
					
						
						
							
							Merge branch 'master' into 'equipment'
						
						
						
						
						
						
						
						# Conflicts:
#   squirrelbattle/display/statsdisplay.py
#   squirrelbattle/entities/items.py
#   squirrelbattle/entities/player.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/tests/game_test.py 
						
						
					 | 
					
						2021-01-08 02:11:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						7aeb659cf5
	
				 
					 | 
					
						
						
							
							Fix french translation
						
						
						
						
						
						
					 | 
					
						2021-01-08 02:00:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						a48e6325fe
	
				 
					 | 
					
						
						
							
							Add log message when the player switches floor
						
						
						
						
						
						
					 | 
					
						2021-01-06 15:55:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d06a405120
	
				 
					 | 
					
						
						
							
							Use a key to use ladders
						
						
						
						
						
						
					 | 
					
						2021-01-06 14:55:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						9a556ba669
					 | 
					
						
						
							
							We can now buy items to merchants, closes #47
						
						
						
						
						
						
					 | 
					
						2020-12-18 01:05:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						7971a1f70e
					 | 
					
						
						
							
							Add waiting key, fixes #16
						
						
						
						
						
						
					 | 
					
						2020-12-12 18:12:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						288a6ac2c9
					 | 
					
						
						
							
							Some translations were missing concerning sunflowers, fixes #44
						
						
						
						
						
						
					 | 
					
						2020-12-12 17:39:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						73e1fac89a
					 | 
					
						
						
							
							Add title to boxes to have pretty boxes, fixes #28
						
						
						
						
						
						
					 | 
					
						2020-12-12 17:15:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						fdc2bcab8d
					 | 
					
						
						
							
							Add spanish translation
						
						
						
						
						
						
					 | 
					
						2020-12-07 01:01:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |