ynerant 4acf6804d4 Merge branch 'master' into 'lighting' ...

# Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py

2021-01-07 16:36:54 +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

Merge branch 'master' into 'lighting'

2021-01-07 16:36:54 +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 'ladders'

2021-01-06 17:29:26 +01:00

texturepack.py

Merge branch 'master' into 'lighting'

2021-01-07 16:36:54 +01:00