Yohann D'ANELLO
|
46ce7c33bf
|
Merchant menu is updated through its update function, and does not access globally to the Game instance
|
2020-12-18 15:15:47 +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
|
a5890a341d
|
Display inventory menu next to the merchant menu
|
2020-12-17 23:46:20 +01:00 |
|
Yohann D'ANELLO
|
599f75b676
|
Erase pad before resizing, fixes #45
|
2020-12-12 21:19:55 +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
|
73e1fac89a
|
Add title to boxes to have pretty boxes, fixes #28
|
2020-12-12 17:15:08 +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
|
04ae56e451
|
Higher abstraction level on addmsg, fixes #43
|
2020-12-12 13:46:45 +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 |
|
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 |
|
Yohann D'ANELLO
|
45f420aaef
|
Linting
|
2020-12-11 18:17:08 +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
|
1afa397fec
|
Better interaction with inventory menu
|
2020-12-11 18:07:39 +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 |
|
eichhornchen
|
7ba49277a9
|
Added a symbol for hazels in the ascii texturepack
|
2020-12-11 15:52:36 +01:00 |
|
Nicolas Margulies
|
cc6033e8e4
|
New pathfinding that avoids most of the mobs getting stuck, closes #35
|
2020-12-10 22:21:09 +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 |
|
Nicolas Margulies
|
50d806cdcf
|
Working Dijkstra
|
2020-12-08 22:22:20 +01:00 |
|
Nicolas Margulies
|
7823a422b9
|
Start f new pathfinding, not working
|
2020-12-08 00:59:19 +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
|
ea672272f5
|
Add body snatch potion
|
2020-12-05 14:20:58 +01:00 |
|
Yohann D'ANELLO
|
ca2ae15117
|
Stack items in the inventory, closes #29
|
2020-12-05 13:42:33 +01:00 |
|
Yohann D'ANELLO
|
a68b3a6d08
|
Display full inventory
|
2020-12-04 16:28:37 +01:00 |
|
Yohann D'ANELLO
|
fbfcd5dae0
|
Inventory title
|
2020-12-04 16:02:03 +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
|
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 |
|
Yohann D'ANELLO
|
d2d74c97a4
|
Settings menu was not translated
|
2020-11-27 22:19:41 +01:00 |
|
Yohann D'ANELLO
|
31b7ece449
|
Main menu width must be updated when the language got changed
|
2020-11-27 21:51:54 +01:00 |
|
Yohann D'ANELLO
|
c151e0f656
|
Menu items are translated
|
2020-11-27 21:44:17 +01:00 |
|
Yohann D'ANELLO
|
2498fd2a61
|
Translate strings
|
2020-11-27 20:42:19 +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
|
d987e60006
|
Added some documentation for menudisplay
|
2020-11-27 18:00:54 +01:00 |
|
eichhornchen
|
3f301423fb
|
Added a menudisplay class for menus with a value such as the menu of the merchants
|
2020-11-27 17:54:55 +01:00 |
|
Yohann D'ANELLO
|
be9c726fa0
|
Display message in bold format
|
2020-11-27 17:54:31 +01:00 |
|
eichhornchen
|
bad56ba442
|
Added the merchants in the texturepack
|
2020-11-27 17:54:03 +01:00 |
|
Yohann D'ANELLO
|
fb8d8f033b
|
Popup border color is red
|
2020-11-27 17:52:26 +01:00 |
|
Yohann D'ANELLO
|
b7f61d9485
|
Close popup if there is a message
|
2020-11-27 17:35:51 +01:00 |
|
Yohann D'ANELLO
|
5cdb12e8a8
|
Display a message on a popup
|
2020-11-27 17:32:26 +01:00 |
|