Commit Graph
100 Commits
Author SHA1 Message Date
eneko 3e0d68cb5c Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-10-13 02:41:53 +02:00
eneko 275458a8a4 feat: say_last_dialog_option command 2023-10-13 02:41:43 +02:00
eneko 937e0fd8d3 Item cleanup 2023-10-10 23:28:06 +02:00
eneko e6de1f1323 Fix: tried to fix compiling errors in esc_item_with_tooltip.gd 2023-10-07 23:38:56 +02:00
eneko d4643568c4 Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-10-06 00:11:39 +02:00
eneko 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
eneko 157f20b0e8 feat: now oier talks to eneko on init, making the developing experience more frustating!
bugfix: initial location in cocina and cocina_delante
2023-10-03 23:55:51 +02:00
eneko c25cfd0061 bugfix: avoid replaying cutscene 2023-10-03 23:25:11 +02:00
eneko 0294394542 Deleted *.translation files 2023-09-28 00:18:54 +02:00
eneko f04736e943 padding 2023-09-27 23:59:55 +02:00
eneko fec381dd1f Oier knows how to count potatoes! 2023-09-23 23:57:21 +02:00
eneko c633ad511d Cutting the big potato 2023-09-22 23:49:22 +02:00
eneko 9705ca14a4 Center cursor on item combination 2023-09-22 22:39:06 +02:00
eneko 0b21813e77 gymkhana/item_count (#16)
Item can now be countable objects, like money, bullets or even potatoes!

Reviewed-on: gymkhana/gymkhana#16
2023-09-22 00:10:02 +02:00
eneko ebbaec2abf Merge pull request 'video player feature' (#11) from gymkhana/video-player into gymkhana/main
Reviewed-on: gymkhana/gymkhana#11
2023-09-18 22:47:47 +02:00
eneko ef82e45e10 Avoid name collision between highlight variable and function 2023-09-14 22:54:31 +02:00
eneko 7900f2a464 Remove not unicode char 2023-08-28 00:12:33 +02:00
eneko 0ad2605b65 Remove not unicode char 2023-08-28 00:11:01 +02:00
eneko 0a1e8e4d7c Merge pull request 'Command: set_tooltip' (#6) from gymkhana/command-set-tooltip into gymkhana/main
Reviewed-on: gymkhana/gymkhana#6
2023-08-27 19:39:10 +02:00
eneko bc2ce9dbf6 bugfix frontal 2023-08-27 04:28:32 +02:00
eneko ceb6dd1244 Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-08-27 04:02:26 +02:00
eneko 42e504f5b2 eneko fuma 2023-08-27 04:02:16 +02:00
eneko 1a159efa20 eneko 2023-08-27 03:08:32 +02:00
eneko e6f4beeab6 bol sin peso + lentejas 2023-08-27 02:42:59 +02:00
eneko a6408ffc1a Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-08-27 02:19:18 +02:00
eneko 73b2a8be5d bol+lentejas 2023-08-27 02:19:04 +02:00
eneko 1ee9c339db peso+bol 2023-08-27 01:35:14 +02:00
eneko b30dcbc29d cocina_peso 2023-08-27 00:47:13 +02:00
eneko 19d38e5e1c start with frontal 2023-08-26 20:00:57 +02:00
eneko 64a362f384 connect rooms 2023-08-26 17:01:55 +02:00
eneko fcabc37482 cocina detras -> cocina 2023-08-26 02:08:33 +02:00
eneko 774aab70eb added cocina_detras room 2023-08-26 01:58:02 +02:00
eneko 7e2f3131ae Added cocina room 2023-08-25 23:47:12 +02:00
eneko 7306c62ebd added door to despensa 2023-08-25 23:00:59 +02:00
eneko 7d9aa7c808 deleted inventory button 2023-08-25 22:40:07 +02:00
eneko c2471ad598 ignore mouse click on grey background 2023-08-25 22:32:12 +02:00
eneko 6956b60c5b ui: grey background 2023-08-25 22:04:12 +02:00
eneko 100fa7e4ef cocina_delante: add exit 2023-08-25 19:47:53 +02:00
eneko a8d669d43c Added cocina_delante room 2023-08-25 16:46:08 +02:00
eneko 48d7740fc8 interior_cocina: sprite for background instead of escbackground 2023-06-06 19:52:37 +02:00
eneko 4ae7f2cff1 Disabled custom dialog manager to avoid bug 2023-06-06 19:29:23 +02:00
eneko 0d38a8646a Updated escoria-demo-game 2023-06-06 19:28:49 +02:00
eneko 6d3bd3511c trampujilla para que se vea medio oier 2023-03-12 23:44:10 +01:00
eneko 289c73c98d Walking it interior cocina 2023-03-11 00:28:35 +01:00
eneko 5657fec563 Walking it interior cocina 2023-03-11 00:21:46 +01:00
eneko ab591ab6ff fix: clear action manager state if background clicked 2023-03-10 18:48:37 +01:00
eneko 9569d4f30f Set tooltips as hidden while performing actions 2023-03-10 18:38:51 +01:00
eneko 99d2b89a4e Erase all references to use_from_inventory_only 2023-03-09 19:33:43 +01:00
eneko 56bf73b639 fix: combine items without use_from_inventory_only 2023-03-09 19:22:41 +01:00
eneko ad4acae88d fix: restore mouse cursor after combining items in inventory 2023-03-09 18:18:45 +01:00
eneko d57317ee6a Eneko blocks you in whatsapp 2023-03-09 13:38:17 +01:00
eneko 41496f5d52 Combine wrench with caja_herramientas and give to Eneko 2023-03-09 13:29:38 +01:00
eneko 1445f1db78 Wrench added to trasera_cocina 2023-03-09 12:39:28 +01:00
eneko dc7deb496f caja_herramientas code cleanup 2023-03-09 12:19:30 +01:00
eneko 4347423700 Move some items to inventory folder and names cleanup 2023-03-09 11:59:00 +01:00
eneko d86e111e3f Added translation to FULLSCREEN 2023-03-09 11:34:46 +01:00
eneko 712fdd1e92 Added translation to FULLSCREEN 2023-03-09 00:33:15 +01:00
eneko cdaba3a055 Fullscreen in optionsgit pull 2023-03-09 00:28:33 +01:00
eneko d8d25e5dbb Added ESCItemWithTooltip.target_when_selected_action_is_in 2023-03-08 23:25:20 +01:00
eneko c9ce5acd5b Actions in caja_herramientas 2023-03-08 23:06:08 +01:00
eneko bf8671b152 Use bombona2 with smoking_eneko 2023-03-08 17:25:23 +01:00
eneko ad44e20063 ESCItemWithTooltip.actionN_target_texts dictionaries 2023-03-08 17:03:01 +01:00
eneko b09e949153 Show action3 and action4 if waiting for target item 2023-03-08 00:40:48 +01:00
eneko 8795986053 Reset mouse cursor on click. Cancel using item if background clicked. 2023-03-08 00:14:29 +01:00
eneko 0380acc353 RESTORED ORIGINAL addons/escoria-core/game/escoria.gd 2023-03-07 23:41:30 +01:00
eneko 50ad55ce14 MODIFIED escoria.gdgit add . Action manager extended to apply needed changes for monkey UI 2023-03-07 00:29:46 +01:00
eneko a19632eb27 Remove some tooltip2 references 2023-03-05 23:26:37 +01:00
eneko 1521a67614 fix(monkey-ui): action3/action4 when using objects 2023-03-03 23:38:45 +01:00
eneko 63cf13a452 fix(rich_tooltip): use action3 and action4 texts if item in inventory 2023-03-03 19:46:43 +01:00
eneko 5b482d99d1 fix rich tooltip showing with empty action texts 2023-03-03 19:27:52 +01:00
eneko 5cf0db6c21 fix in rich tooltip 2023-03-03 19:12:14 +01:00
eneko c633e4bd23 Fixed use inventory items 2023-02-24 20:33:31 +01:00
eneko d9c89abada fix tooltip in inventory 2023-02-24 19:39:06 +01:00
eneko e75c41ff9b Action3 and Action4 2023-02-24 18:03:17 +01:00
eneko caa8b348bf CHANGES TO CORE: comments on action_manager 2023-02-19 23:18:10 +01:00
eneko bf66988190 Reset cursor on event done 2023-02-17 00:26:17 +01:00
eneko a83e5f2778 Use inventory items (WIP) 2023-02-17 00:14:13 +01:00
eneko fab2a7c234 montón de bombonas, pruebas para inventario lleno 2023-02-16 19:55:39 +01:00
eneko 09c49c0824 Inventory always visible 2023-02-16 19:13:06 +01:00
eneko 8ad4d1ff4f cleanup 2023-02-16 18:06:53 +01:00
eneko 551aa1fd05 Right click on inventory items 2023-02-16 17:29:30 +01:00
eneko 6f1d2d89da Renamed item.gd to esc_item_with_tooltip.gd
Trasera cocina as start room
2023-02-16 16:56:57 +01:00
eneko c9e9445f57 Action1 and tooltips on inventory items 2023-02-16 00:18:03 +01:00
eneko fc50e75ad5 pickable bombona 2023-02-15 23:44:36 +01:00
eneko bbe4b2c92f Moved I_Bombona to gymkhana/items/inventory 2023-02-15 23:16:29 +01:00
eneko 9fab2eeacb Fix errors with tooltip2 2023-02-15 22:38:13 +01:00
eneko c722bf5045 Fix errors with tooltip2 2023-02-15 19:23:04 +01:00
eneko 62b8b35f1c Revert "Deleted tooltip2"
This reverts commit f1f9bf7a69.
2023-02-15 17:26:23 +01:00
eneko f1f9bf7a69 Deleted tooltip2 2023-02-15 15:55:25 +01:00
eneko 369b47bff5 Connect door in Home with Trasera cocina 2023-02-14 00:58:26 +01:00
eneko 646c35385e Room selector 2023-02-14 00:51:17 +01:00
eneko 42da5b9235 Cleanup 2023-02-14 00:33:57 +01:00
eneko 78c43de381 Deleted cursor images 2023-02-14 00:19:59 +01:00
eneko ca383efeef Generic update_tooltip_following_mouse_position() 2023-02-14 00:17:34 +01:00
eneko 1b37992827 Delete unused mouse verbs 2023-02-13 23:30:39 +01:00
eneko 4b74545b3a Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-02-13 20:18:02 +01:00
eneko 477ddca540 Hide tooltips while performing action 2023-02-13 20:17:37 +01:00
eneko 143086c4f3 UNDO CHANGES IN escoria-core 2023-02-13 18:20:52 +01:00
eneko cfc45d0c56 Clear tooltip2 on item unfocus 2023-02-13 13:48:54 +01:00
eneko 761cb7fcb8 MODIFIED addons/escoria-core/game/core-scripts/esc_game.gd
Created tooltip2_target
2023-02-13 13:40:53 +01:00