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 |
|
eichhornchen
|
3e1eca8f39
|
import name
|
2020-11-06 17:13:27 +01:00 |
|
eichhornchen
|
fe77f903d1
|
put back the ":" where it belongs
|
2020-11-06 17:10:38 +01:00 |
|
eichhornchen
|
3502acd8d6
|
put back the ":" where it belongs
|
2020-11-06 17:09:39 +01:00 |
|
eichhornchen
|
a6b93cacfb
|
Changed Tiles to take into account the texturepack
|
2020-11-06 17:04:42 +01:00 |
|
eichhornchen
|
4a54609bad
|
changed a few errors
|
2020-11-06 17:03:06 +01:00 |
|
Nicolas Margulies
|
6e5cd9084b
|
Finished cleaning conflicts
|
2020-11-06 17:02:59 +01:00 |
|
eichhornchen
|
38ed5259d5
|
added a squirrel unicode texturepack
|
2020-11-06 16:50:18 +01:00 |
|
Nicolas Margulies
|
065f648118
|
Merged master into game
|
2020-11-06 16:49:39 +01:00 |
|
eichhornchen
|
3d98eac74b
|
Added refresh function
|
2020-11-06 16:43:07 +01:00 |
|
Nicolas Margulies
|
901406351e
|
Better menus
|
2020-11-06 16:40:43 +01:00 |
|
eichhornchen
|
85a006e7b6
|
added coordinates of camera view in map
|
2020-11-06 16:38:32 +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 |
|
eichhornchen
|
bcdbd0a471
|
changed the name of the texturepack
|
2020-11-06 16:16:30 +01:00 |
|
Yohann D'ANELLO
|
ff435dc328
|
More tests and more coverage
|
2020-11-06 16:13:28 +01:00 |
|
eichhornchen
|
420ebe79f5
|
passed settings to mapDisplay call
|
2020-11-06 16:10:46 +01:00 |
|
eichhornchen
|
6bfb8c080c
|
added name to entities
|
2020-11-06 16:05:01 +01:00 |
|
Nicolas Margulies
|
d43a1de2c3
|
Moved texturepacks into display
|
2020-11-06 15:58:07 +01:00 |
|
Nicolas Margulies
|
cf70c2d1b7
|
Merged master into display (settings added)
|
2020-11-06 15:52:17 +01:00 |
|
Nicolas Margulies
|
31ae39ab15
|
basic display wrapper
|
2020-11-06 15:34:24 +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 |