Commit Graph

1061 Commits

Author SHA1 Message Date
3c623156bc room clean up 2023-09-26 03:17:22 +02:00
72fa2931bf room clean up 2023-09-26 03:03:30 +02:00
6e1fe599f2 first background music 2023-09-26 02:41:52 +02:00
a776252bb7 sequences, random & global variables 2023-09-26 02:18:24 +02:00
9c4df0d4d7 Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-09-26 00:48:44 +02:00
401de66a9f cursor fix 2023-09-26 00:48:27 +02:00
2d32f4b312 Localization (#15)
## Changes (escoria-core)
> Pending to do a PR to the core.
- Added `es` langcode with the corresponding flag image.
- Translated literals for `es`

## Changes (gymkhana)
-  Added `turno_cocina` localization csv.
- Proof of concept for tooltips & dialogs.

## Notes
- For tooltips just use the literals. Godot will automatically search for a translation key first.
- For ESC just use `translation_key:"Default text"`

## How to test
- In the option menu ES should be selectable.
- The `frontal` item in the inventory should have the tooltips and the `say` command translated in `en`,`fr` and `es`.

Reviewed-on: gymkhana/gymkhana#15
Co-authored-by: oier <oierbravo@gmail.com>
Co-committed-by: oier <oierbravo@gmail.com>
2023-09-26 00:13:55 +02:00
6cbd466f76 me corte con el cuchillo, XD 2023-09-25 23:49:48 +02:00
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
c633ad511d Cutting the big potato 2023-09-22 23:49:22 +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
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
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
1394861ee7 missing tooltip update 2023-09-16 19:12:46 +02:00
34d8747643 cocina -> cocina_delante spawn point fix 2023-09-16 16:45:10 +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
81dbb521b7 Walking in the start 2023-09-04 23:19:01 +02:00
fc4f4ed8d5 inventory ui texture 2023-09-04 22:42:35 +02:00
36651bf490 pull request template 2023-09-04 19:58:17 +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
bc2ce9dbf6 bugfix frontal 2023-08-27 04:28:32 +02:00
494af4dd0e soniditos 2023-08-27 04:26:22 +02:00
0a748b63d0 Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-08-27 04:09:06 +02:00
d1e467651e eneko fuma 2023-08-27 04:09:02 +02:00
ceb6dd1244 Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-08-27 04:02:26 +02:00
42e504f5b2 eneko fuma 2023-08-27 04:02:16 +02:00
50ccb0f25b Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-08-27 03:31:27 +02:00
beb244a01e cocina frontal-patata 2023-08-27 03:31:18 +02:00
1a159efa20 eneko 2023-08-27 03:08:32 +02:00
e6f4beeab6 bol sin peso + lentejas 2023-08-27 02:42:59 +02:00