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
..
__init__.py	Declare the license, we use GNU GPL	2020-11-27 16:33:17 +01:00
entities_test.py	Merging master into village, conflicts were solved	2020-12-06 11:43:48 +01:00
game_test.py	Merge branch 'master' into 'mouse_interaction'	2020-12-11 18:38:13 +01:00
interfaces_test.py	Declare the license, we use GNU GPL	2020-11-27 16:33:17 +01:00
screen.py	Declare the license, we use GNU GPL	2020-11-27 16:33:17 +01:00
settings_test.py	Merging master into village, conflicts were solved	2020-12-06 11:43:48 +01:00
translations_test.py	The store menu now displays the price of objects, fixes #41	2020-12-11 18:08:10 +01:00