Yohann D'ANELLO 02d3394439 Merge remote-tracking branch 'origin/master' into display ... # Conflicts: # dungeonbattle/entities/player.py # dungeonbattle/game.py # dungeonbattle/interfaces.py # dungeonbattle/mapdisplay.py # dungeonbattle/settings.py # dungeonbattle/tests/settings_test.py # dungeonbattle/texturepack.py		2020-11-06 20:04:24 +01:00
..
__init__.py	A basic fighting mechanic and a few entities	2020-10-16 18:31:49 +02:00
items.py	More tests and more coverage	2020-11-06 16:13:28 +01:00
monsters.py	More tests and more coverage	2020-11-06 16:13:28 +01:00
player.py	Merge remote-tracking branch 'origin/master' into display	2020-11-06 20:04:24 +01:00