Commit Graph

94 Commits

Author SHA1 Message Date
c307f2e5c6 Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-09-25 23:07:20 +02:00
fec381dd1f Oier knows how to count potatoes! 2023-09-23 23:57:21 +02:00
9705ca14a4 Center cursor on item combination 2023-09-22 22:39:06 +02:00
38dece6947 WIP 2023-09-22 00:50:03 +02:00
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
92bfd3bbc2 added sound library settings & command (#12)
## Changes
- Added file base simple sound library
- Added base UI settings and sound library settings
- Added `play_lib_snd` command

## Notes
- The command accepts a namespace so we can leave common sound in the root folder and chapter specific sounds in its own folder

## How to test
- Run the game
- All the door sounds should play as normal.

Reviewed-on: gymkhana/gymkhana#12
Co-authored-by: oier <oierbravo@gmail.com>
Co-committed-by: oier <oierbravo@gmail.com>
2023-09-21 00:38:12 +02:00
d309c9fb88 video player feature 2023-09-17 02:10:20 +02:00
5f15bca474 menu icon, F3 key to show room selector 2023-09-16 21:09:06 +02:00
8674ffffa4 menu to the top right position 2023-09-16 19:13:02 +02:00
1727cbe63e Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-09-16 16:43:12 +02:00
2fdbdaaa6a unified tooltips as dictionary (#8)
## Changes
- From one variable for each tooltip to dictionary
- Should not break the game.

## How to test
- Run game
- In `cocina_delante` every tooltip yould appear as always.
- The rest of the rooms/items appear without tooltip.

## Side effects
- `set_tooltip` ESC command doesn't work untill `tooltip` is set to the in the new way. It changes the tooltip to every object without the new tooltip.
- Should be gone when we update every object.

Reviewed-on: gymkhana/gymkhana#8
Co-authored-by: oier <oierbravo@gmail.com>
Co-committed-by: oier <oierbravo@gmail.com>
2023-09-16 15:56:20 +02:00
344408f23c replaced inventory bg with colored polygon 2023-09-16 14:45:49 +02:00
ef82e45e10 Avoid name collision between highlight variable and function 2023-09-14 22:54:31 +02:00
fc4f4ed8d5 inventory ui texture 2023-09-04 22:42:35 +02:00
0d5c490a9f more changes to the dialog manager 2023-08-28 22:29:35 +02:00
049d18327f Death to the Godot editor! long life to *VSX* 2023-08-28 18:19:17 +02:00
2618b52008 Item Highlight with shift key 2023-08-28 17:22:51 +02:00
59384da8ac simple dialog plugin naming changed to avoid collision with the core 2023-08-28 16:57:21 +02:00
5949f0713b Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-08-28 16:44:47 +02:00
c4e732701f dialog simple plugin updated & enabled 2023-08-28 16:38:02 +02:00
7900f2a464 Remove not unicode char 2023-08-28 00:12:33 +02:00
0ad2605b65 Remove not unicode char 2023-08-28 00:11:01 +02:00
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
2cc01f0326 fix highlight 2023-08-27 18:02:59 +02:00
9015186b5a item highlight, cambio de estrategia. 2023-08-27 17:17:10 +02:00
c20964a17c set_tooltip esc command 2023-08-27 16:37:43 +02:00
494af4dd0e soniditos 2023-08-27 04:26:22 +02:00
beb244a01e cocina frontal-patata 2023-08-27 03:31:18 +02:00
85062ea912 Item Outline, despensa 2023-08-27 01:34:50 +02:00
2eab18d7e8 tooltips fix 2023-08-26 01:24:37 +02:00
7d9aa7c808 deleted inventory button 2023-08-25 22:40:07 +02:00
c2471ad598 ignore mouse click on grey background 2023-08-25 22:32:12 +02:00
6956b60c5b ui: grey background 2023-08-25 22:04:12 +02:00
0d38a8646a Updated escoria-demo-game 2023-06-06 19:28:49 +02:00
ab591ab6ff fix: clear action manager state if background clicked 2023-03-10 18:48:37 +01:00
9569d4f30f Set tooltips as hidden while performing actions 2023-03-10 18:38:51 +01:00
99d2b89a4e Erase all references to use_from_inventory_only 2023-03-09 19:33:43 +01:00
56bf73b639 fix: combine items without use_from_inventory_only 2023-03-09 19:22:41 +01:00
ad4acae88d fix: restore mouse cursor after combining items in inventory 2023-03-09 18:18:45 +01:00
4347423700 Move some items to inventory folder and names cleanup 2023-03-09 11:59:00 +01:00
d8d25e5dbb Added ESCItemWithTooltip.target_when_selected_action_is_in 2023-03-08 23:25:20 +01:00
c9ce5acd5b Actions in caja_herramientas 2023-03-08 23:06:08 +01:00
ad44e20063 ESCItemWithTooltip.actionN_target_texts dictionaries 2023-03-08 17:03:01 +01:00
b09e949153 Show action3 and action4 if waiting for target item 2023-03-08 00:40:48 +01:00
8795986053 Reset mouse cursor on click. Cancel using item if background clicked. 2023-03-08 00:14:29 +01:00
0380acc353 RESTORED ORIGINAL addons/escoria-core/game/escoria.gd 2023-03-07 23:41:30 +01:00
50ad55ce14 MODIFIED escoria.gdgit add . Action manager extended to apply needed changes for monkey UI 2023-03-07 00:29:46 +01:00
a19632eb27 Remove some tooltip2 references 2023-03-05 23:26:37 +01:00
1521a67614 fix(monkey-ui): action3/action4 when using objects 2023-03-03 23:38:45 +01:00
63cf13a452 fix(rich_tooltip): use action3 and action4 texts if item in inventory 2023-03-03 19:46:43 +01:00