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 |