Yohann D'ANELLO
|
7971a1f70e
|
Add waiting key, fixes #16
|
2020-12-12 18:12:37 +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
|
d9912cacad
|
Listen to mouse clicks in the main loop
|
2020-12-11 18:17:59 +01:00 |
|
Yohann D'ANELLO
|
bbe37eab97
|
Listen for clicks, detect which display was clicked
|
2020-12-11 16:56:22 +01:00 |
|
Yohann D'ANELLO
|
19b82ff71a
|
Test merchants
|
2020-12-09 15:32:37 +01:00 |
|
eichhornchen
|
866af98fe4
|
Merging master into village, conflicts were solved
|
2020-12-06 11:43:48 +01:00 |
|
eichhornchen
|
ba68e68584
|
Added a Gamemode for selling interfaces, as well as the base of the player/merchant interaction, related to issue #18
|
2020-12-05 21:43:13 +01:00 |
|
Yohann D'ANELLO
|
c7545e53f7
|
Items can be dropped/equipped/used
|
2020-12-04 16:53:27 +01:00 |
|
Yohann D'ANELLO
|
39af791012
|
We can open an empty inventory!
|
2020-12-04 14:45:18 +01:00 |
|
eichhornchen
|
3886bee1ba
|
Friendly entities are now a subclass of fighting entities, and can die. The T key is now used to talk to friendly entities
|
2020-12-04 00:27:25 +01:00 |
|
Yohann D'ANELLO
|
0d3e33d960
|
Declare the license, we use GNU GPL
|
2020-11-27 16:33:17 +01:00 |
|
Yohann D'ANELLO
|
d0ee9ec562
|
Rename dungeonbattle to squirrelbattle
|
2020-11-19 02:18:16 +01:00 |
|