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
|
dadafc84eb
|
Added a familiar class that follows the player around and hits monsters when it sees one. Added a trumpet, an instance of familiar. Closes #46.
|
2020-12-18 17:29:59 +01:00 |
|
Yohann D'ANELLO
|
c55a7451e7
|
Display more precisely where we are in the store menu
|
2020-12-18 01:50:11 +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
|
8608ce346f
|
Add a small bomb exploding animation, fixes #31
|
2020-12-12 16:50:01 +01:00 |
|
eichhornchen
|
7ba49277a9
|
Added a symbol for hazels in the ascii texturepack
|
2020-12-11 15:52:36 +01:00 |
|
Yohann D'ANELLO
|
2d5a2e4c87
|
Display hazels in the StatsDisplay
|
2020-12-09 16:54:53 +01:00 |
|
Yohann D'ANELLO
|
56627f3e84
|
Reorder texture pack entries
|
2020-12-09 16:50:47 +01:00 |
|
Yohann D'ANELLO
|
b24cc1877f
|
Merchant inventory is working!
|
2020-12-07 21:13:55 +01:00 |
|
eichhornchen
|
866af98fe4
|
Merging master into village, conflicts were solved
|
2020-12-06 11:43:48 +01:00 |
|
Yohann D'ANELLO
|
29142cd91c
|
Merge remote-tracking branch 'origin/master' into village
# Conflicts:
# squirrelbattle/display/texturepack.py
# squirrelbattle/interfaces.py
|
2020-12-01 17:07:40 +01:00 |
|
eichhornchen
|
fbd9f0045b
|
Friendly entities can now talk to the player, a sunflower entity was added to test this new feature. Related to issue #22
|
2020-11-27 18:38:48 +01:00 |
|
eichhornchen
|
bad56ba442
|
Added the merchants in the texturepack
|
2020-11-27 17:54:03 +01:00 |
|
Yohann D'ANELLO
|
0d3e33d960
|
Declare the license, we use GNU GPL
|
2020-11-27 16:33:17 +01:00 |
|
ynerant
|
23a2b4c0cf
|
Merge branch 'beaver-is-a-tiger' into 'master'
Beaver is a tiger
See merge request ynerant/squirrel-battle!24
|
2020-11-20 18:16:56 +01:00 |
|
Yohann D'ANELLO
|
fb3f3ee5e8
|
Beaver is a tiger
|
2020-11-20 18:02:08 +01:00 |
|
eichhornchen
|
777f155d77
|
A test
|
2020-11-20 15:38:01 +01:00 |
|
eichhornchen
|
762fa9acd4
|
A test
|
2020-11-20 15:26:02 +01:00 |
|
Yohann D'ANELLO
|
d0ee9ec562
|
Rename dungeonbattle to squirrelbattle
|
2020-11-19 02:18:16 +01:00 |