Yohann D'ANELLO
d738029335
Fix import order
2021-01-10 11:25:53 +01:00
Yohann D'ANELLO
94c12541ef
Happy new year!
2021-01-10 10:46:17 +01:00
eichhornchen
eac9057f31
Merge branch 'master' into 'moreitems'
...
# Conflicts:
# squirrelbattle/entities/items.py
# squirrelbattle/interfaces.py
# squirrelbattle/tests/game_test.py
2021-01-08 23:41:21 +01:00
eichhornchen
bdbf214d8d
Added chests, they are immortal and contain objects the player can take for free.
2021-01-08 23:15:48 +01:00
Yohann D'ANELLO
75e93611c3
Capture all mouse events and take into account mouse attributes, fixes #58
2021-01-08 11:21:40 +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
Yohann D'ANELLO
411744bf10
Add credits menu, see #42
2020-12-18 22:24:41 +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
a5890a341d
Display inventory menu next to the merchant menu
2020-12-17 23:46:20 +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
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
089a247b2f
Maybe mouse clicks may use the game
2020-12-11 17:43:46 +01:00
Yohann D'ANELLO
d50f6701f4
Open a menu with the mouse
2020-12-11 17:40:56 +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
ca17bf424a
Inventory displays were not updated when the texture pack changed
2020-12-07 21:51:51 +01:00
Yohann D'ANELLO
57fab7db51
Linting
2020-12-07 21:22:06 +01:00
Yohann D'ANELLO
b24cc1877f
Merchant inventory is working!
2020-12-07 21:13:55 +01:00
eichhornchen
8540a8f354
Work in progress on printing a store menu. Its buggy though
2020-12-07 20:54:53 +01:00
eichhornchen
866af98fe4
Merging master into village, conflicts were solved
2020-12-06 11:43:48 +01:00
Yohann D'ANELLO
067570fd1a
The inventory is a popup
2020-12-04 14:51:41 +01:00
Yohann D'ANELLO
39af791012
We can open an empty inventory!
2020-12-04 14:45:18 +01:00
Yohann D'ANELLO
fb8d8f033b
Popup border color is red
2020-11-27 17:52:26 +01:00
Yohann D'ANELLO
5cdb12e8a8
Display a message on a popup
2020-11-27 17:32:26 +01:00
Yohann D'ANELLO
0d3e33d960
Declare the license, we use GNU GPL
2020-11-27 16:33:17 +01:00
Yohann D'ANELLO
3e7dabc94e
Wrap perfectly the map on the screen, bricks won't teleport randomly anymore
2020-11-26 21:59:48 +01:00
Nicolas Margulies
ca57fae19d
Reshaped the game layout using new lines and boxes
2020-11-20 18:07:09 +01:00
Nicolas Margulies
589f825765
Added logs to the layout, clear logs on new game (tests still aren't fixed)
2020-11-19 12:55:06 +01:00
Nicolas Margulies
6e71146aa2
First pass on the logs
...
The newly-added logs manage a list of messages. Entities do register a
message to it when hitting each other. Display is created, but not yet
added to the layout actually displayed.
2020-11-19 12:03:05 +01:00
Yohann D'ANELLO
d0ee9ec562
Rename dungeonbattle to squirrelbattle
2020-11-19 02:18:16 +01:00
