Yohann D'ANELLO 4c7a2e9f3b Merge branch 'master' into map_generation ... # Conflicts: # squirrelbattle/entities/player.py # squirrelbattle/game.py # squirrelbattle/interfaces.py # squirrelbattle/tests/game_test.py		2021-01-10 22:16:11 +01:00
..
assets	Rearranged the display class files, related to issue #56.	2021-01-10 12:35:50 +01:00
display	Update the player inventory when opening the menu/loading the game, fixes #72	2021-01-10 19:52:28 +01:00
entities	Merge branch 'master' into map_generation	2021-01-10 22:16:11 +01:00
locale	Remove unused translations	2021-01-10 21:48:46 +01:00
mapgeneration	Linting	2021-01-10 22:08:42 +01:00
tests	Merge branch 'master' into map_generation	2021-01-10 22:16:11 +01:00
__init__.py	Happy new year!	2021-01-10 10:46:17 +01:00
bootstrap.py	Fix import order	2021-01-10 11:25:53 +01:00
enums.py	Fix linting	2021-01-10 19:17:04 +01:00
game.py	Merge branch 'master' into map_generation	2021-01-10 22:16:11 +01:00
interfaces.py	Merge branch 'master' into map_generation	2021-01-10 22:16:11 +01:00
menus.py	Fix import order	2021-01-10 11:25:53 +01:00
resources.py	Happy new year!	2021-01-10 10:46:17 +01:00
settings.py	Player can now dance! Closes #69.	2021-01-10 17:10:00 +01:00
term_manager.py	Happy new year!	2021-01-10 10:46:17 +01:00
translations.py	Fix import order	2021-01-10 11:25:53 +01:00