Commit Graph

16 Commits

Author SHA1 Message Date
Yohann D'ANELLO
94c12541ef
Happy new year! 2021-01-10 10:46:17 +01:00
eichhornchen
eac9057f31 Merge branch 'master' into 'moreitems'
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
2021-01-08 23:41:21 +01:00
eichhornchen
f6210a6356 Added a Bow, related to #64 2021-01-08 18:06:26 +01:00
Yohann D'ANELLO
ac8c7a0a4c
Only read required keys in settings file 2021-01-08 11:07:38 +01:00
d49c138257 Merge branch 'master' into 'ladders'
# Conflicts:
#   squirrelbattle/game.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
2021-01-06 17:29:26 +01:00
Yohann D'ANELLO
d06a405120
Use a key to use ladders 2021-01-06 14:55:16 +01:00
Yohann D'ANELLO
0394c5d15d Linting 2020-12-18 17:46:38 +01:00
eichhornchen
646e0063be 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
Yohann D'ANELLO
7971a1f70e Add waiting key, fixes #16 2020-12-12 18:12:37 +01:00
Yohann D'ANELLO
19b82ff71a Test merchants 2020-12-09 15:32:37 +01:00
eichhornchen
866af98fe4 Merging master into village, conflicts were solved 2020-12-06 11:43:48 +01:00
Yohann D'ANELLO
d2d74c97a4 Settings menu was not translated 2020-11-27 22:19:41 +01:00
Yohann D'ANELLO
4287b4f045 Add possibility to change the language 2020-11-27 20:53:24 +01:00
Yohann D'ANELLO
0d3e33d960 Declare the license, we use GNU GPL 2020-11-27 16:33:17 +01:00
Yohann D'ANELLO
0fbbf4925d Store configuration in user configuration directory 2020-11-19 03:13:01 +01:00
Yohann D'ANELLO
d0ee9ec562 Rename dungeonbattle to squirrelbattle 2020-11-19 02:18:16 +01:00