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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
ynerant
|
81479f99e2
|
Merge branch 'tests' into 'master'
Tests
Closes #8
See merge request ynerant/dungeon-battle!6
|
2020-11-06 16:17:06 +01:00 |
|
Yohann D'ANELLO
|
ff435dc328
|
More tests and more coverage
|
2020-11-06 16:13:28 +01:00 |
|
Yohann D'ANELLO
|
8ccb74ea54
|
Linting
|
2020-11-06 15:33:26 +01:00 |
|
Yohann D'ANELLO
|
e00d98739a
|
Move tests in a new directory, closes #8
|
2020-11-06 15:13:18 +01:00 |
|
ynerant
|
58c77fa5bf
|
Merge branch 'settings' into 'master'
Paramètres
See merge request ynerant/dungeon-battle!5
|
2020-11-06 15:10:23 +01:00 |
|
Yohann D'ANELLO
|
7469f4855f
|
We don't use tuples for settings now
|
2020-11-06 15:08:29 +01:00 |
|
Yohann D'ANELLO
|
9f6c946279
|
Test settings
|
2020-11-06 15:05:10 +01:00 |
|
Yohann D'ANELLO
|
5ca2827706
|
Write and load settings at the start of the game
|
2020-11-06 14:59:27 +01:00 |
|
Yohann D'ANELLO
|
af363dabfe
|
Add write and load settings
|
2020-11-06 14:56:21 +01:00 |
|
eichhornchen
|
bfce9487c5
|
repaired the texture pack
|
2020-11-06 14:41:05 +01:00 |
|
eichhornchen
|
dadd1fd146
|
added texture pack
|
2020-11-06 14:32:05 +01:00 |
|
Yohann D'ANELLO
|
2728612699
|
Create settings class
|
2020-11-06 14:29:05 +01:00 |
|
Nicolas Margulies
|
bbbcb1b10e
|
Corrigé la merde de Charles
|
2020-11-06 14:23:12 +01:00 |
|
Charles Peyrat
|
37c9fd5267
|
Merge branch 'master' into game.
|
2020-10-23 18:15:21 +02:00 |
|
nicomarg
|
514a3fcb64
|
Merge branch 'entities' into 'master'
Basic entities
See merge request ynerant/dungeon-battle!4
|
2020-10-23 18:10:13 +02:00 |
|
Nicolas Margulies
|
2ba7330ff5
|
An example of item
|
2020-10-23 18:02:57 +02:00 |
|
Charles Peyrat
|
f3bc3101f0
|
Code refactoring in game.Game
|
2020-10-23 18:01:39 +02:00 |
|
Charles Peyrat
|
9c8a352ecd
|
Removed unwanted code from mapdisplay.MapDisplay; the player should be drawn as a map entity, not on its own
|
2020-10-23 17:46:44 +02:00 |
|
Nicolas Margulies
|
343e107b86
|
Basic item and monster interface
|
2020-10-23 16:51:48 +02:00 |
|
Nicolas Margulies
|
7c1c427892
|
Deleted unwanted code in Player
It isn't the player's role to check whether they can move to a tile,
check it beforehands and use the move method from its Entity superclass.
|
2020-10-23 16:17:48 +02:00 |
|
eichhornchen
|
230a7ec432
|
Cleaned an error in interfaces.py
|
2020-10-23 15:55:30 +02:00 |
|
ynerant
|
292a63c16d
|
Merge branch 'game' into 'master'
Game
See merge request ynerant/dungeon-battle!3
|
2020-10-23 15:44:22 +02:00 |
|
Yohann D'ANELLO
|
c85166ff89
|
Remove proof of concept, <3 eichornchen
|
2020-10-23 15:41:17 +02:00 |
|
Yohann D'ANELLO
|
8437482139
|
Clear screen before redrawing
|
2020-10-23 15:40:32 +02:00 |
|
eichhornchen
|
6c675fbac9
|
added player actions for going up, down, left and right
|
2020-10-23 15:15:37 +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 |
|
Nicolas Margulies
|
2fc864ed18
|
Fixed error
|
2020-10-23 14:48:30 +02:00 |
|
Nicolas Margulies
|
759ddf7685
|
Merged master
|
2020-10-23 14:45:03 +02:00 |
|
Nicolas Margulies
|
7a2e1173d9
|
Made the entities optional when creating maps
|
2020-10-23 14:42:46 +02:00 |
|
Yohann D'ANELLO
|
d264fb7dfe
|
Test got broken
|
2020-10-23 14:34:29 +02:00 |
|
Yohann D'ANELLO
|
3467fb622c
|
Replace # by walls
|
2020-10-23 14:34:29 +02:00 |
|