Commit Graph

106 Commits

Author SHA1 Message Date
ddbcf5581e fix(esc): closes 115 2025-09-05 17:44:21 +02:00
c91589ec89 fix(game.gd): if using an item cancel action on click on bg, fixes #116 2025-09-02 13:25:35 +02:00
3676c0ca08 fix: avoid crash picking madera and cuchillo 2025-03-30 05:35:21 +02:00
4a1025a43b fix: avoid crash taking cocina_patata and going to despensa 2025-03-30 05:13:52 +02:00
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
21647df329 Tutorial variable fix 2025-02-09 23:53:57 +01:00
ad92def20b Now with subtitles 2025-02-09 20:53:04 +01:00
d18a9ed102 undo fix 2025-02-08 05:19:17 +01:00
c800f04092 Port: despensa & cocina_detras esc and i18n 2025-02-08 05:09:46 +01:00
6c772da846 Squashed commit of the following:
commit f4e15f11cb99e3ecf97240a57ac407edccd8aabf
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sat Feb 8 03:23:33 2025 +0100

    Doable tutorial

commit a58fc407bbb248a11a3481607b186e16a58b44c7
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 14:56:29 2025 +0100

    items cocina

commit 764abca24270ad109306a6713c9029400544e487
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 13:40:01 2025 +0100

    Intro done

commit e16d1f69e3324f6cc3cb5fb1ba9d1444be92d47e
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 13:23:41 2025 +0100

    Skip dialog fix

commit 8350683785263c3fd037e6484143ef4c43c5ace9
Merge: b968ec4 21cb204
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 13:04:41 2025 +0100

    Merge branch 'gymkhana/escoria4' into gymkhana/escoria4-eneko-smoking-port

commit b968ec4d7c9e282cfd4bcdd048b3aa252981dedb
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Tue Feb 4 20:46:43 2025 +0100

    csv fix

commit 7ba00276b50f60e4b3e2b47303fdec12ac195767
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Tue Feb 4 00:08:48 2025 +0100

    translation keys

commit 127f0732bdfbb28e887609ec992e2fbd1b87bc87
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 2 09:41:29 2025 +0100

    pegatinas

commit 3ad3b05c3ec5d40172259acd430a7798f71da541
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 2 09:17:23 2025 +0100

    eneko dialogs

commit 97b5a69bc0385a5cecd17af48eaf2e45d5fd88f8
Merge: b641ae0 a03bed7
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Wed Jan 29 00:19:38 2025 +0100

    Merge branch 'gymkhana/escoria4' into gymkhana/escoria4-eneko-smoking-port

commit b641ae0da451647bf55888fea5421e4c9463c49c
Merge: 0d75ea8 aaa3953
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Mon Jan 27 17:21:38 2025 +0100

    Merge branch 'gymkhana/escoria4' into gymkhana/escoria4-eneko-smoking-port

commit 0d75ea8a44ff76b1ad6650f5acec2024a9a55685
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Mon Jan 27 17:18:41 2025 +0100

    wip
2025-02-08 03:24:28 +01:00
21cb204d9a feat(escoria4): port peso 2025-02-07 00:05:08 +01:00
d624bda258 feat(escoria4): ported fregadero der and izq 2025-01-29 23:31:58 +01:00
9a124830c5 feat(escoria4): port cocina and cocina_gas 2025-01-27 23:53:41 +01:00
aaa3953b9c fix(rtmi-dialog-simple): say command was blocking game state 2025-01-26 23:38:25 +01:00
a996af25cb fix: global declaration in cocina_delante.esc 2025-01-25 23:07:04 +01:00
09b02a210a fix: port some esc files 2025-01-25 19:56:44 +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
36457cf3f9 fix(cuerno): si la comida está lista no dejar tocar el cuerno hasta que eneko la cate 2024-11-12 22:54:37 +01:00
c7079bfc08 feat(credits): enable music volume, closes #89 2024-11-12 19:36:05 +01:00
27badc4b67 feat(cocina_detras): parece que veo a Mikel, closes #83 2024-11-03 00:21:22 +01:00
2bf4e069c3 Closes #84 2024-11-02 23:35:34 +01:00
220c390597 Dancing animations, some glitch fixed 2024-11-02 21:39:16 +01:00
416d208ab5 fix: underscore before unused argument 2024-11-02 18:10:52 +01:00
b2673e71ac feat(story): el pan que habla 2024-11-02 17:44:05 +01:00
f142ea1b5d adds game over credits (#74)
## Changes
- Adds game over credits

Reviewed-on: gymkhana/gymkhana#74
Reviewed-by: Eneko Nieto <eneko@eneko.ovh>
Co-authored-by: oier <oierbravo@gmail.com>
Co-committed-by: oier <oierbravo@gmail.com>
2024-11-02 00:59:37 +01:00
1241cf9c09 fix(video player): hide inventory when playing videos, closes #72 2024-10-29 22:15:53 +01:00
068c4c982c feat: take sticker if Eneko is away 2024-10-25 23:24:07 +02:00
3304b5ead4 fix: bombona and caja_herramientas cleanup 2024-08-29 12:55:02 +02:00
bd48e7a619 feat: add some dialogs 2024-08-23 20:15:38 +02:00
8c6b360dea fix: misspells 2024-08-23 19:43:39 +02:00
f1e612f602 feat: guardar el bol y el peso después de echar las lentejas 2024-08-23 16:48:23 +02:00
5c7d3e7f3f fix: created turno_cocina_peso_usado, fixes #58 2024-08-23 16:19:13 +02:00
b0ff374dc1 fix disabled economica, removed wood > olla interaction 2024-04-09 22:28:19 +02:00
33e04e13e5 fix: delete unused turno_cocina_bol_inventario item 2024-04-09 22:16:28 +02:00
f73091268c feat: ya se puede tocar el cuerno 2024-03-22 22:47:31 +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
96ff7ea842 fix: use '_COUNT_' as prefix for count manager globals instead of 'count/' 2024-02-14 23:25:57 +01:00
277dc9e10a clean up 2024-02-13 00:07:11 +01:00
803d5ff71d fix cuerno en intro 2024-02-11 22:29:32 +01:00
396db338cf Smoke on the water. Closes #38 2024-02-10 20:23:51 +01:00
8f9e8680b3 more missing carton 2024-02-10 17:34:23 +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
4389701319 fix: small fixes 2024-02-05 23:12:45 +01:00