Commit Graph

512 Commits

Author SHA1 Message Date
Nicolas Margulies
1a1b906c8e Added main menu when launching the game, and fixed menus 2020-11-10 19:40:59 +01:00
Nicolas Margulies
17530f386c Reworked graphics to make it more modular 2020-11-10 18:08:06 +01:00
eichhornchen
e522047c74 Now the tests should trully be repaired 2020-11-10 11:39:32 +01:00
eichhornchen
2e7c12b770 Trying to repair the test 2020-11-10 11:22:09 +01:00
eichhornchen
cb33d97cb7 Fixed game <-> display interaction (the game prints correctly \o/ ) 2020-11-10 10:57:27 +01:00
eichhornchen
002de68a0a Corrected bugs(some still remain) 2020-11-10 10:49:11 +01:00
eichhornchen
91a8919a01 Added a MainMenuDisplay class and fixed errors in display 2020-11-10 10:01:31 +01:00
eichhornchen
10bbb28471 Yet again 2020-11-09 01:39:15 +01:00
eichhornchen
a4876bb7af repaired display 2020-11-09 01:33:23 +01:00
eichhornchen
8d5d9d38ff cleaned the arguments 2020-11-09 01:11:13 +01:00
Yohann D'ANELLO
e9c8640159 Width and height are managed dynamically: we can almost freely resize the window 2020-11-09 00:44:08 +01:00
Yohann D'ANELLO
0ab0e6a00c More tests 2020-11-08 23:48:26 +01:00
Yohann D'ANELLO
3486c865a1 Use a fake pad to make tests runnable 2020-11-08 23:40:03 +01:00
Yohann D'ANELLO
65d89b7f9f Add some comments 2020-11-08 23:31:17 +01:00
Yohann D'ANELLO
259bde81a4 Back to menu by pressing space button 2020-11-08 23:26:54 +01:00
Yohann D'ANELLO
7e92086601 Start game button is working 2020-11-08 23:08:38 +01:00
Yohann D'ANELLO
715fad1817 StatsDisplay extends Display 2020-11-08 23:05:06 +01:00
Yohann D'ANELLO
dc3f55cff3 MapDisplay extends Display 2020-11-08 23:03:59 +01:00
Yohann D'ANELLO
8ccf8c7b67 Display main menu by default 2020-11-08 22:59:11 +01:00
Yohann D'ANELLO
933385e79d Linting 2020-11-08 22:48:50 +01:00
eichhornchen
e0366b4719 Menu display is now supported 2020-11-08 16:36:21 +01:00
eichhornchen
4ea3d20b28 Better stats display (tested) 2020-11-07 15:00:24 +01:00
Yohann D'ANELLO
aeb43a0cec Test player level up 2020-11-06 21:23:17 +01:00
Yohann D'ANELLO
0de11abfa8 Fix circulary import 2020-11-06 21:17:31 +01:00
Yohann D'ANELLO
0bd26a1bd0 Linting 2020-11-06 21:15:09 +01:00
Yohann D'ANELLO
2e667cdebe Fix tests 2020-11-06 20:28:10 +01:00
Yohann D'ANELLO
dbd5f6a1fd Unicode texture pack is squirrel texture pack 2020-11-06 20:26:10 +01:00
Yohann D'ANELLO
b5b76fd07b Make the game start 2020-11-06 20:24:19 +01:00
Yohann D'ANELLO
b3d789e3e7 Fix texture packs 2020-11-06 20:18:27 +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
eichhornchen
760e322389 re-statsdisplay 2020-11-06 19:53:27 +01:00
eichhornchen
1e2ff8a8ea Class for displaying the player statistics (not yet tested) 2020-11-06 19:50:26 +01:00
ynerant
bee475c0dd Merge branch 'game' into 'master'
Menus

See merge request ynerant/dungeon-battle!7
2020-11-06 19:15:29 +01:00
Yohann D'ANELLO
c97a9a2e6c Test some functions in the game 2020-11-06 19:12:56 +01:00
Yohann D'ANELLO
dc0d478d1e init -> __init__ 2020-11-06 18:39:55 +01:00
Yohann D'ANELLO
a1731dc9f7 Default coordinates are (1, 6) 2020-11-06 18:38:10 +01:00
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
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
eichhornchen
bd9dd122f4 Added experience system 2020-11-06 18:12:17 +01:00
Yohann D'ANELLO
8d9b5166b7 Linting 2020-11-06 18:11:59 +01:00
eichhornchen
b1282c107d added player carachteristics 2020-11-06 18:08:10 +01:00
Nicolas Margulies
43001f6ede Basic menu handling 2020-11-06 18:06:28 +01:00
ynerant
f7d63dabdc Merge branch 'collisions' into 'master'
Collisions

See merge request ynerant/dungeon-battle!9
2020-11-06 18:05:36 +01:00
Yohann D'ANELLO
d06a42469a Collisions are working 2020-11-06 18:03:30 +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
Yohann D'ANELLO
f9dcc8f1c1 Texture packs are working 2020-11-06 17:43:30 +01:00
Nicolas Margulies
e3a1bf96c2 Used settings for keys 2020-11-06 17:24:20 +01:00
eichhornchen
4115363b74 glargh 2020-11-06 17:17:10 +01:00