Commit Graph

15 Commits

Author SHA1 Message Date
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
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
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
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
96ff7ea842 fix: use '_COUNT_' as prefix for count manager globals instead of 'count/' 2024-02-14 23:25:57 +01:00
04272190f5 ajo y eneko catador 2024-01-26 23:35:03 +01:00
33895e8ec0 feat:leña en la económica 2023-11-13 23:37:05 +01:00
9ee8daccdd fixes 2023-10-31 23:04:22 +01:00
72dd717df1 basic recipe, missing ingredients, bigger collisions and.... The secret **********. 2023-10-31 00:10:21 +01:00
d649a7f4a8 Se nos viene la olla 2023-10-13 03:14:34 +02:00