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
|
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 |
|
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 |
|
Yohann D'ANELLO
|
038c2d0850
|
Fix concurrent access to entity list issue
|
2020-11-19 01:13:46 +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 |
|
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
|
600819e648
|
Teddy bears has 50 HP
|
2020-11-13 14:07:27 +01:00 |
|
Yohann D'ANELLO
|
526a1a1e27
|
Don't use twice the same setting
|
2020-11-12 02:03:08 +01:00 |
|
Yohann D'ANELLO
|
1366e6a54d
|
Linting
|
2020-11-12 01:58:10 +01:00 |
|
Yohann D'ANELLO
|
d241bc8234
|
One more typo
|
2020-11-12 01:57:56 +01:00 |
|
nicomarg
|
61d66ac220
|
Fixed typos
|
2020-11-12 00:12:30 +01:00 |
|
nicomarg
|
92ab9ae075
|
Changed the behaviour of DisplayManager to match previous commit and fixed tests and bootstrap accordingly
|
2020-11-11 23:56:08 +01:00 |
|
nicomarg
|
b0292c05b2
|
The settings menu refreshes texture pack when exited
|
2020-11-11 23:48:46 +01:00 |
|
Yohann D'ANELLO
|
21e85078a4
|
Display inventory content in statdisplay
|
2020-11-11 23:41:06 +01:00 |
|
Yohann D'ANELLO
|
12c653fe15
|
Cover change texture pack
|
2020-11-11 23:13:21 +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
|
1eee45a0fd
|
Forgot one unused import
|
2020-11-11 22:51:02 +01:00 |