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 |
|
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 |
|
Charles Peyrat
|
96bbc5088f
|
Add a test case for non connex maps in distance computation
|
2021-01-10 21:32:58 +01:00 |
|
Charles Peyrat
|
26e66a5796
|
Implement method add_loops along with tests
|
2021-01-10 21:30:18 +01:00 |
|
eichhornchen
|
4f4223c514
|
More translations.
|
2021-01-10 21:25:15 +01:00 |
|
eichhornchen
|
893a23f95c
|
Repaired a but : bears dealt 1 damage instead of 0.
|
2021-01-10 21:15:42 +01:00 |
|
eichhornchen
|
a1d69203c9
|
Translations.
|
2021-01-10 21:15:30 +01:00 |
|
|
|
b6a448b39b
|
Merge branch 'fix-load' into 'master'
Fix load
Closes #73 et #76
See merge request ynerant/squirrel-battle!72
|
2021-01-10 21:05:13 +01:00 |
|
Yohann D'ANELLO
|
d2af345c0c
|
Fix linting
|
2021-01-10 21:01:43 +01:00 |
|
Yohann D'ANELLO
|
67a9bda6e1
|
Don't fill the inventory of a chest or a Merchant if it is empty, fixes #73
|
2021-01-10 20:46:01 +01:00 |
|
Yohann D'ANELLO
|
3758cb1336
|
Fix the GiantSeaEagle registration, fixes #76
|
2021-01-10 20:20:12 +01:00 |
|
|
|
44b967625c
|
Merge branch 'fix-player-inventory' into 'master'
Update the player inventory when opening the menu/loading the game, fixes #72
Closes #72
See merge request ynerant/squirrel-battle!70
|
2021-01-10 19:57:17 +01:00 |
|
Yohann D'ANELLO
|
5694dd4dff
|
Update the player inventory when opening the menu/loading the game, fixes #72
|
2021-01-10 19:52:28 +01:00 |
|
nicomarg
|
2efa9d4575
|
Merge branch 'fix-mobs-vision-bug' into 'master'
Resolve "Fix mobs vision bug"
Closes #71
See merge request ynerant/squirrel-battle!69
|
2021-01-10 19:48:01 +01:00 |
|
Nicolas Margulies
|
16ddbd31f3
|
also prevent updating seen tiles when checking vision
|
2021-01-10 19:41:51 +01:00 |
|
|
|
0821a5fa7a
|
Merge branch 'broken-bows' into 'master'
Broken bows
Closes #70
See merge request ynerant/squirrel-battle!68
|
2021-01-10 19:30:46 +01:00 |
|
Yohann D'ANELLO
|
01ee49ddd4
|
Entities are updated after a bow shot, fixes #70
|
2021-01-10 19:25:12 +01:00 |
|
Yohann D'ANELLO
|
cddff5c2d9
|
Fix linting
|
2021-01-10 19:17:04 +01:00 |
|
eichhornchen
|
f4965039ee
|
Merge branch 'EvenmoreDoc' into 'master'
Evenmore doc
See merge request ynerant/squirrel-battle!67
|
2021-01-10 19:03:47 +01:00 |
|
|
|
ce1d299de7
|
Merge branch 'moredocs' into 'EvenmoreDoc'
More docs
See merge request ynerant/squirrel-battle!66
|
2021-01-10 18:56:15 +01:00 |
|
eichhornchen
|
2b63f8b3f1
|
Added stats in doc.
|
2021-01-10 18:54:36 +01:00 |
|
|
|
10a1b59b24
|
Merge branch 'EvenmoreDoc' into 'moredocs'
# Conflicts:
# docs/entities/items.rst
|
2021-01-10 18:49:25 +01:00 |
|
eichhornchen
|
c9994423cb
|
Added dance to doc.
|
2021-01-10 18:44:17 +01:00 |
|
Yohann D'ANELLO
|
bc638b3bec
|
Monocles can be found in chests
|
2021-01-10 18:42:26 +01:00 |
|
eichhornchen
|
258bd0d816
|
re-itme doc
|
2021-01-10 18:38:56 +01:00 |
|
eichhornchen
|
e96c50e81a
|
Doc for new items.
|
2021-01-10 18:36:46 +01:00 |
|
Yohann D'ANELLO
|
82421be8bb
|
Documentation on monocles
|
2021-01-10 18:16:01 +01:00 |
|
Yohann D'ANELLO
|
1795d62294
|
Update merchant prices
|
2021-01-10 18:09:09 +01:00 |
|
eichhornchen
|
0de2df0bd2
|
Merge branch 'levelup' into 'master'
Levelup
Closes #69
See merge request ynerant/squirrel-battle!65
|
2021-01-10 18:08:27 +01:00 |
|
eichhornchen
|
93e51d9240
|
Testing + linting (yes there remains two linting errors, i don't know what to do.
|
2021-01-10 18:04:33 +01:00 |
|
Yohann D'ANELLO
|
568b8f3eba
|
Documentation on displays
|
2021-01-10 17:33:06 +01:00 |
|
eichhornchen
|
afaa12d86b
|
Updated doc and README conderning dancing
|
2021-01-10 17:13:07 +01:00 |
|
eichhornchen
|
3d48c43886
|
Player can now dance! Closes #69.
|
2021-01-10 17:10:00 +01:00 |
|
eichhornchen
|
dfb591d410
|
The player's stats now get better when levelling up. The strength level and frequency of appearance of entities have been changed to offer bettter game experience.
|
2021-01-10 16:31:46 +01:00 |
|
eichhornchen
|
841c7b9f90
|
Chest can be destroyed by bombs.
|
2021-01-10 16:31:16 +01:00 |
|
eichhornchen
|
e56fc502cb
|
Merge branch 'clean' into 'master'
Clean
See merge request ynerant/squirrel-battle!64
|
2021-01-10 15:49:00 +01:00 |
|
eichhornchen
|
97ecd13c77
|
Readme got even better !
|
2021-01-10 15:45:26 +01:00 |
|
eichhornchen
|
9516230893
|
We now have a useful Readme with a getting started manual.
|
2021-01-10 15:38:39 +01:00 |
|
eichhornchen
|
5eb7699301
|
Rearranged the display class files, related to issue #56.
|
2021-01-10 12:35:50 +01:00 |
|
eichhornchen
|
8d0d0883a3
|
Merge branch 'master' into clean
|
2021-01-10 12:12:40 +01:00 |
|
