|
|
4c274bebb9
|
Merge branch 'md' into 'master'
Fix Readme
See merge request ynerant/squirrel-battle!82
|
2021-01-25 15:04:47 +01:00 |
|
|
|
a28909bb70
|
Fix Readme
|
2021-01-25 15:04:47 +01:00 |
|
|
|
6566f5140a
|
Merge branch 'fix-ladders' into 'master'
Fix ladders
Closes #81
See merge request ynerant/squirrel-battle!81
|
2021-01-25 14:38:58 +01:00 |
|
Yohann D'ANELLO
|
776f8ed88c
|
Fixes #81
|
2021-01-25 14:31:37 +01:00 |
|
|
|
284a22c92e
|
Merge branch 'fix-yay' into 'master'
Don't create an english translation file
See merge request ynerant/squirrel-battle!80
|
2021-01-21 01:14:17 +01:00 |
|
Yohann D'ANELLO
|
3d019d3ca8
|
Don't create an english translation file
|
2021-01-21 01:12:55 +01:00 |
|
|
|
99b749aaa2
|
Merge branch 'fix-explosions' into 'master'
Fix explosions
Closes #80
See merge request ynerant/squirrel-battle!79
|
2021-01-16 00:46:04 +01:00 |
|
Yohann D'ANELLO
|
d978d319bc
|
Entities are living during two ticks, fixes #80
|
2021-01-16 00:40:32 +01:00 |
|
Yohann D'ANELLO
|
87e896bd06
|
Item owners are correctly set
|
2021-01-16 00:26:33 +01:00 |
|
|
|
e233243b81
|
Merge branch 'es-translation' into 'master'
Fix spanish translation
See merge request ynerant/squirrel-battle!78
|
2021-01-11 01:48:10 +01:00 |
|
Yohann D'ANELLO
|
7ce3b8cd5d
|
Fix spanish translation
|
2021-01-11 01:40:55 +01:00 |
|
|
|
fa0a0a79ea
|
Merge branch 'map_generation' into 'master'
Add new room type : chunk rooms
See merge request ynerant/squirrel-battle!77
|
2021-01-11 01:28:54 +01:00 |
|
Yohann D'ANELLO
|
d839356b2a
|
Merge remote-tracking branch 'origin/map_generation' into map_generation
# Conflicts:
# squirrelbattle/mapgeneration/broguelike.py
|
2021-01-11 01:23:26 +01:00 |
|
Yohann D'ANELLO
|
7b019ce149
|
Linting
|
2021-01-11 01:21:52 +01:00 |
|
Charles Peyrat
|
03c45a970c
|
Fix merging mistakes and chunk rooms
|
2021-01-11 01:19:54 +01:00 |
|
Charles Peyrat
|
79d8ef3a44
|
Add new room type : chunk rooms
|
2021-01-11 01:19:54 +01:00 |
|
Charles Peyrat
|
c854d41579
|
Fix merging mistakes and chunk rooms
|
2021-01-11 01:18:20 +01:00 |
|
|
|
6294f9c07f
|
Merge branch 'v23.14' into 'master'
Bump to version 23.14
See merge request ynerant/squirrel-battle!76
|
2021-01-10 23:58:31 +01:00 |
|
Yohann D'ANELLO
|
57605c969f
|
Bump to version 23.14
|
2021-01-10 23:57:39 +01:00 |
|
|
|
e9374c5e6b
|
Merge branch 'map_generation' into 'master'
Map generation
Closes #5
See merge request ynerant/squirrel-battle!35
|
2021-01-10 23:54:28 +01:00 |
|
|
|
b72e41d14d
|
Merge branch 'doors' into 'map_generation'
Doors
See merge request ynerant/squirrel-battle!75
|
2021-01-10 23:54:13 +01:00 |
|
Yohann D'ANELLO
|
588357e5bf
|
Linting
|
2021-01-10 23:49:43 +01:00 |
|
|
|
2031d7fa67
|
Merge branch 'map_generation' into 'doors'
# Conflicts:
# squirrelbattle/mapgeneration/broguelike.py
|
2021-01-10 23:43:54 +01:00 |
|
Yohann D'ANELLO
|
65ae99a26d
|
The logs of the map was not updated
|
2021-01-10 23:41:51 +01:00 |
|
Charles Peyrat
|
5aaef15b2b
|
Add new room type : chunk rooms
|
2021-01-10 23:38:29 +01:00 |
|
Yohann D'ANELLO
|
60675d7859
|
Cover doors code
|
2021-01-10 23:21:28 +01:00 |
|
Yohann D'ANELLO
|
b0ca1d4edf
|
Cover everytime the map generation test
|
2021-01-10 23:05:49 +01:00 |
|
Yohann D'ANELLO
|
8f845d1e4c
|
Doors don't break the connexity of map
|
2021-01-10 23:03:24 +01:00 |
|
Charles Peyrat
|
ca67d5d7f4
|
Merge remote branch
|
2021-01-10 23:02:34 +01:00 |
|
Yohann D'ANELLO
|
11daa8573c
|
The players can open doors
|
2021-01-10 22:59:34 +01:00 |
|
Charles Peyrat
|
099a0eab31
|
Add comments and docstring
|
2021-01-10 22:54:48 +01:00 |
|
Yohann D'ANELLO
|
6c0aaffd77
|
Doors are walls
|
2021-01-10 22:53:27 +01:00 |
|
Yohann D'ANELLO
|
e744310861
|
Place doors at the beginning of the corridor
|
2021-01-10 22:51:01 +01:00 |
|
nicomarg
|
96e9612d16
|
Merge branch 'equipment-in-inventory' into 'master'
Resolve "Display equipment in inventory"
Closes #75
See merge request ynerant/squirrel-battle!71
|
2021-01-10 22:45:04 +01:00 |
|
Nicolas Margulies
|
f05652d9b8
|
Fixed tests and reached 100% coverage
|
2021-01-10 22:39:52 +01:00 |
|
Yohann D'ANELLO
|
5e378fc2d0
|
Update game rules
|
2021-01-10 22:27:46 +01:00 |
|
Nicolas Margulies
|
519504fc32
|
Mark equipped items and allow unequipping
|
2021-01-10 22:26:43 +01:00 |
|
Yohann D'ANELLO
|
0ea10546ac
|
Fix merge issues
|
2021-01-10 22:19:15 +01:00 |
|
Yohann D'ANELLO
|
4c7a2e9f3b
|
Merge branch 'master' into map_generation
# Conflicts:
# squirrelbattle/entities/player.py
# squirrelbattle/game.py
# squirrelbattle/interfaces.py
# squirrelbattle/tests/game_test.py
|
2021-01-10 22:16:11 +01:00 |
|
Nicolas Margulies
|
88471f4361
|
Changed equipment behaviour, now equipped items stay in the inventory
|
2021-01-10 22:15:32 +01:00 |
|
Yohann D'ANELLO
|
9df1ac7883
|
Linting
|
2021-01-10 22:08:42 +01:00 |
|
Yohann D'ANELLO
|
01cdea6edc
|
Don't spawn random entities on each level anymore
|
2021-01-10 21:57:51 +01:00 |
|
eichhornchen
|
b004dec8c9
|
Merge branch 'translate' into 'master'
Translate
See merge request ynerant/squirrel-battle!73
|
2021-01-10 21:52:39 +01:00 |
|
Charles Peyrat
|
13e3628668
|
Merge branch 'map_generation' of https://gitlab.crans.org/ynerant/squirrel-battle into map_generation
|
2021-01-10 21:50:01 +01:00 |
|
Charles Peyrat
|
12e19759aa
|
Implement populate method, so map generation also handles entity spawn
|
2021-01-10 21:49:39 +01:00 |
|
Yohann D'ANELLO
|
d3607248c0
|
Remove unused translations
|
2021-01-10 21:48:46 +01:00 |
|
Charles Peyrat
|
e639ad6255
|
Getting to full cover, and minor fix to bug that allowed corridors to create loops in a room, resulting in implacability
|
2021-01-10 21:48:12 +01:00 |
|
eichhornchen
|
236481ae1c
|
linting
|
2021-01-10 21:44:45 +01:00 |
|
eichhornchen
|
18ace5144c
|
Repaired a bug : a variable was not declared before it was used in interfaces.py take_damage
|
2021-01-10 21:41:45 +01:00 |
|
eichhornchen
|
6cf0590586
|
even more translations.
|
2021-01-10 21:38:21 +01:00 |
|
