Commit Graph

31 Commits

Author SHA1 Message Date
ynerant 2f5db125e0 Merge branch 'master' into 'new_game'
# Conflicts:
#   dungeonbattle/game.py
#   dungeonbattle/menus.py
#   dungeonbattle/tests/game_test.py
2020-11-19 01:46:25 +01:00
Yohann D'ANELLO 109543a385 Fix broken tests 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 958dcdfee0 Linting 2020-11-19 01:44:46 +01:00
eichhornchen 8f932604f6 Added documentation on a lot of classes and functions (and removed some files I commited by mistake) 2020-11-19 01:44:40 +01:00
ynerant cf863e8fb8 Merge branch 'master' into 'settings-menu'
# Conflicts:
#   dungeonbattle/menus.py
2020-11-19 01:19:08 +01:00
Yohann D'ANELLO 0d5812bfaa Fix broken tests 2020-11-19 01:11:11 +01:00
Yohann D'ANELLO 20aeb5fd4a Linting 2020-11-18 14:56:59 +01:00
eichhornchen 4c4a140a45 Added documentation on a lot of classes and functions (and removed some files I commited by mistake) 2020-11-18 12:19:27 +01:00
eichhornchen f67eae3803 Added functionnal save system and broken load system 2020-11-16 01:01:18 +01:00
Nicolas Margulies 04d2bc1789 linting 2020-11-13 19:08:40 +01:00
Charles Peyrat 18b06c5274 Correcting display bug 2020-11-13 18:17:04 +01:00
Charles Peyrat ae493337ed Modified main menu to be able to override the current game with a new one 2020-11-13 18:08:48 +01:00
Nicolas Margulies aa81d455f6 Changed settings menu to let the display decide how the settings are printed 2020-11-13 15:40:44 +01:00
Yohann D'ANELLO 526a1a1e27 Don't use twice the same setting 2020-11-12 02:03:08 +01:00
nicomarg b0292c05b2 The settings menu refreshes texture pack when exited 2020-11-11 23:48:46 +01:00
Yohann D'ANELLO ffa1ea01b1 Add "back" button in settings menu 2020-11-11 23:10:49 +01:00
Yohann D'ANELLO ddf0b21e37 Change texture pack 2020-11-11 23:09:15 +01:00
Yohann D'ANELLO 13ac2ba13a Display comments on settings menu 2020-11-11 23:00:45 +01:00
Yohann D'ANELLO caef8dc9b2 Cover settings 2020-11-11 22:45:15 +01:00
Yohann D'ANELLO 0c17e74d6a Key handler does not depend on curses's screen anymore 2020-11-11 22:36:42 +01:00
Yohann D'ANELLO 748561e87d More separation on menu code 2020-11-11 22:22:33 +01:00
Yohann D'ANELLO 53077aacb0 Linting 2020-11-11 20:36:43 +01:00
eichhornchen e3d28409f5 Repaired tthe display problem for settings menu 2020-11-11 14:56:00 +01:00
Yohann D'ANELLO 1ff2e26cd4 Set good menu names 2020-11-10 20:22:53 +01:00
Yohann D'ANELLO 259bde81a4 Back to menu by pressing space button 2020-11-08 23:26:54 +01:00
Yohann D'ANELLO 8ccf8c7b67 Display main menu by default 2020-11-08 22:59:11 +01:00
Yohann D'ANELLO 30a01108b8 Test main menu scrolling 2020-11-06 18:32:51 +01:00
Yohann D'ANELLO 60d6c7509a Bind Return key to menus 2020-11-06 18:25:02 +01:00
Yohann D'ANELLO 8d9b5166b7 Linting 2020-11-06 18:11:59 +01:00
Nicolas Margulies 901406351e Better menus 2020-11-06 16:40:43 +01:00
Nicolas Margulies 60ca00b8fa Generic menu implementation 2020-11-06 16:20:07 +01:00