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 |
|
|
|
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 |
|
eichhornchen
|
bdbf214d8d
|
Added chests, they are immortal and contain objects the player can take for free.
|
2021-01-08 23:15:48 +01:00 |
|
eichhornchen
|
175706b1e4
|
Merchants had default maxhealth.
|
2021-01-08 22:30:30 +01:00 |
|
eichhornchen
|
9ff615a6b0
|
Linting and tests...
|
2021-01-08 22:25:00 +01:00 |
|
eichhornchen
|
746379bad6
|
Now with EXPLOSIONS!
|
2021-01-08 19:18:29 +01:00 |
|
eichhornchen
|
591630b8a7
|
Added a fire ball staff, closes #64
|
2021-01-08 19:05:02 +01:00 |
|
eichhornchen
|
903a06c36c
|
Subclassed and removed some debugging code
|
2021-01-08 18:38:54 +01:00 |
|
eichhornchen
|
f6210a6356
|
Added a Bow, related to #64
|
2021-01-08 18:06:26 +01:00 |
|
nicomarg
|
da8cf238ee
|
Merge branch 'mobs-seeing-through-walls' into 'master'
Resolve "Mobs seeing through walls"
Closes #63
See merge request ynerant/squirrel-battle!59
|
2021-01-08 17:34:27 +01:00 |
|
Nicolas Margulies
|
46a5dc6931
|
Made mobs check if they can see the player
|
2021-01-08 17:26:56 +01:00 |
|
eichhornchen
|
bde33e9232
|
Added a second scroll object closes #60
|
2021-01-08 16:14:40 +01:00 |
|
|
|
4a80dc36ad
|
Merge branch 'save_floors' into 'master'
Save floors
Closes #62 et #61
See merge request ynerant/squirrel-battle!58
|
2021-01-08 16:05:10 +01:00 |
|
Yohann D'ANELLO
|
7a4936e6a5
|
Test monocles
|
2021-01-08 15:58:54 +01:00 |
|
Yohann D'ANELLO
|
a497d08f31
|
Implement the monocle of truth, closes #62
|
2021-01-08 15:48:12 +01:00 |
|
Yohann D'ANELLO
|
1270640619
|
Change hint whenever the T key is pressed or not
|
2021-01-08 15:07:35 +01:00 |
|
Yohann D'ANELLO
|
28a6532a21
|
Add a hint to tell the user how to talk to friendly entities
|
2021-01-08 14:59:44 +01:00 |
|
Yohann D'ANELLO
|
156e4a7e3a
|
Add a hint to tell the user how to use ladders
|
2021-01-08 14:51:56 +01:00 |
|
Yohann D'ANELLO
|
f48377e055
|
Save floors and visibility, fixes #61
|
2021-01-08 14:23:57 +01:00 |
|
|
|
073e3d3740
|
Merge branch 'description' into 'master'
Description
Closes #59
See merge request ynerant/squirrel-battle!57
|
2021-01-08 12:10:29 +01:00 |
|
Yohann D'ANELLO
|
120ec82d09
|
Helmet needs only one character in squirrel mode, add a trailing space
|
2021-01-08 12:07:13 +01:00 |
|
Yohann D'ANELLO
|
571e9db3e8
|
Fix french translations
|
2021-01-08 12:06:28 +01:00 |
|
Yohann D'ANELLO
|
e56bdc16c2
|
Add item description, closes #59
|
2021-01-08 11:55:25 +01:00 |
|
eichhornchen
|
5736c2300b
|
Added a scroll object that deals damage based on the player intelligence. Related to #60
|
2021-01-08 11:54:39 +01:00 |
|
|
|
2b3a8279b8
|
Merge branch 'fix-settings' into 'master'
Fix settings
Closes #57 et #58
See merge request ynerant/squirrel-battle!56
|
2021-01-08 11:30:02 +01:00 |
|
Yohann D'ANELLO
|
75e93611c3
|
Capture all mouse events and take into account mouse attributes, fixes #58
|
2021-01-08 11:21:40 +01:00 |
|
eichhornchen
|
ea58d5b426
|
Merge branch 'doc' into 'master'
Doc
Closes #53
See merge request ynerant/squirrel-battle!55
|
2021-01-08 11:15:42 +01:00 |
|
Yohann D'ANELLO
|
b42f1277b1
|
Exit the game on KeyboardInterrupt (don't log this error)
|
2021-01-08 11:10:10 +01:00 |
|
eichhornchen
|
196e3708d2
|
Merge branch 'master' into 'doc'
# Conflicts:
# squirrelbattle/entities/items.py
# squirrelbattle/interfaces.py
|
2021-01-08 11:10:09 +01:00 |
|
Yohann D'ANELLO
|
ac8c7a0a4c
|
Only read required keys in settings file
|
2021-01-08 11:07:38 +01:00 |
|
eichhornchen
|
6673b67ffe
|
Repaired spawn of trumpets.
|
2021-01-08 10:58:40 +01:00 |
|
|
|
fb47c15d6b
|
Merge branch 'equipment' into 'master'
Equipment
Closes #19, #30, #48, #51 et #52
See merge request ynerant/squirrel-battle!54
|
2021-01-08 02:19:29 +01:00 |
|
Yohann D'ANELLO
|
affc1bae59
|
Fix merge
|
2021-01-08 02:15:13 +01:00 |
|
|
|
451dd9cba7
|
Merge branch 'master' into 'equipment'
# Conflicts:
# squirrelbattle/display/statsdisplay.py
# squirrelbattle/entities/items.py
# squirrelbattle/entities/player.py
# squirrelbattle/interfaces.py
# squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
# squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
# squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
# squirrelbattle/tests/game_test.py
|
2021-01-08 02:11:40 +01:00 |
|
|
|
da47731faf
|
Merge branch 'lighting' into 'master'
Lighting
Closes #27
See merge request ynerant/squirrel-battle!34
|
2021-01-08 02:01:13 +01:00 |
|
Yohann D'ANELLO
|
7aeb659cf5
|
Fix french translation
|
2021-01-08 02:00:22 +01:00 |
|
Yohann D'ANELLO
|
6c6a44fb18
|
More tests
|
2021-01-08 01:56:54 +01:00 |
|
Yohann D'ANELLO
|
478a655751
|
Fix fg/bg custom colors
|
2021-01-07 16:49:40 +01:00 |
|
|
|
4acf6804d4
|
Merge branch 'master' into 'lighting'
# Conflicts:
# squirrelbattle/display/mapdisplay.py
# squirrelbattle/interfaces.py
|
2021-01-07 16:36:54 +01:00 |
|
Yohann D'ANELLO
|
c36e68d6e4
|
Reduce player vision
|
2021-01-07 16:34:12 +01:00 |
|
Yohann D'ANELLO
|
e9c8f43e7e
|
Use ternary conditions to add coverage
|
2021-01-07 16:31:39 +01:00 |
|
