Yohann D'ANELLO e91deccb6f Merge branch 'master' into map_generation ...

# Conflicts:
#	squirrelbattle/interfaces.py

2020-12-11 19:02:45 +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

Test clicking on the merchant pad

2020-12-11 18:44:05 +01:00

interfaces_test.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

mapgeneration_test.py

Added a connexity test

2020-12-11 18:59:07 +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