|
|
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
|
093c105120
|
The broken test is mysteriously working now
|
2021-01-06 17:54:43 +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 |
|
Yohann D'ANELLO
|
41548504de
|
Test ladders
|
2021-01-06 16:09:53 +01:00 |
|
Yohann D'ANELLO
|
d06a405120
|
Use a key to use ladders
|
2021-01-06 14:55:16 +01:00 |
|
eichhornchen
|
7f63ab2357
|
Merge branch 'master' into 'familiars'
# Conflicts:
# squirrelbattle/display/display_manager.py
# squirrelbattle/display/logsdisplay.py
# squirrelbattle/display/mapdisplay.py
# squirrelbattle/display/menudisplay.py
# squirrelbattle/menus.py
|
2021-01-05 10:27:39 +01:00 |
|
eichhornchen
|
6341f39fb0
|
Linting
|
2021-01-05 10:20:55 +01:00 |
|
eichhornchen
|
c378eead74
|
Fixed the game loading tests : removed trumpets from the test.
|
2021-01-05 10:11:55 +01:00 |
|
eichhornchen
|
f821fef430
|
added tests
|
2021-01-05 09:38:49 +01:00 |
|
eichhornchen
|
c329150aac
|
Linting again
|
2020-12-31 17:15:24 +01:00 |
|
eichhornchen
|
73952a42f3
|
Added tests for familiars
|
2020-12-31 15:43:38 +01:00 |
|
eichhornchen
|
8e0b8d4fee
|
Added a test for lines 106-107 of game.py
|
2020-12-31 15:16:40 +01:00 |
|
eichhornchen
|
7cd4721daa
|
linting
|
2020-12-31 15:00:20 +01:00 |
|
Yohann D'ANELLO
|
ed6457e94d
|
Test credits menu
|
2020-12-18 23:39:56 +01:00 |
|
Nicolas Margulies
|
762bed888a
|
Working visibility (at least relatively good), but a few lines untested
|
2020-12-18 21:21:00 +01:00 |
|
Yohann D'ANELLO
|
e1918ab066
|
tick function takes the player as argument
|
2020-12-18 17:40:52 +01:00 |
|
Yohann D'ANELLO
|
77f52b6276
|
Screen is refreshed only when pads are all refreshed, fixes #50
|
2020-12-18 16:40:52 +01:00 |
|
Yohann D'ANELLO
|
85870494a0
|
More generic display update
|
2020-12-18 15:07:09 +01:00 |
|
Yohann D'ANELLO
|
b8d32b29c8
|
Test selling items
|
2020-12-18 02:17:06 +01:00 |
|
Yohann D'ANELLO
|
c55a7451e7
|
Display more precisely where we are in the store menu
|
2020-12-18 01:50:11 +01:00 |
|
Yohann D'ANELLO
|
9a556ba669
|
We can now buy items to merchants, closes #47
|
2020-12-18 01:05:50 +01:00 |
|
eichhornchen
|
646e0063be
|
Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32.
|
2020-12-13 21:29:25 +01:00 |
|
Yohann D'ANELLO
|
7971a1f70e
|
Add waiting key, fixes #16
|
2020-12-12 18:12:37 +01:00 |
|
Yohann D'ANELLO
|
288a6ac2c9
|
Some translations were missing concerning sunflowers, fixes #44
|
2020-12-12 17:39:12 +01:00 |
|
Yohann D'ANELLO
|
8608ce346f
|
Add a small bomb exploding animation, fixes #31
|
2020-12-12 16:50:01 +01:00 |
|
Yohann D'ANELLO
|
48318a91fe
|
Give more hazels to the player when testing the interaction with merchants
|
2020-12-11 21:19:25 +01:00 |
|
Yohann D'ANELLO
|
777668848e
|
Clicking on the main image changes its color
|
2020-12-11 21:17:21 +01:00 |
|
Yohann D'ANELLO
|
a4a10e340d
|
Test clicking on the merchant pad
|
2020-12-11 18:44:05 +01:00 |
|
ynerant
|
53d090a9c8
|
Merge branch 'master' into 'mouse_interaction'
# Conflicts:
# squirrelbattle/display/display_manager.py
# squirrelbattle/display/menudisplay.py
# squirrelbattle/entities/items.py
|
2020-12-11 18:38:13 +01:00 |
|
Yohann D'ANELLO
|
f453b82a58
|
Test clicking on the screen
|
2020-12-11 18:33:47 +01:00 |
|
eichhornchen
|
9d3e8a9822
|
Merge branch 'village' into 'master'
Village
Closes #41, #38, #37, #36, and #18
See merge request ynerant/squirrel-battle!44
|
2020-12-11 18:23:10 +01:00 |
|
eichhornchen
|
e7f24c2371
|
The store menu now displays the price of objects, fixes #41
|
2020-12-11 18:08:10 +01:00 |
|
Yohann D'ANELLO
|
99352bc1d5
|
Test buying an item when we don't have enough of money
|
2020-12-11 17:28:16 +01:00 |
|
Yohann D'ANELLO
|
6d4c0b2ca3
|
Testing the merchant must handle two cases: the bought item is a heart or not
|
2020-12-09 17:04:29 +01:00 |
|
Yohann D'ANELLO
|
05e79c14e3
|
Translate the settings entry that change the chat key
|
2020-12-09 15:45:50 +01:00 |
|
Yohann D'ANELLO
|
19b82ff71a
|
Test merchants
|
2020-12-09 15:32:37 +01:00 |
|
Yohann D'ANELLO
|
cea015d015
|
In load&save test, force to have a merchant
|
2020-12-09 15:09:07 +01:00 |
|
Yohann D'ANELLO
|
39787861dc
|
Test sunflowers interaction
|
2020-12-09 15:05:19 +01:00 |
|
Yohann D'ANELLO
|
fdc2bcab8d
|
Add spanish translation
|
2020-12-07 01:01:39 +01:00 |
|
eichhornchen
|
866af98fe4
|
Merging master into village, conflicts were solved
|
2020-12-06 11:43:48 +01:00 |
|
Yohann D'ANELLO
|
f39113fd0b
|
Test body snatch potion, fixes #34
|
2020-12-05 14:42:13 +01:00 |
|
Yohann D'ANELLO
|
c38f8cdc53
|
Save the inventory of the player when saving the game, fixes #33
|
2020-12-05 14:35:59 +01:00 |
|
Yohann D'ANELLO
|
ea672272f5
|
Add body snatch potion
|
2020-12-05 14:20:58 +01:00 |
|
Yohann D'ANELLO
|
bc40f8d0e6
|
Some translations were missing in the settings menu
|
2020-12-05 13:19:04 +01:00 |
|
Yohann D'ANELLO
|
4b9399c687
|
Test inventory
|
2020-12-04 18:16:46 +01:00 |
|
Yohann D'ANELLO
|
5b4dc601bc
|
Fix broken tests
|
2020-12-04 17:15:41 +01:00 |
|
Yohann D'ANELLO
|
39af791012
|
We can open an empty inventory!
|
2020-12-04 14:45:18 +01:00 |
|
Yohann D'ANELLO
|
9f0a29302d
|
Add german translation
|
2020-11-28 16:22:06 +01:00 |
|
Yohann D'ANELLO
|
f78c73a703
|
Tests and the CI are compiling messages
|
2020-11-28 14:02:23 +01:00 |
|
Yohann D'ANELLO
|
7d02604407
|
Clean the translation module
|
2020-11-28 02:00:09 +01:00 |
|
