Commit Graph

63 Commits

Author SHA1 Message Date
e7e9dbb796 Game Over! 2025-09-15 01:57:05 +02:00
f41fc361b8 Picked observer, global observer 2025-09-14 04:44:12 +02:00
8823132e8e Global madness 2025-09-14 01:49:09 +02:00
2d74a87b14 Global observer, adios patata infinita 2025-09-13 23:35:15 +02:00
d7055d412e Cuerno active 2025-09-11 10:26:44 +02:00
8d0fb7d395 A cocinar! fixes #127 #128 2025-09-11 01:59:03 +02:00
54653e13f1 mikel, libro recetas 2025-09-11 00:34:16 +02:00
020df3533c Oier is on fire. Closes #124 2025-09-08 00:27:48 +02:00
d7926d64c8 apaga luz mariluz 2025-09-08 00:18:42 +02:00
7d7a2a8e9e Menu sounds, frontal sound 2025-09-07 19:14:16 +02:00
86ed25c512 feat(economica): dialogs, closes #99 2025-09-05 20:42:38 +02:00
37ab5a4511 feat(fregaderos): dialogs, closes #101 2025-09-05 20:04:11 +02:00
5f9ede68c2 fix(best joke ever): bread is speaking 2025-09-05 18:56:26 +02:00
86ad5965c2 Coger patata debajo sofa. Fixes #114 2025-09-05 18:01:43 +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
d666c9e469 more esc fixes 2025-02-10 00:01:16 +01:00
21647df329 Tutorial variable fix 2025-02-09 23:53:57 +01:00
4f1e647d56 Ground hog day tutorial 2025-02-08 05:33:04 +01:00
18cf6822e7 fix cocina start locations 2025-02-08 05:24: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
757792a76b feat(escoria4): port jarra, jarra_volcada, pan, patata, puerta_delante and puerta_detras 2025-02-05 23:54:31 +01:00
d624bda258 feat(escoria4): ported fregadero der and izq 2025-01-29 23:31:58 +01:00
a03bed73d7 feat(escoria4): ported cuchillos, debajo_sofa and economica 2025-01-29 00:07:18 +01:00
9a124830c5 feat(escoria4): port cocina and cocina_gas 2025-01-27 23:53:41 +01:00
7905433217 Cocina fantasma, closes #91 2024-11-13 00:40:00 +01:00
d958a2934d Ni pan ni agua en el tutorial 2024-11-03 18:39:47 +01:00
27badc4b67 feat(cocina_detras): parece que veo a Mikel, closes #83 2024-11-03 00:21:22 +01:00
b2673e71ac feat(story): el pan que habla 2024-11-02 17:44:05 +01:00
073431e11e gas interactions 2024-04-09 22:28:19 +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
803d5ff71d fix cuerno en intro 2024-02-11 22:29:32 +01:00
c36ad18989 The sound of water 2024-02-10 22:25:27 +01:00
396db338cf Smoke on the water. Closes #38 2024-02-10 20:23:51 +01:00
0d6c98f852 fix missing carton 2024-02-10 17:21:45 +01:00
bcc43712cf feat: intro scene finished 2024-02-04 23:53:35 +01:00
3d6545ad79 Disable items in cocina intro. PENDING RE-ENABLING THEM! 2024-01-28 14:17:59 +01:00
83c8b2e6be Intro cocina 2024-01-28 13:11:36 +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
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
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
d649a7f4a8 Se nos viene la olla 2023-10-13 03:14:34 +02:00
5d50f3e188 Auto set_active(false) for inventory items component 2023-10-08 03:44:21 +02:00
d1fc5995d4 feat: Oier does not speak to Eneko at startup, now the game has no story and is very boring
fix: remember picked items to avoid appering in scene again
fix: counting potatoes
2023-10-06 00:08:33 +02:00