Commit Graph

9 Commits

Author SHA1 Message Date
Yohann D'ANELLO
02d3394439 Merge remote-tracking branch 'origin/master' into display
# 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
2020-11-06 20:04:24 +01:00
Yohann D'ANELLO
c97a9a2e6c Test some functions in the game 2020-11-06 19:12:56 +01:00
ynerant
9c344790a1 Merge branch 'master' into 'game'
# Conflicts:
#   dungeonbattle/game.py
#   dungeonbattle/mapdisplay.py
2020-11-06 18:36:59 +01:00
Yohann D'ANELLO
30a01108b8 Test main menu scrolling 2020-11-06 18:32:51 +01:00
Yohann D'ANELLO
d06a42469a Collisions are working 2020-11-06 18:03:30 +01:00
Yohann D'ANELLO
54bb2d1416 Collisions are working 2020-11-06 17:59:19 +01:00
Yohann D'ANELLO
ff435dc328 More tests and more coverage 2020-11-06 16:13:28 +01:00
Yohann D'ANELLO
8ccb74ea54 Linting 2020-11-06 15:33:26 +01:00
Yohann D'ANELLO
e00d98739a Move tests in a new directory, closes #8 2020-11-06 15:13:18 +01:00