|
|
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 |
|
|
|
7a4936e6a5
|
Test monocles
|
2021-01-08 15:58:54 +01:00 |
|
|
|
a497d08f31
|
Implement the monocle of truth, closes #62
|
2021-01-08 15:48:12 +01:00 |
|
|
|
1270640619
|
Change hint whenever the T key is pressed or not
|
2021-01-08 15:07:35 +01:00 |
|
|
|
28a6532a21
|
Add a hint to tell the user how to talk to friendly entities
|
2021-01-08 14:59:44 +01:00 |
|
|
|
156e4a7e3a
|
Add a hint to tell the user how to use ladders
|
2021-01-08 14:51:56 +01:00 |
|
|
|
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 |
|
|
|
120ec82d09
|
Helmet needs only one character in squirrel mode, add a trailing space
|
2021-01-08 12:07:13 +01:00 |
|
|
|
571e9db3e8
|
Fix french translations
|
2021-01-08 12:06:28 +01:00 |
|
|
|
e56bdc16c2
|
Add item description, closes #59
|
2021-01-08 11:55:25 +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 |
|
|
|
75e93611c3
|
Capture all mouse events and take into account mouse attributes, fixes #58
|
2021-01-08 11:21:40 +01:00 |
|
|
|
ea58d5b426
|
Merge branch 'doc' into 'master'
Doc
Closes #53
See merge request ynerant/squirrel-battle!55
|
2021-01-08 11:15:42 +01:00 |
|
|
|
b42f1277b1
|
Exit the game on KeyboardInterrupt (don't log this error)
|
2021-01-08 11:10:10 +01:00 |
|
|
|
196e3708d2
|
Merge branch 'master' into 'doc'
# Conflicts:
# squirrelbattle/entities/items.py
# squirrelbattle/interfaces.py
|
2021-01-08 11:10:09 +01:00 |
|
|
|
ac8c7a0a4c
|
Only read required keys in settings file
|
2021-01-08 11:07:38 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7aeb659cf5
|
Fix french translation
|
2021-01-08 02:00:22 +01:00 |
|
|
|
6c6a44fb18
|
More tests
|
2021-01-08 01:56:54 +01:00 |
|
|
|
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 |
|
|
|
c36e68d6e4
|
Reduce player vision
|
2021-01-07 16:34:12 +01:00 |
|
|
|
e9c8f43e7e
|
Use ternary conditions to add coverage
|
2021-01-07 16:31:39 +01:00 |
|
|
|
1a78ad584c
|
Move equip functions for items
|
2021-01-06 18:31:28 +01:00 |
|
|
|
a8c0c197ed
|
Linting
|
2021-01-06 18:02:58 +01:00 |
|
|
|
00a4dec6a4
|
Merge branch 'ladders' into 'master'
Ladders
See merge request ynerant/squirrel-battle!53
|
2021-01-06 18:01:36 +01:00 |
|
|
|
5ef12bef3d
|
Changed the prices of armor
|
2021-01-06 17:57:23 +01:00 |
|
|
|
093c105120
|
The broken test is mysteriously working now
|
2021-01-06 17:54:43 +01:00 |
|
|
|
b403bc4784
|
documentation
|
2021-01-06 17:48:03 +01:00 |
|
|
|
ae505166b7
|
Disable critical hits during tests
|
2021-01-06 17:39:13 +01:00 |
|
|
|
d49c138257
|
Merge branch 'master' into 'ladders'
# Conflicts:
# squirrelbattle/game.py
# squirrelbattle/interfaces.py
# squirrelbattle/tests/game_test.py
|
2021-01-06 17:29:26 +01:00 |
|
|
|
0c2b10b031
|
Use ternary conditions to gain coverage
|
2021-01-06 17:21:17 +01:00 |
|
|
|
887a190f11
|
Less complexity on the handle key function
|
2021-01-06 17:00:43 +01:00 |
|
|
|
41548504de
|
Test ladders
|
2021-01-06 16:09:53 +01:00 |
|
|
|
a48e6325fe
|
Add log message when the player switches floor
|
2021-01-06 15:55:44 +01:00 |
|
|
|
15ef6af998
|
Put the texturepack in alphabetical order again.
|
2021-01-06 15:49:54 +01:00 |
|
|
|
4cd4bc9005
|
Display the current floor in the StatsDisplay
|
2021-01-06 15:17:02 +01:00 |
|
|
|
d06a405120
|
Use a key to use ladders
|
2021-01-06 14:55:16 +01:00 |
|
|
|
2dc178d67c
|
Merge branch 'equipment' into doc
|
2021-01-06 14:49:09 +01:00 |
|
|
|
77d501c389
|
Merge branch 'master' into doc
|
2021-01-06 14:39:23 +01:00 |
|
|
|
10788a24ec
|
Pin Sphinx version
|
2021-01-06 13:53:42 +01:00 |
|
|
|
4ad7d6c37c
|
Added rings that can augment the player's statistics. Also added a new statistic : xp_buff, which helps the player level up sooner.
|
2021-01-06 11:44:52 +01:00 |
|
|
|
a9aeb9ca3a
|
Repaired the use functionnality of the main item, as well as the load system for Armor items.
|
2021-01-06 11:13:17 +01:00 |
|
|
|
f3fe04e13a
|
The player now has two hands and a slot for a helmet and a chestplate. Accordingly, new classes of items have been added.
|
2021-01-06 10:46:36 +01:00 |
|
|
|
601062237d
|
Repairing part of the tests.
|
2021-01-05 19:50:25 +01:00 |
|
