Merge branch 'master-lepshiy'

Browse Source

# Conflicts:
#	scenes/настройки/настройки.gd

...

This commit is contained in:

sasha80

2026-01-19 10:48:33 +03:00

parent aee7e2d5d3 216c5f1960

commit e2b0f09fb9

33 changed files with 212 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

shaders/select_tr.gdshader → shaders/select-tr.gdshader

0

shaders/select_tr.gdshader.uid → shaders/select-tr.gdshader.uid