Commit Graph

46 Commits

Author SHA1 Message Date
0fb120466b feat(escoria4): upgraded project to Godot 4.4 2025-03-11 12:29:32 +01:00
9cbf8d17b2 Squashed commit of the following:
commit 2a7c5f745e8d73bd16126aa4714a3b25414c4079
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 02:36:24 2025 +0100

    Tooltips cocina delante

commit 4dbdf3979ca0f9cfee281aa420755f27bee966b3
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 02:33:22 2025 +0100

    Tooltips cocina

commit 57b542420427d2fa1eb3cb74e16188ecb3838710
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 02:20:48 2025 +0100

    tooltips cocina detras

commit 6084757ad3fdb19a784153a4d8b86f8334f02e1e
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 02:19:08 2025 +0100

    Tooltips despensa

commit 504a48b5cdf191661c8edde21caa228216719952
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 02:14:18 2025 +0100

    Invetory target tooltips

commit 2d01a8244646a4a94eb1ef18af27c9141c513dbe
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 02:02:07 2025 +0100

    More tooltips

commit 6885a4e543b0e33f90e734d9ce745291e444c617
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 23 01:53:44 2025 +0100

    Common tooltips and some others
2025-02-23 02:37:35 +01:00
0e9bb9d2c7 Libro cocina tooltip fix 2025-02-10 00:18:00 +01:00
9a124830c5 feat(escoria4): port cocina and cocina_gas 2025-01-27 23:53:41 +01:00
f34f96e87f feat(godot4): project automatic upgrade from godot 3 to 4 2025-01-19 01:05:35 +01:00
e9aee74c2b Añade accion al bol con la fregadera, closes #869 2024-11-13 20:42:42 +01:00
7905433217 Cocina fantasma, closes #91 2024-11-13 00:40:00 +01:00
2bf4e069c3 Closes #84 2024-11-02 23:35:34 +01:00
b2673e71ac feat(story): el pan que habla 2024-11-02 17:44:05 +01:00
5125428b1f fix: merge duplicated custom_data in patata items 2024-03-21 22:39:48 +01:00
19ef4704d4 Custom data tooltip, Tooltip manager, Gymkhana autoload 2024-03-17 19:48:58 +01:00
eed5e64a53 feat: save game system is working! 2024-03-03 19:32:30 +01:00
277dc9e10a clean up 2024-02-13 00:07:11 +01:00
396db338cf Smoke on the water. Closes #38 2024-02-10 20:23:51 +01:00
089c19d95f trampa y carton 2024-02-10 16:42:21 +01:00
5957f1db64 horn of cenarius 2024-02-10 01:51:48 +01:00
1bb1fd9b5a feat: cuerno cutremente puesto en la cocina 2024-02-07 00:01:44 +01:00
3d6545ad79 Disable items in cocina intro. PENDING RE-ENABLING THEM! 2024-01-28 14:17:59 +01:00
7eefcba2f4 imagen carton 2024-01-27 01:14:44 +01:00
2e10ae13da Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2024-01-27 01:12:31 +01:00
393afb4a83 animacion gas 2024-01-27 00:38:26 +01:00
f0c61093e3 feat: encender la economica 2024-01-27 00:37:50 +01:00
a938b5d38c feat: encender cocina de gas 2024-01-26 23:15:20 +01:00
edac94e5b0 fix: outline de la económica 2023-11-14 23:16:13 +01:00
ea0a232732 fix: adjust inventory size 2023-11-14 00:05:04 +01:00
8396487246 feat:leña en la económica 2023-11-13 23:32:27 +01:00
05cf4407ee Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-10-31 22:18:06 +01:00
72dd717df1 basic recipe, missing ingredients, bigger collisions and.... The secret **********. 2023-10-31 00:10:21 +01:00
68f68357a6 feat: potatoes! 2023-10-26 23:43:36 +02:00
cacdc03ab0 fregaderos Location fix 2023-10-14 16:03:19 +02:00
d649a7f4a8 Se nos viene la olla 2023-10-13 03:14:34 +02:00
275458a8a4 feat: say_last_dialog_option command 2023-10-13 02:41:43 +02:00
fec381dd1f Oier knows how to count potatoes! 2023-09-23 23:57:21 +02:00
c633ad511d Cutting the big potato 2023-09-22 23:49:22 +02:00
0b21813e77 gymkhana/item_count (#16)
Item can now be countable objects, like money, bullets or even potatoes!

Reviewed-on: gymkhana/gymkhana#16
2023-09-22 00:10:02 +02:00
2fdbdaaa6a unified tooltips as dictionary (#8)
## Changes
- From one variable for each tooltip to dictionary
- Should not break the game.

## How to test
- Run game
- In `cocina_delante` every tooltip yould appear as always.
- The rest of the rooms/items appear without tooltip.

## Side effects
- `set_tooltip` ESC command doesn't work untill `tooltip` is set to the in the new way. It changes the tooltip to every object without the new tooltip.
- Should be gone when we update every object.

Reviewed-on: gymkhana/gymkhana#8
Co-authored-by: oier <oierbravo@gmail.com>
Co-committed-by: oier <oierbravo@gmail.com>
2023-09-16 15:56:20 +02:00
bc2ce9dbf6 bugfix frontal 2023-08-27 04:28:32 +02:00
beb244a01e cocina frontal-patata 2023-08-27 03:31:18 +02:00
1ee9c339db peso+bol 2023-08-27 01:35:14 +02:00
b30dcbc29d cocina_peso 2023-08-27 00:47:13 +02:00
19d38e5e1c start with frontal 2023-08-26 20:00:57 +02:00
b8bf76241f cocina camera limits 2023-08-26 19:41:08 +02:00
552affc1d7 hay speed en la cocina 2023-08-26 19:14:23 +02:00
8f5627d41e cocina depth 2023-08-26 19:07:21 +02:00
fcabc37482 cocina detras -> cocina 2023-08-26 02:08:33 +02:00
7e2f3131ae Added cocina room 2023-08-25 23:47:12 +02:00