Commit Graph

531 Commits

Author SHA1 Message Date
66d3416b91 Merge branch 'main' of git.fosil.eu:gymkhana/gymkhana 2025-09-06 03:57:22 +02:00
334270582c Fix hidden tooltips. Closes #68 2025-09-06 03:57:14 +02:00
d347b50472 resize cursor. closes #108 2025-09-06 03:50:57 +02:00
ba3634b3cc fix(item_count): closes #122 2025-09-06 01:37:28 +02:00
6f6cd7fc55 Event and target key. 2025-09-06 01:09:36 +02:00
8fed526fd2 feat(outline): outline targets when using item and pressing shift key 2025-09-06 00:14:17 +02:00
80c19824a0 Inventory hover texture 2025-09-05 22:59:38 +02:00
b588754f07 fix(uid): fix uids in oier and eneko scenes to avoid warnings 2025-09-03 20:51:35 +02:00
166da8ba8e fix(import): wrong uid in tres files 2025-09-02 23:20:38 +02:00
eaf16df0c2 fix(ItemComponent): avoid warning loading project 2025-09-02 23:09:53 +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
2c42dff6e5 fix(action_manager): use items, closes #111 2025-09-02 12:47:34 +02:00
4fcc62e176 Unpause dev progress but show pause menu. Fixes #112 2025-09-02 02:54:47 +02:00
a7aab5dfb5 fix: add debug/perform_script_analysis_at_runtime setting to project.godot 2025-08-04 13:34:11 +02:00
b57f56eb9f fix: apply changes to esc_action_manager.gd from escoria-demo-game 2025-08-04 12:12:42 +02:00
97a57d5f3f Merge branch 'gymkhana/escoria4-di' 2025-04-03 17:39:24 +02:00
1d23db63c4 fix(say_last_dialog_option): closes #104 2025-03-30 04:17:19 +02:00
2bb1fa5b31 Merge branch 'gymkhana/escoria4' of git.fosil.eu:gymkhana/gymkhana into gymkhana/escoria4 2025-03-30 04:16:12 +02:00
e8d929bab7 DI proposal 2025-03-30 04:15:04 +02:00
c08e04f00b Click on bg resets icon cursor. 2025-03-30 04:13:30 +02:00
afb3fc9230 fix(eneko): action2 dialog was crashing 2025-03-30 04:05:43 +02:00
07f2b3b76d fix(godot4): update simple_dialog 2025-03-29 20:28:45 +01:00
82dd13b017 fix(escoria4): show menu 2025-03-11 15:39:50 +01:00
0a859038bf feat(escoria4): update overrided InventoryItem and delete overrided ObjectManager 2025-03-11 12:38:54 +01:00
0fb120466b feat(escoria4): upgraded project to Godot 4.4 2025-03-11 12:29:32 +01:00
b377f06be0 makes tooltips visible again 2025-02-23 01:27:40 +01:00
d706383011 Now with inventory 2025-02-09 23:53:21 +01:00
ad92def20b Now with subtitles 2025-02-09 20:53:04 +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
aaa3953b9c fix(rtmi-dialog-simple): say command was blocking game state 2025-01-26 23:38:25 +01:00
6521b2f807 feat: port ESCActionManagerMonkey 2025-01-26 19:04:51 +01:00
93ee35362b fix(project.godot): enable translations with [internationalization]
fix(file structure): fix escoria-core symlink
2025-01-25 19:10:28 +01:00
95b7a8aa2a merge fix 2025-01-24 01:06:21 +01:00
137d696a21 fix(ItemWithTooltip): call super._ready() on _ready() 2025-01-23 23:56:18 +01:00
351060c697 bugfix(rtmi-ui): rtmi's inventory calls to super._ready() on _ready() 2025-01-22 23:21:43 +01:00
061c7b1e03 Port: full rtmi-ui plugin 2025-01-22 00:26:24 +01:00
3b2c4855d8 Port: item_outline 2025-01-21 23:38:27 +01:00
a8be2672d1 Port: GymkhanaAutoload 2025-01-21 23:38:05 +01:00
a8c527c3e4 feat: ported escoria-ui-return-monkey-island-dialog-simple 2025-01-20 23:30:12 +01:00
f34f96e87f feat(godot4): project automatic upgrade from godot 3 to 4 2025-01-19 01:05:35 +01:00
9fd73fe5e3 velocidad del texto 2024-11-14 23:41:58 +01:00
d80e3d4b36 Debug shortcuts: loadgame, new game without intro 2024-11-13 01:28:04 +01:00
c7079bfc08 feat(credits): enable music volume, closes #89 2024-11-12 19:36:05 +01:00
4be604b1d4 Habla solo cuando te toca 2024-11-03 01:14:12 +01:00
1b2c65086d remove dialog tip 2024-11-03 01:07:37 +01:00
3aa4661781 fixes #33 2024-11-02 23:29:11 +01:00
7db2491c7d hide dialogs 2024-11-02 22:58:42 +01:00
b5d57bd2e3 Disable hover stack 2024-11-02 22:58:42 +01:00
bcf185231d fix(patata): added object-manager override. Solves #82 2024-11-02 22:45:24 +01:00