ynerant 451dd9cba7 Merge branch 'master' into 'equipment' ...

# Conflicts:
#   squirrelbattle/display/statsdisplay.py
#   squirrelbattle/entities/items.py
#   squirrelbattle/entities/player.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/tests/game_test.py

2021-01-08 02:11:40 +01:00

..

__init__.py

Declare the license, we use GNU GPL

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

creditsdisplay.py

Linting

2021-01-05 10:59:17 +01:00

display_manager.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

display.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

logsdisplay.py

Linting

2021-01-05 10:59:17 +01:00

mapdisplay.py

Fix fg/bg custom colors

2021-01-07 16:49:40 +01:00

menudisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

messagedisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

statsdisplay.py

Merge branch 'master' into 'equipment'

2021-01-08 02:11:40 +01:00

texturepack.py

Merge branch 'master' into 'equipment'

2021-01-08 02:11:40 +01:00