Commit Graph

10 Commits

Author SHA1 Message Date
Yohann D'ANELLO
c5e6459d37 Fight other entities while bumping them, without any weapon 2020-11-11 01:04:30 +01:00
Yohann D'ANELLO
9909b12501 Fight other entities 2020-11-11 00:50:47 +01:00
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
60d6c7509a Bind Return key to menus 2020-11-06 18:25:02 +01:00
Yohann D'ANELLO
f9dcc8f1c1 Texture packs are working 2020-11-06 17:43:30 +01:00
Yohann D'ANELLO
8ccb74ea54 Linting 2020-11-06 15:33:26 +01:00
Yohann D'ANELLO
7469f4855f We don't use tuples for settings now 2020-11-06 15:08:29 +01:00
Yohann D'ANELLO
5ca2827706 Write and load settings at the start of the game 2020-11-06 14:59:27 +01:00
Yohann D'ANELLO
af363dabfe Add write and load settings 2020-11-06 14:56:21 +01:00
Yohann D'ANELLO
2728612699 Create settings class 2020-11-06 14:29:05 +01:00