ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
789 Commits 4 Branches 3 Tags 893 KiB
Commit Graph

789 Commits

Author SHA1 Message Date
ynerant 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
ynerant 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
ynerant 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
ynerant 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
ynerant 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
ynerant 5c07071cff Merge branch 'moredocs' into 'master' 
Moredocs

See merge request ynerant/squirrel-battle!63
 2021-01-10 12:11:37 +01:00
Yohann D'ANELLO 0ef5875a72
Documentation on ladders 2021-01-10 12:07:53 +01:00
Yohann D'ANELLO 92a3081b2e
Display "Edit on Gitlab" button 2021-01-10 11:58:32 +01:00
eichhornchen dd37c2f62f Renamed the title's ascii art file. 2021-01-10 11:54:49 +01:00
Yohann D'ANELLO 6d786c7358
Documentation on unit tests 2021-01-10 11:30:04 +01:00
Yohann D'ANELLO d738029335
Fix import order 2021-01-10 11:25:53 +01:00
Yohann D'ANELLO 94c12541ef
Happy new year! 2021-01-10 10:46:17 +01:00
Yohann D'ANELLO 391fe6897b
Drop unusued english translation file 2021-01-10 10:29:43 +01:00
ynerant 5b5180d44a Merge branch 'fix-tty-colors' into 'master' 
Don't use custom colors on unsupported screens, fixes #67

Closes #67

See merge request ynerant/squirrel-battle!61
 2021-01-09 21:52:03 +01:00
nicomarg 1e5a268586 Merge branch 'remove-debug-code' into 'master' 
Removed debug code

See merge request ynerant/squirrel-battle!62
 2021-01-09 18:49:20 +01:00
Nicolas Margulies 7bf1789239 Removed debug code 2021-01-09 18:45:55 +01:00
Yohann D'ANELLO 8cb2b2388f
Don't use custom colors on unsupported screens, fixes #67 2021-01-09 18:42:11 +01:00
eichhornchen 93a9e5e4c4 Merge branch 'moreitems' into 'master' 
Moreitems

Closes #64 and #60

See merge request ynerant/squirrel-battle!60
 2021-01-09 00:05:14 +01:00
eichhornchen ac4a73b2cb Final linting 2021-01-09 00:01:02 +01:00
eichhornchen cbe3e226b4 Repaired a merge error, tests now work. 2021-01-08 23:51:47 +01:00
eichhornchen eac9057f31 Merge branch 'master' into 'moreitems' 
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
 2021-01-08 23:41:21 +01:00
eichhornchen 2eb42668c8 Linting and tests for chests 2021-01-08 23:32:47 +01:00