eichhornchen
							
						 
					 | 
					
						
						
							
						
						6cf0590586
					 | 
					
						
						
							
							even more translations.
						
						
						
						
						
						
					 | 
					
						2021-01-10 21:38:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						4f4223c514
					 | 
					
						
						
							
							More translations.
						
						
						
						
						
						
					 | 
					
						2021-01-10 21:25:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						cddff5c2d9
					 | 
					
						
						
							
							Fix linting
						
						
						
						
						
						
					 | 
					
						2021-01-10 19:17:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						93e51d9240
					 | 
					
						
						
							
							Testing + linting (yes there remains two linting errors, i don't know what to do.
						
						
						
						
						
						
					 | 
					
						2021-01-10 18:04:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d738029335
	
				 
					 | 
					
						
						
							
							Fix import order
						
						
						
						
						
						
					 | 
					
						2021-01-10 11:25:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						94c12541ef
	
				 
					 | 
					
						
						
							
							Happy new year!
						
						
						
						
						
						
					 | 
					
						2021-01-10 10:46:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						cbe3e226b4
					 | 
					
						
						
							
							Repaired a merge error, tests now work.
						
						
						
						
						
						
					 | 
					
						2021-01-08 23:51:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						eac9057f31
					 | 
					
						
						
							
							Merge branch 'master' into 'moreitems'
						
						
						
						
						
						
						
						# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py 
						
						
					 | 
					
						2021-01-08 23:41:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						2eb42668c8
					 | 
					
						
						
							
							Linting and tests for chests
						
						
						
						
						
						
					 | 
					
						2021-01-08 23:32:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						9ff615a6b0
					 | 
					
						
						
							
							Linting and tests...
						
						
						
						
						
						
					 | 
					
						2021-01-08 22:25:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						7a4936e6a5
	
				 
					 | 
					
						
						
							
							Test monocles
						
						
						
						
						
						
					 | 
					
						2021-01-08 15:58:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						a497d08f31
	
				 
					 | 
					
						
						
							
							Implement the monocle of truth, closes #62
						
						
						
						
						
						
					 | 
					
						2021-01-08 15:48:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						156e4a7e3a
	
				 
					 | 
					
						
						
							
							Add a hint to tell the user how to use ladders
						
						
						
						
						
						
					 | 
					
						2021-01-08 14:51:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						571e9db3e8
	
				 
					 | 
					
						
						
							
							Fix french translations
						
						
						
						
						
						
					 | 
					
						2021-01-08 12:06:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						75e93611c3
	
				 
					 | 
					
						
						
							
							Capture all mouse events and take into account mouse attributes, fixes #58
						
						
						
						
						
						
					 | 
					
						2021-01-08 11:21:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						6c6a44fb18
	
				 
					 | 
					
						
						
							
							More tests
						
						
						
						
						
						
					 | 
					
						2021-01-08 01:56:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4acf6804d4
					 | 
					
						
						
							
							Merge branch 'master' into 'lighting'
						
						
						
						
						
						
						
						# Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py 
						
						
					 | 
					
						2021-01-07 16:36:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						093c105120
	
				 
					 | 
					
						
						
							
							The broken test is mysteriously working now
						
						
						
						
						
						
					 | 
					
						2021-01-06 17:54:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						ae505166b7
	
				 
					 | 
					
						
						
							
							Disable critical hits during tests
						
						
						
						
						
						
					 | 
					
						2021-01-06 17:39:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d49c138257
					 | 
					
						
						
							
							Merge branch 'master' into 'ladders'
						
						
						
						
						
						
						
						# Conflicts:
#   squirrelbattle/game.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py 
						
						
					 | 
					
						2021-01-06 17:29:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						41548504de
	
				 
					 | 
					
						
						
							
							Test ladders
						
						
						
						
						
						
					 | 
					
						2021-01-06 16:09:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d06a405120
	
				 
					 | 
					
						
						
							
							Use a key to use ladders
						
						
						
						
						
						
					 | 
					
						2021-01-06 14:55:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						601062237d
					 | 
					
						
						
							
							Repairing part of the tests.
						
						
						
						
						
						
					 | 
					
						2021-01-05 19:50:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						7f63ab2357
					 | 
					
						
						
							
							Merge branch 'master' into 'familiars'
						
						
						
						
						
						
						
						# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py 
						
						
					 | 
					
						2021-01-05 10:27:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						6341f39fb0
					 | 
					
						
						
							
							Linting
						
						
						
						
						
						
					 | 
					
						2021-01-05 10:20:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						c378eead74
					 | 
					
						
						
							
							Fixed the game loading tests : removed trumpets from the test.
						
						
						
						
						
						
					 | 
					
						2021-01-05 10:11:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						f821fef430
					 | 
					
						
						
							
							added tests
						
						
						
						
						
						
					 | 
					
						2021-01-05 09:38:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						c329150aac
					 | 
					
						
						
							
							Linting again
						
						
						
						
						
						
					 | 
					
						2020-12-31 17:15:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						73952a42f3
					 | 
					
						
						
							
							Added tests for familiars
						
						
						
						
						
						
					 | 
					
						2020-12-31 15:43:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						8e0b8d4fee
					 | 
					
						
						
							
							Added a test for lines 106-107 of game.py
						
						
						
						
						
						
					 | 
					
						2020-12-31 15:16:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						7cd4721daa
					 | 
					
						
						
							
							linting
						
						
						
						
						
						
					 | 
					
						2020-12-31 15:00:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						ed6457e94d
					 | 
					
						
						
							
							Test credits menu
						
						
						
						
						
						
					 | 
					
						2020-12-18 23:39:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicolas Margulies
							
						 
					 | 
					
						
						
							
						
						762bed888a
					 | 
					
						
						
							
							Working visibility (at least relatively good), but a few lines untested
						
						
						
						
						
						
					 | 
					
						2020-12-18 21:21:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						e1918ab066
					 | 
					
						
						
							
							tick function takes the player as argument
						
						
						
						
						
						
					 | 
					
						2020-12-18 17:40:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						77f52b6276
					 | 
					
						
						
							
							Screen is refreshed only when pads are all refreshed, fixes #50
						
						
						
						
						
						
					 | 
					
						2020-12-18 16:40:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						85870494a0
					 | 
					
						
						
							
							More generic display update
						
						
						
						
						
						
					 | 
					
						2020-12-18 15:07:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						b8d32b29c8
					 | 
					
						
						
							
							Test selling items
						
						
						
						
						
						
					 | 
					
						2020-12-18 02:17:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c55a7451e7
					 | 
					
						
						
							
							Display more precisely where we are in the store menu
						
						
						
						
						
						
					 | 
					
						2020-12-18 01:50:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						9a556ba669
					 | 
					
						
						
							
							We can now buy items to merchants, closes #47
						
						
						
						
						
						
					 | 
					
						2020-12-18 01:05:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						646e0063be
					 | 
					
						
						
							
							Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32.
						
						
						
						
						
						
					 | 
					
						2020-12-13 21:29:25 +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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |