Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						288a6ac2c9
					 | 
					
						
						
							
							Some translations were missing concerning sunflowers, fixes #44
						
						
						
						
						
						
					 | 
					
						2020-12-12 17:39:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						8608ce346f
					 | 
					
						
						
							
							Add a small bomb exploding animation, fixes #31
						
						
						
						
						
						
					 | 
					
						2020-12-12 16:50:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						48318a91fe
					 | 
					
						
						
							
							Give more hazels to the player when testing the interaction with merchants
						
						
						
						
						
						
					 | 
					
						2020-12-11 21:19:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						777668848e
					 | 
					
						
						
							
							Clicking on the main image changes its color
						
						
						
						
						
						
					 | 
					
						2020-12-11 21:17:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						a4a10e340d
					 | 
					
						
						
							
							Test clicking on the merchant pad
						
						
						
						
						
						
					 | 
					
						2020-12-11 18:44:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ynerant
							
						 
					 | 
					
						
						
							
						
						53d090a9c8
					 | 
					
						
						
							
							Merge branch 'master' into 'mouse_interaction'
						
						
						
						
						
						
						
						# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/entities/items.py 
						
						
					 | 
					
						2020-12-11 18:38:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f453b82a58
					 | 
					
						
						
							
							Test clicking on the screen
						
						
						
						
						
						
					 | 
					
						2020-12-11 18:33:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						9d3e8a9822
					 | 
					
						
						
							
							Merge branch 'village' into 'master'
						
						
						
						
						
						
						
						Village
Closes #41, #38, #37, #36, and #18
See merge request ynerant/squirrel-battle!44 
						
						
					 | 
					
						2020-12-11 18:23:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						e7f24c2371
					 | 
					
						
						
							
							The store menu now displays the price of objects, fixes #41
						
						
						
						
						
						
					 | 
					
						2020-12-11 18:08:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						99352bc1d5
					 | 
					
						
						
							
							Test buying an item when we don't have enough of money
						
						
						
						
						
						
					 | 
					
						2020-12-11 17:28:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						6d4c0b2ca3
					 | 
					
						
						
							
							Testing the merchant must handle two cases: the bought item is a heart or not
						
						
						
						
						
						
					 | 
					
						2020-12-09 17:04:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						05e79c14e3
					 | 
					
						
						
							
							Translate the settings entry that change the chat key
						
						
						
						
						
						
					 | 
					
						2020-12-09 15:45:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						19b82ff71a
					 | 
					
						
						
							
							Test merchants
						
						
						
						
						
						
					 | 
					
						2020-12-09 15:32:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						cea015d015
					 | 
					
						
						
							
							In load&save test, force to have a merchant
						
						
						
						
						
						
					 | 
					
						2020-12-09 15:09:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						39787861dc
					 | 
					
						
						
							
							Test sunflowers interaction
						
						
						
						
						
						
					 | 
					
						2020-12-09 15:05:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						fdc2bcab8d
					 | 
					
						
						
							
							Add spanish translation
						
						
						
						
						
						
					 | 
					
						2020-12-07 01:01:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						866af98fe4
					 | 
					
						
						
							
							Merging master into village, conflicts were solved
						
						
						
						
						
						
					 | 
					
						2020-12-06 11:43:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f39113fd0b
					 | 
					
						
						
							
							Test body snatch potion, fixes #34
						
						
						
						
						
						
					 | 
					
						2020-12-05 14:42:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c38f8cdc53
					 | 
					
						
						
							
							Save the inventory of the player when saving the game, fixes #33
						
						
						
						
						
						
					 | 
					
						2020-12-05 14:35:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						ea672272f5
					 | 
					
						
						
							
							Add body snatch potion
						
						
						
						
						
						
					 | 
					
						2020-12-05 14:20:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						bc40f8d0e6
					 | 
					
						
						
							
							Some translations were missing in the settings menu
						
						
						
						
						
						
					 | 
					
						2020-12-05 13:19:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						4b9399c687
					 | 
					
						
						
							
							Test inventory
						
						
						
						
						
						
					 | 
					
						2020-12-04 18:16:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						5b4dc601bc
					 | 
					
						
						
							
							Fix broken tests
						
						
						
						
						
						
					 | 
					
						2020-12-04 17:15:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						39af791012
					 | 
					
						
						
							
							We can open an empty inventory!
						
						
						
						
						
						
					 | 
					
						2020-12-04 14:45:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						9f0a29302d
					 | 
					
						
						
							
							Add german translation
						
						
						
						
						
						
					 | 
					
						2020-11-28 16:22:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f78c73a703
					 | 
					
						
						
							
							Tests and the CI are compiling messages
						
						
						
						
						
						
					 | 
					
						2020-11-28 14:02:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						7d02604407
					 | 
					
						
						
							
							Clean the translation module
						
						
						
						
						
						
					 | 
					
						2020-11-28 02:00:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						138b2c6d54
					 | 
					
						
						
							
							Logs are capitalized
						
						
						
						
						
						
					 | 
					
						2020-11-28 01:25:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						70ae60b9a4
					 | 
					
						
						
							
							Translate entities
						
						
						
						
						
						
					 | 
					
						2020-11-27 22:33:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d2d74c97a4
					 | 
					
						
						
							
							Settings menu was not translated
						
						
						
						
						
						
					 | 
					
						2020-11-27 22:19:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f07324662a
					 | 
					
						
						
							
							Cover the language change
						
						
						
						
						
						
					 | 
					
						2020-11-27 21:56:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c151e0f656
					 | 
					
						
						
							
							Menu items are translated
						
						
						
						
						
						
					 | 
					
						2020-11-27 21:44:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						b0e352444b
					 | 
					
						
						
							
							Test loading wrong saves
						
						
						
						
						
						
					 | 
					
						2020-11-27 18:16:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						5faebfe556
					 | 
					
						
						
							
							Test message display
						
						
						
						
						
						
					 | 
					
						2020-11-27 18:12:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						0d3e33d960
					 | 
					
						
						
							
							Declare the license, we use GNU GPL
						
						
						
						
						
						
					 | 
					
						2020-11-27 16:33:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						2690eb8760
					 | 
					
						
						
							
							Update FakePad to fix tests
						
						
						
						
						
						
					 | 
					
						2020-11-26 22:32:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						fb3f3ee5e8
					 | 
					
						
						
							
							Beaver is a tiger
						
						
						
						
						
						
					 | 
					
						2020-11-20 18:02:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicolas Margulies
							
						 
					 | 
					
						
						
							
						
						984b12421b
					 | 
					
						
						
							
							Reaching 100% coverage and renamed an unused loop variable
						
						
						
						
						
						
					 | 
					
						2020-11-19 20:14:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicolas Margulies
							
						 
					 | 
					
						
						
							
						
						1e5bb26f57
					 | 
					
						
						
							
							Test logs
						
						
						
						
						
						
					 | 
					
						2020-11-19 20:02:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						00f843754a
					 | 
					
						
						
							
							Use a ResourceManager to find assets
						
						
						
						
						
						
					 | 
					
						2020-11-19 02:49:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d0ee9ec562
					 | 
					
						
						
							
							Rename dungeonbattle to squirrelbattle
						
						
						
						
						
						
					 | 
					
						2020-11-19 02:18:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |