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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						de3aba396d
					 | 
					
						
						
							
							Re-changed familiar's inheritance from friendlyEntity to FightingEntity (just a leftover from debug)
						
						
						
						
						
						
					 | 
					
						2020-12-31 14:51:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						505e0a4efb
					 | 
					
						
						
							
							Fixes issue #54, repaired the attribution of the familiars' target
						
						
						
						
						
						
					 | 
					
						2020-12-21 14:23:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						ed6457e94d
					 | 
					
						
						
							
							Test credits menu
						
						
						
						
						
						
					 | 
					
						2020-12-18 23:39:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						4b174f26e4
					 | 
					
						
						
							
							Better colors
						
						
						
						
						
						
					 | 
					
						2020-12-18 23:36:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						411744bf10
					 | 
					
						
						
							
							Add credits menu, see #42
						
						
						
						
						
						
					 | 
					
						2020-12-18 22:24:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						ea5f5c1428
					 | 
					
						
						
							
							Added an original text art to serve as the project's logo.
						
						
						
						
						
						
					 | 
					
						2020-12-18 21:30:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						b876dab156
					 | 
					
						
						
							
							Register Trumpet as savable entity
						
						
						
						
						
						
					 | 
					
						2020-12-18 18:13:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						0394c5d15d
					 | 
					
						
						
							
							Linting
						
						
						
						
						
						
					 | 
					
						2020-12-18 17:46:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						e1918ab066
					 | 
					
						
						
							
							tick function takes the player as argument
						
						
						
						
						
						
					 | 
					
						2020-12-18 17:40:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						dadafc84eb
					 | 
					
						
						
							
							Added a familiar class that follows the player around and hits monsters when it sees one. Added a trumpet, an instance of familiar. Closes #46.
						
						
						
						
						
						
					 | 
					
						2020-12-18 17:29:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						8ecbf13eae
					 | 
					
						
						
							
							Being able to calculate paths is now a property of fighting entities.
						
						
						
						
						
						
					 | 
					
						2020-12-18 15:31:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						a3e059a97b
					 | 
					
						
						
							
							Some required code mysteriously disappeared
						
						
						
						
						
						
					 | 
					
						2020-12-15 17:37:23 +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
							
						 
					 | 
					
						
						
							
						
						599f75b676
					 | 
					
						
						
							
							Erase pad before resizing, fixes #45
						
						
						
						
						
						
					 | 
					
						2020-12-12 21:19:55 +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
							
						 
					 | 
					
						
						
							
						
						8608ce346f
					 | 
					
						
						
							
							Add a small bomb exploding animation, fixes #31
						
						
						
						
						
						
					 | 
					
						2020-12-12 16:50:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						04ae56e451
					 | 
					
						
						
							
							Higher abstraction level on addmsg, fixes #43
						
						
						
						
						
						
					 | 
					
						2020-12-12 13:46:45 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d9912cacad
					 | 
					
						
						
							
							Listen to mouse clicks in the main loop
						
						
						
						
						
						
					 | 
					
						2020-12-11 18:17:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						45f420aaef
					 | 
					
						
						
							
							Linting
						
						
						
						
						
						
					 | 
					
						2020-12-11 18:17:08 +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
							
						 
					 | 
					
						
						
							
						
						1afa397fec
					 | 
					
						
						
							
							Better interaction with inventory menu
						
						
						
						
						
						
					 | 
					
						2020-12-11 18:07:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						089a247b2f
					 | 
					
						
						
							
							Maybe mouse clicks may use the game
						
						
						
						
						
						
					 | 
					
						2020-12-11 17:43:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d50f6701f4
					 | 
					
						
						
							
							Open a menu with the mouse
						
						
						
						
						
						
					 | 
					
						2020-12-11 17:40:56 +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
							
						 
					 | 
					
						
						
							
						
						7179346e2b
					 | 
					
						
						
							
							Add a InventoryHolder superclass for player and merchants
						
						
						
						
						
						
					 | 
					
						2020-12-11 17:20:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						98b5dd64a8
					 | 
					
						
						
							
							Linting
						
						
						
						
						
						
					 | 
					
						2020-12-11 17:06:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						bbe37eab97
					 | 
					
						
						
							
							Listen for clicks, detect which display was clicked
						
						
						
						
						
						
					 | 
					
						2020-12-11 16:56:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						b9b776b7ad
					 | 
					
						
						
							
							Player now pays for what he buys and buying a heart does not put it in the inventory. Solves #38 and #36
						
						
						
						
						
						
					 | 
					
						2020-12-11 16:49:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eichhornchen
							
						 
					 | 
					
						
						
							
						
						7ba49277a9
					 | 
					
						
						
							
							Added a symbol for hazels in the ascii texturepack
						
						
						
						
						
						
					 | 
					
						2020-12-11 15:52:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicolas Margulies
							
						 
					 | 
					
						
						
							
						
						01cc77e146
					 | 
					
						
						
							
							Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles
						
						
						
						
						
						
					 | 
					
						2020-12-10 22:28:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicolas Margulies
							
						 
					 | 
					
						
						
							
						
						cc6033e8e4
					 | 
					
						
						
							
							New pathfinding that avoids most of the mobs getting stuck, closes #35
						
						
						
						
						
						
					 | 
					
						2020-12-10 22:21:09 +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
							
						 
					 | 
					
						
						
							
						
						4dbd4f7912
					 | 
					
						
						
							
							Don't buy hearts, use them instant instead. Fixes #38
						
						
						
						
						
						
					 | 
					
						2020-12-09 16:57:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						2d5a2e4c87
					 | 
					
						
						
							
							Display hazels in the StatsDisplay
						
						
						
						
						
						
					 | 
					
						2020-12-09 16:54:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						56627f3e84
					 | 
					
						
						
							
							Reorder texture pack entries
						
						
						
						
						
						
					 | 
					
						2020-12-09 16:50:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |