Commit Graph

633 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 3520a76613 Test to create/resume a game 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO a51ca5dbe3 Menu key handler moved 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 80ae824ed8 Fix concurrent access to entity list issue 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 90b046f3e7 Don't commit game save 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 109543a385 Fix broken tests 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 075c061a14 Don't ignore first line 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 3126b89bc1 Replace player instance 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 58fbba8cc9 Save entities 2020-11-19 01:44:46 +01:00
eichhornchen a4482849ae Fix for loading game in progress, there remains to change all entities __init__ to allow being initialized by a dictionnary (work in progress, breaks the game) 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 57a20c53f3 Update MapDisplay after loading a map 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO e52e0c833c Replace tiles when loading map from a save file 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 958dcdfee0 Linting 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO be6c949b18 Instantiate entity attributes in __init__ rather than in the class definition 2020-11-19 01:44:46 +01:00
Yohann D'ANELLO 0488d8a9e2 Dead is an entity property 2020-11-19 01:44:46 +01:00
eichhornchen aac01d8bef Added documentation for some classes again 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
eichhornchen 41d1696c9b Added functionnal save system and broken load system 2020-11-19 01:43:31 +01:00
Yohann D'ANELLO d95747159f Non-relative symbolic link 2020-11-19 01:39:17 +01:00
Yohann D'ANELLO dd91569203 Unfortunately 42 is too low... 2020-11-19 01:39:17 +01:00
Yohann D'ANELLO 8d73712789 Add squirrel emoji fix 2020-11-19 01:39:17 +01:00
Yohann D'ANELLO d9fcefbe43 Install latest version of fonts-noto-color-emoji 2020-11-19 01:39:17 +01:00
Yohann D'ANELLO 38ca2d36e8 Exec tests 2020-11-19 01:39:17 +01:00
ynerant 78059f0399 Merge branch 'settings-menu' into 'master'
Settings menu

See merge request ynerant/dungeon-battle!13
2020-11-19 01:24:24 +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 6a2bd64071 Linting 2020-11-19 01:17:46 +01:00
ynerant bbeab344d9 Merge branch 'loadgame' into 'master'
Loadgame

See merge request ynerant/dungeon-battle!12
2020-11-19 01:16:49 +01:00
Yohann D'ANELLO 038c2d0850 Fix concurrent access to entity list issue 2020-11-19 01:13:46 +01:00
Yohann D'ANELLO ae9258cb25 Don't commit game save 2020-11-19 01:12:12 +01:00
Yohann D'ANELLO 0d5812bfaa Fix broken tests 2020-11-19 01:11:11 +01:00
Yohann D'ANELLO a80a604212 Don't ignore first line 2020-11-19 00:34:00 +01:00
Yohann D'ANELLO cf6fe346d3 Replace player instance 2020-11-19 00:33:50 +01:00
Yohann D'ANELLO 81b20b72bc Save entities 2020-11-19 00:10:37 +01:00
eichhornchen 657345e6f7 Fix for loading game in progress, there remains to change all entities __init__ to allow being initialized by a dictionnary (work in progress, breaks the game) 2020-11-18 22:42:46 +01:00
Yohann D'ANELLO 7ae4e47fc3 Update MapDisplay after loading a map 2020-11-18 15:04:15 +01:00
Yohann D'ANELLO 5a65957574 Replace tiles when loading map from a save file 2020-11-18 15:02:30 +01:00
Yohann D'ANELLO 20aeb5fd4a Linting 2020-11-18 14:56:59 +01:00
Yohann D'ANELLO a6cd075b8c Instantiate entity attributes in __init__ rather than in the class definition 2020-11-18 14:54:21 +01:00
Yohann D'ANELLO 61969c46e6 Dead is an entity property 2020-11-18 14:29:54 +01:00
eichhornchen 6f9317fbc2 Added documentation for some classes again 2020-11-18 12:27: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
ynerant 810ca367c5 Merge branch 'readme' into 'master'
Fix terminal

See merge request ynerant/dungeon-battle!11
2020-11-13 18:25:43 +01:00
Yohann D'ANELLO f55b1356c3 Non-relative symbolic link 2020-11-13 18:20:20 +01:00
Yohann D'ANELLO 63e98ae97f Unfortunately 42 is too low... 2020-11-13 18:19:08 +01:00
Charles Peyrat 18b06c5274 Correcting display bug 2020-11-13 18:17:04 +01:00
Yohann D'ANELLO fc71c8ae88 Add squirrel emoji fix 2020-11-13 18:11:37 +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
Yohann D'ANELLO 04e3b05ab5 Install latest version of fonts-noto-color-emoji 2020-11-13 17:49:48 +01:00