eichhornchen 7f63ab2357 Merge branch 'master' into 'familiars' ...

# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py

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

..

assets

Better colors

2020-12-18 23:36:08 +01:00

display

Merge branch 'master' into 'familiars'

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

entities

linting

2020-12-31 15:00:20 +01:00

locale

We can now buy items to merchants, closes #47

2020-12-18 01:05:50 +01:00

tests

Merge branch 'master' into 'familiars'

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

__init__.py

Declare the license, we use GNU GPL

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

bootstrap.py

Declare the license, we use GNU GPL

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

enums.py

Add credits menu, see #42

2020-12-18 22:24:41 +01:00

game.py

Merge branch 'master' into 'familiars'

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

interfaces.py

Register Trumpet as savable entity

2020-12-18 18:13:39 +01:00

menus.py

Merge branch 'master' into 'familiars'

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

resources.py

Declare the license, we use GNU GPL

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

settings.py

Linting

2020-12-18 17:46:38 +01:00

term_manager.py

Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32.

2020-12-13 21:29:25 +01:00

translations.py

Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32.

2020-12-13 21:29:25 +01:00