Merge remote-tracking branch 'origin/master' into display

Browse Source

# 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

...

This commit is contained in:

Yohann D'ANELLO

2020-11-06 20:04:24 +01:00

parent 760e322389 bee475c0dd

commit 02d3394439

17 changed files with 495 additions and 107 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

dungeonbattle/texturepack.py Normal file