Commit Graph

17 Commits

Author SHA1 Message Date
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 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 43001f6ede Basic menu handling 2020-11-06 18:06:28 +01:00
Yohann D'ANELLO 54bb2d1416 Collisions are working 2020-11-06 17:59:19 +01:00
Yohann D'ANELLO 8641e7d13d User player entity instead of temporary Player class 2020-11-06 17:48:47 +01:00
Nicolas Margulies e3a1bf96c2 Used settings for keys 2020-11-06 17:24:20 +01:00
Nicolas Margulies 6e5cd9084b Finished cleaning conflicts 2020-11-06 17:02:59 +01:00
Nicolas Margulies 065f648118 Merged master into game 2020-11-06 16:49:39 +01:00
Yohann D'ANELLO 8ccb74ea54 Linting 2020-11-06 15:33:26 +01:00
Yohann D'ANELLO 5ca2827706 Write and load settings at the start of the game 2020-11-06 14:59:27 +01:00
Nicolas Margulies bbbcb1b10e Corrigé la merde de Charles 2020-11-06 14:23:12 +01:00
Charles Peyrat f3bc3101f0 Code refactoring in game.Game 2020-10-23 18:01:39 +02:00
Yohann D'ANELLO 8437482139 Clear screen before redrawing 2020-10-23 15:40:32 +02:00
Yohann D'ANELLO d264bb45cf Handle player position in game display 2020-10-23 15:14:19 +02:00
Yohann D'ANELLO eea9b45f6c Use map display 2020-10-23 15:00:59 +02:00
Yohann D'ANELLO 7d97befee4 Load game externally 2020-10-23 14:53:08 +02:00