Commit Graph

73 Commits

Author SHA1 Message Date
cbc4eb0181 feat(cleanup): delete talking heads 2025-09-05 21:07:29 +02:00
5f9ede68c2 fix(best joke ever): bread is speaking 2025-09-05 18:56:26 +02:00
c9d090dab8 fixes #119 2025-09-05 18:49:33 +02:00
b588754f07 fix(uid): fix uids in oier and eneko scenes to avoid warnings 2025-09-03 20:51:35 +02:00
afb3fc9230 fix(eneko): action2 dialog was crashing 2025-03-30 04:05:43 +02:00
b4dc4691e6 Fixed dialog position. Closes #105 2025-03-30 01:08:57 +01:00
0fb120466b feat(escoria4): upgraded project to Godot 4.4 2025-03-11 12:29:32 +01:00
21647df329 Tutorial variable fix 2025-02-09 23:53:57 +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
9a124830c5 feat(escoria4): port cocina and cocina_gas 2025-01-27 23:53:41 +01:00
09b02a210a fix: port some esc files 2025-01-25 19:56:44 +01:00
f538ab07b6 Port: cocina delante 2025-01-24 01:01:37 +01:00
f34f96e87f feat(godot4): project automatic upgrade from godot 3 to 4 2025-01-19 01:05:35 +01:00
e269ff97a0 Añade Eneko no quiere mechero sin gas, closes #87 2024-11-13 20:54:48 +01:00
b619a4c126 feat(intro): force 3,4,5,6 options in dialog 2024-11-13 19:24:03 +01:00
aa6fc435c5 fixes & refixes 2024-11-09 01:08:46 +01:00
a0ba8c827c Amenazas hasta el infinito 2024-11-02 23:30:32 +01:00
220c390597 Dancing animations, some glitch fixed 2024-11-02 21:39:16 +01:00
b2673e71ac feat(story): el pan que habla 2024-11-02 17:44:05 +01:00
346472df17 issue/42-oier-amenaza-con-el-cuchillo-a-eneko (#73)
Oier amenaza con cuchillo
Co-authored-by: oier <oierbravo@gmail.com>
Co-committed-by: oier <oierbravo@gmail.com>
2024-11-02 13:59:54 +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
068c4c982c feat: take sticker if Eneko is away 2024-10-25 23:24:07 +02:00
6255c6cef2 feat(eneko): new dialog options 2024-10-25 19:09:35 +02:00
f6d5e50811 more dialogue cleanup 2024-08-29 13:22:55 +02:00
3304b5ead4 fix: bombona and caja_herramientas cleanup 2024-08-29 12:55:02 +02:00
f1ee9c5ed7 feat: block exits while Eneko is tasting the lentils 2024-03-23 22:59:23 +01: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
9f9cebeda9 Merge branch 'custom-data-components' 2024-03-17 20:03:34 +01:00
19ef4704d4 Custom data tooltip, Tooltip manager, Gymkhana autoload 2024-03-17 19:48:58 +01:00
ffd09bf308 fix: replace mp4 with ogv in video paths 2024-03-17 19:44:30 +01:00
277dc9e10a clean up 2024-02-13 00:07:11 +01:00
438270455f fix: intro dialog typo 2024-02-12 22:53:10 +01:00
f3d067054c Now with SubtitleVision 2024-02-11 19:35:40 +01:00
e33601f081 eneko speak animation mini clean up 2024-02-11 18:15:40 +01:00
bcc9a97205 eneko animation mini clean up 2024-02-10 23:20:55 +01:00
fdcf425425 🎉Zorionak eneko!🎉 2024-02-08 23:45:43 +01:00
4389701319 fix: small fixes 2024-02-05 23:12:45 +01:00
03d78da002 el pan que habla 2024-02-05 22:38:46 +01:00
bcc43712cf feat: intro scene finished 2024-02-04 23:53:35 +01:00
83c8b2e6be Intro cocina 2024-01-28 13:11:36 +01:00
bf639419d1 intro 2024-01-28 12:13:17 +01:00
f69a7d071b jersey verde 2024-01-28 11:51:38 +01:00
356ddde0a4 feat: videos! 2024-01-27 19:47:48 +01:00
854cba768c fix: eneko leña dialog 2024-01-27 00:51:39 +01:00
04272190f5 ajo y eneko catador 2024-01-26 23:35:03 +01:00
5e47ade5ba feat: character dialog colors 2023-11-14 23:26:48 +01:00
b6761cc828 fix:texts 2023-11-11 00:13:09 +01:00
a2f26f7306 feat: eneko sabe kung fu 2023-11-11 00:05:02 +01:00
b752b1aef4 feat: la fruntal de mi abuelo 2023-11-10 23:35:57 +01:00