Commit Graph

215 Commits

Author SHA1 Message Date
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
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